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

server: Fix pointer arithmetic in get_selector_entry(). 

The selector table is exclusively 32-bit, so trying to get selector entries
with a 64-bit wineserver will return the wrong values due to the different
size of (long *).

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2018-02-10 10:46:07 -06:00 committed by Alexandre Julliard
parent 67d7eb980e
commit c6dfce2723
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server/ptrace.c
View File

@ -517,13 +517,13 @@ void get_selector_entry( struct thread *thread, int entry, unsigned int *base,
}
if (suspend_for_ptrace( thread ))
{
unsigned char flags_buf[sizeof(long)];
long *addr = (long *)(unsigned long)thread->process->ldt_copy + entry;
if (read_thread_long( thread, addr, (long *)base ) == -1) goto done;
if (read_thread_long( thread, addr + 8192, (long *)limit ) == -1) goto done;
addr = (long *)(unsigned long)thread->process->ldt_copy + 2*8192 + (entry / sizeof(long));
if (read_thread_long( thread, addr, (long *)flags_buf ) == -1) goto done;
*flags = flags_buf[entry % sizeof(long)];
unsigned char flags_buf[4];
unsigned long addr = (unsigned long)thread->process->ldt_copy + (entry * 4);
if (read_thread_long( thread, (long *)addr, (long *)base ) == -1) goto done;
if (read_thread_long( thread, (long *)(addr + (8192 * 4)), (long *)limit ) == -1) goto done;
addr = (unsigned long)thread->process->ldt_copy + (2 * 8192 * 4) + (entry & ~3);
if (read_thread_long( thread, (long *)addr, (long *)flags_buf ) == -1) goto done;
*flags = flags_buf[entry % 4];
done:
resume_after_ptrace( thread );
}