From a1157f7b8b0a032a67184fa6bed48279d9197aaa Mon Sep 17 00:00:00 2001 From: Michael Theall Date: Fri, 20 Nov 2015 09:44:58 -0600 Subject: [PATCH] Fix comparator for overflow check --- libctru/source/util/utf/utf16_to_utf32.c | 2 +- libctru/source/util/utf/utf16_to_utf8.c | 2 +- libctru/source/util/utf/utf32_to_utf16.c | 2 +- libctru/source/util/utf/utf32_to_utf8.c | 2 +- libctru/source/util/utf/utf8_to_utf16.c | 2 +- libctru/source/util/utf/utf8_to_utf32.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libctru/source/util/utf/utf16_to_utf32.c b/libctru/source/util/utf/utf16_to_utf32.c index 3a9c5ce..9fdb943 100644 --- a/libctru/source/util/utf/utf16_to_utf32.c +++ b/libctru/source/util/utf/utf16_to_utf32.c @@ -26,7 +26,7 @@ utf16_to_utf32(uint32_t *out, *out++ = code; } - if(SSIZE_MAX - 1 <= rc) + if(SSIZE_MAX - 1 >= rc) ++rc; else return -1; diff --git a/libctru/source/util/utf/utf16_to_utf8.c b/libctru/source/util/utf/utf16_to_utf8.c index 9802dd3..aaf20df 100644 --- a/libctru/source/util/utf/utf16_to_utf8.c +++ b/libctru/source/util/utf/utf16_to_utf8.c @@ -39,7 +39,7 @@ utf16_to_utf8(uint8_t *out, } } - if(SSIZE_MAX - units <= rc) + if(SSIZE_MAX - units >= rc) rc += units; else return -1; diff --git a/libctru/source/util/utf/utf32_to_utf16.c b/libctru/source/util/utf/utf32_to_utf16.c index 6ac28f3..d0b374b 100644 --- a/libctru/source/util/utf/utf32_to_utf16.c +++ b/libctru/source/util/utf/utf32_to_utf16.c @@ -26,7 +26,7 @@ utf32_to_utf16(uint16_t *out, } } - if(SSIZE_MAX - units <= rc) + if(SSIZE_MAX - units >= rc) rc += units; else return -1; diff --git a/libctru/source/util/utf/utf32_to_utf8.c b/libctru/source/util/utf/utf32_to_utf8.c index 4bfd357..049f982 100644 --- a/libctru/source/util/utf/utf32_to_utf8.c +++ b/libctru/source/util/utf/utf32_to_utf8.c @@ -30,7 +30,7 @@ utf32_to_utf8(uint8_t *out, } } - if(SSIZE_MAX - units <= rc) + if(SSIZE_MAX - units >= rc) rc += units; else return -1; diff --git a/libctru/source/util/utf/utf8_to_utf16.c b/libctru/source/util/utf/utf8_to_utf16.c index 2a450af..82e414b 100644 --- a/libctru/source/util/utf/utf8_to_utf16.c +++ b/libctru/source/util/utf/utf8_to_utf16.c @@ -35,7 +35,7 @@ utf8_to_utf16(uint16_t *out, } } - if(SSIZE_MAX - units <= rc) + if(SSIZE_MAX - units >= rc) rc += units; else return -1; diff --git a/libctru/source/util/utf/utf8_to_utf32.c b/libctru/source/util/utf/utf8_to_utf32.c index 4a5ba81..979c3a1 100644 --- a/libctru/source/util/utf/utf8_to_utf32.c +++ b/libctru/source/util/utf/utf8_to_utf32.c @@ -26,7 +26,7 @@ utf8_to_utf32(uint32_t *out, *out++ = code; } - if(SSIZE_MAX - 1 <= rc) + if(SSIZE_MAX - 1 >= rc) ++rc; else return -1;