dccp_recv: Avoid NULL pointer dereference.

[paraslash.git] / string.c

diff --git a/string.c b/string.c
index bbb7c7dd2e2ef671d2b89d5a5cebd89e535066d5..0a32c0f48b3b8fc9a1b5194587fc10068789a064 100644 (file)
--- a/string.c
+++ b/string.c
@@ -719,6 +719,8 @@ void free_argv(char **argv)
 {
        int i;
 
+       if (!argv)
+               return;
        for (i = 0; argv[i]; i++)
                free(argv[i]);
        free(argv);
@@ -760,6 +762,7 @@ err:
        while (num_words > 0)
                free(argv[--num_words]);
        free(argv);
+       *result = NULL;
        return ret;
 }