mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change comparison to prevent index out of range crash when checking

Browse Source 
index number against max entries and index == maxEntries.
This commit is contained in:
xangis 2012-06-21 13:58:28 -07:00
parent 3959f0de13
commit b81548471d
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libfreerdp-cache/brush.c
View File

@ -78,7 +78,7 @@ void* brush_cache_get(rdpBrushCache* brush, uint32 index, uint32* bpp)
if (*bpp == 1)
{
if (index > brush->maxMonoEntries)
if (index >= brush->maxMonoEntries)
{
printf("invalid brush (%d bpp) index: 0x%04X\n", *bpp, index);
return NULL;
@ -89,7 +89,7 @@ void* brush_cache_get(rdpBrushCache* brush, uint32 index, uint32* bpp)
}
else
{
if (index > brush->maxEntries)
if (index >= brush->maxEntries)
{
printf("invalid brush (%d bpp) index: 0x%04X\n", *bpp, index);
return NULL;
@ -114,7 +114,7 @@ void brush_cache_put(rdpBrushCache* brush, uint32 index, void* entry, uint32 bpp
if (bpp == 1)
{
if (index > brush->maxMonoEntries)
if (index >= brush->maxMonoEntries)
{
printf("invalid brush (%d bpp) index: 0x%04X\n", bpp, index);
return;
@ -130,7 +130,7 @@ void brush_cache_put(rdpBrushCache* brush, uint32 index, void* entry, uint32 bpp
}
else
{
if (index > brush->maxEntries)
if (index >= brush->maxEntries)
{
printf("invalid brush (%d bpp) index: 0x%04X\n", bpp, index);
return;

4
libfreerdp-cache/nine_grid.c
View File

@ -51,7 +51,7 @@ void* nine_grid_cache_get(rdpNineGridCache* nine_grid, uint32 index)
{
void* entry;
if (index > nine_grid->maxEntries)
if (index >= nine_grid->maxEntries)
{
printf("invalid NineGrid index: 0x%04X\n", index);
return NULL;
@ -72,7 +72,7 @@ void nine_grid_cache_put(rdpNineGridCache* nine_grid, uint32 index, void* entry)
{
void* prevEntry;
if (index > nine_grid->maxEntries)
if (index >= nine_grid->maxEntries)
{
printf("invalid NineGrid index: 0x%04X\n", index);
return;

6
libfreerdp-cache/offscreen.c
View File

@ -71,7 +71,7 @@ rdpBitmap* offscreen_cache_get(rdpOffscreenCache* offscreen_cache, uint32 index)
{
rdpBitmap* bitmap;
if (index > offscreen_cache->maxEntries)
if (index >= offscreen_cache->maxEntries)
{
printf("invalid offscreen bitmap index: 0x%04X\n", index);
return NULL;
@ -90,7 +90,7 @@ rdpBitmap* offscreen_cache_get(rdpOffscreenCache* offscreen_cache, uint32 index)
void offscreen_cache_put(rdpOffscreenCache* offscreen, uint32 index, rdpBitmap* bitmap)
{
if (index > offscreen->maxEntries)
if (index >= offscreen->maxEntries)
{
printf("invalid offscreen bitmap index: 0x%04X\n", index);
return;
@ -104,7 +104,7 @@ void offscreen_cache_delete(rdpOffscreenCache* offscreen, uint32 index)
{
rdpBitmap* prevBitmap;
if (index > offscreen->maxEntries)
if (index >= offscreen->maxEntries)
{
printf("invalid offscreen bitmap index (delete): 0x%04X\n", index);
return;

4
libfreerdp-cache/palette.c
View File

@ -32,7 +32,7 @@ void* palette_cache_get(rdpPaletteCache* palette_cache, uint32 index)
{
void* entry;
if (index > palette_cache->maxEntries)
if (index >= palette_cache->maxEntries)
{
printf("invalid color table index: 0x%04X\n", index);
return NULL;
@ -51,7 +51,7 @@ void* palette_cache_get(rdpPaletteCache* palette_cache, uint32 index)
void palette_cache_put(rdpPaletteCache* palette_cache, uint32 index, void* entry)
{
if (index > palette_cache->maxEntries)
if (index >= palette_cache->maxEntries)
{
printf("invalid color table index: 0x%04X\n", index);
return;