dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r23324) -Fix (r15555): Don't free reusable buffer.

Browse Source
This commit is contained in:
peter1138
2011-11-25 11:45:46 +00:00
parent 2635be0549
commit 9f787611fc
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/spriteloader/grf.cpp
View File

@@ -109,7 +109,6 @@ bool SpriteLoaderGrf::LoadSprite(SpriteLoader::Sprite *sprite, uint8 file_slot,
do { do {
if (dest + 2 > dest_orig + dest_size) { if (dest + 2 > dest_orig + dest_size) {
free(sprite->data);
return WarnCorruptSprite(file_slot, file_pos, __LINE__); return WarnCorruptSprite(file_slot, file_pos, __LINE__);
} }
@@ -125,7 +124,6 @@ bool SpriteLoaderGrf::LoadSprite(SpriteLoader::Sprite *sprite, uint8 file_slot,
data = &sprite->data[y * sprite->width + skip]; data = &sprite->data[y * sprite->width + skip];
if (skip + length > sprite->width || dest + length > dest_orig + dest_size) { if (skip + length > sprite->width || dest + length > dest_orig + dest_size) {
free(sprite->data);
return WarnCorruptSprite(file_slot, file_pos, __LINE__); return WarnCorruptSprite(file_slot, file_pos, __LINE__);
} }
@@ -142,7 +140,6 @@ bool SpriteLoaderGrf::LoadSprite(SpriteLoader::Sprite *sprite, uint8 file_slot,
} }
} else { } else {
if (dest_size < sprite->width * sprite->height) { if (dest_size < sprite->width * sprite->height) {
free(sprite->data);
return WarnCorruptSprite(file_slot, file_pos, __LINE__); return WarnCorruptSprite(file_slot, file_pos, __LINE__);
} }