Fix cob_call_with_exception_check

libcob/common.c

@@ -297,6 +297,8 @@ static const char		*cob_last_progid = NULL;
 static cob_global		*cobglobptr = NULL;
 static cob_settings		*cobsetptr = NULL;
 
+static int			inhibit_call_exit_handlers_and_terminate = 0;
+
 static int			last_exception_code;	/* Last exception: code */
 static int			active_error_handler = 0;
 
@@ -3001,6 +3003,9 @@ cob_get_pointer (const void *srcptr)
 static void
 call_exit_handlers_and_terminate (void)
 {
+	if (inhibit_call_exit_handlers_and_terminate != 0) {
+		return;
+	}
 	if (exit_hdlrs != NULL) {
 		struct exit_handlerlist *h = exit_hdlrs;
 		while (h != NULL) {
@@ -10014,17 +10019,20 @@ cob_common_init (void *setptr)
    errors (-1), hard errors (-2) or signals (-3) */
 int
 cob_call_with_exception_check (const char *name, const int argc, void **argv)
-{	
+{
+	inhibit_call_exit_handlers_and_terminate = 1;
 #ifndef COB_WITHOUT_JMP
 	int ret;
 	return_jmp_buffer_set = 1;
 	ret = setjmp (return_jmp_buf);
 	if (ret) {
 		return_jmp_buffer_set = 0;
+		inhibit_call_exit_handlers_and_terminate = 0;
 		return ret;
 	}
 #endif
 	exit_code = cob_call (name, argc, argv);
+	inhibit_call_exit_handlers_and_terminate = 0;
 	return 0;
 }
 

libcob/common.h

@@ -2054,7 +2054,10 @@ COB_EXPIMP void		*cob_call_field		(const cob_field *,
 COB_EXPIMP void		cob_cancel_field	(const cob_field *,
 						 const struct cob_call_struct *);
 COB_EXPIMP void		cob_cancel		(const char *);
+
+/* When using this function, modules will not be unloaded until you manually call cob_tidy */
 COB_EXPIMP int		cob_call_with_exception_check (const char*, const int, void **);
+
 COB_EXPIMP int		cob_call		(const char *, const int, void **);
 COB_EXPIMP int		cob_func		(const char *, const int, void **);