stv0g/Criterion
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed Error NTSTATUS-es not being reported as crashes

Browse source
This commit is contained in:
Snaipe 2016-02-07 02:32:03 +01:00
parent 4636358398
commit d539c12b5d
2 changed files with 53 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/compat/posix.h
View file

@ -68,7 +68,20 @@
# define WIFSIGNALED(Status) (((signed char) (WTERMSIG(Status) + 1) >> 1) > 0) # define WIFSIGNALED(Status) (((signed char) (WTERMSIG(Status) + 1) >> 1) > 0)
# define SIGPROF 27 # define SIGPROF 27
# define CR_EXCEPTION_TIMEOUT 0xC0001042 # define SIGSYS 31
/*
* We define a custom exception code following the ntstatus specification:
*
* 1110 1111 1111 1111 1111 1111 1111 1111
* -||| ------------------| -------------|
* ||| | `- Code: Unspecified (-1)
* ||| `---------------- Facility: Unspecified (-1)
* ||`------------------------------------ Reserved (0b0)
* |`------------------------------------- Customer code: Yes (0b1)
* `-------------------------------------- Severity: Error (0b11)
*/
# define CR_EXCEPTION_TIMEOUT 0xEFFFFFFF
# else # else
# include <sys/wait.h> # include <sys/wait.h>

39
src/compat/process.c
View file

@ -54,6 +54,42 @@
# define WRITE_PROCESS_(Proc, What, Size) \ # define WRITE_PROCESS_(Proc, What, Size) \
WriteProcessMemory(Proc, &What, &What, Size, NULL); WriteProcessMemory(Proc, &What, &What, Size, NULL);
# ifndef STATUS_BAD_STACK
# define STATUS_BAD_STACK 0xC0000028L
# endif
/*
* NTSTATUS specification, from ntstatus.h:
*
* > Values are 32 bit values laid out as follows:
* >
* > 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1
* > 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
* > +---+-+-+-----------------------+-------------------------------+
* > |Sev|C|R| Facility | Code |
* > +---+-+-+-----------------------+-------------------------------+
* >
* > where
* >
* > Sev - is the severity code
* >
* > 00 - Success
* > 01 - Informational
* > 10 - Warning
* > 11 - Error
* >
* > C - is the Customer code flag
* >
* > R - is a reserved bit
* >
* > Facility - is the facility code
* >
* > Code - is the facility's status code
*
* We consider that all exit codes with error severity bits that cannot
* be directly translated to translate to SIGSYS.
*
*/
static int get_win_status(HANDLE handle) { static int get_win_status(HANDLE handle) {
DWORD exit_code; DWORD exit_code;
GetExitCodeProcess(handle, &exit_code); GetExitCodeProcess(handle, &exit_code);
@ -82,12 +118,15 @@ static int get_win_status(HANDLE handle) {
case STATUS_IN_PAGE_ERROR: case STATUS_IN_PAGE_ERROR:
case STATUS_NO_MEMORY: case STATUS_NO_MEMORY:
case STATUS_INVALID_DISPOSITION: case STATUS_INVALID_DISPOSITION:
case STATUS_BAD_STACK:
case STATUS_STACK_OVERFLOW: sig = SIGSEGV; break; case STATUS_STACK_OVERFLOW: sig = SIGSEGV; break;
case STATUS_CONTROL_C_EXIT: sig = SIGINT; break; case STATUS_CONTROL_C_EXIT: sig = SIGINT; break;
default: break; default: break;
} }
if (sig == 0 && exit_code & 0xC0000000)
sig = SIGSYS;
return sig ? sig : exit_code << 8; return sig ? sig : exit_code << 8;
} }
#else #else