Avoid memory leaks when using TRelayer

[mgsmtp.git] / Relay.pas

diff --git a/Relay.pas b/Relay.pas
index 3df2b330ca14ec3d79d61d5200980f7f74597ded..017d943b22463595f184cf51911f176ea112bca5 100644 (file)
--- a/Relay.pas
+++ b/Relay.pas
@@ -176,6 +176,7 @@ begin
    FTransactionComplete:= false;
    FRoutingTarget:= RoutingTable.GetRouteInfo(Envelope.RelayHost);
    Response:= TRFCReply.Create;
+   TCP:= nil;
    FillChar(SMTPExtensions, SizeOf(TSMTPExtensions), #0);
 end;
 
@@ -183,6 +184,7 @@ destructor TRelayer.Destroy;
 begin
    FRoutingTarget.Free;
    Response.Free;
+   if TCP <> nil then TCP.Free;
    inherited Destroy;
 end;
 
@@ -333,14 +335,14 @@ begin
    if MXList.Count >= 1 then begin
       TCP:= TTCPRFCConnection.Create;
       TCP.SetBindAddress(MainServerConfig.BindAddress);
-      TCP.Connect(MXList.Strings[0], RelayServerPort);
       TCP.SetSockTimeOut(DEF_SOCK_TIMEOUT);
-      i:= 1;
+      i:= 0;
       while (not TCP.Connected) and (i < MXList.Count) do begin
          TCP.Connect(MXList.Strings[i], RelayServerPort);
          Inc(i);
       end;
       Result:= TCP.Connected;
+      if not TCP.Connected then FreeAndNil(TCP);
    end
    else Result:= false;
    MXList.Free;
@@ -540,7 +542,7 @@ procedure TRelayer.CloseConnection;
 begin
    TCP.SendCommand(SMTP_C_QUIT);
    {TCP.ReadResponse(Response);}
-   TCP.Free;
+   FreeAndNil(TCP);
 end;