2 files changed, 3 insertions, 2 deletions
diff --git a/src/attach.c b/src/attach.c
index f177f1a5b..597351fa3 100644
--- a/src/attach.c
+++ b/src/attach.c
@@ -229,6 +229,7 @@ static void attachFunc(
   */
   if( rc==SQLITE_OK ){
     sqlite3BtreeEnterAll(db);
+    db->init.iDb = 0;
     rc = sqlite3Init(db, &zErrDyn);
     sqlite3BtreeLeaveAll(db);
   }
diff --git a/src/tclsqlite.c b/src/tclsqlite.c
index c9b4ff610..f3261d1e7 100644
--- a/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@ -2442,11 +2442,11 @@ static int SQLITE_TCLAPI DbObjCmd(
     }
     pBA = Tcl_GetByteArrayFromObj(pValue, &len);
     pData = sqlite3_malloc64( len );
-    if( pData==0 ){
+    if( pData==0 && len>0 ){
       Tcl_AppendResult(interp, "out of memory", (char*)0);
       rc = TCL_ERROR;
     }else{
-      memcpy(pData, pBA, len);
+      if( len>0 ) memcpy(pData, pBA, len);
       xrc = sqlite3_deserialize(pDb->db, zSchema, pData, len, len,
                 SQLITE_DESERIALIZE_FREEONCLOSE |
                 SQLITE_DESERIALIZE_RESIZEABLE);