From 8115dbe61c1de406d67786e47bc24fd519547fc5 Mon Sep 17 00:00:00 2001 From: Andrii Chepurnyi Date: Tue, 14 Apr 2020 13:03:57 +0300 Subject: drm_hwcomposer: Fix GetDisplayIdentificationData Fix GetDisplayIdentificationData, introduced by commit: b3d817815fad. Edid data should be copied instead of assign. Signed-off-by: Andrii Chepurnyi --- drmhwctwo.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drmhwctwo.cpp b/drmhwctwo.cpp index 605406b..798e013 100644 --- a/drmhwctwo.cpp +++ b/drmhwctwo.cpp @@ -997,10 +997,13 @@ HWC2::Error DrmHwcTwo::HwcDisplay::GetDisplayIdentificationData( blob = drmModeGetPropertyBlob(drm_->fd(), blob_id); - outData = static_cast(blob->data); - + if (outData) { + *outDataSize = std::min(*outDataSize, blob->length); + memcpy(outData, blob->data, *outDataSize); + } else { + *outDataSize = blob->length; + } *outPort = connector_->id(); - *outDataSize = blob->length; return HWC2::Error::None; } -- cgit v1.2.3