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

This commit is contained in:
Alexandre Julliard 2007-01-02 12:21:45 +01:00
parent 2cbf7d4d91
commit 4d9f3dfae1
1 changed files with 5 additions and 2 deletions

View File

@ -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 */