From ed586689315e1b48feb513b27c7d4a82edf06882 Mon Sep 17 00:00:00 2001 From: Chairn Date: Fri, 30 Dec 2022 00:23:50 +0100 Subject: [PATCH] Remove possible overflow in str_comp_filenames (fixes #6204) --- src/base/system.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/base/system.cpp b/src/base/system.cpp index ac345d236..40f7b00a1 100644 --- a/src/base/system.cpp +++ b/src/base/system.cpp @@ -2834,8 +2834,7 @@ int str_comp_filenames(const char *a, const char *b) result = 0; do { - if(!result) - result = *a - *b; + result = *a - *b; ++a; ++b; } while(*a >= '0' && *a <= '9' && *b >= '0' && *b <= '9'); @@ -2844,7 +2843,7 @@ int str_comp_filenames(const char *a, const char *b) return 1; else if(*b >= '0' && *b <= '9') return -1; - else if(result) + else return result; }