Merge lp:~xnox/upstart/bug-1324096 into lp:~jamesodhunt/upstart/bug-1324096

[Dimitri John Ledkov]

[James Hunt (jamesodhunt)]

Thanks - merged.

review: Approve

=== modified file 'init/control.c'
--- init/control.c	2014-06-04 15:32:58 +0000
+++ init/control.c	2014-06-05 09:25:56 +0000
@@ -1393,6 +1393,11 @@
 		 const char      *var,
 		 int              replace)
 {
+	if (! var) {
+		nih_dbus_error_raise_printf (DBUS_ERROR_INVALID_ARGS,
+					_("Variable may not be empty string"));
+		return -1;
+	}
 	nih_local char **vars = NULL;
 	
 	vars = NIH_MUST (nih_str_array_new (NULL));
@@ -1523,6 +1528,11 @@
 		   char * const    *job_details,
 		   const char      *name)
 {
+	if (! name) {
+		nih_dbus_error_raise_printf (DBUS_ERROR_INVALID_ARGS,
+					_("Variable may not be empty string"));
+		return -1;
+	}
 	nih_local char **names = NULL;
 	
 	names = NIH_MUST (nih_str_array_new (NULL));