Changeset 23381

Timestamp:

09/13/07 12:11:36 (15 months ago)

Author:

zarzycki@…

Message:

Better input vetting.

Files:

• trunk/launchd/src/launchd_core_logic.c (modified) (2 diffs)

trunk/launchd/src/launchd_core_logic.c

@@ -1688 +1688 @@
 
         if (pload == NULL) {
+                errno = EINVAL;
                 return NULL;
         }
@@ -1696 +1697 @@
         }
 
-        if ((tmp = launch_data_dict_lookup(pload, LAUNCH_JOBKEY_LABEL)) &&
-                        (launch_data_get_type(tmp) == LAUNCH_DATA_STRING)) {
-                if (!(label = launch_data_get_string(tmp))) {
-                        errno = EINVAL;
-                        return NULL;
-                }
+        if (!(tmp = launch_data_dict_lookup(pload, LAUNCH_JOBKEY_LABEL))) {
+                errno = EINVAL;
+                return NULL;
+        }
+
+        if (launch_data_get_type(tmp) != LAUNCH_DATA_STRING) {
+                errno = EINVAL;
+                return NULL;
+        }
+
+        if (!(label = launch_data_get_string(tmp))) {
+                errno = EINVAL;
+                return NULL;
         }