From: micah <devnull@localhost>
Date: Thu, 16 Aug 2007 08:41:04 +0000 (-0700)
Subject: [svn] Fix #20748: fix test usage wrt zero-termination of strings.
X-Git-Tag: v1.13~572
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=19f0a05e9135c570b871804b7b88724e9746c005

[svn] Fix #20748: fix test usage wrt zero-termination of strings.
Also fixed incorrect "src/" prefix in ChangeLog entry for #20736.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index d6909aa7..9ca0bace 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,12 @@
+2007-08-10  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* url.c (append_uri_pathel): Do not assume dest string to be
+	zero-terminated.
+	(test_append_uri_pathel): Terminate string to fix test failure.
+
 2007-08-09  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
-	* src/url.c (url_string): Use comparison, not assignment, in
+	* url.c (url_string): Use comparison, not assignment, in
 	check for auth_mode == URL_AUTH_HIDE_PASSWD.
 
 2007-08-08  Micah Cowan  <micah@cowan.name>
diff --git a/src/url.c b/src/url.c
index 3c38b14a..04ecb3a4 100644
--- a/src/url.c
+++ b/src/url.c
@@ -1,5 +1,5 @@
 /* URL handling.
-   Copyright (C) 1996-2006 Free Software Foundation, Inc.
+   Copyright (C) 1996-2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
@@ -1369,7 +1369,7 @@ append_uri_pathel (const char *b, const char *e, bool escaped,
       || opt.restrict_files_case == restrict_uppercase)
     {
       char *q;
-      for (q = TAIL (dest); *q; ++q)
+      for (q = TAIL (dest); q < TAIL (dest) + outlen; ++q)
         {
           if (opt.restrict_files_case == restrict_lowercase)
             *q = TOLOWER (*q);
@@ -2089,6 +2089,7 @@ test_append_uri_pathel()
       
       append_string (test_array[i].original_url, &dest);
       append_uri_pathel (p, p + strlen(p), test_array[i].escaped, &dest);
+      append_char ('\0', &dest);
 
       mu_assert ("test_append_uri_pathel: wrong result", 
                  strcmp (dest.base, test_array[i].expected_result) == 0);