From: drh <>
Date: Wed, 30 Aug 2023 17:41:55 +0000 (+0000)
Subject: Remove another unreachable branch in the sqlite3_set_clientdata() logic.
X-Git-Tag: version-3.44.0~217^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d25d938877b675a7cf8ded0948ae814b1ae026d7;p=thirdparty%2Fsqlite.git

Remove another unreachable branch in the sqlite3_set_clientdata() logic.

FossilOrigin-Name: 57e31e6b10b2aa68b6039914d191819bae0aa60999a99d5ef23ca18128b72e0e
---

diff --git a/manifest b/manifest
index a603830c4d..9c846bbc47 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\san\sunreachable\sbranch,\sand\simprove\sdocumentation\sof\nsqlite3_set_clientdata().
-D 2023-08-30T17:14:12.141
+C Remove\sanother\sunreachable\sbranch\sin\sthe\ssqlite3_set_clientdata()\slogic.
+D 2023-08-30T17:41:55.821
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -668,7 +668,7 @@ F src/insert.c 3f0a94082d978bbdd33c38fefea15346c6c6bffb70bc645a71dc0f1f87dd3276
 F src/json.c ae840f87b418f039f5d336b488933d09396bd31e6b31e855b93055ccaee4e255
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 98cfba10989b3da6f1807ad42444017742db7f100a54f1032af7a8b1295912c0
-F src/main.c 42672e9540b67a6e7369445cc36bba865f9d6e0536b5e7a23233ae6d1731f809
+F src/main.c 3eb8c45e05829649bb15aea10cd04cbc1a116438e6a129de025b70dba73b922a
 F src/malloc.c 47b82c5daad557d9b963e3873e99c22570fb470719082c6658bf64e3012f7d23
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c 3bb59158c38e05f6270e761a9f435bf19827a264c13d1631c58b84bdc96d73b2
@@ -2115,8 +2115,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 937cd1762b36d48d9e7bafe42e99e524c9b5528d39f64521bce2f81d9c887db8
-R 41efca5fe12b212203aeac4a8130ce7f
+P 565c68adee64b6c838f2fcb162485b6cfe9a976adb79de4370be98fcd4af2baf
+R c44620e6fdc8795cc96b9dcf7aa093f2
 U drh
-Z a5ff41f13a2cbd8967a9da47012a6601
+Z ba5cdcdbc9c47766f3528cc96f85a22f
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 534c3fc7aa..99a60a7742 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-565c68adee64b6c838f2fcb162485b6cfe9a976adb79de4370be98fcd4af2baf
\ No newline at end of file
+57e31e6b10b2aa68b6039914d191819bae0aa60999a99d5ef23ca18128b72e0e
\ No newline at end of file
diff --git a/src/main.c b/src/main.c
index 9f60ceebef..257b9b7600 100644
--- a/src/main.c
+++ b/src/main.c
@@ -3742,7 +3742,8 @@ int sqlite3_set_clientdata(
     pp = &p->pNext;
   }
   if( p ){
-    if( p->pData && p->xDestructor ) p->xDestructor(p->pData);
+    assert( p->pData!=0 );
+    if( p->xDestructor ) p->xDestructor(p->pData);
     if( pData==0 ){
       *pp = p->pNext;
       sqlite3_free(p);