diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2013-03-29 21:19:45 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2013-03-29 21:19:45 +0100 |
| commit | ca62ac69bbda381b3ba3a7b8bca63e82e84743ab (patch) | |
| tree | 39e3bf0349be6cd2e210957e0b779eaf253ae032 /lib/ftp.c | |
| parent | 048726a5a27e17bbd7d4db5382b2f2e92096b1c3 (diff) | |
ftp_sendquote: use PPSENDF, not FTPSENDF
The last remaining code piece that still used FTPSENDF now uses PPSENDF.
In the problematic case, a PREQUOTE series was done on a re-used
connection when Curl_pp_init() hadn't been called so it had messed up
pointers. The init call is done properly from Curl_pp_sendf() so this
change fixes this particular crash.
Bug: http://curl.haxx.se/mail/lib-2013-03/0319.html
Reported by: Sam Deane
Diffstat (limited to 'lib/ftp.c')
| -rw-r--r-- | lib/ftp.c | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -162,8 +162,6 @@ static CURLcode ftp_dophase_done(struct connectdata *conn, bool connected); /* easy-to-use macro: */ -#define FTPSENDF(x,y,z) if((result = Curl_ftpsendf(x,y,z)) != CURLE_OK) \ - return result #define PPSENDF(x,y,z) if((result = Curl_pp_sendf(x,y,z)) != CURLE_OK) \ return result @@ -3523,7 +3521,7 @@ CURLcode ftp_sendquote(struct connectdata *conn, struct curl_slist *quote) acceptfail = TRUE; } - FTPSENDF(conn, "%s", cmd); + PPSENDF(&conn->proto.ftpc.pp, "%s", cmd); pp->response = Curl_tvnow(); /* timeout relative now */ |