From 5b081d8a2839c0d4183f3ceb67bf3b6170e4dd3f Mon Sep 17 00:00:00 2001 From: drh Date: Thu, 18 Feb 2016 01:29:12 +0000 Subject: [PATCH] Add extra API armor on the sqlite3_bind_blob() interface. FossilOrigin-Name: 80de1ad5eb4c3839756b6467d5b8195b4abfb1f8 --- manifest | 13 ++++++------- manifest.uuid | 2 +- src/vdbeapi.c | 3 +++ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index b21fdb1ca1..47cc7ca96b 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C When\sVDBE\sopcodes\sfail,\sthey\scause\san\simmediate\sexit\sfrom\sthe\sloop,\srather\nthan\sdepending\son\sthe\src==SQLITE_OK\stest\sat\sthe\stop\sof\sthe\sloop.\s\sThis\sis\nfaster\sand\ssmaller. -D 2016-02-17T20:47:24.973 +C Add\sextra\sAPI\sarmor\son\sthe\ssqlite3_bind_blob()\sinterface. +D 2016-02-18T01:29:12.161 F Makefile.in 4e90dc1521879022aa9479268a4cd141d1771142 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 30f075dc4f27a07abb76088946b2944178d85347 @@ -417,7 +417,7 @@ F src/vacuum.c feb1eabb20987983d9350cad98299b21fa811f52 F src/vdbe.c 4eef77da4b81763a25992cc060506c001ebd4e3d F src/vdbe.h c743791f723049db94f009e3e30958952bc2d512 F src/vdbeInt.h 4b69d5451bcadd473e745af53ef1e8abfdce0a79 -F src/vdbeapi.c bfc06382d5089944388a90e4f90bb1e975b3613d +F src/vdbeapi.c 95b1f8e527240a18a9aea41a655b013bf07a7009 F src/vdbeaux.c 3580de0325a05663195d8f8fddf48c6dd9a28522 F src/vdbeblob.c 3b570b730109e8f653d9d2081649f6e7015113db F src/vdbemem.c be8381ed6de54eb9cb9dfa802823cdeb5166d855 @@ -1428,8 +1428,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh a98af506df552f3b3c0d904f94e4cdc4e1a6d598 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P c17d7276b8c114df5fe6e9ea14d59758443c281b a444633a827642bcf4d02a461e7e5f66769d39fd -R 99549bba2f02d5e0c4a44abe6153e853 -T +closed a444633a827642bcf4d02a461e7e5f66769d39fd +P 24c7151c1aabeaffcb8bb5836404e70a3ec4681b +R f0b4335702e227844828d1e40e95332a U drh -Z fc76c9d80b0512ba6c14a32a0f780946 +Z ca0837f1f24e7471925104495cb0295d diff --git a/manifest.uuid b/manifest.uuid index adcedef80e..6621d165b5 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -24c7151c1aabeaffcb8bb5836404e70a3ec4681b \ No newline at end of file +80de1ad5eb4c3839756b6467d5b8195b4abfb1f8 \ No newline at end of file diff --git a/src/vdbeapi.c b/src/vdbeapi.c index b25b1ce5f4..c2038137d1 100644 --- a/src/vdbeapi.c +++ b/src/vdbeapi.c @@ -1301,6 +1301,9 @@ int sqlite3_bind_blob( int nData, void (*xDel)(void*) ){ +#ifdef SQLITE_ENABLE_API_ARMOR + if( nData<0 ) return SQLITE_MISUSE_BKPT; +#endif return bindText(pStmt, i, zData, nData, xDel, 0); } int sqlite3_bind_blob64(