Merge pull request #639 from mtomaschewski/null-cmp-fix

openSUSE · Apr 13, 2016 · 0ddf5e0 · 0ddf5e0
2 parents d85458f + c9b08c5
commit 0ddf5e0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/include/wicked/util.h b/include/wicked/util.h
@@ -279,7 +279,7 @@ static inline int
 ni_string_cmp(const char *a, const char *b)
 {
 	if (a == NULL || b == NULL)
-		return a > b ? 1 : -1;
+		return a > b ? 1 : a < b ? -1 : 0;
 	else
 		return strcmp(a, b);
 }
@@ -288,7 +288,7 @@ static inline int
 ni_string_cmp_nocase(const char *a, const char *b)
 {
 	if (a == NULL || b == NULL)
-		return a > b ? 1 : -1;
+		return a > b ? 1 : a < b ? -1 : 0;
 	else
 		return strcasecmp(a, b);
 }

diff --git a/src/util.c b/src/util.c
@@ -323,7 +323,7 @@ ni_string_array_cmp(const ni_string_array_t *la, const ni_string_array_t *ra)
 	int ret;
 
 	if (!la || !ra)
-		return la > ra ? 1 : -1;
+		return la > ra ? 1 : la < ra ? -1 : 0;
 
 	if (la->count != ra->count)
 		return la->count > ra->count ? 1 : -1;