- complete fix for CVE-2018-20365 [bsc#1120500]

OBS-URL: https://build.opensuse.org/package/show/graphics/libraw?expand=0&rev=127
This commit is contained in:
Petr Gajdos 2019-01-09 10:07:31 +00:00 committed by Git OBS Bridge
parent 292e14c9ed
commit 2fba2715ca
2 changed files with 28 additions and 0 deletions

View File

@ -0,0 +1,23 @@
diff --git a/src/libraw_cxx.cpp b/src/libraw_cxx.cpp
index b5fe5eab..b1d6d3c0 100644
--- a/src/libraw_cxx.cpp
+++ b/src/libraw_cxx.cpp
@@ -3195,7 +3195,7 @@ int LibRaw::raw2image(void)
get_decoder_info(&decoder_info);
// Move saved bitmap to imgdata.image
- if (imgdata.idata.filters || P1.colors == 1)
+ if ((imgdata.idata.filters || P1.colors == 1) && imgdata.rawdata.raw_image)
{
if (IO.fuji_width)
{
@@ -3566,7 +3566,7 @@ int LibRaw::raw2image_ex(int do_subtract_black)
}
// Move saved bitmap to imgdata.image
- if (imgdata.idata.filters || P1.colors == 1)
+ if ((imgdata.idata.filters || P1.colors == 1) && imgdata.rawdata.raw_image)
{
if (IO.fuji_width)
{

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jan 9 08:48:24 UTC 2019 - Petr Gajdos <pgajdos@suse.com>
- complete fix for CVE-2018-20365 [bsc#1120500]
-------------------------------------------------------------------
Tue Jan 8 13:22:31 UTC 2019 - Petr Gajdos <pgajdos@suse.com>