Merge 25141 - Fix issue 15261: Crash in history::TextDatabase::GetTextMatches...

third_party/sqlite/ext/fts3/fts3.c

Index: third_party/sqlite/ext/fts3/fts3.c
===================================================================
--- third_party/sqlite/ext/fts3/fts3.c	(revision 25199)
+++ third_party/sqlite/ext/fts3/fts3.c	(working copy)
@@ -330,7 +330,7 @@
   return (c&0x80)==0 ? isspace(c) : 0;
 }
 static int safe_tolower(char c){
-  return (c&0x80)==0 ? tolower(c) : c;
+  return (c>='A' && c<='Z') ? (c-'A'+'a') : c;
 }
 static int safe_isalnum(char c){
   return (c&0x80)==0 ? isalnum(c) : 0;
Property changes on: third_party\sqlite\ext\fts3\fts3.c
___________________________________________________________________
Added: svn:mergeinfo
   Merged /trunk/src/third_party/sqlite/ext/fts3/fts3.c:r25141
   Merged /branches/chrome_webkit_merge_branch/third_party/sqlite/ext/fts3/fts3.c:r69-2775