From: drh Date: Wed, 3 May 2017 17:44:28 +0000 (+0000) Subject: Fix the sqlite3GetInt32() function so that it correctly returns 0 on a X-Git-Tag: version-3.19.0~24 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=313e6fd222867542864d93c2d660fc03239c643b;p=thirdparty%2Fsqlite.git Fix the sqlite3GetInt32() function so that it correctly returns 0 on a zero-length input string. FossilOrigin-Name: 05eba9e3a5f9bb2a40af1dacd885e1915fbcd20b9af4cf0eed79ac16dbeba31b --- diff --git a/manifest b/manifest index 834674808b..33d1b5fbef 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Always\senable\sURI\sfilenames\swhen\scompiling\swith\sSQLITE_HAS_CODEC.\s\sAlso\sallow\nplaintext\skeys\susing\sthe\skey=\squery\sparameter. -D 2017-05-03T15:54:53.280 +C Fix\sthe\ssqlite3GetInt32()\sfunction\sso\sthat\sit\scorrectly\sreturns\s0\son\sa\nzero-length\sinput\sstring. +D 2017-05-03T17:44:28.665 F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 6a8c838220f7c00820e1fc0ac1bccaaa8e5676067e1dbfa1bafa7a4ffecf8ae6 @@ -467,7 +467,7 @@ F src/treeview.c 6cf8d7fe9e63fae57dad1bb57f6615e14eac0c527e43d868e805042cae8ed1f F src/trigger.c c9f0810043b265724fdb1bdd466894f984dfc182 F src/update.c c443935c652af9365e033f756550b5032d02e1b06eb2cb890ed7511ae0c051dc F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c -F src/util.c ca8440ede81e155d15cff7c101654f60b55a9ae6 +F src/util.c fc081ec6f63448dcd80d3dfad35baecfa104823254a815b081a4d9fe76e1db23 F src/vacuum.c 1fe4555cd8c9b263afb85b5b4ee3a4a4181ad569 F src/vdbe.c 9bac2bc2313ed682e6f48ccff6644d3263341885bfcbb3cdea7b720c722be2d5 F src/vdbe.h f7d1456e28875c2dcb964056589b5b7149ab7edf39edeca801596a39bb3d3848 @@ -1578,7 +1578,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 430f539cbb3f806fb89191e0b759a5f8b49d9e5b6c95fe9a4b55a1aa0875762a -R 9361fb55741f5070a358ac5ee22a5ad4 +P 31a51b4d168065fa59cc0e52ba798bd87ac82160c675bd531442b65133edb401 +R 1a9ae67768895b2203701f1f99daf69e U drh -Z 6969a550096004330a93c292edb36e97 +Z 6a4f04dd64a8ebc17f6d0713668a32cd diff --git a/manifest.uuid b/manifest.uuid index 3d5674cd54..40ea5642bb 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -31a51b4d168065fa59cc0e52ba798bd87ac82160c675bd531442b65133edb401 \ No newline at end of file +05eba9e3a5f9bb2a40af1dacd885e1915fbcd20b9af4cf0eed79ac16dbeba31b \ No newline at end of file diff --git a/src/util.c b/src/util.c index 9b6f4f9e1d..7c9c5f54b7 100644 --- a/src/util.c +++ b/src/util.c @@ -713,6 +713,7 @@ int sqlite3GetInt32(const char *zNum, int *pValue){ } } #endif + if( !sqlite3Isdigit(zNum[0]) ) return 0; while( zNum[0]=='0' ) zNum++; for(i=0; i<11 && (c = zNum[i] - '0')>=0 && c<=9; i++){ v = v*10 + c;