[svn] Fix access violation bug in DO_REALLOC_FROM_ALLOCA.

Published in <sxspubriqay.fsf@florida.arsdigita.de>.

diff --git a/src/ChangeLog b/src/ChangeLog
index 66cfca9d658a836beedb5c33b89f6562e3a96323..44d44f681a19e09cc4ff9ba7453f93c66f11a7d4 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2001-06-18  Hrvoje Niksic  <hniksic@arsdigita.com>
+
+       * recur.c (convert_all_links): Make sure "../" stuff is properly
+       handled in cur_url->url before we hand it over to convert_links.
+       (register_download): Canonicalize URL before storing it.
+
+2001-06-26  Hrvoje Niksic  <hniksic@arsdigita.com>
+
+       * wget.h (DO_REALLOC_FROM_ALLOCA): Set SIZEVAR after the memcpy()
+       call because it needs the old value.
+
 2001-06-18  Hrvoje Niksic  <hniksic@arsdigita.com>
 
        * cookies.c (ATTR_NAME_CHAR): Allow almost any character to be in

diff --git a/src/wget.h b/src/wget.h
index 02321777e16fd1e4eedfc1618cbcacb0b78b5c74..fb7e3f49759fe7c3e9e1138705b180b16566ec94 100644 (file)
--- a/src/wget.h
+++ b/src/wget.h
@@ -236,7 +236,6 @@ char *xstrdup_debug PARAMS ((const char *, const char *, int));
     do_realloc_newsize = 2*(sizevar);                                          \
     if (do_realloc_newsize < 16)                                               \
       do_realloc_newsize = 16;                                                 \
-    (sizevar) = do_realloc_newsize;                                            \
   }                                                                            \
   if (do_realloc_newsize)                                                      \
     {                                                                          \
@@ -249,6 +248,7 @@ char *xstrdup_debug PARAMS ((const char *, const char *, int));
          (basevar) = drfa_new_basevar;                                         \
          allocap = 0;                                                          \
        }                                                                       \
+      (sizevar) = do_realloc_newsize;                                          \
     }                                                                          \
 } while (0)