From f270940cc52c754ae1010e09b8a2b0cb41389aff Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 28 Mar 2026 23:36:10 +0100 Subject: [PATCH] v_video: make stringwidth loops safer --- src/v_video.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/v_video.c b/src/v_video.c index d4788cf94..7e65401d3 100644 --- a/src/v_video.c +++ b/src/v_video.c @@ -3235,7 +3235,7 @@ INT32 V_SubStringWidth(const char *string, INT32 length, INT32 option) break; } - for (i = 0; string[i] && i < length; i++) + for (i = 0; i < length && string[i]; i++) { c = string[i]; if ((UINT8)c >= 0x80 && (UINT8)c <= 0x8F) //color parsing! -Inuyasha 2.16.09 @@ -3280,7 +3280,7 @@ INT32 V_SmallSubStringWidth(const char *string, INT32 length, INT32 option) break; } - for (i = 0; string[i] && i < length; i++) + for (i = 0; i < length && string[i]; i++) { c = string[i]; if ((UINT8)c >= 0x80 && (UINT8)c <= 0x8F) //color parsing! -Inuyasha 2.16.09 @@ -3329,7 +3329,7 @@ INT32 V_ThinSubStringWidth(const char *string, INT32 length, INT32 option) break; } - for (i = 0; string[i] && i < length; i++) + for (i = 0; i < length && string[i]; i++) { c = string[i]; if ((UINT8)c >= 0x80 && (UINT8)c <= 0x8F) //color parsing! -Inuyasha 2.16.09