amacocian/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2026-07-24 03:56:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #15247: crash when handling invalid sprite in OpenGL cursor sprite system (#15248)

Browse Source
This commit is contained in:
Peter Nelson
2026-02-08 17:29:54 +00:00
committed by GitHub
parent 4ba0208437
commit 840e4316c6
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/spritecache.cpp
+6 -5
View File
@@ -803,10 +803,11 @@ void *UniquePtrSpriteAllocator::AllocatePtr(size_t size)
* @param requested requested sprite type
* @param sc the currently known sprite cache for the requested sprite
* @param allocator Callback that provides the memory when loading sprites.
* @param encoder Sprite encoder to use. Set to nullptr to use the currently active blitter.
* @return fallback sprite
* @note this function will do UserError() in the case the fallback sprite isn't available
*/
static void *HandleInvalidSpriteRequest(SpriteID sprite, SpriteType requested, SpriteCache *sc, SpriteAllocator *allocator)
static void *HandleInvalidSpriteRequest(SpriteID sprite, SpriteType requested, SpriteCache *sc, SpriteAllocator *allocator, SpriteEncoder *encoder)
{
static const std::string_view sprite_types[] = {
"normal", // SpriteType::Normal
@@ -818,7 +819,7 @@ static void *HandleInvalidSpriteRequest(SpriteID sprite, SpriteType requested, S
SpriteType available = sc->type;
if (requested == SpriteType::Font && available == SpriteType::Normal) {
if (sc->ptr == nullptr) sc->type = SpriteType::Font;
return GetRawSprite(sprite, sc->type, allocator);
return GetRawSprite(sprite, sc->type, allocator, encoder);
}
uint8_t warning_level = sc->warned ? 6 : 0;
@@ -830,10 +831,10 @@ static void *HandleInvalidSpriteRequest(SpriteID sprite, SpriteType requested, S
if (sprite == SPR_IMG_QUERY) UserError("Uhm, would you be so kind not to load a NewGRF that makes the 'query' sprite a non-normal sprite?");
[[fallthrough]];
case SpriteType::Font:
return GetRawSprite(SPR_IMG_QUERY, SpriteType::Normal, allocator);
return GetRawSprite(SPR_IMG_QUERY, SpriteType::Normal, allocator, encoder);
case SpriteType::Recolour:
if (sprite == PALETTE_TO_DARK_BLUE) UserError("Uhm, would you be so kind not to load a NewGRF that makes the 'PALETTE_TO_DARK_BLUE' sprite a non-remap sprite?");
return GetRawSprite(PALETTE_TO_DARK_BLUE, SpriteType::Recolour, allocator);
return GetRawSprite(PALETTE_TO_DARK_BLUE, SpriteType::Recolour, allocator, encoder);
case SpriteType::MapGen:
/* this shouldn't happen, overriding of SpriteType::MapGen sprites is checked in LoadNextSprite()
* (the only case the check fails is when these sprites weren't even loaded...) */
@@ -865,7 +866,7 @@ void *GetRawSprite(SpriteID sprite, SpriteType type, SpriteAllocator *allocator,
SpriteCache *sc = GetSpriteCache(sprite);
if (sc->type != type) return HandleInvalidSpriteRequest(sprite, type, sc, allocator);
if (sc->type != type) return HandleInvalidSpriteRequest(sprite, type, sc, allocator, encoder);
if (allocator == nullptr && encoder == nullptr) {
/* Load sprite into/from spritecache */