From adcee8121ca25a14ee4cc50d15211b075b769ab8 Mon Sep 17 00:00:00 2001 From: George Kiagiadakis Date: Thu, 24 Jun 2021 18:14:11 +0300 Subject: audiomixer: fix calls to g_variant_lookup() * actually get values instead of storing them into intermediate pointers on the stack * fix crash on 32-bit architectures * no need to use NULL sentinel Bug-AGL: SPEC-3976 Signed-off-by: George Kiagiadakis Change-Id: I88647ae21405fe3bd7e57c82d3e953be2767c0c9 (cherry picked from commit dadd3d771d5b27a455afffed8437c0a2e6db26b2) --- binding/audiomixer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/binding/audiomixer.c b/binding/audiomixer.c index 78dd347..97ad622 100644 --- a/binding/audiomixer.c +++ b/binding/audiomixer.c @@ -56,8 +56,8 @@ get_mixer_controls (struct audiomixer * self, guint32 node_id, gdouble * vol, gb g_autoptr (GVariant) v = NULL; g_signal_emit_by_name (self->mixer_api, "get-volume", node_id, &v); return v && - g_variant_lookup (v, "volume", "d", &vol, NULL) && - g_variant_lookup (v, "mute", "b", &mute, NULL); + g_variant_lookup (v, "volume", "d", vol) && + g_variant_lookup (v, "mute", "b", mute); } static void -- cgit 1.2.3-korg