Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
b4991f20
Commit
b4991f20
authored
Aug 18, 2016
by
Piotr Caban
Committed by
Alexandre Julliard
Aug 23, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Remove no longer accessible TEB frames in RtlRestoreContext.
Signed-off-by:
Piotr Caban
<
piotr@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
b13924a6
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
0 deletions
+10
-0
signal_x86_64.c
dlls/ntdll/signal_x86_64.c
+10
-0
No files found.
dlls/ntdll/signal_x86_64.c
View file @
b4991f20
...
@@ -3557,6 +3557,8 @@ __ASM_GLOBAL_FUNC( call_consolidate_callback,
...
@@ -3557,6 +3557,8 @@ __ASM_GLOBAL_FUNC( call_consolidate_callback,
*/
*/
void
WINAPI
RtlRestoreContext
(
CONTEXT
*
context
,
EXCEPTION_RECORD
*
rec
)
void
WINAPI
RtlRestoreContext
(
CONTEXT
*
context
,
EXCEPTION_RECORD
*
rec
)
{
{
EXCEPTION_REGISTRATION_RECORD
*
teb_frame
=
NtCurrentTeb
()
->
Tib
.
ExceptionList
;
if
(
rec
&&
rec
->
ExceptionCode
==
STATUS_LONGJUMP
&&
rec
->
NumberParameters
>=
1
)
if
(
rec
&&
rec
->
ExceptionCode
==
STATUS_LONGJUMP
&&
rec
->
NumberParameters
>=
1
)
{
{
struct
MSVCRT_JUMP_BUFFER
*
jmp
=
(
struct
MSVCRT_JUMP_BUFFER
*
)
rec
->
ExceptionInformation
[
0
];
struct
MSVCRT_JUMP_BUFFER
*
jmp
=
(
struct
MSVCRT_JUMP_BUFFER
*
)
rec
->
ExceptionInformation
[
0
];
...
@@ -3586,6 +3588,14 @@ void WINAPI RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec )
...
@@ -3586,6 +3588,14 @@ void WINAPI RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec )
TRACE
(
"calling consolidate callback %p (rec=%p)
\n
"
,
consolidate
,
rec
);
TRACE
(
"calling consolidate callback %p (rec=%p)
\n
"
,
consolidate
,
rec
);
context
->
Rip
=
(
ULONG64
)
call_consolidate_callback
(
context
,
consolidate
,
rec
);
context
->
Rip
=
(
ULONG64
)
call_consolidate_callback
(
context
,
consolidate
,
rec
);
}
}
/* hack: remove no longer accessible TEB frames */
while
((
ULONG64
)
teb_frame
<
context
->
Rsp
)
{
TRACE
(
"removing TEB frame: %p
\n
"
,
teb_frame
);
teb_frame
=
__wine_pop_frame
(
teb_frame
);
}
TRACE
(
"returning to %lx stack %lx
\n
"
,
context
->
Rip
,
context
->
Rsp
);
TRACE
(
"returning to %lx stack %lx
\n
"
,
context
->
Rip
,
context
->
Rsp
);
set_cpu_context
(
context
);
set_cpu_context
(
context
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment