diff options
| author | Zim <zezeozue@google.com> | 2020-04-29 20:08:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-29 20:08:15 +0000 |
| commit | 3d1d3968cb21ededcea29398d83bd5e558debee6 (patch) | |
| tree | 8cdde3ab20d11d5e2427c4e168b314e71d0a79f3 /dist/Android.patch | |
| parent | 082c42be8d8efecf54dab8907c257759871d1807 (diff) | |
| parent | 5c264f7964912a6d8dec0e4d395a2248e264c5f3 (diff) | |
Fix CVE-2019-13734，CVE-2019-13751，CVE-2019-13752, CVE-2019-13753 am: 0f62c1a0e8 am: 5c264f7964
Change-Id: Iec55434503797129a187359c2b6fe2fa2844c8f5
Diffstat (limited to 'dist/Android.patch')
| -rw-r--r-- | dist/Android.patch | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/dist/Android.patch b/dist/Android.patch index 7ecbecb..ab90c89 100644 --- a/dist/Android.patch +++ b/dist/Android.patch @@ -1,5 +1,5 @@ ---- orig/shell.c 2019-06-11 15:05:36.341739007 -0700 -+++ shell.c 2019-06-11 15:05:36.401739332 -0700 +--- orig/shell.c 2020-04-29 18:24:56.239581819 +0100 ++++ shell.c 2020-04-29 18:25:19.531740101 +0100 @@ -87,6 +87,12 @@ #endif #include <ctype.h> @@ -37,9 +37,9 @@ if( p->openMode==SHELL_OPEN_ZIPFILE ){ char *zSql = sqlite3_mprintf( "CREATE VIRTUAL TABLE zip USING zipfile(%Q);", p->zDbFilename); ---- orig/sqlite3.c 2019-06-11 15:05:36.393739289 -0700 -+++ sqlite3.c 2019-06-11 15:05:36.449739593 -0700 -@@ -32438,6 +32438,10 @@ +--- orig/sqlite3.c 2020-04-29 18:24:56.211581629 +0100 ++++ sqlite3.c 2020-04-29 18:25:19.531740101 +0100 +@@ -32446,6 +32446,10 @@ # include <sys/mount.h> #endif @@ -50,7 +50,7 @@ #ifdef HAVE_UTIME # include <utime.h> #endif -@@ -33197,6 +33201,12 @@ +@@ -33205,6 +33209,12 @@ #if defined(FD_CLOEXEC) && (!defined(O_CLOEXEC) || O_CLOEXEC==0) osFcntl(fd, F_SETFD, osFcntl(fd, F_GETFD, 0) | FD_CLOEXEC); #endif @@ -63,7 +63,7 @@ } return fd; } -@@ -33777,7 +33787,13 @@ +@@ -33785,7 +33795,13 @@ ** and move on. */ static void robust_close(unixFile *pFile, int h, int lineno){ @@ -77,7 +77,7 @@ unixLogErrorAtLine(SQLITE_IOERR_CLOSE, "close", pFile ? pFile->zPath : 0, lineno); } -@@ -36310,7 +36326,7 @@ +@@ -36318,7 +36334,7 @@ SimulateIOError( rc=1 ); if( rc!=0 ){ storeLastErrno((unixFile*)id, errno); @@ -86,7 +86,7 @@ } *pSize = buf.st_size; -@@ -36346,7 +36362,7 @@ +@@ -36354,7 +36370,7 @@ struct stat buf; /* Used to hold return values of fstat() */ if( osFstat(pFile->h, &buf) ){ @@ -95,7 +95,7 @@ } nSize = ((nByte+pFile->szChunk-1) / pFile->szChunk) * pFile->szChunk; -@@ -37032,7 +37048,7 @@ +@@ -37040,7 +37056,7 @@ ** with the same permissions. */ if( osFstat(pDbFd->h, &sStat) ){ @@ -104,7 +104,7 @@ goto shm_open_err; } -@@ -123984,7 +124000,7 @@ +@@ -124046,7 +124062,7 @@ } if( pDb->pSchema->file_format>SQLITE_MAX_FILE_FORMAT ){ sqlite3SetString(pzErrMsg, db, "unsupported file format"); @@ -113,7 +113,7 @@ goto initone_error_out; } -@@ -164271,13 +164287,25 @@ +@@ -164415,13 +164431,25 @@ ** module with sqlite. */ if( SQLITE_OK==rc |