Camera metadata: Check for inconsistent data count am: 241ff3e1ce
am: 59bc9e30bd
Change-Id: Ie09a5953eb7e44e45838306b2998f70541081499
diff --git a/camera/src/camera_metadata.c b/camera/src/camera_metadata.c
index 3f435eb..e9ad689 100644
--- a/camera/src/camera_metadata.c
+++ b/camera/src/camera_metadata.c
@@ -14,6 +14,7 @@
* limitations under the License.
*/
#define _GNU_SOURCE // for fdprintf
+#include <inttypes.h>
#include <system/camera_metadata.h>
#define LOG_TAG "camera_metadata"
@@ -380,6 +381,14 @@
return ERROR;
}
+ if (metadata->data_count > metadata->data_capacity) {
+ ALOGE("%s: Data count (%" PRIu32 ") should be <= data capacity "
+ "(%" PRIu32 ")",
+ __FUNCTION__, metadata->data_count, metadata->data_capacity);
+ android_errorWriteLog(SN_EVENT_LOG_ID, "30591838");
+ return ERROR;
+ }
+
uptrdiff_t entries_end = metadata->entries_start + metadata->entry_capacity;
if (entries_end < metadata->entries_start || // overflow check
entries_end > metadata->data_start) {
@@ -482,6 +491,10 @@
const camera_metadata_t *src) {
if (dst == NULL || src == NULL ) return ERROR;
+ // Check for overflow
+ if (src->entry_count + dst->entry_count < src->entry_count) return ERROR;
+ if (src->data_count + dst->data_count < src->data_count) return ERROR;
+ // Check for space
if (dst->entry_capacity < src->entry_count + dst->entry_count) return ERROR;
if (dst->data_capacity < src->data_count + dst->data_count) return ERROR;