From: Tanu Kaskinen <tanu.kaskinen@digia.com>
Date: Fri, 23 Mar 2012 09:01:22 +0000 (+0200)
Subject: sample-util: Remove redundant check from pa_volume_memchunk.
X-Git-Tag: submit/2.0-panda/20130828.192557~108
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2f7a586a23a7e8c595c4a0a1d11b75669953d794;p=profile%2Fivi%2Fpulseaudio-panda.git

sample-util: Remove redundant check from pa_volume_memchunk.

Add also an assertion for the sample spec validity. The
existing code already does crash in case of an invalid
sample spec, but the error would not be as obvious: the
crash would happen due to a divide-by-zero operation in
pa_frame_aligned().
---

diff --git a/src/pulsecore/sample-util.c b/src/pulsecore/sample-util.c
index f2017aa..38201b2 100644
--- a/src/pulsecore/sample-util.c
+++ b/src/pulsecore/sample-util.c
@@ -721,6 +721,7 @@ void pa_volume_memchunk(
 
     pa_assert(c);
     pa_assert(spec);
+    pa_assert(pa_sample_spec_valid(spec));
     pa_assert(pa_frame_aligned(c->length, spec));
     pa_assert(volume);
 
@@ -735,11 +736,6 @@ void pa_volume_memchunk(
         return;
     }
 
-    if (spec->format < 0 || spec->format >= PA_SAMPLE_MAX) {
-      pa_log_warn("Unable to change volume of format");
-      return;
-    }
-
     do_volume = pa_get_volume_func(spec->format);
     pa_assert(do_volume);