Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-11-22 03:47:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed text functions fast-path for handling "%s" and "%.*s" to handle null pointers gracefully. (#7016, #3466, #6846)

Browse Source
This commit is contained in:
ocornut 2023-11-16 00:00:26 +01:00
parent 3d083dbe1a
commit 7bb0a525c3
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/CHANGELOG.txt
View File

@ -44,6 +44,10 @@ Breaking changes:
Other changes: Other changes:
- Misc: Fixed text functions fast-path for handling "%s" and "%.*s" to handle null pointers gracefully,
like most printf implementations. (#7016, #3466, #6846) [@codefrog2002]
----------------------------------------------------------------------- -----------------------------------------------------------------------
VERSION 1.90.0 (Released 2023-11-15) VERSION 1.90.0 (Released 2023-11-15)
----------------------------------------------------------------------- -----------------------------------------------------------------------

7
imgui.cpp
View File

@ -1944,6 +1944,8 @@ void ImFormatStringToTempBufferV(const char** out_buf, const char** out_buf_end,
if (fmt[0] == '%' && fmt[1] == 's' && fmt[2] == 0) if (fmt[0] == '%' && fmt[1] == 's' && fmt[2] == 0)
{ {
const char* buf = va_arg(args, const char*); // Skip formatting when using "%s" const char* buf = va_arg(args, const char*); // Skip formatting when using "%s"
if (buf == NULL)
buf = "(null)";
*out_buf = buf; *out_buf = buf;
if (out_buf_end) { *out_buf_end = buf + strlen(buf); } if (out_buf_end) { *out_buf_end = buf + strlen(buf); }
} }
@ -1951,6 +1953,11 @@ void ImFormatStringToTempBufferV(const char** out_buf, const char** out_buf_end,
{ {
int buf_len = va_arg(args, int); // Skip formatting when using "%.*s" int buf_len = va_arg(args, int); // Skip formatting when using "%.*s"
const char* buf = va_arg(args, const char*); const char* buf = va_arg(args, const char*);
if (buf == NULL)
{
buf = "(null)";
buf_len = ImMin(buf_len, 6);
}
*out_buf = buf; *out_buf = buf;
*out_buf_end = buf + buf_len; // Disallow not passing 'out_buf_end' here. User is expected to use it. *out_buf_end = buf + buf_len; // Disallow not passing 'out_buf_end' here. User is expected to use it.
} }