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

Side by Side Diff: third_party/sqlite/src/ext/fts3/fts3.c

Issue 7230021: Fix authorizer issue with fts3 in WebDatabase. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Whitespace, and add patch file. Created 9 years, 6 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
« no previous file with comments | « third_party/sqlite/fts3_85522.patch ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 ** 2006 Oct 10 2 ** 2006 Oct 10
3 ** 3 **
4 ** The author disclaims copyright to this source code. In place of 4 ** The author disclaims copyright to this source code. In place of
5 ** a legal notice, here is a blessing: 5 ** a legal notice, here is a blessing:
6 ** 6 **
7 ** May you do good and not evil. 7 ** May you do good and not evil.
8 ** May you find forgiveness for yourself and forgive others. 8 ** May you find forgiveness for yourself and forgive others.
9 ** May you share freely, never taking more than you give. 9 ** May you share freely, never taking more than you give.
10 ** 10 **
(...skipping 612 matching lines...) Expand 10 before | Expand all | Expand 10 after
623 623
624 zSql = sqlite3_mprintf("PRAGMA %Q.page_size", p->zDb); 624 zSql = sqlite3_mprintf("PRAGMA %Q.page_size", p->zDb);
625 if( !zSql ){ 625 if( !zSql ){
626 rc = SQLITE_NOMEM; 626 rc = SQLITE_NOMEM;
627 }else{ 627 }else{
628 rc = sqlite3_prepare(p->db, zSql, -1, &pStmt, 0); 628 rc = sqlite3_prepare(p->db, zSql, -1, &pStmt, 0);
629 if( rc==SQLITE_OK ){ 629 if( rc==SQLITE_OK ){
630 sqlite3_step(pStmt); 630 sqlite3_step(pStmt);
631 p->nPgsz = sqlite3_column_int(pStmt, 0); 631 p->nPgsz = sqlite3_column_int(pStmt, 0);
632 rc = sqlite3_finalize(pStmt); 632 rc = sqlite3_finalize(pStmt);
633 }else if( rc==SQLITE_AUTH ){
634 p->nPgsz = 1024;
635 rc = SQLITE_OK;
633 } 636 }
634 } 637 }
635 assert( p->nPgsz>0 || rc!=SQLITE_OK ); 638 assert( p->nPgsz>0 || rc!=SQLITE_OK );
636 sqlite3_free(zSql); 639 sqlite3_free(zSql);
637 *pRc = rc; 640 *pRc = rc;
638 } 641 }
639 } 642 }
640 643
641 /* 644 /*
642 ** "Special" FTS4 arguments are column specifications of the following form: 645 ** "Special" FTS4 arguments are column specifications of the following form:
(...skipping 3050 matching lines...) Expand 10 before | Expand all | Expand 10 after
3693 sqlite3 *db, 3696 sqlite3 *db,
3694 char **pzErrMsg, 3697 char **pzErrMsg,
3695 const sqlite3_api_routines *pApi 3698 const sqlite3_api_routines *pApi
3696 ){ 3699 ){
3697 SQLITE_EXTENSION_INIT2(pApi) 3700 SQLITE_EXTENSION_INIT2(pApi)
3698 return sqlite3Fts3Init(db); 3701 return sqlite3Fts3Init(db);
3699 } 3702 }
3700 #endif 3703 #endif
3701 3704
3702 #endif 3705 #endif
OLDNEW
« no previous file with comments | « third_party/sqlite/fts3_85522.patch ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698