Skip to content

W
wine-cw
Commit 4d9f3dfa authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

preloader: Reset both AT_SYSINFO and AT_SYSINFO_EHDR when one of them conflicts.

parent 2cbf7d4d
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
loader/preloader.c
View file @ 4d9f3dfa
......@@ -1076,8 +1076,11 @@ void* wld_start( void **stack )
i = 0;
/* delete sysinfo values if addresses conflict */
if (is_in_preload_range( av, AT_SYSINFO )) delete_av[i++].a_type = AT_SYSINFO;
if (is_in_preload_range( av, AT_SYSINFO_EHDR )) delete_av[i++].a_type = AT_SYSINFO_EHDR;
if (is_in_preload_range( av, AT_SYSINFO ) || is_in_preload_range( av, AT_SYSINFO_EHDR ))
{
delete_av[i++].a_type = AT_SYSINFO;
delete_av[i++].a_type = AT_SYSINFO_EHDR;
}
delete_av[i].a_type = AT_NULL;
/* get rid of first argument */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment