Changeset 7961a57

Timestamp:

Jul 27, 2010, 9:10:43 PM (14 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

release-1.6

Children:

de44b96

Parents:

b19e324

git-author:

Nelson Elhage <nelhage@mit.edu> (07/15/10 23:23:23)

git-committer:

Nelson Elhage <nelhage@mit.edu> (07/27/10 21:10:43)

Message:

zephyr.c: Handle errors from ZPending and ZReceiveNotice.

It is easy for a remote user to cause these functions to return errors by
sending us corrupt zgrams, so basically the only safe thing to do is to ignore
the errors.

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;
@@ -1381 +1388 @@
 #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++;