From 4d9f3dfae10102fdd464d102f01b8f2e1fcc5fdd Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Tue, 2 Jan 2007 12:21:45 +0100 Subject: [PATCH] preloader: Reset both AT_SYSINFO and AT_SYSINFO_EHDR when one of them conflicts. --- loader/preloader.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 381b8e40231..b1e2e53afe1 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -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 */ -- 2.11.4.GIT