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/urldata.h | |
| parent | 3910a61b617ed3f943f1f2bc25b3f034a82f692d (diff) | |
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/urldata.h')
| -rw-r--r-- | lib/urldata.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/urldata.h b/lib/urldata.h index 8ee1d1989..b13ba42f1 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -376,8 +376,6 @@ struct FTP { curl_off_t *bytecountp; char *user; /* user name string */ char *passwd; /* password string */ - char *urlpath; /* the originally given path part of the URL */ - char *file; /* decoded file */ /* transfer a file/body or not, done as a typedefed enum just to make debuggers display the full symbol and not just the numerical value */ @@ -392,6 +390,7 @@ struct ftp_conn { char **dirs; /* realloc()ed array for path components */ int dirdepth; /* number of entries used in the 'dirs' array */ int diralloc; /* number of entries allocated for the 'dirs' array */ + char *file; /* decoded file */ char *cache; /* data cache between getresponse()-calls */ curl_off_t cache_size; /* size of cache in bytes */ bool dont_check; /* Set to TRUE to prevent the final (post-transfer) @@ -807,6 +806,8 @@ struct HandleData { void *generic; struct SSHPROTO *ssh; } proto; + /* current user of this HandleData instance, or NULL */ + struct connectdata *current_conn; }; /* |