From 134b083f3638ded590646f8e8edf6b8758b73bb0 Mon Sep 17 00:00:00 2001 From: Seungbae Shin Date: Tue, 31 Dec 2019 15:55:04 +0900 Subject: [PATCH] Fix improper implementation of CPulseAudioClient::getReadableSize() + Fix 'Dereference null return value' issue reported by Covertity [Version] 0.5.23 [Issue Type] Bug Change-Id: Ic6ad0f52b4ee1ad7e29a8c6f6bdcd46e1f6b734d --- packaging/capi-media-audio-io.spec | 2 +- src/cpp/CPulseAudioClient.cpp | 2 +- test/audio_io_test.c | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packaging/capi-media-audio-io.spec b/packaging/capi-media-audio-io.spec index 62a471c..11038f3 100644 --- a/packaging/capi-media-audio-io.spec +++ b/packaging/capi-media-audio-io.spec @@ -1,6 +1,6 @@ Name: capi-media-audio-io Summary: An Audio Input & Audio Output library in Tizen Native API -Version: 0.5.22 +Version: 0.5.23 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/cpp/CPulseAudioClient.cpp b/src/cpp/CPulseAudioClient.cpp index c3f68c9..2b598d7 100644 --- a/src/cpp/CPulseAudioClient.cpp +++ b/src/cpp/CPulseAudioClient.cpp @@ -877,7 +877,7 @@ size_t CPulseAudioClient::getReadableSize() { ret = pa_stream_readable_size(__mpStream); pa_threaded_mainloop_unlock(__mpMainloop); } else { - ret = pa_stream_writable_size(__mpStream); + ret = pa_stream_readable_size(__mpStream); } return ret; diff --git a/test/audio_io_test.c b/test/audio_io_test.c index be3946c..f3f5304 100644 --- a/test/audio_io_test.c +++ b/test/audio_io_test.c @@ -122,6 +122,10 @@ static void _audio_out_stream_cb(audio_out_h handle, size_t nbytes, void *user_d } buf = (char *)malloc(nbytes); + if (!buf) { + printf("malloc(%zu) failed\n", nbytes); + return; + } read_bytes = fread(buf, 1, nbytes, fp); -- 2.7.4