submitted-rld_map

2010-05-20  Aurelien Jarno  <aurelien@aurel32.net>

	* sysdeps/mips/dl-debug.h (ELF_MACHINE_DEBUG_SETUP): test for
	RLD_MAP pointer before using it.

Gbp-Pq: Topic mips
Gbp-Pq: Name submitted-rld_map.diff

diff --git a/sysdeps/mips/dl-debug.h b/sysdeps/mips/dl-debug.h
index 584ae0da1c625eeffe28da3d764ab50d633bac0c..b4dd2c5f96757c313715830e852cd0f6decfa1bd 100644 (file)
--- a/sysdeps/mips/dl-debug.h
+++ b/sysdeps/mips/dl-debug.h
@@ -33,7 +33,8 @@ elf_setup_debug_entry (struct link_map *l, struct r_debug *r)
       ptr += l->l_info[DT_MIPS (RLD_MAP_REL)]->d_un.d_val;
       *(ElfW(Addr) *) ptr = (ElfW(Addr)) r;
     }
-  else if (l->l_info[DT_MIPS (RLD_MAP)] != NULL)
+  else if (l->l_info[DT_MIPS (RLD_MAP)] != NULL &&
+      (l)->l_info[DT_MIPS (RLD_MAP)]->d_un.d_ptr)
     *(ElfW(Addr) *) (l->l_info[DT_MIPS (RLD_MAP)]->d_un.d_ptr)
       = (ElfW(Addr)) r;
 }