# HG changeset patch # User truelight # Date 2007-06-11 12:51:27 # Node ID 5cad66fb93e7470b8ba68485969d824e7f90a505 # Parent 69c98d4361001585ed473be748ff2fa6fa24ad87 (svn r10095) -Fix: avoid reading outside the buffer because of scaling problems diff --git a/src/blitter/8bpp_optimized.cpp b/src/blitter/8bpp_optimized.cpp --- a/src/blitter/8bpp_optimized.cpp +++ b/src/blitter/8bpp_optimized.cpp @@ -134,6 +134,7 @@ Sprite *Blitter_8bppOptimized::Encode(Sp 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(Sp 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;