cleanup temporary migration file on cipher_migrate error

sjlombardo · sjlombardo · commit b36c3dfa558c · 2021-10-08T17:16:33.000-04:00
diff --git a/src/crypto_impl.c b/src/crypto_impl.c
@@ -1526,10 +1526,6 @@ int sqlcipher_codec_ctx_migrate(codec_ctx *ctx) {
   CODEC_TRACE("DETACH DATABASE called %d\n", rc);
   if(rc != SQLITE_OK) goto cleanup; 
 
-  rc = sqlite3OsDelete(db->pVfs, migrated_db_filename, 0);
-  CODEC_TRACE("deleted migration database: %d\n", rc);
-  if( rc!=SQLITE_OK ) goto handle_error;
-
   sqlite3ResetAllSchemasOfConnection(db);
   CODEC_TRACE("reset all schemas\n");
 
@@ -1544,6 +1540,11 @@ int sqlcipher_codec_ctx_migrate(codec_ctx *ctx) {
   CODEC_TRACE("An error occurred attempting to migrate the database - last error %d\n", rc);
 
 cleanup:
+  if(migrated_db_filename) {
+    int del_rc = sqlite3OsDelete(db->pVfs, migrated_db_filename, 0);
+    CODEC_TRACE("deleted migration database: %d\n", del_rc);
+  }
+
   if(pass) sqlcipher_free(pass, pass_sz);
   if(attach_command) sqlcipher_free(attach_command, sqlite3Strlen30(attach_command)); 
   if(migrated_db_filename) sqlcipher_free(migrated_db_filename, sqlite3Strlen30(migrated_db_filename)); 
diff --git a/test/sqlcipher-compatibility.test b/test/sqlcipher-compatibility.test
@@ -1065,7 +1065,7 @@ do_test migrate-1.1.8-database-to-current-format {
   }
 } {ok 1}
 db close
-file delete -force test.db test.db-migrated test.db-journal
+file delete -force test.db 
 
 do_test migrate-2-0-le-database-to-current-format {
   file copy -force $sampleDir/sqlcipher-2.0-le-testkey.db test.db
@@ -1083,7 +1083,7 @@ do_test migrate-2-0-le-database-to-current-format {
   }
 } {ok 1}
 db close
-file delete -force test.db test.db-migrated test.db-journal
+file delete -force test.db 
 
 do_test migrate-3-0-database-to-current-format {
   file copy -force $sampleDir/sqlcipher-3.0-testkey.db test.db
@@ -1151,6 +1151,8 @@ do_test migrate-failure {
     PRAGMA cipher_migrate;
   }]
   db close
+  
+  lappend rc [file exists test.db-migrated]
 
   sqlite_orig db test.db
   lappend rc [execsql {
@@ -1159,9 +1161,9 @@ do_test migrate-failure {
     PRAGMA cipher_compatibility = 3;
     SELECT count(*) FROM sqlite_schema;
   }]
-} {{ok 1} {ok 1}}
+} {{ok 1} 0 {ok 1}}
 db close
-file delete -force test.db test.db-migrated
+file delete -force test.db 
 
 # leave database is a readable state after a 
 # a failed migration 
@@ -1188,7 +1190,7 @@ do_test migrate-failure-readable {
   }]
 } {{ok 1} {1 {SQL logic error}} 0}
 db close
-file delete -force test.db test.db-migrated
+file delete -force test.db 
 
 do_test key-database-by-name {
     sqlite_orig db test.db
