Merge r6480 (parse_procselfmaps: don't hand zero-length mappings to

*record_mapping)

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

diff --git a/coregrind/m_aspacemgr/aspacemgr-linux.c b/coregrind/m_aspacemgr/aspacemgr-linux.c
index 588770f0bcd6f0ac5c2ac78a89ebae9efae9bf1a..dba0adad8692d271565d86444c07286ca258a8c9 100644 (file)
--- a/coregrind/m_aspacemgr/aspacemgr-linux.c
+++ b/coregrind/m_aspacemgr/aspacemgr-linux.c
@@ -3150,9 +3150,10 @@ static void parse_procselfmaps (
       if (record_gap && gapStart < start)
          (*record_gap) ( gapStart, start-gapStart );
 
-      (*record_mapping) ( start, endPlusOne-start, 
-                          prot, dev, ino,
-                          foffset, filename );
+      if (record_mapping && start < endPlusOne)
+         (*record_mapping) ( start, endPlusOne-start,
+                             prot, dev, ino,
+                             foffset, filename );
 
       if ('\0' != tmp) {
          filename[i_eol - i] = tmp;