X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd94e8aa4563b22e7c66c379625a8373d20720aa..a7fd7c7851405371db0171181f240591cca38158:/src/common/imagbmp.cpp?ds=sidebyside

diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp
index 3dcd8b1254..71b32dcaef 100644
--- a/src/common/imagbmp.cpp
+++ b/src/common/imagbmp.cpp
@@ -750,7 +750,7 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
 
      image->SetMask(FALSE);
 
-    return stream.IsOk();
+    return ( stream.LastError() == wxSTREAM_NO_ERROR || stream.LastError() == wxSTREAM_EOF );
 }
 
 bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream,
@@ -876,9 +876,11 @@ bool wxBMPHandler::DoCanRead(wxInputStream& stream)
 {
     unsigned char hdr[2];
 
-    stream.Read(hdr, 2);
-    stream.SeekI(-2, wxFromCurrent);
-    return (hdr[0] == 'B' && hdr[1] == 'M');
+    if ( !stream.Read(hdr, WXSIZEOF(hdr)) )
+        return FALSE;
+
+    // do we have the BMP file signature?
+    return hdr[0] == 'B' && hdr[1] == 'M';
 }
 
 
@@ -1196,13 +1198,13 @@ int wxICOHandler::GetImageCount(wxInputStream& stream)
 
 bool wxICOHandler::DoCanRead(wxInputStream& stream)
 {
+    stream.SeekI(0);   
     unsigned char hdr[4];
-    off_t iPos = stream.TellI();
-    stream.SeekI (0);
-    stream.Read(hdr, 4);
-    stream.SeekI(iPos);
-    //hdr[2] is one for an icon and two for a cursor
-    return (hdr[0] == '\0' && hdr[1] == '\0' && hdr[2] == '\1' && hdr[3] == '\0');
+    if ( !stream.Read(hdr, WXSIZEOF(hdr)) )
+        return FALSE;
+
+    // hdr[2] is one for an icon and two for a cursor
+    return hdr[0] == '\0' && hdr[1] == '\0' && hdr[2] == '\1' && hdr[3] == '\0';
 }
 
 
@@ -1215,13 +1217,13 @@ IMPLEMENT_DYNAMIC_CLASS(wxCURHandler, wxICOHandler)
 
 bool wxCURHandler::DoCanRead(wxInputStream& stream)
 {
+    stream.SeekI(0);
     unsigned char hdr[4];
-    off_t iPos = stream.TellI();
-    stream.SeekI (0);
-    stream.Read(hdr, 4);
-    stream.SeekI(iPos);
-    //hdr[2] is one for an icon and two for a cursor
-    return (hdr[0] == '\0' && hdr[1] == '\0' && hdr[2] == '\2' && hdr[3] == '\0');
+    if ( !stream.Read(hdr, WXSIZEOF(hdr)) )
+        return FALSE;
+
+    // hdr[2] is one for an icon and two for a cursor
+    return hdr[0] == '\0' && hdr[1] == '\0' && hdr[2] == '\2' && hdr[3] == '\0';
 }
 
 //-----------------------------------------------------------------------------
@@ -1255,11 +1257,13 @@ bool wxANIHandler::LoadFile(wxImage *image, wxInputStream& stream,
     {
         // we always have a data size
         stream.Read(&datalen, 4);
-
+        datalen = wxINT32_SWAP_ON_BE(datalen) ;
+        //data should be padded to make even number of bytes
+        if (datalen % 2 == 1) datalen ++ ;
         //now either data or a FCC
         if ( (FCC1 == *riff32) || (FCC1 == *list32) )
         {
-    	    stream.Read(&FCC2, 4);
+            stream.Read(&FCC2, 4);
         }
         else
         {
@@ -1294,22 +1298,26 @@ bool wxANIHandler::DoCanRead(wxInputStream& stream)
     wxInt32 *anih32 = (wxInt32 *) anihtxt;
 
     stream.SeekI(0);
-    stream.Read(&FCC1, 4);
+    if ( !stream.Read(&FCC1, 4) )
+        return FALSE;
+
     if ( FCC1 != *riff32 )
         return FALSE;
 
     // we have a riff file:
     while ( stream.IsOk() )
     {
-        if ( FCC1 != *anih32 )
+        if ( FCC1 == *anih32 )
             return TRUE;
         // we always have a data size:
         stream.Read(&datalen, 4);
-
+        datalen = wxINT32_SWAP_ON_BE(datalen) ;
+        //data should be padded to make even number of bytes
+        if (datalen % 2 == 1) datalen ++ ;
         // now either data or a FCC:
         if ( (FCC1 == *riff32) || (FCC1 == *list32) )
         {
-       	    stream.Read(&FCC2, 4);
+            stream.Read(&FCC2, 4);
         }
         else
         {
@@ -1317,7 +1325,11 @@ bool wxANIHandler::DoCanRead(wxInputStream& stream)
         }
 
         // try to read next data chunk:
-        stream.Read(&FCC1, 4);
+        if ( !stream.Read(&FCC1, 4) )
+        {
+            // reading failed -- either EOF or IO error, bail out anyhow
+            return FALSE;
+        }
     }
 
     return FALSE;
@@ -1345,11 +1357,13 @@ int wxANIHandler::GetImageCount(wxInputStream& stream)
     {
         // we always have a data size:
         stream.Read(&datalen, 4);
-
+        datalen = wxINT32_SWAP_ON_BE(datalen) ;
+        //data should be padded to make even number of bytes
+        if (datalen % 2 == 1) datalen ++ ;
         // now either data or a FCC:
         if ( (FCC1 == *riff32) || (FCC1 == *list32) )
-    	{
-    	    stream.Read(&FCC2, 4);
+        {
+            stream.Read(&FCC2, 4);
         }
         else
         {
@@ -1357,7 +1371,7 @@ int wxANIHandler::GetImageCount(wxInputStream& stream)
             {
                 wxUint32 *pData = new wxUint32[datalen/4];
                 stream.Read(pData, datalen);
-                int nIcons = *(pData + 1);
+                int nIcons = wxINT32_SWAP_ON_BE(*(pData + 1));
                 delete[] pData;
                 return nIcons;
             }