commit b80e226b39421392ffe187a36dbc7df07b64c372
author Dichen Zhang <dichenzhang@google.com> Wed Mar 08 06:59:51 2023 +0000
committer Dichen Zhang <dichenzhang@google.com> Wed Mar 08 23:15:20 2023 +0000
tree fa5ee4689c5f1056142aa819cf227e0123218596
parent 2c1f96e0d825463dc1e420982d31d77bd442d9e7

jpegr decoder: fill exif buffer

Bug: b/264715926

Change-Id: Id42208fed6e03db21ae87346c46892b989ad3077

libs/jpegrecoverymap/jpegr.cpp

diff --git a/libs/jpegrecoverymap/jpegr.cpp b/libs/jpegrecoverymap/jpegr.cpp
index 79b1ae3..a5ba611 100644
--- a/libs/jpegrecoverymap/jpegr.cpp
+++ b/libs/jpegrecoverymap/jpegr.cpp
@@ -355,8 +355,6 @@
   if (compressed_jpegr_image == nullptr || dest == nullptr) {
     return ERROR_JPEGR_INVALID_NULL_PTR;
   }
-  // TODO: fill EXIF data
-  (void) exif;
 
   if (output_format == JPEGR_OUTPUT_SDR) {
     JpegDecoderHelper jpeg_decoder;
@@ -384,6 +382,17 @@
     return ERROR_JPEGR_DECODE_ERROR;
   }
 
+  if (exif != nullptr) {
+    if (exif->data == nullptr) {
+      return ERROR_JPEGR_INVALID_NULL_PTR;
+    }
+    if (exif->length < jpeg_decoder.getEXIFSize()) {
+      return ERROR_JPEGR_BUFFER_TOO_SMALL;
+    }
+    memcpy(exif->data, jpeg_decoder.getEXIFPtr(), jpeg_decoder.getEXIFSize());
+    exif->length = jpeg_decoder.getEXIFSize();
+  }
+
   JpegDecoderHelper recovery_map_decoder;
   if (!recovery_map_decoder.decompressImage(compressed_map.data, compressed_map.length)) {
     return ERROR_JPEGR_DECODE_ERROR;