mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

spa: alsa: fix some coverity warnings

Browse source 
NULL checks.

Change pa_x* malloc functions act like the pulseaudio ones: assert on
failure, as code assumes that.
This commit is contained in:
Pauli Virtanen 2025-06-14 13:54:23 +03:00
parent 7f2bdab8ea
commit 3539374ba7
4 changed files with 30 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

20
spa/plugins/alsa/acp/acp.c
View file

@ -8,6 +8,7 @@
#include <spa/utils/string.h>
#include <spa/utils/json.h>
#include <spa/utils/cleanup.h>
#include <spa/param/audio/iec958-types.h>
int _acp_log_level = 1;
@ -372,7 +373,7 @@ static int add_pro_profile(pa_card *impl, uint32_t index)
dev = -1;
while (1) {
char desc[128], devstr[128], *name;
char desc[128], devstr[128];
if ((err = snd_ctl_pcm_next_device(ctl_hndl, &dev)) < 0) {
pa_log_error("error iterating devices: %s", snd_strerror(err));
@ -396,8 +397,13 @@ static int add_pro_profile(pa_card *impl, uint32_t index)
pa_log_error("error pcm info: %s", snd_strerror(err));
}
if (err >= 0) {
spa_autofree char *name = NULL;
pa_assert_se(asprintf(&name, "Mapping pro-output-%d", dev) >= 0);
m = pa_alsa_mapping_get(ps, name);
} else {
m = NULL;
}
if (m) {
m->description = pa_xstrdup(desc);
m->device_strings = pa_split_spaces_strv(devstr);
@ -419,7 +425,6 @@ static int add_pro_profile(pa_card *impl, uint32_t index)
n_playback++;
}
pa_idxset_put(ap->output_mappings, m, NULL);
free(name);
}
snd_pcm_info_set_stream(pcminfo, SND_PCM_STREAM_CAPTURE);
@ -428,8 +433,13 @@ static int add_pro_profile(pa_card *impl, uint32_t index)
pa_log_error("error pcm info: %s", snd_strerror(err));
}
if (err >= 0) {
spa_autofree char *name = NULL;
pa_assert_se(asprintf(&name, "Mapping pro-input-%d", dev) >= 0);
m = pa_alsa_mapping_get(ps, name);
} else {
m = NULL;
}
if (m) {
m->description = pa_xstrdup(desc);
m->device_strings = pa_split_spaces_strv(devstr);
@ -451,7 +461,6 @@ static int add_pro_profile(pa_card *impl, uint32_t index)
n_capture++;
}
pa_idxset_put(ap->input_mappings, m, NULL);
free(name);
}
}
snd_ctl_close(ctl_hndl);
@ -1190,7 +1199,7 @@ uint32_t acp_card_find_best_profile_index(struct acp_card *card, const char *nam
static void find_mixer(pa_card *impl, pa_alsa_device *dev, const char *element, bool ignore_dB)
{
const char *mdev;
const char *mdev = NULL;
pa_alsa_mapping *mapping = dev->mapping;
if (!mapping && !element)
@ -1199,7 +1208,8 @@ static void find_mixer(pa_card *impl, pa_alsa_device *dev, const char *element,
if (!element && mapping && pa_alsa_path_set_is_empty(dev->mixer_path_set))
return;
mdev = pa_proplist_gets(mapping->proplist, "alsa.mixer_device");
if (mapping)
mdev = pa_proplist_gets(mapping->proplist, "alsa.mixer_device");
if (mdev) {
dev->mixer_handle = pa_alsa_open_mixer_by_name(impl->ucm.mixers, mdev, true);
} else {

2
spa/plugins/alsa/acp/alsa-ucm.c
View file

@ -1741,7 +1741,7 @@ int pa_alsa_ucm_set_profile(pa_alsa_ucm_config *ucm, pa_card *card, pa_alsa_prof
ret = -1;
}
} else if (ucm->active_verb) {
} else if (ucm->active_verb && old_profile) {
/* Disable modifiers not in new profile. Has to be done before
* devices, because _dismod fails if a modifier's supported
* devices are disabled. */

21
spa/plugins/alsa/acp/compat.h
View file

@ -327,18 +327,23 @@ static inline size_t pa_snprintf(char *str, size_t size, const char *format, ...
return ret;
}
#define pa_xstrdup(s) ((s) != NULL ? strdup(s) : NULL)
#define pa_xstrndup(s,n) ((s) != NULL ? strndup(s,n) : NULL)
#define pa_xnullcheck(p) ({ void *_mem_alloc = (p); spa_assert_se(_mem_alloc); _mem_alloc; })
#define pa_xstrdup(s) ((s) != NULL ? pa_xnullcheck(strdup(s)) : NULL)
#define pa_xstrndup(s,n) ((s) != NULL ? pa_xnullcheck(strndup(s,n)) : NULL)
#define pa_xfree free
#define pa_xmalloc malloc
#define pa_xnew0(t,n) calloc(n, sizeof(t))
#define pa_xmalloc(n) pa_xnullcheck(malloc(n))
#define pa_xnew0(t,n) pa_xnullcheck(calloc((n), sizeof(t)))
#define pa_xnew(t,n) pa_xnew0(t,n)
#define pa_xrealloc realloc
#define pa_xrenew(t,p,n) ((t*) realloc(p, (n)*sizeof(t)))
#define pa_xrenew(t,p,n) ((t*) pa_xnullcheck(realloc(p, (n)*sizeof(t))))
static inline void* pa_xmemdup(const void *p, size_t l) {
return memcpy(malloc(l), p, l);
if (!p) {
return NULL;
} else {
void *dst = pa_xmalloc(l);
memcpy(dst, p, l);
return dst;
}
}
#define pa_xnewdup(t,p,n) ((t*) pa_xmemdup((p), (n)*sizeof(t)))

2
spa/plugins/alsa/alsa-pcm.c
View file

@ -968,7 +968,7 @@ int spa_alsa_init(struct state *state, const struct spa_dict *info)
snd_config_update_free_global();
if ((str = spa_dict_lookup(info, "device.profile.pro")) != NULL)
if (info && (str = spa_dict_lookup(info, "device.profile.pro")) != NULL)
state->is_pro = spa_atob(str);
state->multi_rate = true;