s4:heimdal: import lorikeet-heimdal-200908050050 (commit 8714779fa7376fd9f7761587639e...

[samba.git] / source4 / heimdal / lib / roken / strpool.c

diff --git a/source4/heimdal/lib/roken/strpool.c b/source4/heimdal/lib/roken/strpool.c
index dc56892144ba3bc36c99be3e426604c8210d18a8..642d335dec874baf4a9995ed3edf4cde534da607 100644 (file)
--- a/source4/heimdal/lib/roken/strpool.c
+++ b/source4/heimdal/lib/roken/strpool.c
@@ -100,7 +100,10 @@ rk_strpoolprintf(struct rk_strpool *p, const char *fmt, ...)
 char * ROKEN_LIB_FUNCTION
 rk_strpoolcollect(struct rk_strpool *p)
 {
-    char *str = p->str;
+    char *str;
+    if (p == NULL)
+       return strdup("");
+    str = p->str;
     p->str = NULL;
     free(p);
     return str;