mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

coreaudio-device: fix improper memory handling leading to crashes.

Browse source 
Make sure that we NULL pointers after freeing them. Otherwise bad things
happen.
This commit is contained in:
Mihai Moldovan 2017-02-25 10:38:24 +01:00 • committed by Tanu Kaskinen
parent b282f3bb96
commit c7d8085acb
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/modules/macosx/module-coreaudio-device.c
View file

@ -379,8 +379,6 @@ static int ca_sink_set_state(pa_sink *s, pa_sink_state_t state) {
static char * CFString_to_cstr(CFStringRef cfstr) { static char * CFString_to_cstr(CFStringRef cfstr) {
char *ret = NULL; char *ret = NULL;
ret = false;
if (cfstr != NULL) { if (cfstr != NULL) {
const char *tmp = CFStringGetCStringPtr(cfstr, kCFStringEncodingUTF8); const char *tmp = CFStringGetCStringPtr(cfstr, kCFStringEncodingUTF8);
CFIndex n = CFStringGetLength(cfstr) + 1 /* for the terminating NULL */; CFIndex n = CFStringGetLength(cfstr) + 1 /* for the terminating NULL */;
@ -410,7 +408,7 @@ static int ca_device_create_sink(pa_module *m, AudioBuffer *buf, int channel_idx
coreaudio_sink *ca_sink; coreaudio_sink *ca_sink;
pa_sink *sink; pa_sink *sink;
unsigned int i; unsigned int i;
char *tmp; char *tmp = NULL;
pa_strbuf *strbuf; pa_strbuf *strbuf;
AudioObjectPropertyAddress property_address; AudioObjectPropertyAddress property_address;
CFStringRef tmp_cfstr = NULL; CFStringRef tmp_cfstr = NULL;
@ -450,6 +448,7 @@ static int ca_device_create_sink(pa_module *m, AudioBuffer *buf, int channel_idx
pa_strbuf_puts(strbuf, tmp); pa_strbuf_puts(strbuf, tmp);
pa_xfree(tmp); pa_xfree(tmp);
tmp = NULL;
} }
ca_sink->name = pa_strbuf_to_string_free(strbuf); ca_sink->name = pa_strbuf_to_string_free(strbuf);
@ -543,7 +542,7 @@ static int ca_device_create_source(pa_module *m, AudioBuffer *buf, int channel_i
coreaudio_source *ca_source; coreaudio_source *ca_source;
pa_source *source; pa_source *source;
unsigned int i; unsigned int i;
char *tmp; char *tmp = NULL;
pa_strbuf *strbuf; pa_strbuf *strbuf;
AudioObjectPropertyAddress property_address; AudioObjectPropertyAddress property_address;
CFStringRef tmp_cfstr = NULL; CFStringRef tmp_cfstr = NULL;
@ -583,6 +582,7 @@ static int ca_device_create_source(pa_module *m, AudioBuffer *buf, int channel_i
pa_strbuf_puts(strbuf, tmp); pa_strbuf_puts(strbuf, tmp);
pa_xfree(tmp); pa_xfree(tmp);
tmp = NULL;
} }
ca_source->name = pa_strbuf_to_string_free(strbuf); ca_source->name = pa_strbuf_to_string_free(strbuf);