MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-26 14:13:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Handle empty files table when upgrading from schema v11 -> v12

Browse Source
This commit is contained in:
Julien BLACHE 2011-04-06 18:38:53 +02:00
parent 7984b4baea
commit 54c5314712
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/db.c
View File

@ -4370,13 +4370,18 @@ db_upgrade_v12(void)
goto out_fclose;
}
dump = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fd, 0);
if (dump == MAP_FAILED)
if (sb.st_size == 0)
dump = NULL;
else
{
DPRINTF(E_LOG, L_DB, "Could not map dump file: %s\n", strerror(errno));
dump = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fd, 0);
if (dump == MAP_FAILED)
{
DPRINTF(E_LOG, L_DB, "Could not map dump file: %s\n", strerror(errno));
ret = -1;
goto out_fclose;
ret = -1;
goto out_fclose;
}
}
/* Move old table out of the way */
@ -4410,15 +4415,18 @@ db_upgrade_v12(void)
/* Reload dump */
DPRINTF(E_LOG, L_DB, "Reloading new files table...\n");
ret = sqlite3_exec(hdl, dump, NULL, NULL, &errmsg);
if (ret != SQLITE_OK)
if (dump)
{
DPRINTF(E_LOG, L_DB, "Error reloading files table data: %s\n", errmsg);
ret = sqlite3_exec(hdl, dump, NULL, NULL, &errmsg);
if (ret != SQLITE_OK)
{
DPRINTF(E_LOG, L_DB, "Error reloading files table data: %s\n", errmsg);
sqlite3_free(errmsg);
sqlite3_free(errmsg);
ret = -1;
goto out_munmap;
ret = -1;
goto out_munmap;
}
}
/* Delete old files table */
@ -4434,8 +4442,11 @@ db_upgrade_v12(void)
}
out_munmap:
if (munmap(dump, sb.st_size) < 0)
DPRINTF(E_LOG, L_DB, "Could not unmap dump file: %s\n", strerror(errno));
if (dump)
{
if (munmap(dump, sb.st_size) < 0)
DPRINTF(E_LOG, L_DB, "Could not unmap dump file: %s\n", strerror(errno));
}
out_fclose:
fclose(fp);