diff options
| author | Andy Shevchenko <ext-andriy.shevchenko@nokia.com> | 2009-08-28 15:16:54 +0300 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2009-08-28 17:12:44 +0200 |
| commit | 300384ce0aa79bd86cdafa88848c6e944c0353b5 (patch) | |
| tree | eb95d8af827f8aed4e3801046e4f922ff4dd59a6 /src/pulse | |
| parent | ae383539d7001d59044e6d7e06e9270b65ae762b (diff) | |
Fix checking for NULL after usage
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.
Diffstat (limited to 'src/pulse')
| -rw-r--r-- | src/pulse/ext-stream-restore.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/pulse/ext-stream-restore.c b/src/pulse/ext-stream-restore.c index 63c911f8..10e9fd5d 100644 --- a/src/pulse/ext-stream-restore.c +++ b/src/pulse/ext-stream-restore.c @@ -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; |