From 6beef589e32d874e5d961e7e6f7b2a68c56538bd Mon Sep 17 00:00:00 2001 From: RichardHitt Date: Wed, 9 Jan 2013 14:37:57 -0800 Subject: Make source cleah with cppcheck, except for mpc and sasl --- src/common/util.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src/common/util.c') diff --git a/src/common/util.c b/src/common/util.c index 55cb530a..38537402 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1319,8 +1319,17 @@ int my_poptParseArgvString(const char * s, int * argcPtr, char *** argvPtr) { if (*argv[argc]) { buf++, argc++; if (argc == argvAlloced) { + char *temp[]; argvAlloced += POPT_ARGV_ARRAY_GROW_DELTA; - argv = realloc(argv, sizeof(*argv) * argvAlloced); + temp = realloc(argv, sizeof(*argv) * argvAlloced); + if (temp) + argv = temp; + else + { + free(argv); + free(bufStart); + return 1; + } } argv[argc] = buf; } -- cgit 1.4.1 From 672dbf75d6d3d47135be49568ebcce917d6c188c Mon Sep 17 00:00:00 2001 From: RichardHitt Date: Wed, 9 Jan 2013 14:53:19 -0800 Subject: Oops, fixed error in util.c --- src/common/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/common/util.c') diff --git a/src/common/util.c b/src/common/util.c index 38537402..2319f75e 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1319,7 +1319,7 @@ int my_poptParseArgvString(const char * s, int * argcPtr, char *** argvPtr) { if (*argv[argc]) { buf++, argc++; if (argc == argvAlloced) { - char *temp[]; + char **temp; argvAlloced += POPT_ARGV_ARRAY_GROW_DELTA; temp = realloc(argv, sizeof(*argv) * argvAlloced); if (temp) -- cgit 1.4.1