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

Fix checking for NULL after usage

Browse source 
The pa_xmalloc calls oom() in case of NULL pointer returned by malloc() on one
hand and dereferencing of pointer is happen early than actual check on other
hand. Thus, just remove useless checks.
This commit is contained in:
Andy Shevchenko 2009-08-28 15:16:54 +03:00 • committed by Lennart Poettering
parent ae383539d7
commit 300384ce0a
4 changed files with 9 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/pulse/ext-stream-restore.c
View file

@ -239,13 +239,10 @@ pa_operation *pa_ext_stream_restore_write(
return o;
fail:
if (o) {
pa_operation_cancel(o);
pa_operation_unref(o);
}
pa_operation_cancel(o);
pa_operation_unref(o);
if (t)
pa_tagstruct_free(t);
pa_tagstruct_free(t);
pa_context_set_error(c, PA_ERR_INVALID);
return NULL;
@ -290,13 +287,10 @@ pa_operation *pa_ext_stream_restore_delete(
return o;
fail:
if (o) {
pa_operation_cancel(o);
pa_operation_unref(o);
}
pa_operation_cancel(o);
pa_operation_unref(o);
if (t)
pa_tagstruct_free(t);
pa_tagstruct_free(t);
pa_context_set_error(c, PA_ERR_INVALID);
return NULL;

3
src/pulsecore/protocol-simple.c
View file

@ -627,8 +627,7 @@ void pa_simple_protocol_connect(pa_simple_protocol *p, pa_iochannel *io, pa_simp
return;
fail:
if (c)
connection_unlink(c);
connection_unlink(c);
}
void pa_simple_protocol_disconnect(pa_simple_protocol *p, pa_module *m) {

3
src/pulsecore/resampler.c
View file

@ -299,8 +299,7 @@ pa_resampler* pa_resampler_new(
return r;
fail:
if (r)
pa_xfree(r);
pa_xfree(r);
return NULL;
}

3
src/pulsecore/sound-file-stream.c
View file

@ -334,8 +334,7 @@ int pa_play_file(
return 0;
fail:
if (u)
file_stream_unref(u);
file_stream_unref(u);
if (fd >= 0)
pa_close(fd);