commit 4a6b6db9a1bf21213d3e0e237c81460d65464ad9
author Bill Yi <byi@google.com> Mon May 04 20:37:44 2020 -0700
committer Bill Yi <byi@google.com> Mon May 04 20:37:44 2020 -0700
tree 31730bd5c1f9fa79e319a806f4ade4c05e366e39
parent e919bd76a1051365d36e4dcacc113b49707265f7
parent 743914bd6810af7d9057dc659424fc2ca49088a1

Merge android10-qpr2-s3-release to aosp/master - DO NOT MERGE

Change-Id: I3760cb04ad700582598a5c8e6a006f1784fda059

libexif/exif-data.c

diff --git a/libexif/exif-data.c b/libexif/exif-data.c
index adfb512..b81b8ce 100644
--- a/libexif/exif-data.c
+++ b/libexif/exif-data.c
@@ -299,7 +299,9 @@
 	/* Write the data. Fill unneeded bytes with 0. Do not crash with
 	 * e->data is NULL */
 	if (e->data) {
-		memcpy (*d + 6 + doff, e->data, s);
+		unsigned int len = s;
+		if (e->size < s) len = e->size;
+		memcpy (*d + 6 + doff, e->data, len);
 	} else {
 		memset (*d + 6 + doff, 0, s);
 	}