diff options
| author | Hui Yu <huiyu@google.com> | 2018-12-27 15:40:29 -0800 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-01-16 18:55:44 +0000 |
| commit | 18c26a364fe8979b5dbbd93a439c49b2db5d104c (patch) | |
| tree | 1424871fa03e9ab89a50376c2399bebe725c3028 /dist/Android.patch | |
| parent | 7cb2759e23ee511ba234b705c3672073d1ae983e (diff) | |
RESTRICT AUTOMERGE: Apply security patch to sqlite 3.22.
This patch fixes Magellan SQLite Security Vulnerability as in
b/121156452
Download from https://www.sqlite.org/src/info/c255889bd95bd543
Get the Tarball or ZIP Archive, unzip it on linux machine then run:
mkdir bld; cd bld; ../configure; make sqlite3.c
Copy sqlite3.c, sqlite3.h, sqlite3ext.h, shell.c from bld directory
to dist/orig.
dist contains a copy of dist/orig, but with the Android.patch
file applied.
Bug: 121156452
Test: select sqlite_version() - returns 3.22.0
Test: atest cts/SQLiteDatabaseTest all passed.
Test: atest cts/SQLSecurityTest
Change-Id: Iea1cefe2577ac52da84b24b6d51e1769042e449a
Merged-In: Iad8c3d1d74d8591a75a4c033c8bf9d3956d2fe4f
(cherry picked from commit 7fbf27c91af1621264154cc09f0fdafb3ba69ed3)
Diffstat (limited to 'dist/Android.patch')
| -rw-r--r-- | dist/Android.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dist/Android.patch b/dist/Android.patch index 5ff70a7..c5f7e1d 100644 --- a/dist/Android.patch +++ b/dist/Android.patch @@ -1,6 +1,6 @@ diff -r -u -d orig/shell.c ./shell.c ---- orig/shell.c 2018-01-22 10:57:34.000000000 -0800 -+++ ./shell.c 2018-02-13 16:03:40.927106364 -0800 +--- orig/shell.c 2018-04-13 17:25:47.747857988 -0700 ++++ ./shell.c 2018-04-13 17:25:47.787857731 -0700 @@ -87,6 +87,12 @@ #endif #include <ctype.h> @@ -39,8 +39,8 @@ diff -r -u -d orig/shell.c ./shell.c char *zSql = sqlite3_mprintf( "CREATE VIRTUAL TABLE zip USING zipfile(%Q);", p->zDbFilename); diff -r -u -d orig/sqlite3.c ./sqlite3.c ---- orig/sqlite3.c 2018-01-22 10:57:34.000000000 -0800 -+++ ./sqlite3.c 2018-02-13 15:48:29.453358014 -0800 +--- orig/sqlite3.c 2018-12-27 15:39:18.784267281 -0800 ++++ ./sqlite3.c 2018-12-27 15:39:18.788267250 -0800 @@ -34428,7 +34428,7 @@ SimulateIOError( rc=1 ); if( rc!=0 ){ |