(cdk_strlist_next): Handle NULL root value better.

Based on report by Fabian Keil <fk@fabiankeil.de>.

1 files changed, 5 insertions, 2 deletions

diff --git a/lib/opencdk/misc.c b/lib/opencdk/misc.c
index 50977bfd49..0df82a1f15 100644
--- a/lib/opencdk/misc.c
+++ b/lib/opencdk/misc.c
@@ -109,7 +109,7 @@ cdk_strlist_add (cdk_strlist_t * list, const char *string)
  * cdk_strlist_next:
  * @root: the opaque string list.
  * @r_str: optional argument to store the string data.
- * 
+ *
  * Return the next string list node from @root. The optional
  * argument @r_str return the data of the current (!) node.
  **/
@@ -118,7 +118,10 @@ cdk_strlist_next (cdk_strlist_t root, const char **r_str)
 {
   cdk_strlist_t node;
 
-  if (root && r_str)
+  if (!root)
+    return NULL;
+
+  if (r_str)
     *r_str = root->d;
   for (node = root->next; node; node = node->next)
     return node;