ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntdll: Don't send EXCEPTION_EXECUTE_FAULT to Windows programs that didn't enable DEP.

This commit is contained in:
Michael Karcher 2009-08-18 01:20:53 +02:00 committed by Alexandre Julliard
parent 7aa1f6c346
commit 9476071fd2
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/ntdll/signal_i386.c
View File

@ -1833,6 +1833,15 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext )
rec->ExceptionCode = EXCEPTION_ACCESS_VIOLATION;
rec->NumberParameters = 2;
rec->ExceptionInformation[0] = (get_error_code(context) >> 1) & 0x09;
/* Send code 8 (EXCEPTION_EXECUTE_FAULT) only if data execution
prevention is enabled */
if (rec->ExceptionInformation[0] & 8)
{
ULONG flags;
NtQueryInformationProcess( GetCurrentProcess(), ProcessExecuteFlags,
&flags, sizeof(flags), NULL );
if (!(flags & MEM_EXECUTE_OPTION_DISABLE)) rec->ExceptionInformation[0] &= 1;
}
rec->ExceptionInformation[1] = (ULONG_PTR)siginfo->si_addr;
break;
case TRAP_x86_ALIGNFLT: /* Alignment check exception */

6
dlls/ntdll/tests/exception.c
View File

@ -1053,11 +1053,7 @@ static void test_dpe_exceptions(void)
info.exception_caught = FALSE;
run_exception_test(dpe_exception_handler, &info, single_ret, sizeof(single_ret), PAGE_NOACCESS);
ok(info.exception_caught == TRUE, "Execution of disabled memory suceeded\n");
if(has_hw_support)
todo_wine ok(info.exception_info == EXCEPTION_READ_FAULT,
"Access violation type: %08x\n", (unsigned)info.exception_info);
else
ok(info.exception_info == EXCEPTION_READ_FAULT,
ok(info.exception_info == EXCEPTION_READ_FAULT,
"Access violation type: %08x\n", (unsigned)info.exception_info);
}
else