From: Julian Seward <jseward@acm.org>
Date: Tue, 4 Apr 2006 16:57:15 +0000 (+0000)
Subject: Comment-only change.
X-Git-Tag: svn/VALGRIND_3_2_0~134
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed4dde1934e563ffb6125a60cc49499fe8005046;p=thirdparty%2Fvalgrind.git

Comment-only change.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@5825
---

diff --git a/coregrind/m_aspacemgr/aspacemgr.c b/coregrind/m_aspacemgr/aspacemgr.c
index cec3f0e295..a788fbf8af 100644
--- a/coregrind/m_aspacemgr/aspacemgr.c
+++ b/coregrind/m_aspacemgr/aspacemgr.c
@@ -1696,9 +1696,15 @@ static void read_maps_callback ( Addr addr, SizeT len, UInt prot,
    seg.hasX   = toBool(prot & VKI_PROT_EXEC);
    seg.hasT   = False;
 
+   /* Don't use the presence of a filename to decide if a segment in
+      the initial /proc/self/maps to decide if the segment is an AnonV
+      or FileV segment as some systems don't report the filename. Use
+      the device and inode numbers instead. Fixes bug #124528. */
    seg.kind = SkAnonV;
-   if (dev != 0 && ino != 0) seg.kind  = SkFileV;
-   if (filename) seg.fnIdx = allocate_segname( filename );
+   if (dev != 0 && ino != 0) 
+      seg.kind = SkFileV;
+   if (filename)
+      seg.fnIdx = allocate_segname( filename );
 
    if (0) show_nsegment( 2,0, &seg );
    add_segment( &seg );