Applied [ 594745 ] Fixes core dump under Forte 6U1 in imagbmp.cpp

By John Skiff
I was getting a core dump under Solaris 2.6 when
storing images. My compiler is Forte 6 Update 1. The
problem was in imagbmp.cpp:

t@1 (l@1) signal BUS (invalid address alignment) in
wxANIHandler::DoCanRead at line 1304 in file "imagbmp.cpp"
1304 if ( FCC1 != *riff32 )
(dbx) p FCC1
FCC1 = 31064321
(dbx) p *riff32
*riff32 = 1380533830
(dbx)

I have tested the fix under Windows 2000, Solaris 2.6,
and Irix 6.5.

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

diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp
index 71b32dcaefbe7649dd6bac4d5108b77b6b8d9555..d138bb7345e9a42c0dd3ed3b28b180e33b4cbb1a 100644 (file)
--- a/src/common/imagbmp.cpp
+++ b/src/common/imagbmp.cpp
@@ -1241,15 +1241,15 @@ bool wxANIHandler::LoadFile(wxImage *image, wxInputStream& stream,
     static const char *listtxt = "LIST";
     static const char *icotxt  = "icon";
 
     static const char *listtxt = "LIST";
     static const char *icotxt  = "icon";
 

-    wxInt32 *riff32 = (wxInt32 *) rifftxt;
-    wxInt32 *list32 = (wxInt32 *) listtxt;
-    wxInt32 *ico32  = (wxInt32 *) icotxt;
+    wxInt32 riff32 = (wxInt32) rifftxt;
+    wxInt32 list32 = (wxInt32) listtxt;
+    wxInt32 ico32  = (wxInt32) icotxt;

 
     int iIcon = 0;
 
     stream.SeekI(0);
     stream.Read(&FCC1, 4);
 
     int iIcon = 0;
 
     stream.SeekI(0);
     stream.Read(&FCC1, 4);

-    if ( FCC1 != *riff32 )
+    if ( FCC1 != riff32 )

         return FALSE;
 
     // we have a riff file:
         return FALSE;
 
     // we have a riff file:


@@ -1261,20 +1261,20 @@ bool wxANIHandler::LoadFile(wxImage *image, wxInputStream& stream,
         //data should be padded to make even number of bytes
         if (datalen % 2 == 1) datalen ++ ;
         //now either data or a FCC
         //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) )
+        if ( (FCC1 == riff32) || (FCC1 == list32) )

         {
             stream.Read(&FCC2, 4);
         }
         else
         {
         {
             stream.Read(&FCC2, 4);
         }
         else
         {

-            if (FCC1 == *ico32 && iIcon >= index)
+            if (FCC1 == ico32 && iIcon >= index)

             {
                 return DoLoadFile(image, stream, verbose, -1);
             }
             else
             {
                 stream.SeekI(stream.TellI() + datalen);
             {
                 return DoLoadFile(image, stream, verbose, -1);
             }
             else
             {
                 stream.SeekI(stream.TellI() + datalen);

-                if ( FCC1 == *ico32 )
+                if ( FCC1 == ico32 )

                     iIcon ++;
             }
         }
                     iIcon ++;
             }
         }


@@ -1293,21 +1293,21 @@ bool wxANIHandler::DoCanRead(wxInputStream& stream)
     static const char *listtxt = "LIST";
     static const char *anihtxt = "anih";
 
     static const char *listtxt = "LIST";
     static const char *anihtxt = "anih";
 

-    wxInt32 *riff32 = (wxInt32 *) rifftxt;
-    wxInt32 *list32 = (wxInt32 *) listtxt;
-    wxInt32 *anih32 = (wxInt32 *) anihtxt;
+    wxInt32 riff32 = (wxInt32) rifftxt;
+    wxInt32 list32 = (wxInt32) listtxt;
+    wxInt32 anih32 = (wxInt32) anihtxt;

 
     stream.SeekI(0);
     if ( !stream.Read(&FCC1, 4) )
         return FALSE;
 
 
     stream.SeekI(0);
     if ( !stream.Read(&FCC1, 4) )
         return FALSE;
 

-    if ( FCC1 != *riff32 )
+    if ( FCC1 != riff32 )

         return FALSE;
 
     // we have a riff file:
     while ( stream.IsOk() )
     {
         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);
             return TRUE;
         // we always have a data size:
         stream.Read(&datalen, 4);


@@ -1315,7 +1315,7 @@ bool wxANIHandler::DoCanRead(wxInputStream& stream)
         //data should be padded to make even number of bytes
         if (datalen % 2 == 1) datalen ++ ;
         // now either data or a FCC:
         //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) )
+        if ( (FCC1 == riff32) || (FCC1 == list32) )

         {
             stream.Read(&FCC2, 4);
         }
         {
             stream.Read(&FCC2, 4);
         }


@@ -1343,13 +1343,13 @@ int wxANIHandler::GetImageCount(wxInputStream& stream)
     static const char *listtxt = "LIST";
     static const char *anihtxt = "anih";
 
     static const char *listtxt = "LIST";
     static const char *anihtxt = "anih";
 

-    wxInt32 *riff32 = (wxInt32 *) rifftxt;
-    wxInt32 *list32 = (wxInt32 *) listtxt;
-    wxInt32 *anih32 = (wxInt32 *) anihtxt;
+    wxInt32 riff32 = (wxInt32) rifftxt;
+    wxInt32 list32 = (wxInt32) listtxt;
+    wxInt32 anih32 = (wxInt32) anihtxt;

 
     stream.SeekI(0);
     stream.Read(&FCC1, 4);
 
     stream.SeekI(0);
     stream.Read(&FCC1, 4);

-    if ( FCC1 != *riff32 )
+    if ( FCC1 != riff32 )

         return wxNOT_FOUND;
 
     // we have a riff file:
         return wxNOT_FOUND;
 
     // we have a riff file:


@@ -1361,13 +1361,13 @@ int wxANIHandler::GetImageCount(wxInputStream& stream)
         //data should be padded to make even number of bytes
         if (datalen % 2 == 1) datalen ++ ;
         // now either data or a FCC:
         //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) )
+        if ( (FCC1 == riff32) || (FCC1 == list32) )

         {
             stream.Read(&FCC2, 4);
         }
         else
         {
         {
             stream.Read(&FCC2, 4);
         }
         else
         {

-            if ( FCC1 == *anih32 )
+            if ( FCC1 == anih32 )

             {
                 wxUint32 *pData = new wxUint32[datalen/4];
                 stream.Read(pData, datalen);
             {
                 wxUint32 *pData = new wxUint32[datalen/4];
                 stream.Read(pData, datalen);