Changeset e488ec5 for zephyr.c

Timestamp:

Jul 27, 2010, 10:50:36 PM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.7, release-1.8, release-1.9

Children:

35a30f9

Parents:

f93cc34 (diff), 26ad412 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'security'

File:

• zephyr.c (modified) (2 diffs)

zephyr.c

@@ -179 +179 @@
 {
 #ifdef HAVE_LIBZEPHYR
-  if(owl_global_is_havezephyr(&g))
-    return(ZPending());
+  Code_t code;
+  if(owl_global_is_havezephyr(&g)) {
+    if((code = ZPending()) < 0) {
+      owl_function_debugmsg("Error (%s) in ZPending()\n",
+                            error_message(code));
+      return 0;
+    }
+    return code;
+  }
 #endif
   return 0;
@@ -1397 +1404 @@
 #ifdef HAVE_LIBZEPHYR
   ZNotice_t notice;
+  Code_t code;
   owl_message *m=NULL;
 
   while(owl_zephyr_zpending() && zpendcount < OWL_MAX_ZEPHYRGRAMS_TO_PROCESS) {
     if (owl_zephyr_zpending()) {
-      ZReceiveNotice(&notice, NULL);
+      if ((code = ZReceiveNotice(&notice, NULL)) != ZERR_NONE) {
+        owl_function_debugmsg("Error: %s while calling ZReceiveNotice\n",
+                              error_message(code));
+        continue;
+      }
       zpendcount++;