Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e3eacbe authored by Dichen Zhang's avatar Dichen Zhang Committed by Automerger Merge Worker
Browse files

Merge "ultrahdr: fix input buffer access in tonemap" into udc-dev am: bb319326 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23288897



Change-Id: Iad954d770ff0dd5f34d25e6a6146a2d309e3c1b3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7a66ef37 bb319326

libs/ultrahdr/jpegr.cpp

+9 −12
Original line number Diff line number Diff line
@@ -1041,21 +1041,18 @@ status_t JpegR::toneMap(jr_uncompressed_ptr src, jr_uncompressed_ptr dest) { 
    return ERROR_JPEGR_INVALID_NULL_PTR;

  }



  size_t src_luma_stride = src->luma_stride;

  size_t src_chroma_stride = src->chroma_stride;

  uint16_t* src_luma_data = reinterpret_cast<uint16_t*>(src->data);

  uint16_t* src_chroma_data = reinterpret_cast<uint16_t*>(src->chroma_data);

  size_t src_luma_stride = src->luma_stride == 0 ? src->width : src->luma_stride;



  if (src_chroma_data == nullptr) {

    src_chroma_data = &reinterpret_cast<uint16_t*>(src->data)[src_luma_stride * src->height];

  }

  if (src_luma_stride == 0) {

    src_luma_stride = src->width;

  }

  if (src_chroma_stride == 0) {

  uint16_t* src_chroma_data;

  size_t src_chroma_stride;

  if (src->chroma_data == nullptr) {

     src_chroma_stride = src_luma_stride;

     src_chroma_data = &reinterpret_cast<uint16_t*>(src->data)[src_luma_stride * src->height];

  } else {

     src_chroma_stride = src->chroma_stride;

     src_chroma_data = reinterpret_cast<uint16_t*>(src->chroma_data);

  }



  dest->width = src->width;

  dest->height = src->height;