decode_URI_duplicate: fix error handling

cb6e4c62 · Rémi Denis-Courmont · d6e4d5a5 · cb6e4c62 · cb6e4c62
Commit cb6e4c62 authored Aug 20, 2012 by Rémi Denis-Courmont
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

src/test/url.c src/test/url.c +2 -2

src/text/url.c src/text/url.c +5 -1

No files found.
--- a/src/test/url.c
+++ b/src/test/url.c
@@ -101,8 +101,8 @@ int main (void)
    test_decode ("%7E", "~");

    /* tests with invalid input */
-    test_decode ("%", "%");
-    test_decode ("%2", "%2");
+    test_decode ("%", NULL);
+    test_decode ("%2", NULL);
    test_decode ("%0000", "");

    /* Non-ASCII tests */

--- a/src/text/url.c
+++ b/src/text/url.c
@@ -41,7 +41,11 @@
 char *decode_URI_duplicate (const char *str)
 {
    char *buf = strdup (str);
-    decode_URI (buf);
+    if (decode_URI (buf) == NULL)
+    {
+        free (buf);
+        buf = NULL;
+    }
    return buf;
 }