From 6235cbbfda800750f69e3cc646fe292d19a35762 Mon Sep 17 00:00:00 2001
From: Seungbae Shin <seungbae.shin@samsung.com>
Date: Tue, 3 May 2016 15:30:27 +0900
Subject: [PATCH] Fix SVACE defects

[Version] 0.3.33
[Profile] Common
[Issues] WGID 61200, 61201, 61304, 61305
[Issue Type] SVACE

Change-Id: Ie9d60101d3ce15f22a4347e9a829ba562381044b
---
 packaging/capi-media-audio-io.spec |  2 +-
 src/cpp/cpp_audio_io.cpp           | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/packaging/capi-media-audio-io.spec b/packaging/capi-media-audio-io.spec
index 617bc49..9bf4e9c 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.3.32
+Version:        0.3.33
 Release:        0
 Group:          Multimedia/API
 License:        Apache-2.0
diff --git a/src/cpp/cpp_audio_io.cpp b/src/cpp/cpp_audio_io.cpp
index 8bc1f83..667381d 100644
--- a/src/cpp/cpp_audio_io.cpp
+++ b/src/cpp/cpp_audio_io.cpp
@@ -633,6 +633,9 @@ int cpp_audio_in_read(audio_in_h input, void *buffer, unsigned int length) {
         assert(handle->audioIoHandle);
 
         CAudioInput* inputHandle = dynamic_cast<CAudioInput*>(handle->audioIoHandle);
+        if (inputHandle == NULL) {
+            THROW_ERROR_MSG_FORMAT(CAudioError::EError::ERROR_INVALID_HANDLE, "Handle is NULL");
+        }
         size_t readn = inputHandle->read(buffer, static_cast<size_t>(length));
         ret = static_cast<int>(readn);
 #ifdef _AUDIO_IO_DEBUG_TIMING_
@@ -657,6 +660,9 @@ int cpp_audio_in_get_buffer_size(audio_in_h input, int *size) {
         assert(handle->audioIoHandle);
 
         CAudioIO* inputHandle = dynamic_cast<CAudioInput*>(handle->audioIoHandle);
+        if (inputHandle == NULL) {
+            THROW_ERROR_MSG_FORMAT(CAudioError::EError::ERROR_INVALID_HANDLE, "Handle is NULL");
+        }
         *size = inputHandle->getBufferSize();
     } catch (CAudioError e) {
         AUDIO_IO_LOGE("%s", e.getErrorMsg());
@@ -1260,6 +1266,9 @@ int cpp_audio_out_write(audio_out_h output, void *buffer, unsigned int length) {
         assert(handle->audioIoHandle);
 
         CAudioOutput* outputHandle = dynamic_cast<CAudioOutput*>(handle->audioIoHandle);
+        if (outputHandle == NULL) {
+            THROW_ERROR_MSG_FORMAT(CAudioError::EError::ERROR_INVALID_HANDLE, "Handle is NULL");
+        }
         size_t writen = outputHandle->write(buffer, static_cast<size_t>(length));
         ret = static_cast<int>(writen);
 #ifdef _AUDIO_IO_DEBUG_TIMING_
@@ -1284,6 +1293,9 @@ int cpp_audio_out_get_buffer_size(audio_out_h output, int *size) {
         assert(handle->audioIoHandle);
 
         CAudioOutput* outputHandle = dynamic_cast<CAudioOutput*>(handle->audioIoHandle);
+        if (outputHandle == NULL) {
+            THROW_ERROR_MSG_FORMAT(CAudioError::EError::ERROR_INVALID_HANDLE, "Handle is NULL");
+        }
         *size = outputHandle->getBufferSize();
     } catch (CAudioError e) {
         AUDIO_IO_LOGE("%s", e.getErrorMsg());
-- 
2.34.1