fixedb ug with normalization of UNC paths (patch 558701)

[wxWidgets.git] / src / common / imagbmp.cpp

diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp
index f8552ff5a55be8ec951f4535014194675c529653..85124d1a7548879f883d82e5de44160de60f70a8 100644 (file)
--- a/src/common/imagbmp.cpp
+++ b/src/common/imagbmp.cpp
@@ -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';
 }
 
 
@@ -1197,12 +1199,11 @@ int wxICOHandler::GetImageCount(wxInputStream& stream)
 bool wxICOHandler::DoCanRead(wxInputStream& stream)
 {
     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';
 }
 
 
@@ -1216,12 +1217,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxCURHandler, wxICOHandler)
 bool wxCURHandler::DoCanRead(wxInputStream& stream)
 {
     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';
 }
 
 //-----------------------------------------------------------------------------
@@ -1259,7 +1259,7 @@ bool wxANIHandler::LoadFile(wxImage *image, wxInputStream& stream,
         //now either data or a FCC
         if ( (FCC1 == *riff32) || (FCC1 == *list32) )
         {
-           stream.Read(&FCC2, 4);
+            stream.Read(&FCC2, 4);
         }
         else
         {
@@ -1293,8 +1293,9 @@ bool wxANIHandler::DoCanRead(wxInputStream& stream)
     wxInt32 *list32 = (wxInt32 *) listtxt;
     wxInt32 *anih32 = (wxInt32 *) anihtxt;
 
-    stream.SeekI(0);
-    stream.Read(&FCC1, 4);
+    if ( !stream.Read(&FCC1, 4) )
+        return FALSE;
+
     if ( FCC1 != *riff32 )
         return FALSE;
 
@@ -1305,11 +1306,11 @@ bool wxANIHandler::DoCanRead(wxInputStream& stream)
             return TRUE;
         // we always have a data size:
         stream.Read(&datalen, 4);
-        datalen = wxINT32_SWAP_ON_BE(datalen) ;  
+        datalen = wxINT32_SWAP_ON_BE(datalen) ;
         // now either data or a FCC:
         if ( (FCC1 == *riff32) || (FCC1 == *list32) )
         {
-                   stream.Read(&FCC2, 4);
+            stream.Read(&FCC2, 4);
         }
         else
         {
@@ -1317,7 +1318,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;
@@ -1348,8 +1353,8 @@ int wxANIHandler::GetImageCount(wxInputStream& stream)
         datalen = wxINT32_SWAP_ON_BE(datalen) ;
         // now either data or a FCC:
         if ( (FCC1 == *riff32) || (FCC1 == *list32) )
-       {
-           stream.Read(&FCC2, 4);
+        {
+            stream.Read(&FCC2, 4);
         }
         else
         {