Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Julian Smart
2002-08-16 10:51:07 +00:00
parent 508196798b
commit cff81649d6
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/common/imagbmp.cpp
View File

@@ -1241,15 +1241,15 @@ bool wxANIHandler::LoadFile(wxImage *image, wxInputStream& stream,
static const char *listtxt = "LIST"; static const char *listtxt = "LIST";
static const char *icotxt = "icon"; static const char *icotxt = "icon";
wxInt32 *riff32 = (wxInt32 *) rifftxt; wxInt32 riff32 = (wxInt32) rifftxt;
wxInt32 *list32 = (wxInt32 *) listtxt; wxInt32 list32 = (wxInt32) listtxt;
wxInt32 *ico32 = (wxInt32 *) icotxt; wxInt32 ico32 = (wxInt32) icotxt;
int iIcon = 0; int iIcon = 0;
stream.SeekI(0); stream.SeekI(0);
stream.Read(&FCC1, 4); stream.Read(&FCC1, 4);
if ( FCC1 != *riff32 ) if ( FCC1 != riff32 )
return FALSE; return FALSE;
// we have a riff file: // 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 //data should be padded to make even number of bytes
if (datalen % 2 == 1) datalen ++ ; if (datalen % 2 == 1) datalen ++ ;
//now either data or a FCC //now either data or a FCC
if ( (FCC1 == *riff32) || (FCC1 == *list32) ) if ( (FCC1 == riff32) || (FCC1 == list32) )
{ {
stream.Read(&FCC2, 4); stream.Read(&FCC2, 4);
} }
else else
{ {
if (FCC1 == *ico32 && iIcon >= index) if (FCC1 == ico32 && iIcon >= index)
{ {
return DoLoadFile(image, stream, verbose, -1); return DoLoadFile(image, stream, verbose, -1);
} }
else else
{ {
stream.SeekI(stream.TellI() + datalen); 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 *listtxt = "LIST";
static const char *anihtxt = "anih"; static const char *anihtxt = "anih";
wxInt32 *riff32 = (wxInt32 *) rifftxt; wxInt32 riff32 = (wxInt32) rifftxt;
wxInt32 *list32 = (wxInt32 *) listtxt; wxInt32 list32 = (wxInt32) listtxt;
wxInt32 *anih32 = (wxInt32 *) anihtxt; wxInt32 anih32 = (wxInt32) anihtxt;
stream.SeekI(0); stream.SeekI(0);
if ( !stream.Read(&FCC1, 4) ) if ( !stream.Read(&FCC1, 4) )
return FALSE; return FALSE;
if ( FCC1 != *riff32 ) if ( FCC1 != riff32 )
return FALSE; return FALSE;
// we have a riff file: // we have a riff file:
while ( stream.IsOk() ) while ( stream.IsOk() )
{ {
if ( FCC1 == *anih32 ) if ( FCC1 == anih32 )
return TRUE; return TRUE;
// we always have a data size: // we always have a data size:
stream.Read(&datalen, 4); stream.Read(&datalen, 4);
@@ -1315,7 +1315,7 @@ bool wxANIHandler::DoCanRead(wxInputStream& stream)
//data should be padded to make even number of bytes //data should be padded to make even number of bytes
if (datalen % 2 == 1) datalen ++ ; if (datalen % 2 == 1) datalen ++ ;
// now either data or a FCC: // 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 *listtxt = "LIST";
static const char *anihtxt = "anih"; static const char *anihtxt = "anih";
wxInt32 *riff32 = (wxInt32 *) rifftxt; wxInt32 riff32 = (wxInt32) rifftxt;
wxInt32 *list32 = (wxInt32 *) listtxt; wxInt32 list32 = (wxInt32) listtxt;
wxInt32 *anih32 = (wxInt32 *) anihtxt; wxInt32 anih32 = (wxInt32) anihtxt;
stream.SeekI(0); stream.SeekI(0);
stream.Read(&FCC1, 4); stream.Read(&FCC1, 4);
if ( FCC1 != *riff32 ) if ( FCC1 != riff32 )
return wxNOT_FOUND; return wxNOT_FOUND;
// we have a riff file: // we have a riff file:
@@ -1361,13 +1361,13 @@ int wxANIHandler::GetImageCount(wxInputStream& stream)
//data should be padded to make even number of bytes //data should be padded to make even number of bytes
if (datalen % 2 == 1) datalen ++ ; if (datalen % 2 == 1) datalen ++ ;
// now either data or a FCC: // now either data or a FCC:
if ( (FCC1 == *riff32) || (FCC1 == *list32) ) if ( (FCC1 == riff32) || (FCC1 == list32) )
{ {
stream.Read(&FCC2, 4); stream.Read(&FCC2, 4);
} }
else else
{ {
if ( FCC1 == *anih32 ) if ( FCC1 == anih32 )
{ {
wxUint32 *pData = new wxUint32[datalen/4]; wxUint32 *pData = new wxUint32[datalen/4];
stream.Read(pData, datalen); stream.Read(pData, datalen);