33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
From 26790c3583b0588d21aa47603f441ee75937a2e1 Mon Sep 17 00:00:00 2001
|
|
From: Cong Ma <cma@pmo.ac.cn>
|
|
Date: Mon, 15 Dec 2014 21:21:10 +0800
|
|
Subject: [PATCH] ftp: fix invalid pointer dereference in getftp() (tiny change)
|
|
|
|
---
|
|
src/ftp.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/ftp.c b/src/ftp.c
|
|
index a3b2cb6..34c3858 100644
|
|
--- a/src/ftp.c
|
|
+++ b/src/ftp.c
|
|
@@ -1350,7 +1350,6 @@ Error in server response, closing control connection.\n"));
|
|
|
|
/* Get the server to tell us if everything is retrieved. */
|
|
err = ftp_response (csock, &respline);
|
|
- *last_expected_bytes = ftp_expected_bytes (respline);
|
|
if (err != FTPOK)
|
|
{
|
|
/* The control connection is decidedly closed. Print the time
|
|
@@ -1366,6 +1365,7 @@ Error in server response, closing control connection.\n"));
|
|
con->csock = -1;
|
|
return FTPRETRINT;
|
|
} /* err != FTPOK */
|
|
+ *last_expected_bytes = ftp_expected_bytes (respline);
|
|
/* If retrieval failed for any reason, return FTPRETRINT, but do not
|
|
close socket, since the control connection is still alive. If
|
|
there is something wrong with the control connection, it will
|
|
--
|
|
libgit2 0.21.0
|
|
|