From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 4 Aug 2009 23:05:08 +0000 (+0200)
Subject: simple: split data/length validity checks into two
X-Git-Tag: v0.9.16-test4~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5bbeb516aa3539e30fccf228d5ac31381209a578;p=platform%2Fupstream%2Fpulseaudio.git

simple: split data/length validity checks into two
---

diff --git a/src/pulse/simple.c b/src/pulse/simple.c
index b5e108f..1e0f3e1 100644
--- a/src/pulse/simple.c
+++ b/src/pulse/simple.c
@@ -276,7 +276,8 @@ int pa_simple_write(pa_simple *p, const void*data, size_t length, int *rerror) {
     pa_assert(p);
 
     CHECK_VALIDITY_RETURN_ANY(rerror, p->direction == PA_STREAM_PLAYBACK, PA_ERR_BADSTATE, -1);
-    CHECK_VALIDITY_RETURN_ANY(rerror, data && length, PA_ERR_INVALID, -1);
+    CHECK_VALIDITY_RETURN_ANY(rerror, data, PA_ERR_INVALID, -1);
+    CHECK_VALIDITY_RETURN_ANY(rerror, length > 0, PA_ERR_INVALID, -1);
 
     pa_threaded_mainloop_lock(p->mainloop);
 
@@ -315,7 +316,8 @@ int pa_simple_read(pa_simple *p, void*data, size_t length, int *rerror) {
     pa_assert(p);
 
     CHECK_VALIDITY_RETURN_ANY(rerror, p->direction == PA_STREAM_RECORD, PA_ERR_BADSTATE, -1);
-    CHECK_VALIDITY_RETURN_ANY(rerror, data && length, PA_ERR_INVALID, -1);
+    CHECK_VALIDITY_RETURN_ANY(rerror, data, PA_ERR_INVALID, -1);
+    CHECK_VALIDITY_RETURN_ANY(rerror, length > 0, PA_ERR_INVALID, -1);
 
     pa_threaded_mainloop_lock(p->mainloop);