Commit ce3cf8bf authored by Timo Teräs's avatar Timo Teräs
Browse files

db, pkg: fix triggers related crash

clean up the triggers properly, in proper order.
parent 440cffef
...@@ -831,7 +831,8 @@ static void apk_db_triggers_write(struct apk_database *db, struct apk_ostream *o ...@@ -831,7 +831,8 @@ static void apk_db_triggers_write(struct apk_database *db, struct apk_ostream *o
list_for_each_entry(ipkg, &db->installed.triggers, trigger_pkgs_list) { list_for_each_entry(ipkg, &db->installed.triggers, trigger_pkgs_list) {
bfn = APK_BLOB_BUF(buf); bfn = APK_BLOB_BUF(buf);
apk_blob_push_csum(&bfn, &ipkg->pkg->csum); apk_blob_push_csum(&bfn, &ipkg->pkg->csum);
os->write(os, buf, bfn.ptr - buf); bfn = apk_blob_pushed(APK_BLOB_BUF(buf), bfn);
os->write(os, bfn.ptr, bfn.len);
for (i = 0; i < ipkg->triggers->num; i++) { for (i = 0; i < ipkg->triggers->num; i++) {
os->write(os, " ", 1); os->write(os, " ", 1);
...@@ -1269,8 +1270,8 @@ void apk_db_close(struct apk_database *db) ...@@ -1269,8 +1270,8 @@ void apk_db_close(struct apk_database *db)
if (db->world) if (db->world)
free(db->world); free(db->world);
apk_hash_free(&db->available.names);
apk_hash_free(&db->available.packages); apk_hash_free(&db->available.packages);
apk_hash_free(&db->available.names);
apk_hash_free(&db->installed.files); apk_hash_free(&db->installed.files);
apk_hash_free(&db->installed.dirs); apk_hash_free(&db->installed.dirs);
...@@ -2106,12 +2107,6 @@ int apk_db_install_pkg(struct apk_database *db, ...@@ -2106,12 +2107,6 @@ int apk_db_install_pkg(struct apk_database *db,
/* Install the new stuff */ /* Install the new stuff */
ipkg = apk_pkg_install(db, newpkg); ipkg = apk_pkg_install(db, newpkg);
ipkg->flags |= APK_IPKGF_RUN_ALL_TRIGGERS;
if (ipkg->triggers) {
list_del(&ipkg->trigger_pkgs_list);
free(ipkg->triggers);
ipkg->triggers = NULL;
}
if (newpkg->installed_size != 0) { if (newpkg->installed_size != 0) {
r = apk_db_unpack_pkg(db, ipkg, (oldpkg != NULL), r = apk_db_unpack_pkg(db, ipkg, (oldpkg != NULL),
(oldpkg == newpkg), cb, cb_ctx, (oldpkg == newpkg), cb, cb_ctx,
...@@ -2122,6 +2117,13 @@ int apk_db_install_pkg(struct apk_database *db, ...@@ -2122,6 +2117,13 @@ int apk_db_install_pkg(struct apk_database *db,
} }
} }
ipkg->flags |= APK_IPKGF_RUN_ALL_TRIGGERS;
if (ipkg->triggers) {
list_del(&ipkg->trigger_pkgs_list);
free(ipkg->triggers);
ipkg->triggers = NULL;
}
if (oldpkg != NULL && oldpkg != newpkg && oldpkg->ipkg != NULL) { if (oldpkg != NULL && oldpkg != newpkg && oldpkg->ipkg != NULL) {
apk_db_purge_pkg(db, oldpkg->ipkg, NULL); apk_db_purge_pkg(db, oldpkg->ipkg, NULL);
apk_pkg_uninstall(db, oldpkg); apk_pkg_uninstall(db, oldpkg);
......
...@@ -92,6 +92,7 @@ void apk_pkg_uninstall(struct apk_database *db, struct apk_package *pkg) ...@@ -92,6 +92,7 @@ void apk_pkg_uninstall(struct apk_database *db, struct apk_package *pkg)
if (ipkg->triggers) { if (ipkg->triggers) {
list_del(&ipkg->trigger_pkgs_list); list_del(&ipkg->trigger_pkgs_list);
list_init(&ipkg->trigger_pkgs_list);
for (i = 0; i < ipkg->triggers->num; i++) for (i = 0; i < ipkg->triggers->num; i++)
free(ipkg->triggers->item[i]); free(ipkg->triggers->item[i]);
free(ipkg->triggers); free(ipkg->triggers);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment