From: George Kiagiadakis <george.kiagiadakis@collabora.com>
Date: Thu, 24 Jun 2021 15:14:11 +0000 (+0300)
Subject: audiomixer: fix calls to g_variant_lookup()
X-Git-Tag: 11.0.3^0
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F98%2F26398%2F1;p=apps%2Fagl-service-audiomixer.git

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 <george.kiagiadakis@collabora.com>
Change-Id: I88647ae21405fe3bd7e57c82d3e953be2767c0c9
(cherry picked from commit dadd3d771d5b27a455afffed8437c0a2e6db26b2)
---

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