Fix a failure to report a failed malloc() within sqlite3_create_module(). (CVS 5284)

FossilOrigin-Name: 3ca7dab88e030cc945e0d358d7f53ddca35bc221

diff --git a/manifest b/manifest
index 984da081ed090ac889079f255528a58c3c7ea3c5..f461dbc35b3d3d7bde617ff1e495f59e4d805880 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sbug\scausing\sthe\spager-cache\ssize\sto\sbe\sreset\sto\sits\sdefault\svalue\swhenever\sthe\sdatabase\sschema\swas\sreloaded.\s(CVS\s5283)
-D 2008-06-23T16:53:47
+C Fix\sa\sfailure\sto\sreport\sa\sfailed\smalloc()\swithin\ssqlite3_create_module().\s(CVS\s5284)
+D 2008-06-23T17:44:19
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in ff6f90048555a0088f6a4b7406bed5e55a7c4eff
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -189,7 +189,7 @@ F src/vdbeaux.c 3db1f037906cd0961b1f79771abc267b94bd8475
 F src/vdbeblob.c 9345f6dcd675fdcfdb537d2d2f487542d9ea136a
 F src/vdbefifo.c c46dae1194e4277bf007144d7e5b0c0b1c24f136
 F src/vdbemem.c a39a822e6ae61c4cab4a512df4a315888b206911
-F src/vtab.c ce9d19ca9053812a557010fd4be7e842f8ebba2d
+F src/vtab.c 2096c03ec5540a43c8c73a8f43407dfd3549a982
 F src/where.c 5c4a999f6aed992131479bfaec9b874326d9963c
 F tclinstaller.tcl 4356d9d94d2b5ed5e68f9f0c80c4df3048dd7617
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@ -592,7 +592,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P e872c78c72eb5976e72123485692a76409bd857f
-R f7cd8593345fa0392a9591d6d8df4193
+P 6dbe67da5cb0141e011b4fdcc3964a20f68be843
+R d294d8c8ca1e1e0b998b4b9e46c87eb3
 U danielk1977
-Z 82fd96eb942b7f8687f6348bde0b3b6d
+Z aa84f2af470a4c68cbe527219bc745f0

diff --git a/manifest.uuid b/manifest.uuid
index e913abd6c2defbbd81efd0ace81ed6c012bd1022..5ec9329174bd560534be2d263c9e98c4db33ad4c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6dbe67da5cb0141e011b4fdcc3964a20f68be843
\ No newline at end of file
+3ca7dab88e030cc945e0d358d7f53ddca35bc221
\ No newline at end of file

diff --git a/src/vtab.c b/src/vtab.c
index 74c14c8d49aecd21c3cfe742610e21a4588b3075..ab960236eeca5a5448faa6fc44bcc20029cef11c 100644 (file)
--- a/src/vtab.c
+++ b/src/vtab.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** This file contains code used to help implement virtual tables.
 **
-** $Id: vtab.c,v 1.69 2008/05/05 13:23:04 drh Exp $
+** $Id: vtab.c,v 1.70 2008/06/23 17:44:19 danielk1977 Exp $
 */
 #ifndef SQLITE_OMIT_VIRTUALTABLE
 #include "sqliteInt.h"
@@ -30,17 +30,21 @@ static int createModule(
   nName = strlen(zName);
   pMod = (Module *)sqlite3DbMallocRaw(db, sizeof(Module) + nName + 1);
   if( pMod ){
+    Module *pDel;
     char *zCopy = (char *)(&pMod[1]);
     memcpy(zCopy, zName, nName+1);
     pMod->zName = zCopy;
     pMod->pModule = pModule;
     pMod->pAux = pAux;
     pMod->xDestroy = xDestroy;
-    pMod = (Module *)sqlite3HashInsert(&db->aModule, zCopy, nName, (void*)pMod);
-    if( pMod && pMod->xDestroy ){
-      pMod->xDestroy(pMod->pAux);
+    pDel = (Module *)sqlite3HashInsert(&db->aModule, zCopy, nName, (void*)pMod);
+    if( pDel && pDel->xDestroy ){
+      pDel->xDestroy(pDel->pAux);
+    }
+    sqlite3_free(pDel);
+    if( pDel==pMod ){
+      db->mallocFailed = 1;
     }
-    sqlite3_free(pMod);
     sqlite3ResetInternalSchema(db, 0);
   }
   rc = sqlite3ApiExit(db, SQLITE_OK);