[PR PATCH] AppStream: fix segfault when updating the cache

[PR PATCH] AppStream: fix segfault when updating the cache

[r-ricci]

[-- 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"

Re: [PR REVIEW] AppStream: fix segfault when updating the cache

[sgn]

[-- Attachment #1: Type: text/plain, Size: 170 bytes --]

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/39371#discussion_r974424930

Comment:
Please link to upstream PR.

Re: [PR PATCH] [Updated] AppStream: fix segfault when updating the cache

[r-ricci]

[-- Attachment #1: Type: text/plain, Size: 1278 bytes --]

There is an updated 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: 2308 bytes --]

From 75ad4e98939461ecef800ceff13feb64de876c2e 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..8bbe5996e36b
--- /dev/null
+++ b/srcpkgs/AppStream/patches/0001-ascli_refresh_cache-fix-NULL-pointer-dereference.patch
@@ -0,0 +1,29 @@
+https://github.com/ximion/appstream/pull/432
+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"

Re: [PR PATCH] [Merged]: AppStream: fix segfault when updating the cache

[paper42]

[-- Attachment #1: Type: text/plain, Size: 1120 bytes --]

There's a merged pull request on the void-packages repository

AppStream: fix segfault when updating the cache
https://github.com/void-linux/void-packages/pull/39371

Description:
<!-- 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
-->