Fix segfault due to a typo (#2012606)

This commit is contained in:
Peter Hutterer 2021-10-11 19:10:24 +10:00
parent eae32dd6a7
commit 1fa642e7c8
2 changed files with 47 additions and 2 deletions

View File

@ -0,0 +1,39 @@
From 47896503a80f5754837117b4f96574c5f35f95b1 Mon Sep 17 00:00:00 2001
From: Julian Bouzas <julian.bouzas@collabora.com>
Date: Mon, 11 Oct 2021 03:08:34 -0400
Subject: [PATCH] modules: fix default audio format segfault
---
modules/module-si-audio-adapter.c | 2 +-
modules/module-si-audio-endpoint.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/module-si-audio-adapter.c b/modules/module-si-audio-adapter.c
index a7eb62c7..57fb222b 100644
--- a/modules/module-si-audio-adapter.c
+++ b/modules/module-si-audio-adapter.c
@@ -264,7 +264,7 @@ build_adapter_format (WpSiAudioAdapter * self, guint32 format, gint channels,
wp_spa_pod_builder_add_int (b, channels);
if (position) {
wp_spa_pod_builder_add_property (b, "position");
- wp_spa_pod_builder_add_pod (b, pos);
+ wp_spa_pod_builder_add_pod (b, position);
}
return wp_spa_pod_builder_end (b);
}
diff --git a/modules/module-si-audio-endpoint.c b/modules/module-si-audio-endpoint.c
index 2ffd7960..ac0a061f 100644
--- a/modules/module-si-audio-endpoint.c
+++ b/modules/module-si-audio-endpoint.c
@@ -471,7 +471,7 @@ build_endpoint_format (WpSiAudioEndpoint * self, guint32 format, gint channels,
wp_spa_pod_builder_add_int (b, channels);
if (position) {
wp_spa_pod_builder_add_property (b, "position");
- wp_spa_pod_builder_add_pod (b, pos);
+ wp_spa_pod_builder_add_pod (b, position);
}
return wp_spa_pod_builder_end (b);
}
--
GitLab

View File

@ -1,12 +1,15 @@
Name: wireplumber
Version: 0.4.3
Release: 1%{?dist}
Release: 2%{?dist}
Summary: A modular session/policy manager for PipeWire
License: MIT
URL: https://pipewire.pages.freedesktop.org/wireplumber/
Source0: https://gitlab.freedesktop.org/pipewire/%{name}/-/archive/%{version}/%{name}-%{version}.tar.bz2
# From https://gitlab.freedesktop.org/pipewire/wireplumber/-/merge_requests/233
Patch01: 0001-modules-fix-default-audio-format-segfault.patch
BuildRequires: meson gcc pkgconfig
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gobject-2.0)
@ -51,7 +54,7 @@ convenience for writing the daemon's modules as well as external tools for
managing PipeWire.
%prep
%autosetup
%autosetup -p1
%build
%meson -Dsystem-lua=true \
@ -120,6 +123,9 @@ managing PipeWire.
%{_datadir}/gir-1.0/Wp-0.4.gir
%changelog
* Mon Oct 11 2021 Peter Hutterer <peter.hutterer@redhat.com> - 0.4.3-2
- Fix segfault due to a typo (#2012606)
* Fri Oct 07 2021 Wim Taymans <wim.taymans@redhat.com> - 0.4.3-1
- wireplumber 0.4.3