From: drh <> Date: Fri, 21 Jul 2023 15:07:56 +0000 (+0000) Subject: Fix harmless compiler warning about signed/unsigned comparison. X-Git-Tag: version-3.43.0~125^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eee8687a9ff50465a720298bd8d50cbd85bb0fe7;p=thirdparty%2Fsqlite.git Fix harmless compiler warning about signed/unsigned comparison. FossilOrigin-Name: 75cc3c89ee2dcfefa9421ce60bee77e85d2895918e8c5cfd05c434f8932a99b5 --- diff --git a/manifest b/manifest index 2bf0e377ab..b4f361aba9 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Multiple\soptimizations\sthat\stry\sto\spreserve\sor\sinfer\sthe\szero-terminated\nproperty\sof\sTEXT\svalues.\s\sAvoid\sunnecessary\scopying\sof\stext\svalues\sdestined\nto\sbecome\sfunction\sparameters.\s\sAll\schanges\shelp\simprove\sperformance\sof\ndoing\sUPDATEs\son\slarge\sJSON\svalues\sthat\sare\sindexed\smultiple\sways. -D 2023-07-21T15:01:53.046 +C Fix\sharmless\scompiler\swarning\sabout\ssigned/unsigned\scomparison. +D 2023-07-21T15:07:56.630 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -710,7 +710,7 @@ F src/vacuum.c 604fcdaebe76f3497c855afcbf91b8fa5046b32de3045bab89cc008d68e40104 F src/vdbe.c 4cda877d413a18fa07346b08d6959b3d18ce982357921e7acb9649fca2534a12 F src/vdbe.h 41485521f68e9437fdb7ec4a90f9d86ab294e9bb8281e33b235915e29122cfc0 F src/vdbeInt.h 7bd49eef8f89c1a271fbf12d80a206bf56c876814c5fc6bee340f4e1907095ae -F src/vdbeapi.c 1b17d1a53c3b88eb8bf2534f4f3557957f59f9431e5283734452b191cd45898d +F src/vdbeapi.c b8866af13401c9779759640457fa37dafe7bc2466c8428ade10ef625d012e52b F src/vdbeaux.c b5e3f7e158518b4eca6f166ac43900640a3fe9735c710e12bfa119af21059339 F src/vdbeblob.c 2516697b3ee8154eb8915f29466fb5d4f1ae39ee8b755ea909cefaf57ec5e2ce F src/vdbemem.c cf4a1556dd5b18c071cf7c243373c29ce752eb516022e3ad49ba72f08b785033 @@ -2043,8 +2043,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 0a745897d66e9f36ea6e787fad54f0c413d52c226dc96fad36ccd33a0aa1930e -R ad6898efbc6819851ab380be79271f0e +P d0278cdedfa04fb0b61838ab9622be8a2c462f58d5c3ebc4c5f802a727d0974e +R e667842b6755e6f486934eef004d9f18 U drh -Z ecdcb9c56dec3594bcd0055088d236ad +Z 993e102a87ed849f759c01f42525f684 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 000a57e974..247f7c86b6 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -d0278cdedfa04fb0b61838ab9622be8a2c462f58d5c3ebc4c5f802a727d0974e \ No newline at end of file +75cc3c89ee2dcfefa9421ce60bee77e85d2895918e8c5cfd05c434f8932a99b5 \ No newline at end of file diff --git a/src/vdbeapi.c b/src/vdbeapi.c index 7f44d22bc7..079fb3976a 100644 --- a/src/vdbeapi.c +++ b/src/vdbeapi.c @@ -517,7 +517,7 @@ void sqlite3_result_text64( if( xDel==sqlite3_free && enc==SQLITE_UTF8 ){ Mem *pOut = pCtx->pOut; if( pOut->z==z - && sqlite3_msize(pOut->z)>=pOut->n+1 + && sqlite3_msize(pOut->z) >= (sqlite3_uint64)(pOut->n+1) && pOut->z[n]==0 ){ pOut->flags |= MEM_Term;