X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b81e45065986abc34676fecc31515efeb3f3a8d4..8472511246c9160d4ff40ab86f635fc67c10b54a:/src/common/anidecod.cpp?ds=sidebyside

diff --git a/src/common/anidecod.cpp b/src/common/anidecod.cpp
index bf5e22855a..d0d0b6d75b 100644
--- a/src/common/anidecod.cpp
+++ b/src/common/anidecod.cpp
@@ -113,10 +113,10 @@ wxColour wxANIDecoder::GetTransparentColour(unsigned int frame) const
 // ANI reading and decoding
 //---------------------------------------------------------------------------
 
-bool wxANIDecoder::CanRead(wxInputStream& stream) const
+bool wxANIDecoder::DoCanRead(wxInputStream& stream) const
 {
     wxInt32 FCC1, FCC2;
-    wxUint32 datalen ;
+    wxUint32 datalen;
 
     wxInt32 riff32;
     memcpy( &riff32, "RIFF", 4 );
@@ -127,8 +127,11 @@ bool wxANIDecoder::CanRead(wxInputStream& stream) const
     wxInt32 anih32;
     memcpy( &anih32, "anih", 4 );
 
-    if ( stream.SeekI(0) == wxInvalidOffset )
+    if ( stream.IsSeekable() && stream.SeekI(0) == wxInvalidOffset )
+    {
         return false;
+    }
+
     if ( !stream.Read(&FCC1, 4) )
         return false;
 
@@ -222,8 +225,11 @@ bool wxANIDecoder::Load( wxInputStream& stream )
     wxInt32 seq32;
     memcpy( &seq32, "seq ", 4 );
 
-    if ( stream.SeekI(0) == wxInvalidOffset)
+    if ( stream.IsSeekable() && stream.SeekI(0) == wxInvalidOffset )
+    {
         return false;
+    }
+
     if ( !stream.Read(&FCC1, 4) )
         return false;
     if ( FCC1 != riff32 )
@@ -236,10 +242,12 @@ bool wxANIDecoder::Load( wxInputStream& stream )
     m_info.Clear();
 
     // we have a riff file:
-    while ( stream.IsOk() )
+    while ( !stream.Eof() )
     {
         // we always have a data size:
-        stream.Read(&datalen, 4);
+        if (!stream.Read(&datalen, 4))
+            return false;
+
         datalen = wxINT32_SWAP_ON_BE(datalen);
 
         //data should be padded to make even number of bytes
@@ -248,7 +256,8 @@ bool wxANIDecoder::Load( wxInputStream& stream )
         // now either data or a FCC:
         if ( (FCC1 == riff32) || (FCC1 == list32) )
         {
-            stream.Read(&FCC2, 4);
+            if (!stream.Read(&FCC2, 4))
+                return false;
         }
         else if ( FCC1 == anih32 )
         {
@@ -259,7 +268,8 @@ bool wxANIDecoder::Load( wxInputStream& stream )
                 return false;       // already parsed an ani header?
 
             struct wxANIHeader header;
-            stream.Read(&header, sizeof(wxANIHeader));
+            if (!stream.Read(&header, sizeof(wxANIHeader)))
+                return false;
             header.AdjustEndianness();
 
             // we should have a global frame size
@@ -284,7 +294,8 @@ bool wxANIDecoder::Load( wxInputStream& stream )
             wxASSERT(m_info.GetCount() == m_nFrames);
             for (unsigned int i=0; i<m_nFrames; i++)
             {
-                stream.Read(&FCC2, 4);
+                if (!stream.Read(&FCC2, 4))
+                    return false;
                 m_info[i].m_delay = wxINT32_SWAP_ON_BE(FCC2) * 1000 / 60;
             }
         }
@@ -297,7 +308,8 @@ bool wxANIDecoder::Load( wxInputStream& stream )
             wxASSERT(m_info.GetCount() == m_nFrames);
             for (unsigned int i=0; i<m_nFrames; i++)
             {
-                stream.Read(&FCC2, 4);
+                if (!stream.Read(&FCC2, 4))
+                    return false;
                 m_info[i].m_imageIndex = wxINT32_SWAP_ON_BE(FCC2);
             }
         }
@@ -318,8 +330,13 @@ bool wxANIDecoder::Load( wxInputStream& stream )
         }
 
         // try to read next data chunk:
-        if ( !stream.Read(&FCC1, 4) )
+        if ( !stream.Read(&FCC1, 4) && !stream.Eof())
+        {
+            // we didn't reach the EOF! An other kind of error has occurred...
             return false;
+        }
+        //else: proceed with the parsing of the next header block or
+        //      exiting this loop (if stream.Eof() == true)
     }
 
     if (m_nFrames==0)