add a few missing null pointer checks, and fix check vs dereference order in some cases (patch by Stanislav Fomichev)

1 files changed, 3 insertions, 0 deletions

diff --git a/ucimap.c b/ucimap.c
index 6a5c117..0bc31c5 100644
--- a/ucimap.c
+++ b/ucimap.c
@@ -295,6 +295,9 @@ realloc:
 		offset = (items - (*list)->size) * sizeof(union ucimap_data);
 
 	a->ptr = realloc(a->ptr, size);
+	if (!a->ptr)
+		return -ENOMEM;
+
 	if (offset)
 		memset((char *) a->ptr + offset, 0, size - offset);
 	new = a->ptr;