From: drh <> Date: Thu, 30 Oct 2025 22:10:41 +0000 (+0000) Subject: New assert() statements to help out static analyzers. X-Git-Tag: major-release~15 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da17de532fd9d45802768cb4529f852cb8904750;p=thirdparty%2Fsqlite.git New assert() statements to help out static analyzers. FossilOrigin-Name: ba0c4bf072ed721a507855d68bde7f1c388396a19b69814b6e257b934f8b0fd9 --- diff --git a/manifest b/manifest index 1173d58013..2877bf4a91 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sSQLITE_OMIT_WAL\schecks\saround\ssome\sfunctions\sto\savoid\sdefining\sunused\sstatics\sin\ssuch\sbuilds.\sFixes\sOMIT_WAL\sbuilds\son\smsys2\sand\spasses\stool/omittest-msvc.tcl. -D 2025-10-30T21:11:01.655 +C New\sassert()\sstatements\sto\shelp\sout\sstatic\sanalyzers. +D 2025-10-30T22:10:41.858 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -735,7 +735,7 @@ F src/printf.c 7297c2aeed4d90d80c5ba82920d9e57b7bfad04b3466be1d7e042db382fe296e F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c f8d1d011aba0964ff1bdccd049d4d2c2fec217efd90d202a4bb775e926b2c25d F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 -F src/select.c b95181711d59c36d9789e67f76c4cfec64b99f9629a50be5e6566e117b87d957 +F src/select.c ba9cd07ffa3277883c1986085f6ddc4320f4d35d5f212ab58df79a7ecc1a576a F src/shell.c.in 20e64d6b9a587af2a36b97b9787e065c99065db4a8069e915884bc19be8a1dba F src/sqlite.h.in f7944026ee89ea348f89aec56372d6d25b6cafc1d89df741278d6917e86326a3 F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479 @@ -808,7 +808,7 @@ F src/vdbeInt.h 2aaeb6df2938b181b4700a9328688a3986f2bba71e8b96f6a80671316618fa49 F src/vdbeapi.c 869a0da5d855495055f4d35c6ada582f64ce995ce14b26ff9d336274d497266c F src/vdbeaux.c 908d8a191aed444b2e4c920159249127f3ff67b94c56a16fad1dfdf9c7488f20 F src/vdbeblob.c b3f0640db9642fbdc88bd6ebcc83d6009514cafc98f062f675f2c8d505d82692 -F src/vdbemem.c e67d9c6484d868c879d20c70d00bf4a9058082f1d4058607ca15d50eb3aebc21 +F src/vdbemem.c 48e562ff27e6386eb8613207ac27d3d98c1f67fdc4775a1ab13759d2c2a1c021 F src/vdbesort.c b69220f4ea9ffea5fdef34d968c60305444eea909252a81933b54c296d9cca70 F src/vdbetrace.c 49e689f751505839742f4a243a1a566e57d5c9eaf0d33bbaa26e2de3febf7b41 F src/vdbevtab.c fc46b9cbd759dc013f0b3724549cc0d71379183c667df3a5988f7e2f1bd485f3 @@ -2171,8 +2171,8 @@ F tool/version-info.c 33d0390ef484b3b1cb685d59362be891ea162123cea181cb8e6d2cf6dd F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P cd0c77934ff32050380c2143bba7d4e6c07d5f08187cb5d5e8e7602854d1cda8 -R b15783ff90017f6ae98cc96ff8d575bf -U stephan -Z 2b56c84181eff6b4ea326dd2d455e43a +P f9b89535dc279acf617f274b6edbad0610fc8e5c76d402fc8b5b9dc656e95caa +R ad5045e76e8f6f44bec0a28b6002d6bb +U drh +Z c6a1968ff2633a707d24fcf178b842cc # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index e51fab76e1..ece39fd144 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f9b89535dc279acf617f274b6edbad0610fc8e5c76d402fc8b5b9dc656e95caa +ba0c4bf072ed721a507855d68bde7f1c388396a19b69814b6e257b934f8b0fd9 diff --git a/src/select.c b/src/select.c index 651a9e1c8f..bec00ecb9a 100644 --- a/src/select.c +++ b/src/select.c @@ -6823,6 +6823,7 @@ static void resetAccumulator(Parse *pParse, AggInfo *pAggInfo){ if( pFunc->bOBPayload ){ /* extra columns for the function arguments */ assert( ExprUseXList(pFunc->pFExpr) ); + assert( pFunc->pFExpr->x.pList!=0 ); nExtra += pFunc->pFExpr->x.pList->nExpr; } if( pFunc->bUseSubtype ){ diff --git a/src/vdbemem.c b/src/vdbemem.c index 6db9e4b1a7..2c4d1c5681 100644 --- a/src/vdbemem.c +++ b/src/vdbemem.c @@ -1226,6 +1226,7 @@ int sqlite3VdbeMemSetStr( if( sqlite3VdbeMemClearAndResize(pMem, (int)MAX(nAlloc,32)) ){ return SQLITE_NOMEM_BKPT; } + assert( pMem->z!=0 ); memcpy(pMem->z, z, nAlloc); }else{ sqlite3VdbeMemRelease(pMem);