Changeset 340c3e7

Timestamp:

Oct 3, 2009, 10:12:06 AM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

8830f79f

Parents:

40bda84

git-author:

Nelson Elhage <nelhage@mit.edu> (09/12/09 19:47:59)

git-committer:

Nelson Elhage <nelhage@mit.edu> (10/03/09 10:12:06)

Message:

owl_function_error: Bail out early in the case of recursive errors.

owl_function_adminmsg triggers a lot of code, and so it is possible that
whatever caused an error will also cause owl_function_adminmsg to error
out. Watch for recursive calls to owl_function_error, and bail out early
to prevent infinite looping.

File:

• functions.c (modified) (2 diffs)

functions.c

@@ -3397 +3397 @@
 void owl_function_error(const char *fmt, ...)
 {
+  static int in_error = 0;
   va_list ap;
   char *buff;
   const char *nl;
 
+  if (++in_error > 2) {
+    /* More than two nested errors, bail immediately. */
+    in_error--;
+    return;
+  }
+
   va_start(ap, fmt);
-
   buff = g_strdup_vprintf(fmt, ap);
+  va_end(ap);
+
   owl_function_debugmsg("ERROR: %s", buff);
+  owl_function_log_err(buff);
+
   nl = strchr(buff, '\n');
-  if(nl && *(nl + 1)) {
+
+  /*
+    Showing admin messages triggers a lot of code. If we have a
+    recursive error call, that's the most likely candidate, so
+    suppress the call in that case, to try to avoid infinite looping.
+  */
+
+  if(nl && *(nl + 1) && in_error == 1) {
     /* Multiline error */
     owl_function_adminmsg("ERROR", buff);
@@ -3412 +3429 @@
     owl_function_makemsg("[Error] %s", buff);
   }
-  owl_function_log_err(buff);
-  va_end(ap);
+
   owl_free(buff);
+
+  in_error--;
 }