fix for infinite loop in wxFileConfig when reading from input stream fails (patch...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index 6423bbe8e9e72128523896e77f5759144f3aec41..1c0337284ef66bff06f7512ae2a824e101124013 100644 (file)
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -494,10 +494,21 @@ wxFileConfig::wxFileConfig(wxInputStream &inStream, wxMBConv& conv)
         wxString strTmp;
 
         char buf[1024];
         wxString strTmp;
 
         char buf[1024];

-        while ( !inStream.Read(buf, WXSIZEOF(buf)).Eof() )
+        for ( ;; )
+        {
+            inStream.Read(buf, WXSIZEOF(buf));
+
+            if ( !inStream.IsOk() )
+            {
+                wxLogError(_("Error reading config options."));
+                break;
+            }
+

             strTmp.append(wxConvertMB2WX(buf), inStream.LastRead());
 
             strTmp.append(wxConvertMB2WX(buf), inStream.LastRead());
 

-        strTmp.append(wxConvertMB2WX(buf), inStream.LastRead());
+            if ( inStream.Eof() )
+                break;
+        }

 
         strTrans = wxTextBuffer::Translate(strTmp);
     }
 
         strTrans = wxTextBuffer::Translate(strTmp);
     }