From: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Date: Fri, 26 Jan 2018 22:35:29 +0000 (+0000)
Subject: submitted-rld_map
X-Git-Tag: archive/raspbian/2.26-6+rpi1^2~42
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=91d0f8c9a4c00d56747866ba991abd27b5917255;p=glibc.git

submitted-rld_map

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

	* sysdeps/mips/dl-machine.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-machine.h b/sysdeps/mips/dl-machine.h
index 74ead7f52..ea9bf70d8 100644
--- a/sysdeps/mips/dl-machine.h
+++ b/sysdeps/mips/dl-machine.h
@@ -78,7 +78,8 @@ do { if ((l)->l_info[DT_MIPS (RLD_MAP_REL)]) \
 	 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)]) \
+     else if ((l)->l_info[DT_MIPS (RLD_MAP)] && \
+	 (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); \
    } while (0)