moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

[svn] Fix memory allocation in cmd_address().

Browse Source 
Published in <sxs66gogt0k.fsf@florida.arsdigita.de> under
the subject "Fix for opt.bind_address".
This commit is contained in:
hniksic 2001-04-01 15:23:52 -07:00
parent 57d4abad60
commit cee04f2ef3
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2001-04-02 Hrvoje Niksic <hniksic@arsdigita.com>
* init.c (cmd_address): Heap-allocate the address that gets stored
to CLOSURE. Old code would simply assign an address on the stack.
2001-04-01 Nicolas Lichtmaier <nick@debian.org> 2001-04-01 Nicolas Lichtmaier <nick@debian.org>
* ftp.c (ftp_get_listing): Propagate error status. * ftp.c (ftp_get_listing): Propagate error status.

19
src/init.c
View File

@ -491,12 +491,21 @@ setval (const char *com, const char *val)
static int myatoi PARAMS ((const char *s)); static int myatoi PARAMS ((const char *s));
/* Store the address (specified as hostname or dotted-quad IP address) from VAL /* Interpret VAL as an Internet address (a hostname or a dotted-quad
to CLOSURE. COM is ignored, except for error messages. */ IP address), and write it (in network order) to a malloc-allocated
address. That address gets stored to the memory pointed to by
CLOSURE. COM is ignored, except for error messages.
#### IMHO it's a mistake to do this kind of work so early in the
process (before any download even started!) opt.bind_address
should simply remember the provided value as a string. Another
function should do the lookup, when needed, and cache the
result. --hniksic */
static int static int
cmd_address (const char *com, const char *val, void *closure) cmd_address (const char *com, const char *val, void *closure)
{ {
struct sockaddr_in sin; struct sockaddr_in sin;
struct sockaddr_in **target = (struct sockaddr_in **)closure;
if (!store_hostaddress ((unsigned char *)&sin.sin_addr, val)) if (!store_hostaddress ((unsigned char *)&sin.sin_addr, val))
{ {
@ -508,7 +517,10 @@ cmd_address (const char *com, const char *val, void *closure)
sin.sin_family = AF_INET; sin.sin_family = AF_INET;
sin.sin_port = 0; sin.sin_port = 0;
memcpy (closure, &sin, sizeof (sin)); FREE_MAYBE (*target);
*target = xmalloc (sizeof (sin));
memcpy (*target, &sin, sizeof (sin));
return 1; return 1;
} }
@ -1021,4 +1033,5 @@ cleanup (void)
FREE_MAYBE (opt.sslcertkey); FREE_MAYBE (opt.sslcertkey);
FREE_MAYBE (opt.sslcertfile); FREE_MAYBE (opt.sslcertfile);
#endif /* HAVE_SSL */ #endif /* HAVE_SSL */
FREE_MAYBE (opt.bind_address);
} }