[Scummvm-git-logs] scummvm master -> 74336c541142641fe0847b53176d1e4be6d6a4f4

phcoder noreply at scummvm.org
Thu Jan 12 13:02:02 UTC 2023


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
74336c5411 SDL: Fix potential buffer overflow


Commit: 74336c541142641fe0847b53176d1e4be6d6a4f4
    https://github.com/scummvm/scummvm/commit/74336c541142641fe0847b53176d1e4be6d6a4f4
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2023-01-12T14:01:45+01:00

Commit Message:
SDL: Fix potential buffer overflow

This causes a segmentation error on Miyoo Mini but is not specific to it

Changed paths:
    backends/graphics/surfacesdl/surfacesdl-graphics.cpp


diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
index b8dd4ea61f8..4ea7bb5f02a 100644
--- a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
+++ b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
@@ -1350,7 +1350,7 @@ void SurfaceSdlGraphicsManager::internUpdateScreen() {
 					dst_y = real2Aspect(dst_y);
 
 				_scaler->scale((byte *)srcSurf->pixels + (r->x + _maxExtraPixels) * bpp + (r->y + _maxExtraPixels) * srcPitch, srcPitch,
-					(byte *)_hwScreen->pixels + dst_x * bpp + dst_y * dstPitch, dstPitch, r->w, dst_h, r->x, r->y);
+					(byte *)_hwScreen->pixels + dst_x * bpp + dst_y * dstPitch, dstPitch, dst_w, dst_h, r->x, r->y);
 			}
 
 			r->x = dst_x;




More information about the Scummvm-git-logs mailing list