From: drh <drh@noemail.net>
Date: Sat, 7 May 2011 18:40:36 +0000 (+0000)
Subject: Set the sqlite3.mallocFailed flag if sqlite3ParseUri fails with SQLITE_NOMEM.
X-Git-Tag: version-3.7.7~126
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ffd9668fb5c64a542ed8a54598e8e347bc12d963;p=thirdparty%2Fsqlite.git

Set the sqlite3.mallocFailed flag if sqlite3ParseUri fails with SQLITE_NOMEM.

FossilOrigin-Name: ca3797d4967361e31a8a5ce1ce8190b095f3ed4c
---

diff --git a/manifest b/manifest
index 43a2d8df59..27e92dc7ff 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-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
+C Set\sthe\ssqlite3.mallocFailed\sflag\sif\ssqlite3ParseUri\sfails\swith\sSQLITE_NOMEM.
+D 2011-05-07T18:40:36.334
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -117,7 +117,7 @@ F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc
 F sqlite3.pc.in ae6f59a76e862f5c561eb32a380228a02afc3cad
 F src/alter.c 280f5c04b11b492703a342222b3de0a999445280
 F src/analyze.c a425d62e8fa9ebcb4359ab84ff0c62c6563d2e2a
-F src/attach.c 77caa25fb9d16a030438674f16b77844078d18ed
+F src/attach.c 12c6957996908edc31c96d7c68d4942c2474405f
 F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c 986c15232757f2873dff35ee3b35cbf935fc573c
 F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef
@@ -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 9c9cfeb1e2dad0485e55bfb2d647cf7e6bcfc0d9
+F src/main.c c914afd2c37b7662acb5034c20465b807037b84c
 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 139eecbe1b072711a36128f1eeb24fc3e3bacc1c
-R 9647e2f243248962e973055679cb35ec
+P 3c926ce0976e765b4c51fcd81d251268ff21a741
+R 469c4635a93084885b543f0cd5b2c5df
 U drh
-Z b72c527dc0866038aace0b0ad58a6fe8
+Z c02f1d6b5c75b5c7abb8e8e853d0d67b
diff --git a/manifest.uuid b/manifest.uuid
index da38fe3379..60e4538975 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3c926ce0976e765b4c51fcd81d251268ff21a741
\ No newline at end of file
+ca3797d4967361e31a8a5ce1ce8190b095f3ed4c
\ No newline at end of file
diff --git a/src/attach.c b/src/attach.c
index 7e6f7c1fbb..18f8823b31 100644
--- a/src/attach.c
+++ b/src/attach.c
@@ -131,6 +131,7 @@ static void attachFunc(
   flags = db->openFlags;
   rc = sqlite3ParseUri(db->pVfs->zName, zFile, &flags, &pVfs, &zPath, &zErr);
   if( rc!=SQLITE_OK ){
+    if( rc==SQLITE_NOMEM ) db->mallocFailed = 1;
     sqlite3_result_error(context, zErr, -1);
     sqlite3_free(zErr);
     return;
diff --git a/src/main.c b/src/main.c
index f941a9398b..6fdffcd876 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2162,6 +2162,7 @@ static int openDatabase(
   /* Parse the filename/URI argument. */
   rc = sqlite3ParseUri(zVfs, zFilename, &flags, &db->pVfs, &zOpen, &zErrMsg);
   if( rc!=SQLITE_OK ){
+    if( rc==SQLITE_NOMEM ) db->mallocFailed = 1;
     sqlite3Error(db, rc, zErrMsg ? "%s" : 0, zErrMsg);
     sqlite3_free(zErrMsg);
     goto opendb_out;