core.git: vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/filter/GraphicFormatDetector.cxx |   28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

New commits:
commit 80d28b6ad2e1295db7f78e6ad0b19045fa6f377e
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat May 10 21:06:05 2025 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sun May 11 16:46:16 2025 +0200

    ofz: Use-of-uninitialized-value
    
    Change-Id: I788f0ddd506fe0db39f123c849a79db9b4902ec3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185148
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Tested-by: Jenkins

diff --git a/vcl/source/filter/GraphicFormatDetector.cxx 
b/vcl/source/filter/GraphicFormatDetector.cxx
index 7963505f4b2e..90e5db7289bf 100644
--- a/vcl/source/filter/GraphicFormatDetector.cxx
+++ b/vcl/source/filter/GraphicFormatDetector.cxx
@@ -651,36 +651,24 @@ bool GraphicFormatDetector::checkPCX()
         bRet = (cByte == 0 || cByte == 1);
         if (bRet)
         {
-            sal_uInt16 nTemp16;
-            sal_uInt16 nXmin;
-            sal_uInt16 nXmax;
-            sal_uInt16 nYmin;
-            sal_uInt16 nYmax;
-            sal_uInt16 nDPIx;
-            sal_uInt16 nDPIy;
-
             // Bits/Pixel
             mrStream.ReadUChar(cByte);
             maMetadata.mnBitsPerPixel = cByte;
 
             // image dimensions
-            mrStream.ReadUInt16(nTemp16);
-            nXmin = nTemp16;
-            mrStream.ReadUInt16(nTemp16);
-            nYmin = nTemp16;
-            mrStream.ReadUInt16(nTemp16);
-            nXmax = nTemp16;
-            mrStream.ReadUInt16(nTemp16);
-            nYmax = nTemp16;
+            sal_uInt16 nXmin(0), nXmax(0), nYmin(0), nYmax(0);
+            mrStream.ReadUInt16(nXmin);
+            mrStream.ReadUInt16(nYmin);
+            mrStream.ReadUInt16(nXmax);
+            mrStream.ReadUInt16(nYmax);
 
             maMetadata.maPixSize.setWidth(nXmax - nXmin + 1);
             maMetadata.maPixSize.setHeight(nYmax - nYmin + 1);
 
             // resolution
-            mrStream.ReadUInt16(nTemp16);
-            nDPIx = nTemp16;
-            mrStream.ReadUInt16(nTemp16);
-            nDPIy = nTemp16;
+            sal_uInt16 nDPIx(0), nDPIy(0);
+            mrStream.ReadUInt16(nDPIx);
+            mrStream.ReadUInt16(nDPIy);
 
             // set logical size
             MapMode aMap(MapUnit::MapInch, Point(), Fraction(1, nDPIx), 
Fraction(1, nDPIy));