From: Panu Matilainen <pmatilai@redhat.com>
Date: Tue, 5 Oct 2010 06:11:13 +0000 (+0300)
Subject: Tolerate NULL args in argvSplitString()
X-Git-Tag: rpm-4.9.0-beta1~227
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=152d1f0bc4b3b99ca72d994f90fee0f91f627daf;p=platform%2Fupstream%2Frpm.git

Tolerate NULL args in argvSplitString()
---

diff --git a/rpmio/argv.c b/rpmio/argv.c
index f21da1c..cf6e299 100644
--- a/rpmio/argv.c
+++ b/rpmio/argv.c
@@ -170,13 +170,17 @@ int argvAppend(ARGV_t * argvp, ARGV_const_t av)
 
 ARGV_t argvSplitString(const char * str, const char * seps, argvFlags flags)
 {
-    char *dest = xmalloc(strlen(str) + 1);
+    char *dest = NULL;
     ARGV_t argv;
     int argc = 1;
     const char * s;
     char * t;
     int c;
 
+    if (str == NULL || seps == NULL)
+	return NULL;
+
+    dest = xmalloc(strlen(str) + 1);
     for (argc = 1, s = str, t = dest; (c = *s); s++, t++) {
 	if (strchr(seps, c)) {
 	    argc++;