From dacbacab4dd49896c9f0e9bc114c615c9f032bbd Mon Sep 17 00:00:00 2001
From: Seungbae Shin <seungbae.shin@samsung.com>
Date: Mon, 13 Feb 2017 16:56:08 +0900
Subject: [PATCH] Fix SVACE defects

[Version] 0.3.67
[Profile] Common
[Issue Type] Security

Change-Id: Ieaf38e106ca40196571cdfca35ccecad2b146dab
---
 include/CAudioIO.h                 | 2 +-
 packaging/capi-media-audio-io.spec | 2 +-
 src/cpp/CAudioIO.cpp               | 2 ++
 src/cpp/CAudioOutput.cpp           | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/CAudioIO.h b/include/CAudioIO.h
index 43e0e29..0f9557e 100644
--- a/include/CAudioIO.h
+++ b/include/CAudioIO.h
@@ -116,7 +116,6 @@ namespace tizen_media_audio {
 
         bool isForceIgnore();
 
-        CAudioInfo::EAudioDirection mDirection;
         CAudioSessionHandler* mpAudioSessionHandler;
         CPulseAudioClient*    mpPulseAudioClient;
         CAudioInfo            mAudioInfo;
@@ -125,6 +124,7 @@ namespace tizen_media_audio {
         SStateChangedCallback mStateChangedCallback;
         SInterruptCallback    mInterruptCallback;
 
+        CAudioInfo::EAudioDirection mDirection;
         CAudioInfo::EAudioIOState mState;
         CAudioInfo::EAudioIOState mStatePrev;
         bool                  mByPolicy;
diff --git a/packaging/capi-media-audio-io.spec b/packaging/capi-media-audio-io.spec
index 9f5316a..4525359 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.66
+Version:        0.3.67
 Release:        0
 Group:          Multimedia/API
 License:        Apache-2.0
diff --git a/src/cpp/CAudioIO.cpp b/src/cpp/CAudioIO.cpp
index 4991b80..4b16771 100644
--- a/src/cpp/CAudioIO.cpp
+++ b/src/cpp/CAudioIO.cpp
@@ -34,6 +34,7 @@ CAudioIO::CAudioIO() :
     __mCond(PTHREAD_COND_INITIALIZER),
     __mIsInit(false),
     __mForceIgnore(false) {
+    mDirection = CAudioInfo::EAudioDirection::AUDIO_DIRECTION_MAX;
     mState = CAudioInfo::EAudioIOState::AUDIO_IO_STATE_NONE;
     mStatePrev = CAudioInfo::EAudioIOState::AUDIO_IO_STATE_NONE;
     mByPolicy = false;
@@ -47,6 +48,7 @@ CAudioIO::CAudioIO(CAudioInfo& audioInfo) :
     __mIsInit(false),
     __mForceIgnore(false) {
     mAudioInfo = audioInfo;
+    mDirection = CAudioInfo::EAudioDirection::AUDIO_DIRECTION_MAX;
     mState = CAudioInfo::EAudioIOState::AUDIO_IO_STATE_NONE;
     mStatePrev = CAudioInfo::EAudioIOState::AUDIO_IO_STATE_NONE;
     mByPolicy = false;
diff --git a/src/cpp/CAudioOutput.cpp b/src/cpp/CAudioOutput.cpp
index 75fbed4..2e5db0e 100644
--- a/src/cpp/CAudioOutput.cpp
+++ b/src/cpp/CAudioOutput.cpp
@@ -345,7 +345,7 @@ size_t CAudioOutput::write(const void* buffer, size_t length) throw(CAudioError)
     }
 
     /* When write() is called in PulseAudio callback, bypass a pcm data to CPulseAudioClient (For Asynchronous) */
-    if (mpPulseAudioClient->isInThread() == true) {
+    if (mpPulseAudioClient && mpPulseAudioClient->isInThread() == true) {
         int ret = mpPulseAudioClient->write(buffer, length);
         if (ret < 0) {
             THROW_ERROR_MSG_FORMAT(CAudioError::EError::ERROR_INTERNAL_OPERATION,
-- 
2.34.1