From 5dd72ad6df8040a8799c0b6ec483f3d1d6f0099a Mon Sep 17 00:00:00 2001 From: drh Date: Sat, 7 May 2011 18:18:33 +0000 Subject: [PATCH] Return SQLITE_MISUSE from the sqlite3_open_v2() function if the 3rd parameter is not a valid set of bit-values. FossilOrigin-Name: 3c926ce0976e765b4c51fcd81d251268ff21a741 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/main.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index 882e6dc356..43a2d8df59 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sminor\scompiler\swarnings. -D 2011-05-07T14:40:29.349 +C Return\sSQLITE_MISUSE\sfrom\sthe\ssqlite3_open_v2()\sfunction\sif\sthe\s3rd\sparameter\nis\snot\sa\svalid\sset\sof\sbit-values. +D 2011-05-07T18:18:33.871 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2 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 35bce9d0c201d35f8398716c04be7fb616c600b3 +F src/main.c 9c9cfeb1e2dad0485e55bfb2d647cf7e6bcfc0d9 F src/malloc.c 591aedb20ae40813f1045f2ef253438a334775d9 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem1.c 00bd8265c81abb665c48fea1e0c234eb3b922206 @@ -935,7 +935,7 @@ F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P 88df33c45fd5875ea82bc757b239fe3e61663c12 -R 60bd58714af3d9085d800460facedd20 +P 139eecbe1b072711a36128f1eeb24fc3e3bacc1c +R 9647e2f243248962e973055679cb35ec U drh -Z 41f26c68b9bef2dce351bff5509fd9e2 +Z b72c527dc0866038aace0b0ad58a6fe8 diff --git a/manifest.uuid b/manifest.uuid index e005b5342c..da38fe3379 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -139eecbe1b072711a36128f1eeb24fc3e3bacc1c \ No newline at end of file +3c926ce0976e765b4c51fcd81d251268ff21a741 \ No newline at end of file diff --git a/src/main.c b/src/main.c index 1515d7d2ac..f941a9398b 100644 --- a/src/main.c +++ b/src/main.c @@ -2056,7 +2056,7 @@ static int openDatabase( testcase( (1<<(flags&7))==0x02 ); /* READONLY */ testcase( (1<<(flags&7))==0x04 ); /* READWRITE */ testcase( (1<<(flags&7))==0x40 ); /* READWRITE | CREATE */ - if( ((1<<(flags&7)) & 0x46)==0 ) rc = SQLITE_MISUSE; + if( ((1<<(flags&7)) & 0x46)==0 ) return SQLITE_MISUSE_BKPT; if( sqlite3GlobalConfig.bCoreMutex==0 ){ isThreadsafe = 0; -- 2.47.2