From 9d570fa018a7c449853c113c9d2190e5246a8f09 Mon Sep 17 00:00:00 2001 From: truelight Date: Mon, 11 Jun 2007 12:51:27 +0000 Subject: (svn r10095) -Fix: avoid reading outside the buffer because of scaling problems --- src/blitter/8bpp_optimized.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/blitter/8bpp_optimized.cpp b/src/blitter/8bpp_optimized.cpp index 00c427441..62397a045 100644 --- a/src/blitter/8bpp_optimized.cpp +++ b/src/blitter/8bpp_optimized.cpp @@ -134,6 +134,7 @@ Sprite *Blitter_8bppOptimized::Encode(SpriteLoader::Sprite *sprite) uint pixels = 0; uint last_color = 0; uint count_index = 0; + uint rx = 0; src = &sprite->data[ScaleByZoom(y, (ZoomLevel)i) * sprite->width]; for (int x = 0; x < UnScaleByZoom(sprite->width, (ZoomLevel)i); x++) { @@ -144,6 +145,9 @@ Sprite *Blitter_8bppOptimized::Encode(SpriteLoader::Sprite *sprite) for (int j = 0; j < ScaleByZoom(1, (ZoomLevel)i); j++) { if (src->m != 0) { color = src->m; count++; } src++; + rx++; + /* Because of the scaling it might happen we read outside the buffer. Avoid that. */ + if (rx == sprite->width) break; } /* If more than 12.5% of the pixels are non-transparent, make thisone non-transparent too */ if (count < ScaleByZoom(1, (ZoomLevel)i) / 8) color = 0; -- cgit v1.2.3-54-g00ecf