Deal appropriately with ParseArgv returning NULL

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2963 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/bin/varnishd/mgt_param.c b/varnish-cache/bin/varnishd/mgt_param.c
index 416b0d940d65dcb2023ce4906493bf1e35a10fe8..f2f8893fa8744019e4324f519ac6188a8bbee0c0 100644 (file)
--- a/varnish-cache/bin/varnishd/mgt_param.c
+++ b/varnish-cache/bin/varnishd/mgt_param.c
@@ -324,6 +324,11 @@ tweak_listen_address(struct cli *cli, const struct parspec *par, const char *arg
        }
 
        av = ParseArgv(arg, 0);
+       if (av == NULL) {
+               cli_out(cli, "Parse error: out of memory");
+               cli_result(cli, CLIS_PARAM);
+               return;
+       }
        if (av[0] != NULL) {
                cli_out(cli, "Parse error: %s", av[0]);
                cli_result(cli, CLIS_PARAM);

diff --git a/varnish-cache/bin/varnishd/varnishd.c b/varnish-cache/bin/varnishd/varnishd.c
index 5171561e1b9c624c19cd3cd3c1c1c9878e0d6c1c..1b6df279080e6e9d5995f575e80cc7d0a2cfe6e6 100644 (file)
--- a/varnish-cache/bin/varnishd/varnishd.c
+++ b/varnish-cache/bin/varnishd/varnishd.c
@@ -115,6 +115,7 @@ setup_storage(const char *spec)
        int ac;
 
        av = ParseArgv(spec, ARGV_COMMA);
+       AN(av);
 
        if (av[0] != NULL) 
                ARGV_ERR("%s\n", av[0]);
@@ -153,6 +154,7 @@ setup_hash(const char *h_arg)
        struct hash_slinger *hp;
 
        av = ParseArgv(h_arg, ARGV_COMMA);
+       AN(av);
 
        if (av[0] != NULL) 
                ARGV_ERR("%s\n", av[0]);