From: drh Date: Fri, 17 Aug 2012 13:44:31 +0000 (+0000) Subject: Clarify that the number-of-bytes parameter to sqlite3_bind_blob() must X-Git-Tag: version-3.7.14~27 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bcebd86f7c26dd96cee64067f2fe1599af55862a;p=thirdparty%2Fsqlite.git Clarify that the number-of-bytes parameter to sqlite3_bind_blob() must be non-negative. FossilOrigin-Name: b1b01c4cd9798d69951665ed7d6d9f79f6b463a1 --- diff --git a/manifest b/manifest index 6595cc5d64..62f37dd710 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sMSVC\scompiler\swarning\sin\sthe\sspellfix\smodule.\s\sAlso,\sadd\san\sassert. -D 2012-08-17T12:13:11.201 +C Clarify\sthat\sthe\snumber-of-bytes\sparameter\sto\ssqlite3_bind_blob()\smust\nbe\snon-negative. +D 2012-08-17T13:44:31.839 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -178,7 +178,7 @@ F src/resolve.c b3c70ab28cac60de33684c9aa9e5138dcf71d6dd F src/rowset.c f6a49f3e9579428024662f6e2931832511f831a1 F src/select.c a365da6d7a6d7d8a10ad60ca71837ab5e9369466 F src/shell.c 076e1c90d594644f36027c8ecff9a392cf2d3a06 -F src/sqlite.h.in 3e8035bc406b1571a5cc8ea46bcc831201676f1a +F src/sqlite.h.in f664797c68ced43c2ea2c541d4ec8e1e04ec68ac F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477 F src/sqliteInt.h c8169801f8bbfdf5873cc6fa45cb5df720c04db4 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d @@ -1010,7 +1010,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9 -P 61b1ae121782525b37882a559d0fbb7c85237fd5 -R 4a539007d16a7b2447dc6f1195076d94 -U mistachkin -Z d4535b1b3829b27511b2fc45cd393eb2 +P e66cf0401fab766f62c1d263dcb1efb67b2075a9 +R b0faef55b691eb73f9d6281a2018b023 +U drh +Z b53d17a639d0a2dddf7d584349060e4d diff --git a/manifest.uuid b/manifest.uuid index ede4d8e9ae..89df3edfb9 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -e66cf0401fab766f62c1d263dcb1efb67b2075a9 \ No newline at end of file +b1b01c4cd9798d69951665ed7d6d9f79f6b463a1 \ No newline at end of file diff --git a/src/sqlite.h.in b/src/sqlite.h.in index aa60f80b22..9281fa48db 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -3154,8 +3154,11 @@ typedef struct sqlite3_context sqlite3_context; ** ^(In those routines that have a fourth argument, its value is the ** number of bytes in the parameter. To be clear: the value is the ** number of bytes in the value, not the number of characters.)^ -** ^If the fourth parameter is negative, the length of the string is +** ^If the fourth parameter to sqlite3_bind_text() or sqlite3_bind_text16() +** is negative, then the length of the string is ** the number of bytes up to the first zero terminator. +** If the fourth parameter to sqlite3_bind_blob() is negative, then +** the behavior is undefined. ** If a non-negative fourth parameter is provided to sqlite3_bind_text() ** or sqlite3_bind_text16() then that parameter must be the byte offset ** where the NUL terminator would occur assuming the string were NUL