From: drh <drh@noemail.net>
Date: Thu, 14 Oct 2010 01:16:32 +0000 (+0000)
Subject: Check-in [d3c95e3a4e08d0] was incorrect.  This is the correct fix for
X-Git-Tag: version-3.7.4~95
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=94bb2ba61973293a198260110661669e8addbc8f;p=thirdparty%2Fsqlite.git

Check-in [d3c95e3a4e08d0] was incorrect.  This is the correct fix for
sqlit3_bind_blob().  Ticket [860399cc408f2dd5f4]

FossilOrigin-Name: ea8c2f5f8a890dcb422e9e46298ae6ca378c74b7
---

diff --git a/manifest b/manifest
index ef68334d8c..c0941acfc0 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Fix\sthe\ssqlite3_bind_blob()\sinterface\s(and\sits\skin)\sso\sthat\sthe\sdestructor\nis\sinvoked\sif\sthe\sbinding\sfails.\s\sTicket\s[860399cc408f2dd5f41aed44b]\nUpdate\sthe\sdocumentation\sto\sexplain\swhich\sinterfaces\sinvoke\stheir\ndestructors\son\sfailure\sand\swhich\sdo\snot.
-D 2010-10-12T02:13:33
+C Check-in\s[d3c95e3a4e08d0]\swas\sincorrect.\s\sThis\sis\sthe\scorrect\sfix\sfor\nsqlit3_bind_blob().\s\sTicket\s[860399cc408f2dd5f4]
+D 2010-10-14T01:16:33
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in b01fdfcfecf8a0716c29867a67959f6148b79961
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -231,7 +231,7 @@ F src/vacuum.c 924bd1bcee2dfb05376f79845bd3b4cec7b54b2f
 F src/vdbe.c e1aa917961e69f71c80f46ce231b496d3c841ae1
 F src/vdbe.h 4de0efb4b0fdaaa900cf419b35c458933ef1c6d2
 F src/vdbeInt.h 7f4cf1b2b69bef3a432b1f23dfebef57275436b4
-F src/vdbeapi.c 66abe27b886f82c18bcfb1e27b9b4dd33cb70d41
+F src/vdbeapi.c 5368714fa750270cf6430160287c21adff44582d
 F src/vdbeaux.c de0b06b11a25293e820a49159eca9f1c51a64716
 F src/vdbeblob.c 258a6010ba7a82b72b327fb24c55790655689256
 F src/vdbemem.c 23723a12cd3ba7ab3099193094cbb2eb78956aa9
@@ -876,14 +876,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 6464276ec1c0951a6edc59eb402ca3dd49629a18
-R 10ff206c4aa126ad395bc245dcdbe279
+P d3c95e3a4e08d08028e9bc7f282074e32b9cf950
+R c98ef3dc0fa2144496c5ce9ed9bca898
 U drh
-Z 85e4e15dab10d5b63301916ef8daf991
+Z bce2632c7f66d8ece358839f54e35ed0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFMs8RRoxKgR168RlERAhg6AJ4jB3XuddIoNxkkTHCbMiZCQDkyuwCfQ8DW
-zuydaBOtQGPX4Da5mPFWYaQ=
-=t4eY
+iD8DBQFMtln1oxKgR168RlERAiWvAJ9rXglnwByHGbbkgLs+G2EEefeXTwCfTAqs
+iQxq9aRZ62Kqv3eMBN4yX9k=
+=eO0n
 -----END PGP SIGNATURE-----
diff --git a/manifest.uuid b/manifest.uuid
index 0e93dacca2..6f39cb4183 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d3c95e3a4e08d08028e9bc7f282074e32b9cf950
\ No newline at end of file
+ea8c2f5f8a890dcb422e9e46298ae6ca378c74b7
\ No newline at end of file
diff --git a/src/vdbeapi.c b/src/vdbeapi.c
index da709064fc..e51555658c 100644
--- a/src/vdbeapi.c
+++ b/src/vdbeapi.c
@@ -1022,7 +1022,7 @@ static int bindText(
       rc = sqlite3ApiExit(p->db, rc);
     }
     sqlite3_mutex_leave(p->db->mutex);
-  }else if( xDel ){
+  }else if( xDel!=SQLITE_STATIC && xDel!=SQLITE_TRANSIENT ){
     xDel((void*)zData);
   }
   return rc;