From: r-ricci <r-ricci@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] AppStream: fix segfault when updating the cache
Date: Mon, 19 Sep 2022 17:54:49 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39371@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1273 bytes --]
There is a new pull request by r-ricci against master on the void-packages repository
https://github.com/r-ricci/void-packages appstream
https://github.com/void-linux/void-packages/pull/39371
AppStream: fix segfault when updating the cache
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
@paper42
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39371.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-appstream-39371.patch --]
[-- Type: text/x-diff, Size: 2334 bytes --]
From 04ead8ff1e052d2c36a9a82f7e976ff93c1097c6 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Mon, 19 Sep 2022 17:18:49 +0200
Subject: [PATCH] AppStream: fix segfault when updating the cache
---
...h_cache-fix-NULL-pointer-dereference.patch | 29 +++++++++++++++++++
srcpkgs/AppStream/template | 2 +-
2 files changed, 30 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/AppStream/patches/0001-ascli_refresh_cache-fix-NULL-pointer-dereference.patch
diff --git a/srcpkgs/AppStream/patches/0001-ascli_refresh_cache-fix-NULL-pointer-dereference.patch b/srcpkgs/AppStream/patches/0001-ascli_refresh_cache-fix-NULL-pointer-dereference.patch
new file mode 100644
index 000000000000..d4c9eefa8153
--- /dev/null
+++ b/srcpkgs/AppStream/patches/0001-ascli_refresh_cache-fix-NULL-pointer-dereference.patch
@@ -0,0 +1,29 @@
+From 979cf340ec0a7774c4137360a7832b4f689ac413 Mon Sep 17 00:00:00 2001
+From: Roberto Ricci <ricci@disroot.org>
+Date: Mon, 19 Sep 2022 16:02:59 +0200
+Subject: [PATCH] ascli_refresh_cache: fix NULL pointer dereference
+
+The command `appstreamcli refresh-cache --cachepath /tmp/cache`
+segfaults. In this code path, `ret` (initialized to `FALSE`) is not
+updated when `as_pool_load` returns successfully and sets the `error`
+pointer to NULL. Then the code tries to print `error->message`.
+---
+ tools/ascli-actions-mdata.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/ascli-actions-mdata.c b/tools/ascli-actions-mdata.c
+index c77773da..30bfd325 100644
+--- a/tools/ascli-actions-mdata.c
++++ b/tools/ascli-actions-mdata.c
+@@ -81,7 +81,7 @@ ascli_refresh_cache (const gchar *cachepath,
+ ret = as_pool_refresh_system_cache (pool, forced, &cache_updated, &error);
+ } else {
+ as_pool_override_cache_locations (pool, cachepath, NULL);
+- as_pool_load (pool, NULL, &error);
++ ret = as_pool_load (pool, NULL, &error);
+ cache_updated = TRUE;
+ }
+
+--
+2.37.3
+
diff --git a/srcpkgs/AppStream/template b/srcpkgs/AppStream/template
index 13689572efd1..d195c300dd49 100644
--- a/srcpkgs/AppStream/template
+++ b/srcpkgs/AppStream/template
@@ -1,7 +1,7 @@
# Template file for 'AppStream'
pkgname=AppStream
version=0.15.5
-revision=1
+revision=2
wrksrc="appstream-${version}"
build_style=meson
build_helper="gir qemu"
next reply other threads:[~2022-09-19 15:54 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-19 15:54 r-ricci [this message]
2022-09-19 15:58 ` [PR REVIEW] " sgn
2022-09-19 16:02 ` [PR PATCH] [Updated] " r-ricci
2022-09-19 23:15 ` [PR PATCH] [Merged]: " paper42
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39371@inbox.vuxu.org \
--to=r-ricci@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).