From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Laurent Vivier" <laurent@vivier.eu>,
qemu-arm@nongnu.org, qemu-ppc@nongnu.org,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>
Subject: [PATCH v3 10/17] audio/alsaaudio: Replace ALSA alloca() by malloc() equivalent
Date: Fri, 7 May 2021 16:43:08 +0200 [thread overview]
Message-ID: <20210507144315.1994337-11-philmd@redhat.com> (raw)
In-Reply-To: <20210507144315.1994337-1-philmd@redhat.com>
The ALLOCA(3) man-page mentions its "use is discouraged".
Define the cleanup functions for the snd_pcm_[hw/sw]_params_t types,
and replace the ALSA alloca() calls by equivalent ALSA malloc().
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
audio/alsaaudio.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c
index fcc2f62864f..f39061ebc42 100644
--- a/audio/alsaaudio.c
+++ b/audio/alsaaudio.c
@@ -70,6 +70,9 @@ struct alsa_params_obt {
snd_pcm_uframes_t samples;
};
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(snd_pcm_hw_params_t, snd_pcm_hw_params_free)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(snd_pcm_sw_params_t, snd_pcm_sw_params_free)
+
static void GCC_FMT_ATTR (2, 3) alsa_logerr (int err, const char *fmt, ...)
{
va_list ap;
@@ -410,9 +413,9 @@ static void alsa_dump_info (struct alsa_params_req *req,
static void alsa_set_threshold (snd_pcm_t *handle, snd_pcm_uframes_t threshold)
{
int err;
- snd_pcm_sw_params_t *sw_params;
+ g_autoptr(snd_pcm_sw_params_t) sw_params = NULL;
- snd_pcm_sw_params_alloca (&sw_params);
+ snd_pcm_sw_params_malloc(&sw_params);
err = snd_pcm_sw_params_current (handle, sw_params);
if (err < 0) {
@@ -444,7 +447,7 @@ static int alsa_open(bool in, struct alsa_params_req *req,
AudiodevAlsaOptions *aopts = &dev->u.alsa;
AudiodevAlsaPerDirectionOptions *apdo = in ? aopts->in : aopts->out;
snd_pcm_t *handle;
- snd_pcm_hw_params_t *hw_params;
+ g_autoptr(snd_pcm_hw_params_t) hw_params = NULL;
int err;
unsigned int freq, nchannels;
const char *pcm_name = apdo->has_dev ? apdo->dev : "default";
@@ -455,7 +458,7 @@ static int alsa_open(bool in, struct alsa_params_req *req,
freq = req->freq;
nchannels = req->nchannels;
- snd_pcm_hw_params_alloca (&hw_params);
+ snd_pcm_hw_params_malloc(&hw_params);
err = snd_pcm_open (
&handle,
--
2.26.3
next prev parent reply other threads:[~2021-05-07 14:56 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-07 14:42 [PATCH v3 00/17] misc: Replace alloca() by g_malloc() Philippe Mathieu-Daudé
2021-05-07 14:42 ` [PATCH v3 01/17] bsd-user/syscall: Replace alloca() by g_try_new() Philippe Mathieu-Daudé
2021-05-07 14:43 ` [PATCH v3 02/17] linux-user/elfload: Replace alloca() by g_try_malloc() Philippe Mathieu-Daudé
2021-05-07 14:43 ` [PATCH v3 03/17] linux-user/syscall: Replace alloca() by g_try_new() Philippe Mathieu-Daudé
2021-05-07 14:43 ` [PATCH v3 04/17] linux-user/syscall: Replace alloca() by g_try_malloc() Philippe Mathieu-Daudé
2021-05-07 14:43 ` [PATCH v3 05/17] linux-user: Replace alloca() by g_try_new() in ppoll() syscall Philippe Mathieu-Daudé
2021-05-07 14:43 ` [PATCH v3 06/17] linux-user: Replace alloca() by g_try_malloc() in setsockopt() syscall Philippe Mathieu-Daudé
2021-05-07 14:43 ` [PATCH v3 07/17] linux-user: Replace alloca() by g_try_malloc() in various socket syscall Philippe Mathieu-Daudé
2021-05-07 14:43 ` [PATCH v3 08/17] linux-user/syscall: Move code around in do_sendrecvmsg_locked() Philippe Mathieu-Daudé
2021-05-07 14:43 ` [PATCH v3 09/17] linux-user/syscall: Replace alloca() by GLib alloc() in sendrecvmsg Philippe Mathieu-Daudé
2021-05-07 14:43 ` Philippe Mathieu-Daudé [this message]
2021-05-07 14:43 ` [PATCH v3 11/17] backends/tpm: Replace g_alloca() by g_malloc() Philippe Mathieu-Daudé
2021-05-07 14:43 ` [PATCH v3 12/17] gdbstub: Constify GdbCmdParseEntry Philippe Mathieu-Daudé
2021-05-07 14:43 ` [PATCH v3 13/17] gdbstub: Replace GdbCmdContext with plain g_array() Philippe Mathieu-Daudé
2021-05-07 14:43 ` [PATCH v3 14/17] hw/misc/pca9552: Replace g_newa() by g_new() Philippe Mathieu-Daudé
2021-05-10 5:59 ` Cédric Le Goater
2021-05-07 14:43 ` [PATCH v3 15/17] target/ppc/kvm: Replace alloca() by g_malloc() Philippe Mathieu-Daudé
2021-05-10 5:38 ` David Gibson
2021-05-07 14:43 ` [PATCH v3 16/17] configure: Prohibit alloca() by using -Walloca CPPFLAG Philippe Mathieu-Daudé
2021-05-07 17:14 ` Philippe Mathieu-Daudé
2021-05-07 14:43 ` [NOTFORMERGE PATCH v3 17/17] configure: libSLiRP buildsys kludge Philippe Mathieu-Daudé
2021-05-07 17:15 ` Philippe Mathieu-Daudé
2021-05-07 17:19 ` [PATCH v3 18/17] tests/unit/test-char: Replace g_alloca() by buffer on the stack Philippe Mathieu-Daudé
2021-05-07 20:44 ` Marc-André Lureau
2021-05-07 21:25 ` Richard Henderson
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=20210507144315.1994337-11-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=kraxel@redhat.com \
--cc=laurent@vivier.eu \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.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).