Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(69)

Side by Side Diff: third_party/sqlite/misc.patch

Issue 6835006: Convert to SQLite amalgamation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 Index: ext/icu/icu.c
2 ===================================================================
3 --- ext/icu/icu.c 2009-09-03 13:32:06.000000000 -0700
4 +++ ext/icu/icu.c 2009-07-01 12:08:37.000000000 -0700
5 @@ -38,6 +38,11 @@
6
7 #include <assert.h>
8
9 +// TODO(evanm): this is cut'n'pasted from fts2.c. Why is it necessary?
10 +#if !defined(SQLITE_CORE)
11 +# define SQLITE_CORE 1
12 +#endif
13 +
14 #ifndef SQLITE_CORE
15 #include "sqlite3ext.h"
16 SQLITE_EXTENSION_INIT1
17 Index: src/expr.c 1 Index: src/expr.c
18 =================================================================== 2 ===================================================================
19 --- src/expr.c 2009-09-08 12:16:11.000000000 -0700 3 --- src/expr.c 2009-09-08 12:16:11.000000000 -0700
20 +++ src/expr.c 2009-09-23 16:58:47.000000000 -0700 4 +++ src/expr.c 2009-09-23 16:58:47.000000000 -0700
21 @@ -804,7 +804,9 @@ 5 @@ -804,7 +804,9 @@
22 }else{ 6 }else{
23 int nSize = exprStructSize(p); 7 int nSize = exprStructSize(p);
24 memcpy(zAlloc, p, nSize); 8 memcpy(zAlloc, p, nSize);
25 - memset(&zAlloc[nSize], 0, EXPR_FULLSIZE-nSize); 9 - memset(&zAlloc[nSize], 0, EXPR_FULLSIZE-nSize);
26 + if( EXPR_FULLSIZE>nSize ){ 10 + if( EXPR_FULLSIZE>nSize ){
27 + memset(&zAlloc[nSize], 0, EXPR_FULLSIZE-nSize); 11 + memset(&zAlloc[nSize], 0, EXPR_FULLSIZE-nSize);
28 + } 12 + }
29 } 13 }
30 14
31 /* Set the EP_Reduced, EP_TokenOnly, and EP_Static flags appropriately. * / 15 /* Set the EP_Reduced, EP_TokenOnly, and EP_Static flags appropriately. * /
32 Index: src/func.c 16 Index: src/func.c
33 =================================================================== 17 ===================================================================
34 --- src/func.c 2009-09-04 13:37:42.000000000 -0700 18 --- src/func.c 2009-09-04 13:37:42.000000000 -0700
35 +++ src/func.c 2009-09-14 18:18:18.000000000 -0700 19 +++ src/func.c 2009-09-14 18:18:18.000000000 -0700
36 @@ -1020,7 +1020,7 @@ 20 @@ -1020,7 +1020,7 @@
37 } 21 }
38 } 22 }
39 if( zCharSet ){ 23 if( zCharSet ){
40 - sqlite3_free(azChar); 24 - sqlite3_free(azChar);
41 + sqlite3_free((void*)azChar); 25 + sqlite3_free((void*)azChar);
42 } 26 }
43 } 27 }
44 sqlite3_result_text(context, (char*)zIn, nIn, SQLITE_TRANSIENT); 28 sqlite3_result_text(context, (char*)zIn, nIn, SQLITE_TRANSIENT);
OLDNEW
« no previous file with comments | « third_party/sqlite/google_generate_preprocessed.sh ('k') | third_party/sqlite/preprocessed/README » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698