From daff8f4f28b05c6ca796b5bacf8e934e77f96b25 Mon Sep 17 00:00:00 2001 From: Marek Habersack Date: Mon, 25 Jan 2021 16:24:01 +0100 Subject: [PATCH] Applied Android changes to v3.34.1 --- dist/Android.patch | 48 +++++++++++++++++++++++++--------------------- dist/shell.c | 21 ++++++++++++++++++++ dist/sqlite3.c | 36 ++++++++++++++++++++++++++++++---- 3 files changed, 79 insertions(+), 26 deletions(-) diff --git a/dist/Android.patch b/dist/Android.patch index 7137ea3..bfab00c 100644 --- a/dist/Android.patch +++ b/dist/Android.patch @@ -1,6 +1,8 @@ ---- orig/shell.c 2020-07-09 13:55:18.598783417 +0100 -+++ shell.c 2020-10-06 00:01:10.631859326 +0100 -@@ -95,6 +95,11 @@ +diff --git a/dist/shell.c b/dist/shell.c +index 6f4fee8..96ae749 100644 +--- a/dist/shell.c ++++ b/dist/shell.c +@@ -95,6 +95,11 @@ typedef unsigned char u8; #endif #include #include @@ -12,7 +14,7 @@ #if !defined(_WIN32) && !defined(WIN32) # include -@@ -12957,6 +12962,22 @@ +@@ -14673,6 +14678,22 @@ static void open_db(ShellState *p, int openFlags){ sqlite3_create_function(p->db, "edit", 2, SQLITE_UTF8, 0, editFunc, 0, 0); #endif @@ -35,9 +37,11 @@ if( p->openMode==SHELL_OPEN_ZIPFILE ){ char *zSql = sqlite3_mprintf( "CREATE VIRTUAL TABLE zip USING zipfile(%Q);", p->zDbFilename); ---- orig/sqlite3.c 2020-07-09 13:55:18.706784068 +0100 -+++ sqlite3.c 2020-07-09 13:55:18.814784719 +0100 -@@ -33395,6 +33395,10 @@ +diff --git a/dist/sqlite3.c b/dist/sqlite3.c +index 38874ce..e68646c 100644 +--- a/dist/sqlite3.c ++++ b/dist/sqlite3.c +@@ -33579,6 +33579,10 @@ SQLITE_PRIVATE const char *sqlite3OpcodeName(int i){ # include #endif @@ -48,7 +52,7 @@ #ifdef HAVE_UTIME # include #endif -@@ -34155,6 +34159,12 @@ +@@ -34339,6 +34343,12 @@ static int robust_open(const char *z, int f, mode_t m){ #if defined(FD_CLOEXEC) && (!defined(O_CLOEXEC) || O_CLOEXEC==0) osFcntl(fd, F_SETFD, osFcntl(fd, F_GETFD, 0) | FD_CLOEXEC); #endif @@ -61,7 +65,7 @@ } return fd; } -@@ -34735,7 +34745,13 @@ +@@ -34919,7 +34929,13 @@ static int unixLogErrorAtLine( ** and move on. */ static void robust_close(unixFile *pFile, int h, int lineno){ @@ -75,7 +79,7 @@ unixLogErrorAtLine(SQLITE_IOERR_CLOSE, "close", pFile ? pFile->zPath : 0, lineno); } -@@ -37269,7 +37285,7 @@ +@@ -37474,7 +37490,7 @@ static int unixFileSize(sqlite3_file *id, i64 *pSize){ SimulateIOError( rc=1 ); if( rc!=0 ){ storeLastErrno((unixFile*)id, errno); @@ -84,16 +88,16 @@ } *pSize = buf.st_size; -@@ -37305,7 +37321,7 @@ +@@ -37510,7 +37526,7 @@ static int fcntlSizeHint(unixFile *pFile, i64 nByte){ struct stat buf; /* Used to hold return values of fstat() */ - + if( osFstat(pFile->h, &buf) ){ - return SQLITE_IOERR_FSTAT; + return unixLogError(SQLITE_IOERR_FSTAT, "fstat", pFile->zPath); } nSize = ((nByte+pFile->szChunk-1) / pFile->szChunk) * pFile->szChunk; -@@ -38000,7 +38016,7 @@ +@@ -38206,7 +38222,7 @@ static int unixOpenSharedMemory(unixFile *pDbFd){ ** with the same permissions. */ if( osFstat(pDbFd->h, &sStat) ){ @@ -102,7 +106,7 @@ goto shm_open_err; } -@@ -128218,7 +128234,7 @@ +@@ -129165,7 +129181,7 @@ SQLITE_PRIVATE int sqlite3InitOne(sqlite3 *db, int iDb, char **pzErrMsg, u32 mFl } if( pDb->pSchema->file_format>SQLITE_MAX_FILE_FORMAT ){ sqlite3SetString(pzErrMsg, db, "unsupported file format"); @@ -111,10 +115,10 @@ goto initone_error_out; } -@@ -170128,13 +170144,25 @@ +@@ -171835,13 +171851,25 @@ SQLITE_PRIVATE int sqlite3Fts3Init(sqlite3 *db){ ** module with sqlite. */ - if( SQLITE_OK==rc + if( SQLITE_OK==rc +#ifndef ANDROID /* fts3_tokenizer disabled for security reasons */ && SQLITE_OK==(rc = sqlite3Fts3InitHashTable(db, pHash, "fts3_tokenizer")) +#endif @@ -125,14 +129,14 @@ && SQLITE_OK==(rc = sqlite3_overload_function(db, "optimize", 1)) ){ +#ifdef SQLITE_ENABLE_FTS3_BACKWARDS -+ rc = sqlite3_create_module_v2( -+ db, "fts1", &fts3Module, (void *)pHash, 0 -+ ); -+ if(rc) return rc; -+ rc = sqlite3_create_module_v2( ++ rc = sqlite3_create_module_v2( ++ db, "fts1", &fts3Module, (void *)pHash, 0 ++ ); ++ if(rc) return rc; ++ rc = sqlite3_create_module_v2( + db, "fts2", &fts3Module, (void *)pHash, 0 + ); -+ if(rc) return rc; ++ if(rc) return rc; +#endif rc = sqlite3_create_module_v2( db, "fts3", &fts3Module, (void *)pHash, hashDestroy diff --git a/dist/shell.c b/dist/shell.c index 6f4fee8..96ae749 100644 --- a/dist/shell.c +++ b/dist/shell.c @@ -95,6 +95,11 @@ typedef unsigned char u8; #endif #include #include +// Begin Android Add +#ifndef NO_ANDROID_FUNCS +#include +#endif +// End Android Add #if !defined(_WIN32) && !defined(WIN32) # include @@ -14673,6 +14678,22 @@ static void open_db(ShellState *p, int openFlags){ sqlite3_create_function(p->db, "edit", 2, SQLITE_UTF8, 0, editFunc, 0, 0); #endif + +// Begin Android Add +#ifndef NO_ANDROID_FUNCS + int err = register_localized_collators(p->db, "en_US", 0); + if (err != SQLITE_OK) { + fprintf(stderr, "register_localized_collators() failed\n"); + exit(1); + } + err = register_android_functions(p->db, 0); + if (err != SQLITE_OK) { + fprintf(stderr, "register_android_functions() failed\n"); + exit(1); + } +#endif +// End Android Add + if( p->openMode==SHELL_OPEN_ZIPFILE ){ char *zSql = sqlite3_mprintf( "CREATE VIRTUAL TABLE zip USING zipfile(%Q);", p->zDbFilename); diff --git a/dist/sqlite3.c b/dist/sqlite3.c index 38874ce..e68646c 100644 --- a/dist/sqlite3.c +++ b/dist/sqlite3.c @@ -33579,6 +33579,10 @@ SQLITE_PRIVATE const char *sqlite3OpcodeName(int i){ # include #endif +#if defined(__BIONIC__) +# include +#endif + #ifdef HAVE_UTIME # include #endif @@ -34339,6 +34343,12 @@ static int robust_open(const char *z, int f, mode_t m){ #if defined(FD_CLOEXEC) && (!defined(O_CLOEXEC) || O_CLOEXEC==0) osFcntl(fd, F_SETFD, osFcntl(fd, F_GETFD, 0) | FD_CLOEXEC); #endif + +#if defined(__BIONIC__) && __ANDROID_API__ >= __ANDROID_API_Q__ + uint64_t tag = android_fdsan_create_owner_tag( + ANDROID_FDSAN_OWNER_TYPE_SQLITE, fd); + android_fdsan_exchange_owner_tag(fd, 0, tag); +#endif } return fd; } @@ -34919,7 +34929,13 @@ static int unixLogErrorAtLine( ** and move on. */ static void robust_close(unixFile *pFile, int h, int lineno){ +#if defined(__BIONIC__) && __ANDROID_API__ >= __ANDROID_API_Q__ + uint64_t tag = android_fdsan_create_owner_tag( + ANDROID_FDSAN_OWNER_TYPE_SQLITE, h); + if( android_fdsan_close_with_tag(h, tag) ){ +#else if( osClose(h) ){ +#endif unixLogErrorAtLine(SQLITE_IOERR_CLOSE, "close", pFile ? pFile->zPath : 0, lineno); } @@ -37474,7 +37490,7 @@ static int unixFileSize(sqlite3_file *id, i64 *pSize){ SimulateIOError( rc=1 ); if( rc!=0 ){ storeLastErrno((unixFile*)id, errno); - return SQLITE_IOERR_FSTAT; + return unixLogError(SQLITE_IOERR_FSTAT, "fstat", ((unixFile*)id)->zPath); } *pSize = buf.st_size; @@ -37510,7 +37526,7 @@ static int fcntlSizeHint(unixFile *pFile, i64 nByte){ struct stat buf; /* Used to hold return values of fstat() */ if( osFstat(pFile->h, &buf) ){ - return SQLITE_IOERR_FSTAT; + return unixLogError(SQLITE_IOERR_FSTAT, "fstat", pFile->zPath); } nSize = ((nByte+pFile->szChunk-1) / pFile->szChunk) * pFile->szChunk; @@ -38206,7 +38222,7 @@ static int unixOpenSharedMemory(unixFile *pDbFd){ ** with the same permissions. */ if( osFstat(pDbFd->h, &sStat) ){ - rc = SQLITE_IOERR_FSTAT; + rc = unixLogError(SQLITE_IOERR_FSTAT, "fstat", pDbFd->zPath); goto shm_open_err; } @@ -129165,7 +129181,7 @@ SQLITE_PRIVATE int sqlite3InitOne(sqlite3 *db, int iDb, char **pzErrMsg, u32 mFl } if( pDb->pSchema->file_format>SQLITE_MAX_FILE_FORMAT ){ sqlite3SetString(pzErrMsg, db, "unsupported file format"); - rc = SQLITE_ERROR; + rc = SQLITE_CORRUPT_BKPT; // Android Change from "rc = SQLITE_ERROR;"; goto initone_error_out; } @@ -171835,13 +171851,25 @@ SQLITE_PRIVATE int sqlite3Fts3Init(sqlite3 *db){ ** module with sqlite. */ if( SQLITE_OK==rc +#ifndef ANDROID /* fts3_tokenizer disabled for security reasons */ && SQLITE_OK==(rc = sqlite3Fts3InitHashTable(db, pHash, "fts3_tokenizer")) +#endif && SQLITE_OK==(rc = sqlite3_overload_function(db, "snippet", -1)) && SQLITE_OK==(rc = sqlite3_overload_function(db, "offsets", 1)) && SQLITE_OK==(rc = sqlite3_overload_function(db, "matchinfo", 1)) && SQLITE_OK==(rc = sqlite3_overload_function(db, "matchinfo", 2)) && SQLITE_OK==(rc = sqlite3_overload_function(db, "optimize", 1)) ){ +#ifdef SQLITE_ENABLE_FTS3_BACKWARDS + rc = sqlite3_create_module_v2( + db, "fts1", &fts3Module, (void *)pHash, 0 + ); + if(rc) return rc; + rc = sqlite3_create_module_v2( + db, "fts2", &fts3Module, (void *)pHash, 0 + ); + if(rc) return rc; +#endif rc = sqlite3_create_module_v2( db, "fts3", &fts3Module, (void *)pHash, hashDestroy );