mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 20:03:10 +02:00
Code

Fix 21381, make sure gcc does not make any ip-relative calls or similar.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21477 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2006-12-03 19:49:39 +00:00
parent 92256c07d1
commit 80439005c7
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
loader/win32.c
View File

@ -5291,7 +5291,9 @@ struct libs libraries[]={
static void ext_stubs(void)
{
volatile int idx = 0xdeadabcd;
printf("Called unk_%s\n", export_names[idx]);
// make sure gcc does not do eip-relative call or something like that
volatile void (*my_printf)(char *, char *) = (void *)0xdeadfbcd;
my_printf("Called unk_%s\n", export_names[idx]);
}
#define MAX_STUB_SIZE 0x60
@ -5302,6 +5304,7 @@ static char extcode[MAX_NUM_STUBS * MAX_STUB_SIZE];
static void* add_stub(void)
{
int i;
int found = 0;
// generated code in runtime!
char* answ = extcode + pos * MAX_STUB_SIZE;
if (pos >= MAX_NUM_STUBS) {
@ -5310,14 +5313,20 @@ static void* add_stub(void)
}
memcpy(answ, ext_stubs, MAX_STUB_SIZE);
for (i = 0; i < MAX_STUB_SIZE - 3; i++) {
if (*(int*)(answ + i) == 0xdeadabcd)
break;
int *magic = (int *)(answ + i);
if (*magic == 0xdeadabcd) {
*magic = pos;
found |= 1;
}
if (*magic == 0xdeadfbcd) {
*magic = (intptr_t)printf;
found |= 2;
}
}
if (*(int*)(answ + i) != 0xdeadabcd) {
if (found != 3) {
printf("magic code not found in ext_subs, expect crash\n");
return NULL;
}
*(int*)(answ + i) = pos;
pos++;
return (void*)answ;
}