sanitizer_linux.cc (MemoryMappingLayout::Next): Cherry pick upstream r182922.

2013-06-03  Christophe Lyon  <christophe.lyon@linaro.org>

       * sanitizer_common/sanitizer_linux.cc (MemoryMappingLayout::Next):
       Cherry pick upstream r182922.

From-SVN: r199606

libsanitizer/ChangeLog

+2013-06-03  Christophe Lyon  <christophe.lyon@linaro.org>
+
+	* sanitizer_common/sanitizer_linux.cc (MemoryMappingLayout::Next):
+	Cherry pick upstream r182922.
+
 2013-05-07  Christophe Lyon  <christophe.lyon@linaro.org>
 
 	* configure.tgt: Add ARM pattern.

libsanitizer/sanitizer_common/sanitizer_linux.cc

@@ -410,7 +410,9 @@ bool MemoryMappingLayout::Next(uptr *start, uptr *end, uptr *offset,
   CHECK_EQ(*current_++, ' ');
   while (IsDecimal(*current_))
     current_++;
-  CHECK_EQ(*current_++, ' ');
+  // Qemu may lack the trailing space.
+  // http://code.google.com/p/address-sanitizer/issues/detail?id=160
+  // CHECK_EQ(*current_++, ' ');
   // Skip spaces.
   while (current_ < next_line && *current_ == ' ')
     current_++;