ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Feature: Fix No-Intro cleanup on initial errors

This commit is contained in:
Vicki Pfau 2023-03-01 20:27:51 -08:00
parent bba57ce530
commit bc048094b1
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/feature/sqlite3/no-intro.c
View File

@ -17,7 +17,7 @@ struct NoIntroDB {
}; };
struct NoIntroDB* NoIntroDBLoad(const char* path) { struct NoIntroDB* NoIntroDBLoad(const char* path) {
struct NoIntroDB* db = malloc(sizeof(*db)); struct NoIntroDB* db = calloc(1, sizeof(*db));
if (sqlite3_open_v2(path, &db->db, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_FULLMUTEX, NULL)) { if (sqlite3_open_v2(path, &db->db, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_FULLMUTEX, NULL)) {
goto error; goto error;
@ -60,9 +60,6 @@ struct NoIntroDB* NoIntroDBLoad(const char* path) {
return db; return db;
error: error:
if (db->crc32) {
sqlite3_finalize(db->crc32);
}
NoIntroDBDestroy(db); NoIntroDBDestroy(db);
return NULL; return NULL;
@ -285,8 +282,12 @@ bool NoIntroDBLoadClrMamePro(struct NoIntroDB* db, struct VFile* vf) {
} }
void NoIntroDBDestroy(struct NoIntroDB* db) { void NoIntroDBDestroy(struct NoIntroDB* db) {
sqlite3_finalize(db->crc32); if (db->crc32) {
sqlite3_close(db->db); sqlite3_finalize(db->crc32);
}
if (db->db) {
sqlite3_close(db->db);
}
free(db); free(db);
} }