AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed memory leak in colour parsing code

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10262 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2001-05-21 23:22:26 +00:00
parent 7561aacd5e
commit c48269b9f7
1 changed files with 35 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/common/xpmdecod.cpp
View File

@ -561,41 +561,47 @@ static bool GetRGBFromName(const char *inname, bool *isNone,
grey[2] = 'a';
// check for special 'none' colour:
bool found;
if ( strcmp(name, "none") == 0 )
{
*isNone = TRUE;
return TRUE;
found = TRUE;
}
else // not "None"
{
found = FALSE;
// binary search:
left = 0;
right = numTheRGBRecords - 1;
do
{
middle = (left + right) / 2;
cmp = strcmp(name, theRGBRecords[middle].name);
if ( cmp == 0 )
{
rgbVal = theRGBRecords[middle].rgb;
*r = (unsigned char)((rgbVal >> 16) & 0xFF);
*g = (unsigned char)((rgbVal >> 8) & 0xFF);
*b = (unsigned char)((rgbVal) & 0xFF);
*isNone = FALSE;
found = TRUE;
break;
}
else if ( cmp < 0 )
{
right = middle - 1;
}
else // cmp > 0
{
left = middle + 1;
}
} while (left <= right);
}
// binary search:
left = 0;
right = numTheRGBRecords - 1;
do
{
middle = (left + right) / 2;
cmp = strcmp(name, theRGBRecords[middle].name);
if ( cmp == 0 )
{
rgbVal = theRGBRecords[middle].rgb;
*r = (unsigned char)((rgbVal >> 16) & 0xFF);
*g = (unsigned char)((rgbVal >> 8) & 0xFF);
*b = (unsigned char)((rgbVal) & 0xFF);
*isNone = FALSE;
free(name);
return TRUE;
}
else if ( cmp < 0 )
{
right = middle - 1;
}
else
{ // > 0
left = middle + 1;
}
} while (left <= right);
free(name);
return FALSE;
return found;
}
static const char *ParseColor(const char *data)