[Android] Fix bug in address parser.

Substring takes a length, not an index. Bug:b/12125045 BUG= Review URL: https://codereview.chromium.org/180873007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253956 0039d316-1c4b-4281-b951-d872f2087c98
cbchan · Feb 27, 2014 · fb3c8f4 · fb3c8f4
1 parent 3489f76
commit fb3c8f4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java
@@ -46,7 +46,8 @@ public void testFindAddress() {
         assertNull(ContentViewStatics.findAddress("This is some random text"));
 
         String googleAddr = "1600 Amphitheatre Pkwy, Mountain View, CA 94043";
-        assertEquals(googleAddr, ContentViewStatics.findAddress(googleAddr));
+        String testString = "Address: " + googleAddr + "  in a string";
+        assertEquals(googleAddr, ContentViewStatics.findAddress(testString));
     }
 
     @SmallTest

diff --git a/content/common/android/address_parser.cc b/content/common/android/address_parser.cc
@@ -51,7 +51,8 @@ using namespace internal;
 bool FindAddress(const base::string16& text, base::string16* address) {
   size_t start, end;
   if (FindAddress(text.begin(), text.end(), &start, &end)) {
-    address->assign(text.substr(start, end));
+    size_t len = end >= start ? end - start : 0;
+    address->assign(text.substr(start, len));
     return true;
   }
   return false;