diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2007-10-22 15:05:35 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2007-10-22 15:05:35 +0000 |
| commit | 5b358603bd8897dcd38795c1ae971a8f917e97df (patch) | |
| tree | 2832440bbb6bfa0e7d597707ec02e8e80d73d794 /lib/http.c | |
| parent | 3910a61b617ed3f943f1f2bc25b3f034a82f692d (diff) | |
| download | curl-5b358603bd8897dcd38795c1ae971a8f917e97df.tar.gz | |
Michal Marek forwarded the bug report
https://bugzilla.novell.com/show_bug.cgi?id=332917 about a HTTP redirect to
FTP that caused memory havoc. His work together with my efforts created two
fixes:
#1 - FTP::file was moved to struct ftp_conn, because is has to be dealt with
at connection cleanup, at which time the struct HandleData could be
used by another connection.
Also, the unused char *urlpath member is removed from struct FTP.
#2 - provide a Curl_reset_reqproto() function that frees
data->reqdata.proto.* on connection setup if needed (that is if the
SessionHandle was used by a different connection).
Diffstat (limited to 'lib/http.c')
| -rw-r--r-- | lib/http.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/http.c b/lib/http.c index b32ca1d5b..7c63097c9 100644 --- a/lib/http.c +++ b/lib/http.c @@ -1894,13 +1894,16 @@ CURLcode Curl_http(struct connectdata *conn, bool *done) the rest of the request in the PERFORM phase. */ *done = TRUE; + /* If there already is a protocol-specific struct allocated for this + sessionhandle, deal with it */ + Curl_reset_reqproto(conn); + if(!data->reqdata.proto.http) { /* Only allocate this struct if we don't already have it! */ - http = (struct HTTP *)malloc(sizeof(struct HTTP)); + http = (struct HTTP *)calloc(sizeof(struct HTTP), 1); if(!http) return CURLE_OUT_OF_MEMORY; - memset(http, 0, sizeof(struct HTTP)); data->reqdata.proto.http = http; } else |