OSDN Git Service
(root)
/
android-x86
/
system-media.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Camera: Prevent data size overflow am: 97a9cd6748 am: 5ccb5b43ec am: 4d15f88da3 am...
[android-x86/system-media.git]
/
camera
/
src
/
camera_metadata.c
diff --git
a/camera/src/camera_metadata.c
b/camera/src/camera_metadata.c
index
9bb58cb
..
9292687
100644
(file)
--- a/
camera/src/camera_metadata.c
+++ b/
camera/src/camera_metadata.c
@@
-553,7
+553,7
@@
static int add_camera_metadata_entry_raw(camera_metadata_t *dst,
if (dst == NULL) return ERROR;
if (dst->entry_count == dst->entry_capacity) return ERROR;
if (dst == NULL) return ERROR;
if (dst->entry_count == dst->entry_capacity) return ERROR;
- if (data == NULL) return ERROR;
+ if (data
_count && data
== NULL) return ERROR;
size_t data_bytes =
calculate_camera_metadata_entry_data_size(type, data_count);
size_t data_bytes =
calculate_camera_metadata_entry_data_size(type, data_count);
@@
-852,6
+852,7
@@
int get_camera_metadata_tag_type(uint32_t tag) {
int set_camera_metadata_vendor_tag_ops(const vendor_tag_query_ops_t* ops) {
// **DEPRECATED**
int set_camera_metadata_vendor_tag_ops(const vendor_tag_query_ops_t* ops) {
// **DEPRECATED**
+ (void) ops;
ALOGE("%s: This function has been deprecated", __FUNCTION__);
return ERROR;
}
ALOGE("%s: This function has been deprecated", __FUNCTION__);
return ERROR;
}