emfio/source/reader/emfreader.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 09995c09f78e245f717bf0560680b832f2f73967
Author: Caolán McNamara <caol...@redhat.com>
Date: Sat Sep 23 20:47:47 2017 +0100
ofz#2956: Conditional jump or move depends on uninitialised value
Change-Id: I399c2eb2379b23568dda83f9d41473858f33a802
Reviewed-on: https://gerrit.libreoffice.org/42699
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/emfio/source/reader/emfreader.cxx
b/emfio/source/reader/emfreader.cxx
index 54b4a4c04e57..8203951029f8 100644
--- a/emfio/source/reader/emfreader.cxx
+++ b/emfio/source/reader/emfreader.cxx
@@ -1378,7 +1378,7 @@ namespace emfio
Bitmap aBitmap;
tools::Rectangle aRect( Point( xDest, yDest ), Size(
cxDest, cyDest ) );
- if ( (cbBitsSrc > (SAL_MAX_UINT32 - 14)) ||
((SAL_MAX_UINT32 - 14) - cbBitsSrc < cbBmiSrc) )
+ if (!mpInputStream->good() || (cbBitsSrc >
(SAL_MAX_UINT32 - 14)) || ((SAL_MAX_UINT32 - 14) - cbBitsSrc < cbBmiSrc))
bStatus = false;
else
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
