Handle NULL in str2hge()

- at least apt-rpm expects to pass empty version as NULL to rpmdsSingle(),
  don't blow up...

1 files changed, 9 insertions, 3 deletions

diff --git a/lib/rpmds.c b/lib/rpmds.c
index 565dace9a..2d49ec692 100644
--- a/lib/rpmds.c
+++ b/lib/rpmds.c
@@ -90,10 +90,16 @@ static int dsType(rpmTag tag,
 static const char ** str2hge(const char *str)
 {
     const char ** arr;
-    char *t = xmalloc(sizeof(*arr) + strlen(str) + 1);
+    size_t slen = str ? strlen(str) + 1 : 0;
+    char *t = xmalloc(sizeof(*arr) + slen);
     arr = (const char **) t;
-    t += sizeof(*arr);
-    strcpy(t, str);
+
+    if (str) {
+	t += sizeof(*arr);
+	strcpy(t, str);
+    } else {
+	t = NULL;
+    }
     arr[0] = t;
     return arr;
 }