dereference
/
android_hardware_qcom_audio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "hal: Prevent integer overflow"

This commit is contained in:
qctecmdr 2019-11-01 21:25:56 -07:00 committed by Gerrit - the friendly Code Review server
parent b38a301ffd 3018ede6a7
commit 9a6343bcbd
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hal/audio_hw.c
View File

@ -44,7 +44,7 @@
#else
#define ALOGVV(a...) do { } while(0)
#endif
#include <limits.h>
#include <errno.h>
#include <pthread.h>
#include <stdint.h>
@ -6365,7 +6365,8 @@ static int in_standby(struct audio_stream *stream)
if (!in->standby && in->is_st_session) {
ALOGD("%s: sound trigger pcm stop lab", __func__);
audio_extn_sound_trigger_stop_lab(in);
adev->num_va_sessions--;
if (adev->num_va_sessions > 0)
adev->num_va_sessions--;
in->standby = 1;
}
@ -6406,8 +6407,10 @@ static int in_standby(struct audio_stream *stream)
if (do_stop)
status = stop_input_stream(in);
if (in->source == AUDIO_SOURCE_VOICE_RECOGNITION)
adev->num_va_sessions--;
if (in->source == AUDIO_SOURCE_VOICE_RECOGNITION) {
if (adev->num_va_sessions > 0)
adev->num_va_sessions--;
}
pthread_mutex_unlock(&adev->lock);
}
@ -6661,7 +6664,8 @@ static ssize_t in_read(struct audio_stream_in *stream, void *buffer,
/* Read from sound trigger HAL */
audio_extn_sound_trigger_read(in, buffer, bytes);
if (in->standby) {
adev->num_va_sessions++;
if (adev->num_va_sessions < UINT_MAX)
adev->num_va_sessions++;
in->standby = 0;
}
pthread_mutex_unlock(&in->lock);
@ -6685,8 +6689,10 @@ static ssize_t in_read(struct audio_stream_in *stream, void *buffer,
ret = voice_extn_compress_voip_start_input_stream(in);
else
ret = start_input_stream(in);
if (!ret && in->source == AUDIO_SOURCE_VOICE_RECOGNITION)
adev->num_va_sessions++;
if (!ret && in->source == AUDIO_SOURCE_VOICE_RECOGNITION) {
if (adev->num_va_sessions < UINT_MAX)
adev->num_va_sessions++;
}
pthread_mutex_unlock(&adev->lock);
if (ret != 0) {
goto exit;