From 51ec463e9d9b5e5c20e1e476870b19f14f856456 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Mon, 26 Jun 2017 10:53:52 +0300
Subject: [PATCH] db: fix current directory instance caching in tar extraction
Depending how the directory entries are ordered, the cached dir
instance might not have been updated correctly. This has not been
a problem as the entries have been ordered, but is now triggered
on ppc.
---
src/database.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/database.c b/src/database.c
index 7c3c646f..ab6a8cbb 100644
--- a/src/database.c
+++ b/src/database.c
@@ -2409,7 +2409,7 @@ static int apk_db_install_archive_entry(void *_ctx,
return 0;
/* Make sure the file is part of the cached directory tree */
- diri = find_diri(ipkg, bdir, diri, &ctx->file_diri_node);
+ diri = ctx->diri = find_diri(ipkg, bdir, diri, &ctx->file_diri_node);
if (diri == NULL) {
if (!APK_BLOB_IS_NULL(bdir)) {
apk_error(PKG_VER_FMT": "BLOB_FMT": no dirent in archive",
--
GitLab