From 2d9fca46c67146249a25a5971e8a0d5fd242030d Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Sun, 1 Mar 2026 11:34:34 -0800
Subject: [PATCH] Added surface validation to SDL_ConvertSurfaceRect()
Fixes https://github.com/libsdl-org/SDL/issues/15141
---
src/video/SDL_surface.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/video/SDL_surface.c b/src/video/SDL_surface.c
index 13c00b0ac33ad..33d76d2737447 100644
--- a/src/video/SDL_surface.c
+++ b/src/video/SDL_surface.c
@@ -2311,6 +2311,11 @@ SDL_Surface *SDL_ScaleSurface(SDL_Surface *surface, int width, int height, SDL_S
SDL_Surface *SDL_ConvertSurfaceRect(SDL_Surface *surface, const SDL_Rect *rect, SDL_PixelFormat format)
{
+ CHECK_PARAM(!SDL_SurfaceValid(surface)) {
+ SDL_InvalidParamError("surface");
+ return NULL;
+ }
+
return SDL_ConvertSurfaceRectAndColorspace(surface, NULL, format, NULL, SDL_GetDefaultColorspaceForFormat(format), surface->props);
}