Changeset 30428a9

Timestamp:

Jul 24, 2011, 7:05:36 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.9

Children:

8c3cae0, f271129

Parents:

40de7394

git-author:

David Benjamin <davidben@mit.edu> (07/24/11 18:23:21)

git-committer:

David Benjamin <davidben@mit.edu> (07/24/11 19:05:36)

Message:

Fix missing NULL check on anyone list return value

Error handling changed in ecffae6c5b3fd57d8ca74cd2ba142098748bfe7c.

File:

• functions.c (modified) (1 diff)

functions.c

@@ -3480 +3480 @@
 
   anyone = owl_zephyr_get_anyone_list(NULL);
-  for (i = 0; i < anyone->len; i++) {
-    user = anyone->pdata[i];
-    zald = g_new(ZAsyncLocateData_t, 1);
-    if (ZRequestLocations(zstr(user), zald, UNACKED, ZAUTH) == ZERR_NONE) {
-      *zaldlist = g_list_append(*zaldlist, zald);
-    } else {
-      g_free(zald);
-    }
-  }
-
-  owl_ptr_array_free(anyone, g_free);
+  if (anyone != NULL) {
+    for (i = 0; i < anyone->len; i++) {
+      user = anyone->pdata[i];
+      zald = g_new(ZAsyncLocateData_t, 1);
+      if (ZRequestLocations(zstr(user), zald, UNACKED, ZAUTH) == ZERR_NONE) {
+        *zaldlist = g_list_append(*zaldlist, zald);
+      } else {
+        g_free(zald);
+      }
+    }
+    owl_ptr_array_free(anyone, g_free);
+  }
 #endif
 }