[Lldb-commits] [PATCH] D50149: Fix out-of-bounds read in Stream::PutCStringAsRawHex8

Raphael Isemann via Phabricator via lldb-commits lldb-commits at lists.llvm.org
Wed Aug 1 10:48:22 PDT 2018

teemperor created this revision.

When I added the Stream unit test (r338488), the build bots failed due to an out-of-
bound reads when passing an empty string to the PutCStringAsRawHex8 method.
In r338491 I removed the test case to fix the bots.

This patch fixes this in PutCStringAsRawHex8 by always checking for the terminating
null character in the given string (instead of skipping it the first time). It also re-adds the
test case I removed.



Index: unittests/Utility/StreamTest.cpp
--- unittests/Utility/StreamTest.cpp
+++ unittests/Utility/StreamTest.cpp
@@ -106,6 +106,9 @@
 TEST_F(StreamTest, PutCStringAsRawHex8) {
+  s.PutCStringAsRawHex8("");
+  EXPECT_EQ("", TakeValue());
   EXPECT_EQ("666f6f626172", TakeValue());
Index: source/Utility/Stream.cpp
--- source/Utility/Stream.cpp
+++ source/Utility/Stream.cpp
@@ -518,10 +518,10 @@
   size_t bytes_written = 0;
   bool binary_is_set = m_flags.Test(eBinary);
-  do {
+  while(*s) {
     bytes_written += _PutHex8(*s, false);
-  } while (*s);
+  }
   if (binary_is_set)
   return bytes_written;

-------------- next part --------------
A non-text attachment was scrubbed...
Name: D50149.158569.patch
Type: text/x-patch
Size: 852 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20180801/7220eeeb/attachment.bin>

More information about the lldb-commits mailing list