Changeset 2878 for pjproject/trunk/pjlib/src/pj/except.c

Timestamp:

Aug 14, 2009 10:41:00 AM (15 years ago)

Author:

bennylp

Message:

Fixed ticket #939: Throwing exception inside exception handler will cause infinite loop (thanks Roman Puls for the report)

• exception handler is now popped from the stack immediately in PJ_THROW

File:

• pjproject/trunk/pjlib/src/pj/except.c (modified) (3 diffs)

pjproject/trunk/pjlib/src/pj/except.c

@@ -51 +51 @@
         /* This will crash the system! */
     }
+    pj_pop_exception_handler_(handler);
     pj_longjmp(handler->state, exception_id);
 }
@@ -87 +88 @@
 }
 
-PJ_DEF(void) pj_pop_exception_handler_(void)
+PJ_DEF(void) pj_pop_exception_handler_(struct pj_exception_state_t *rec)
 {
     struct pj_exception_state_t *handler;
@@ -93 +94 @@
     handler = (struct pj_exception_state_t *)
               pj_thread_local_get(thread_local_id);
-    pj_assert(handler != NULL);
-    pj_thread_local_set(thread_local_id, handler->prev);
+    if (handler && handler==rec) {
+        pj_thread_local_set(thread_local_id, handler->prev);
+    }
 }
 #endif