libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-02 23:01:42 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

COMMON: Fix handling negative numbers in Common::U32String::format

Browse Source
This commit is contained in:
Cameron Cawley 2022-11-15 10:59:51 +00:00 committed by Eugene Sandulenko
parent b3c70aa1ba
commit 29024cded7
3 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
common/ustr.cpp
View File

@ -176,6 +176,7 @@ U32String U32String::format(const char *fmt, ...) {
int U32String::vformat(const value_type *fmt, const value_type *fmtEnd, U32String &output, va_list args) {
int int_temp;
uint uint_temp;
char *string_temp;
value_type ch;
@ -221,8 +222,8 @@ int U32String::vformat(const value_type *fmt, const value_type *fmtEnd, U32Strin
pos += len - 1;
break;
case 'u':
int_temp = va_arg(args, uint);
itoa(int_temp, buffer, 10);
uint_temp = va_arg(args, uint);
uitoa(uint_temp, buffer, 10);
len = strlen(buffer);
length += len;
@ -247,7 +248,18 @@ int U32String::vformat(const value_type *fmt, const value_type *fmtEnd, U32Strin
return length;
}
char* U32String::itoa(int num, char* str, int base) {
char* U32String::itoa(int num, char* str, uint base) {
if (num < 0) {
str[0] = '-';
uitoa(-num, str + 1, base);
} else {
uitoa(num, str, base);
}
return str;
}
char* U32String::uitoa(uint num, char* str, uint base) {
int i = 0;
if (num) {

18
common/ustr.h
View File

@ -156,12 +156,6 @@ public:
*/
static int vformat(const value_type *fmt, const value_type *fmtEnd, U32String &output, va_list args);
/**
* Helper function for vformat. Convert an int to string.
* Minimal implementation, only for base 10.
*/
static char* itoa(int num, char* str, int base);
using BaseString<value_type>::insertString;
void insertString(const char *s, uint32 p, CodePage page = kUtf8); /*!< Insert string @p s into this string at position @p p. */
void insertString(const String &s, uint32 p, CodePage page = kUtf8); /*!< @overload */
@ -194,6 +188,18 @@ public:
private:
static U32String formatInternal(const U32String *fmt, ...);
/**
* Helper function for vformat. Convert an int to a string.
* Minimal implementation, only for base 10.
*/
static char* itoa(int num, char* str, uint base);
/**
* Helper function for vformat. Convert an unsigned int to a string.
* Minimal implementation, only for base 10.
*/
static char* uitoa(uint num, char* str, uint base);
void decodeInternal(const char *str, uint32 len, CodePage page);
void decodeOneByte(const char *str, uint32 len, CodePage page);
void decodeWindows932(const char *src, uint32 len);

7
test/common/str.h
View File

@ -370,6 +370,13 @@ class StringTestSuite : public CxxTest::TestSuite
TS_ASSERT_EQUALS( Common::U32String::format("%s", "test").encode(), "test" );
TS_ASSERT_EQUALS( Common::U32String::format("%s%c%s", "Press ", 'X', " to win").encode(), "Press X to win" );
TS_ASSERT_EQUALS( Common::U32String::format("Some %s to make this string longer than the default built-in %s %d", "text", "capacity", 123456).encode(), "Some text to make this string longer than the default built-in capacity 123456" );
TS_ASSERT_EQUALS( Common::U32String::format("%u", 0).encode(), "0" );
TS_ASSERT_EQUALS( Common::U32String::format("%u", 1234).encode(), "1234" );
TS_ASSERT_EQUALS( Common::U32String::format("%d", 0).encode(), "0" );
TS_ASSERT_EQUALS( Common::U32String::format("%d", 1234).encode(), "1234" );
TS_ASSERT_EQUALS( Common::U32String::format("%d", -1234).encode(), "-1234" );
}
void test_strlcpy() {