[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - emfio/source

[Caolán McNamara (via logerrit)]

 emfio/source/reader/emfreader.cxx |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

New commits:
commit 73e00139740d1005d7c08660ca2e3695a300d5c6
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Aug 28 21:48:21 2021 +0100
Commit:     Michael Stahl <michael.stahl at allotropia.de>
CommitDate: Mon Aug 30 11:51:53 2021 +0200

    ofz: MemorySanitizer: use-of-uninitialized-value
    
    Change-Id: I4a34981e6597743f9f3a9ad6ca063cb347a68d14
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121160
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>

diff --git a/emfio/source/reader/emfreader.cxx b/emfio/source/reader/emfreader.cxx
index 4ad77dd3fb32..a1ac109435ad 100644
--- a/emfio/source/reader/emfreader.cxx
+++ b/emfio/source/reader/emfreader.cxx
@@ -1380,12 +1380,17 @@ namespace emfio
                     {
                         sal_Int32 nStartX, nStartY, nEndX, nEndY;
                         mpInputStream->ReadInt32( nX32 ).ReadInt32( nY32 ).ReadInt32( nx32 ).ReadInt32( ny32 ).ReadInt32( nStartX ).ReadInt32( nStartY ).ReadInt32( nEndX ).ReadInt32( nEndY );
-                        SAL_INFO( "emfio", "\t\t Bounds: " << nX32 << ":" << nY32 << ", " << nx32 << ":" << ny32 << ", Start: " << nStartX << ":" << nStartY << ", End: " << nEndX << ":" << nEndY );
-                        tools::Polygon aPoly( ReadRectangle( nX32, nY32, nx32, ny32 ), Point( nStartX, nStartY ), Point( nEndX, nEndY ), PolyStyle::Arc );
-                        if ( nRecType == EMR_CHORD )
-                            DrawPolygon( aPoly, mbRecordPath );
+                        if (!mpInputStream->good())
+                            bStatus = false;
                         else
-                            DrawPolyLine( aPoly, nRecType == EMR_ARCTO, mbRecordPath );
+                        {
+                            SAL_INFO( "emfio", "\t\t Bounds: " << nX32 << ":" << nY32 << ", " << nx32 << ":" << ny32 << ", Start: " << nStartX << ":" << nStartY << ", End: " << nEndX << ":" << nEndY );
+                            tools::Polygon aPoly( ReadRectangle( nX32, nY32, nx32, ny32 ), Point( nStartX, nStartY ), Point( nEndX, nEndY ), PolyStyle::Arc );
+                            if ( nRecType == EMR_CHORD )
+                                DrawPolygon( aPoly, mbRecordPath );
+                            else
+                                DrawPolyLine( aPoly, nRecType == EMR_ARCTO, mbRecordPath );
+                        }
                     }
                     break;