Added null checks, removed unnecessary mark check

sergi · Nov 30, 2012 · 1ce781f · 1ce781f
1 parent 76b42dc
commit 1ce781f
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/lib/jsftp.js b/lib/jsftp.js
@@ -365,8 +365,8 @@ Ftp.getPasvPort = function(text) {
         var ftpResponse = action[0];
         var command  = action[1];
         var callback = command[1];
-        if (Ftp.isMark(ftpResponse.code)) {
-            if (callback.acceptsMarks) {
+        if (ftpResponse != null && Ftp.isMark(ftpResponse.code)) {
+            if (callback != null && callback.acceptsMarks) {
                 callback(null, ftpResponse);
             }
             this.cmdQueue.next(['', callback]);
@@ -602,9 +602,7 @@ Ftp.getPasvPort = function(text) {
                         if (err) {
                             doneCallback(err)
                         } else {
-                            if (!Ftp.isMark(res.code)) {
-                                doneCallback(err, res)
-                            }
+                            doneCallback(err, res)
                         }
                     }
                 }