From cbd56e6fe46e3ce446651f0e44f5b5b52fa71191 Mon Sep 17 00:00:00 2001 From: "huayong.xu" Date: Mon, 16 Aug 2021 15:17:39 +0800 Subject: [PATCH] Fix a SVACE issue that evas_object_image_data_get need be checked. Change-Id: I460c46eb6304941141685d21ab7aa86ba19abcf3 --- .../tizen-web-engine-chromium.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dali-extension/web-engine-chromium/tizen-web-engine-chromium.cpp b/dali-extension/web-engine-chromium/tizen-web-engine-chromium.cpp index 942cbac2..f994bb50 100755 --- a/dali-extension/web-engine-chromium/tizen-web-engine-chromium.cpp +++ b/dali-extension/web-engine-chromium/tizen-web-engine-chromium.cpp @@ -836,16 +836,20 @@ public: } private: - static Dali::PixelData ConvertImageColorSpace(Evas_Object *image) + static Dali::PixelData ConvertImageColorSpace(Evas_Object* image) { + // color-space is argb8888. + uint8_t* pixelBuffer = (uint8_t*)evas_object_image_data_get(image, false); + if (!pixelBuffer) + { + return Dali::PixelData(); + } + int width = 0, height = 0; evas_object_image_size_get(image, &width, &height); uint32_t bufferSize = width * height * 4; - uint8_t *convertedBuffer = new uint8_t[bufferSize]; - - // color-space is argb8888. - uint8_t *pixelBuffer = (uint8_t *)evas_object_image_data_get(image, false); + uint8_t* convertedBuffer = new uint8_t[bufferSize]; // convert the color-space to rgba8888. for (uint32_t i = 0; i < bufferSize; i += 4) -- 2.34.1