Avoid buffer overruns and check return value of malloc()

[moira.git] / lib / mr_query.c

diff --git a/lib/mr_query.c b/lib/mr_query.c
index f9374d014064350cb2a52f6ca6f12209daee4ce9..af22ef891f5e265fb86e42151a94b92ffdc29d17 100644 (file)
--- a/lib/mr_query.c
+++ b/lib/mr_query.c
@@ -1,4 +1,4 @@
-/* $Id $
+/* $Id$
  *
  * Perform a Moira query
  *
@@ -12,6 +12,7 @@
 #include <moira.h>
 #include "mr_private.h"
 
+#include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -34,6 +35,8 @@ int mr_query(char *name, int argc, char **argv,
   char **nargv = malloc(sizeof(char *) * (argc + 1));
   int status = 0;
 
+  if (!nargv)
+    return ENOMEM;
   nargv[0] = name;
   memcpy(nargv + 1, argv, sizeof(char *) * argc);
   status = mr_query_internal(argc + 1, nargv, callproc, callarg);