commit 417c570c28794c960ad57a5287b48175959bbb37
author Elliott Hughes <enh@google.com> Tue Feb 14 19:07:01 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Feb 14 19:07:01 2017 +0000
tree ad932d7589003f629165dd2688a877049a06dec7
parent ccef727d393da91cf548de733a410c2ff1136923
parent 24d6e38a9b08f6532aff3257851734c3614ee5ea

Merge "Fix ubsan failure in android::base::Split." am: aa9548dbb4
am: 09980cd1a8

Change-Id: I49116f209d65365cc1caf3a50c09c7cc4178ecff

base/Android.bp

diff --git a/base/Android.bp b/base/Android.bp
index 7f81915..df09784 100644
--- a/base/Android.bp
+++ b/base/Android.bp
@@ -37,6 +37,9 @@
     cppflags: libbase_cppflags,
     export_include_dirs: ["include"],
     shared_libs: ["liblog"],
+    sanitize: {
+        misc_undefined: ["integer"],
+    },
     target: {
         android: {
             srcs: [
@@ -97,6 +100,9 @@
         "strings_test.cpp",
         "test_main.cpp",
     ],
+    sanitize: {
+        misc_undefined: ["integer"],
+    },
     target: {
         android: {
             srcs: [

base/strings.cpp

diff --git a/base/strings.cpp b/base/strings.cpp
index 46fe939..bfdaf12 100644
--- a/base/strings.cpp
+++ b/base/strings.cpp
@@ -36,11 +36,12 @@
 
   size_t base = 0;
   size_t found;
-  do {
+  while (true) {
     found = s.find_first_of(delimiters, base);
     result.push_back(s.substr(base, found - base));
+    if (found == s.npos) break;
     base = found + 1;
-  } while (found != s.npos);
+  }
 
   return result;
 }

base/strings_test.cpp

diff --git a/base/strings_test.cpp b/base/strings_test.cpp
index 7a65a00..7ed5b2b 100644
--- a/base/strings_test.cpp
+++ b/base/strings_test.cpp
@@ -251,3 +251,7 @@
   ASSERT_FALSE(android::base::EqualsIgnoreCase("foo", "bar"));
   ASSERT_FALSE(android::base::EqualsIgnoreCase("foo", "fool"));
 }
+
+TEST(strings, ubsan_28729303) {
+  android::base::Split("/dev/null", ":");
+}