From e2e122c289533d353dad5220fa133d393c29fa85 Mon Sep 17 00:00:00 2001 From: Yin-Chia Yeh Date: Fri, 29 Sep 2017 14:13:28 -0700 Subject: [PATCH] Camera: fix wrong vector size bug Test: partner testing, CTS Bug: 67107422 Change-Id: If9db3cca35aecceb8ca24ebf0e913efb84bc0dae Merged-In: If9db3cca35aecceb8ca24ebf0e913efb84bc0dae --- camera/ICameraClient.cpp | 4 +++- camera/ICameraRecordingProxyListener.cpp | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/camera/ICameraClient.cpp b/camera/ICameraClient.cpp index 7e6297c05b..8620f36022 100644 --- a/camera/ICameraClient.cpp +++ b/camera/ICameraClient.cpp @@ -192,12 +192,14 @@ status_t BnCameraClient::onTransact( timestamps.reserve(n); handles.reserve(n); for (uint32_t i = 0; i < n; i++) { - res = data.readInt64(×tamps[i]); + nsecs_t t; + res = data.readInt64(&t); if (res != OK) { ALOGE("%s: Failed to read timestamp[%d]: %s (%d)", __FUNCTION__, i, strerror(-res), res); return BAD_VALUE; } + timestamps.push_back(t); } for (uint32_t i = 0; i < n; i++) { native_handle_t* handle = data.readNativeHandle(); diff --git a/camera/ICameraRecordingProxyListener.cpp b/camera/ICameraRecordingProxyListener.cpp index c954241915..66faf8fdd6 100644 --- a/camera/ICameraRecordingProxyListener.cpp +++ b/camera/ICameraRecordingProxyListener.cpp @@ -146,12 +146,14 @@ status_t BnCameraRecordingProxyListener::onTransact( timestamps.reserve(n); handles.reserve(n); for (uint32_t i = 0; i < n; i++) { - res = data.readInt64(×tamps[i]); + nsecs_t t; + res = data.readInt64(&t); if (res != OK) { ALOGE("%s: Failed to read timestamp[%d]: %s (%d)", __FUNCTION__, i, strerror(-res), res); return BAD_VALUE; } + timestamps.push_back(t); } for (uint32_t i = 0; i < n; i++) { native_handle_t* handle = data.readNativeHandle();