fix potential use after free

[zpackage] / lib / zpm.c

diff --git a/lib/zpm.c b/lib/zpm.c
index b7d97776659c5c7b22bc6aec59462b2b2e58a138..87ffbbb3ebde53cf464a48fe5a9972883b8a1203 100644 (file)
--- a/lib/zpm.c
+++ b/lib/zpm.c
@@ -333,6 +333,8 @@ static void zpm_set_db_errmsg(struct zpm *zpm, const char *msg) {
                        if (!zpm->dberrmsg) {
                                zpm->error = 1;
                        }
+               } else {
+                       zpm->dberrmsg = 0;
                }
        }
 }
@@ -357,7 +359,7 @@ int zpm_init(struct zpm *pkg, char *path) {
                        sqlite3_close(db);
                }
                fprintf(stderr, "error (%d): %s: %s\n", rc,
-                               pkg->dberrmsg, path);
+                               pkg->dberrmsg ? pkg->dberrmsg : "null", path);
 
                return 0;
        }
@@ -562,10 +564,6 @@ static int set_elf_info(sqlite3 *db, char *hash, char *content, size_t length) {
                int rc;
 
                /* clear existing for this hash */
-               if (!run_for_hash(db, "delete from elfinfo where file = ?", hash)) {
-                       SQLERP(db, "error clearing elf info");
-                       return 0;
-               }
 
                if (!run_for_hash(db, "delete from elflibraries where file = ?", hash)) {
                        SQLERP(db, "error clearing elf library");