isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cannot wrap sigsetjmp() or we end up returning to the wrong place.

Browse Source 
Use a macro instead.
This commit is contained in:
Todd C. Miller
2012-11-29 06:37:13 -05:00
parent 02ad501ecc
commit b7ae7977a6
7 changed files with 36 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/error.h
View File

@@ -18,6 +18,7 @@
#define _SUDO_ERROR_H_
#include <stdarg.h>
#include <setjmp.h>
/*
* We wrap error/errorx and warn/warnx so that the same output can
@@ -170,9 +171,15 @@
warning_restore_locale(); \
} while (0)
#define error_setjmp() (error_enable_setjmp(), sigsetjmp(error_jmp, 1))
#define error_longjmp(val) siglongjmp(error_jmp, val)
extern int (*sudo_printf)(int msg_type, const char *fmt, ...);
extern sigjmp_buf error_jmp;
int error_callback_register(void (*func)(void));
void error_disable_setjmp(void);
void error_enable_setjmp(void);
void error2(int, const char *, ...) __printflike(2, 3) __attribute__((__noreturn__));
void errorx2(int, const char *, ...) __printflike(2, 3) __attribute__((__noreturn__));
void verror2(int, const char *, va_list ap) __attribute__((__noreturn__));