From: drh <>
Date: Sat, 10 Apr 2021 15:34:30 +0000 (+0000)
Subject: Avoid invoking sqlite3Atoi64() will a null pointer following an error
X-Git-Tag: version-3.36.0~223
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1fd1cc44334d50e4f35a067a34197921a78a98d1;p=thirdparty%2Fsqlite.git

Avoid invoking sqlite3Atoi64() will a null pointer following an error
from ExpandBlob().

FossilOrigin-Name: 780412f2ca7576ce90861b2bd499f953504125b200e9aeae685def4a943f9d2b
---

diff --git a/manifest b/manifest
index 1d9bd29294..6cce0c2969 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\swith\shandling\sexpressions\slike\s"(col\sIS\sNULL\sAND\s<expr1>)\sOR\scol\s==\sNULL"\sin\sWHERE\sclauses.
-D 2021-04-10T14:49:45.172
+C Avoid\sinvoking\ssqlite3Atoi64()\swill\sa\snull\spointer\sfollowing\san\serror\nfrom\sExpandBlob().
+D 2021-04-10T15:34:30.503
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -614,7 +614,7 @@ F src/upsert.c df8f1727d62b5987c4fd302cd4d7c0c84ae57cd65683c5a34a740dfe24039235
 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
 F src/util.c 41c7a72da1df47864faa378a1c720b38adb288c6838cb6be5594511b6287a048
 F src/vacuum.c 492422c1463c076473bae1858799c7a0a5fe87a133d1223239447c422cd26286
-F src/vdbe.c 1e0c840714b508898326de757b5eec42990ddbb3bea560a672f603aea9a64202
+F src/vdbe.c c98340e85fae3a784d3efb88ad98a148282aa65402217ed2b44534294529506c
 F src/vdbe.h 25dabb25c7e157b84e59260cfb5b466c3ac103ede9f36f4db371332c47601abe
 F src/vdbeInt.h 000d9ab1ea4cb55a80de15e28f3f595645b4fddef34bca4347fb3db8031d9041
 F src/vdbeapi.c 4a43e303ec3354c785f453e881521969378e85628278ab74ba4a9df790c0d93b
@@ -1912,7 +1912,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 7d674970741bd9b228b818c701c1ae010b90cc287a4c60a872f18b66353d164d
-R d9ebb4317f562cba7219ced248df767d
-U dan
-Z e0238411756859b56ec8476d4ae8819b
+P 40852ca8e215e51f63652a67817361b835b6fbbff7f66af50089af91007505f1
+R a5a7974c5f4c4887902bb85878f4741c
+U drh
+Z fdb85dc855d6f7931ee561366a3c79ad
diff --git a/manifest.uuid b/manifest.uuid
index 15afe410ba..bb87e65f4a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-40852ca8e215e51f63652a67817361b835b6fbbff7f66af50089af91007505f1
\ No newline at end of file
+780412f2ca7576ce90861b2bd499f953504125b200e9aeae685def4a943f9d2b
\ No newline at end of file
diff --git a/src/vdbe.c b/src/vdbe.c
index 722c3fe839..df8c7e45ac 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -433,7 +433,10 @@ static u16 SQLITE_NOINLINE computeNumericType(Mem *pMem){
   sqlite3_int64 ix;
   assert( (pMem->flags & (MEM_Int|MEM_Real|MEM_IntReal))==0 );
   assert( (pMem->flags & (MEM_Str|MEM_Blob))!=0 );
-  ExpandBlob(pMem);
+  if( ExpandBlob(pMem) ){
+    pMem->u.i = 0;
+    return MEM_Int;
+  }
   rc = sqlite3AtoF(pMem->z, &pMem->u.r, pMem->n, pMem->enc);
   if( rc<=0 ){
     if( rc==0 && sqlite3Atoi64(pMem->z, &ix, pMem->n, pMem->enc)<=1 ){