From: drh <> Date: Thu, 7 May 2026 20:45:57 +0000 (+0000) Subject: Remove unnecessary and incorrect assert() statements in the new %J code. X-Git-Url: http://git.ipfire.org/index.cgi?a=commitdiff_plain;h=1788b7b719e7067d24aa191652802bc28e6671af;p=thirdparty%2Fsqlite.git Remove unnecessary and incorrect assert() statements in the new %J code. FossilOrigin-Name: 5a8497dbec80b55a2dedc8a6f9ee823243e01a08d37ceeed1f87214dfe527d63 --- diff --git a/manifest b/manifest index 0ef84ab77e..e4e3687e8e 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sthe\s%J\sand\s%j\sconversions\sto\sprintf()\s-\srendering\sJSON\sstring\nliterals. -D 2026-05-07T15:04:30.145 +C Remove\sunnecessary\sand\sincorrect\sassert()\sstatements\sin\sthe\snew\s%J\scode. +D 2026-05-07T20:45:57.859 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -731,7 +731,7 @@ F src/pcache.h 092b758d2c5e4dabb30eae46d8dfad77c0f70b16bf3ff1943f7a232b0fe0d4ba F src/pcache1.c 131ca0daf4e66b4608d2945ae76d6ed90de3f60539afbd5ef9ec65667a5f2fcd F src/pragma.c 789ef67117b74b5be0a2db6681f7f0c55e6913791b9da309aefd280de2c8a74d F src/prepare.c f6a6e28a281bd1d1da12f47d370a81af46159b40f73bf7fa0b276b664f9c8b7d -F src/printf.c e3b02d7e7e48569f79e894491e813eeda921c000faf8638910270a4ca6717447 +F src/printf.c 7085e8504f519cf6cb23a84572f785b259769907fef94bbf90ef0a5a533ab89f F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c fcc406bfb055bee9954ee77c023f4a2a66a24bcdf1573516a72280811a269c20 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 @@ -2203,9 +2203,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P 5c6d3e9d83af94234f67b06bd23c4eb0178a80c74c39be4945b3282244630020 c5235734a6787b9c59a356f4e0ccbb3f262b8d9a6407ebd415afc87e859b0498 -R 5bef29969df718ccf240c0115942b7dd -T +closed c5235734a6787b9c59a356f4e0ccbb3f262b8d9a6407ebd415afc87e859b0498 +P 7e6fd838a15f08bf15d57f1887ed1019b58aa6be9eb7b162e67e0d9412082c6d +R 06187e74abcd7ba51a19ee0ef6ec6273 U drh -Z 5fdf2d80df7e0962005099d3f0328069 +Z 9e808589c718d909177d4890282c6910 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 77b295e229..03c3cd9291 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -7e6fd838a15f08bf15d57f1887ed1019b58aa6be9eb7b162e67e0d9412082c6d +5a8497dbec80b55a2dedc8a6f9ee823243e01a08d37ceeed1f87214dfe527d63 diff --git a/src/printf.c b/src/printf.c index 81b00096cf..d1a7cf2359 100644 --- a/src/printf.c +++ b/src/printf.c @@ -927,8 +927,6 @@ void sqlite3_str_vappendf( char *zz; if( flag_altform2 && n>0 ){ zz = sqlite3_str_value(pAccum); - assert( zz!=0 ); - assert( strlen(zz)==iStart + n ); for(i=iStart; zz[i]; i++){ if( (zz[i]&0xc0)==0x80 ) len--; } @@ -942,8 +940,6 @@ void sqlite3_str_vappendf( && sqlite3_str_errcode(pAccum)==0 ){ zz = sqlite3_str_value(pAccum); - assert( zz!=0 ); - assert( strlen(zz)==iStart+n+sp ); zz += iStart; memmove(zz+sp, zz, n); memset(zz, ' ', sp);