don't hang if at end of stream

Change-Id: I497a30041ec667237c2aa64963dcefb67753e87c

don't hang if at end of stream
Change-Id: I497a30041ec667237c2aa64963dcefb67753e87c
5c832532 · Caolán McNamara · 8547c336 · 5c832532 · 5c832532 · 5c832532
Kaydet (Commit) 5c832532 authored Tem 15, 2015 tarafından Caolán McNamara
Showing with 3 additions and 2 deletions

hang-1.dxf filter/qa/cppunit/data/dxf/fail/hang-1.dxf +2 -0

pyramid.dxf filter/qa/cppunit/data/dxf/pass/pyramid.dxf +0 -0

dxfgrprd.cxx filter/source/graphicfilter/idxf/dxfgrprd.cxx +1 -2

No files found.
--- a/filter/qa/cppunit/data/dxf/fail/hang-1.dxf
+++ b/filter/qa/cppunit/data/dxf/fail/hang-1.dxf
+99
\ No newline at end of file
--- a/filter/qa/cppunit/data/dxf/pass/pyramid.dxf
+++ b/filter/qa/cppunit/data/dxf/pass/pyramid.dxf
--- a/filter/source/graphicfilter/idxf/dxfgrprd.cxx
+++ b/filter/source/graphicfilter/idxf/dxfgrprd.cxx
@@ -86,8 +86,7 @@ OString DXFReadLine(SvStream& rIStm)

 void DXFSkipLine(SvStream& rIStm)
 {
-    while (!rIStm.GetError())   // !!! do not check for EOF
-                                // !!! because we read blockwise
+    while (rIStm.good())
    {
        char  buf[256 + 1];
        sal_uInt16 nLen = (sal_uInt16)rIStm.Read(buf, sizeof(buf) - 1);