On Sunday, December 18, 2022 6:39:00 PM CET Volker Rümelin wrote: > Am 18.12.22 um 18:26 schrieb Philippe Mathieu-Daudé: > > On 18/12/22 18:15, Volker Rümelin wrote: > >> Use g_malloc0() as a direct replacement for audio_calloc(). > >> > >> Signed-off-by: Volker Rümelin <vr_q...@t-online.de> > >> --- > >> audio/audio_template.h | 2 +- > >> 1 file changed, 1 insertion(+), 1 deletion(-) > >> > >> diff --git a/audio/audio_template.h b/audio/audio_template.h > >> index d343a1dcb3..5f51ef26b2 100644 > >> --- a/audio/audio_template.h > >> +++ b/audio/audio_template.h > >> @@ -273,7 +273,7 @@ static HW *glue(audio_pcm_hw_add_new_, > >> TYPE)(AudioState *s, > >> return NULL; > >> } > >> - hw = audio_calloc(__func__, 1, glue(drv->voice_size_, TYPE)); > >> + hw = g_malloc0(glue(drv->voice_size_, TYPE)); > >> if (!hw) { > > > > g_malloc0() can't fail. Either you want g_try_malloc0() or > > remove the error path. > > > > g_malloc0() returns NULL if drv->voice_size_(out|in) is 0. I think the > code is correct.
Correct, that's the only case these glib functions return NULL. And AFAICS this can be zero with CoreAudio or wav. Reviewed-by: Christian Schoenebeck <qemu_...@crudebyte.com> > > >> dolog ("Can not allocate voice `%s' size %d\n", > >> drv->name, glue (drv->voice_size_, TYPE)); > > > > >