From 28e2a1126b8bcf97693d024dbd034f62fe373965 Mon Sep 17 00:00:00 2001
From: Simon McVittie <[EMAIL REDACTED]>
Date: Tue, 3 Sep 2024 16:23:19 +0100
Subject: [PATCH] Update for new names and return types of overflow-checked
add/multiply
---
src/SDL_ttf.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/SDL_ttf.c b/src/SDL_ttf.c
index 4e6354c8..a2423d11 100644
--- a/src/SDL_ttf.c
+++ b/src/SDL_ttf.c
@@ -1422,14 +1422,14 @@ static SDL_Surface *AllocateAlignedPixels(size_t width, size_t height, SDL_Pixel
*/
if (width > SDL_MAX_SINT32 ||
height > SDL_MAX_SINT32 ||
- SDL_size_add_overflow(width, alignment, &pitch) ||
- SDL_size_mul_overflow(pitch, bytes_per_pixel, &pitch) ||
+ !SDL_size_add_check_overflow(width, alignment, &pitch) ||
+ !SDL_size_mul_check_overflow(pitch, bytes_per_pixel, &pitch) ||
pitch > SDL_MAX_SINT32) {
return NULL;
}
pitch &= ~alignment;
- if (SDL_size_mul_overflow(height, pitch, &size)) {
+ if (!SDL_size_mul_check_overflow(height, pitch, &size)) {
/* Overflow... */
return NULL;
}