Ticket #1460: ControlSocket.cpp.2.patch

C:/Documents

@@ -643 +643 @@
             i=args.ReverseFind('.');
             port+=256*atoi(args.Right(args.GetLength()-(i+1))); // add ms byte to server socket
             ip=args.Left(i);
+            
+            if(inet_addr(ip) == INADDR_NONE)
+            {
+                // Fix: Convert IP in PORT command to int and back to string (strips 
+                // leading zeros) because some FTP clients prepend zeros to it. 
+                // inet_addr() thinks this is an octal number and will return INADDR_NONE 
+                // if 8 or 9 are encountered.
+                // 12/13/2004 DKW
+                CString DecIP = "";
+                char *TempIP = ip.GetBuffer();
+                char *tok;
+                const char *sep = ".";
+                int oct = 0;
+                char tmp[4];
 
-            if (inet_addr(ip)==INADDR_NONE || port<1 || port>65535)
+                tok = strtok(TempIP,sep);
+
+                while(tok != NULL){
+                    oct = atoi(tok);
+                    itoa(oct,tmp,10);
+                    DecIP += tmp;
+                    DecIP += ".";
+                    tok = strtok(NULL, sep);
+                }
+
+                ip.ReleaseBuffer();
+
+                ip = DecIP.Left(DecIP.GetLength() - 1);             
+            }
+
+            if(inet_addr(ip) == INADDR_NONE || port < 1 || port > 65535)
             {
                 Send("501 Syntax error");
                 break;