From: drh Date: Tue, 17 May 2011 19:43:38 +0000 (+0000) Subject: Fix an off-by-one error in the new sqlite3_uri_parameter() function. X-Git-Tag: version-3.7.7~111 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd69559bfdfc72d4c1e5741a3bdcd51268cfedd5;p=thirdparty%2Fsqlite.git Fix an off-by-one error in the new sqlite3_uri_parameter() function. FossilOrigin-Name: 9593a640795458ce6e57e02dd5d702b642858f76 --- diff --git a/manifest b/manifest index 2c19667b1c..1a8a57d2af 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sthe\ssqlite3_uri_parameter()\sinterface\sfunction\sfor\suse\sin\sbuilding\nnew\sVFSes. -D 2011-05-17T18:53:08.942 +C Fix\san\soff-by-one\serror\sin\sthe\snew\ssqlite3_uri_parameter()\sfunction. +D 2011-05-17T19:43:38.641 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 11dcc00a8d0e5202def00e81732784fb0cc4fe1d F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -144,7 +144,7 @@ F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e F src/loadext.c 3ae0d52da013a6326310655be6473fd472347b85 -F src/main.c d189df8eb4833ca36e93ccf7ba1b5bad6273bfea +F src/main.c 059daeed5876b3604f0192f838faf5f4db138901 F src/malloc.c 591aedb20ae40813f1045f2ef253438a334775d9 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem1.c 00bd8265c81abb665c48fea1e0c234eb3b922206 @@ -936,7 +936,7 @@ F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P 8844e8bfb87314fb40ecb92705e8fff88f72bb38 -R 95d48a407a23b64e1866e265afe49282 +P 6b5de95fb575c7ceb3034068c4f5e0fccb1b15ac +R d104cfa9424db95a1c8ed2af31b70a54 U drh -Z 6f0e27514e0a4b3281aede2f373acd02 +Z e3568578d123c11b9aea2de4d2897b24 diff --git a/manifest.uuid b/manifest.uuid index 7b2519a73f..0fe7c3a736 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -6b5de95fb575c7ceb3034068c4f5e0fccb1b15ac \ No newline at end of file +9593a640795458ce6e57e02dd5d702b642858f76 \ No newline at end of file diff --git a/src/main.c b/src/main.c index 6dd591ce05..c99d396546 100644 --- a/src/main.c +++ b/src/main.c @@ -2921,12 +2921,12 @@ int sqlite3_test_control(int op, ...){ ** returns a NULL pointer. */ const char *sqlite3_uri_parameter(const char *zFilename, const char *zParam){ - zFilename += sqlite3Strlen30(zFilename); + zFilename += sqlite3Strlen30(zFilename) + 1; while( zFilename[0] ){ int x = strcmp(zFilename, zParam); - zFilename += sqlite3Strlen30(zFilename); + zFilename += sqlite3Strlen30(zFilename) + 1; if( x==0 ) return zFilename; - zFilename += sqlite3Strlen30(zFilename); + zFilename += sqlite3Strlen30(zFilename) + 1; } return 0; }