Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-11-25 21:17:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed unlikely buffer overrun in InputCharacters (thanks Daniel Collin)

Browse Source
This commit is contained in:
ocornut 2014-10-07 12:15:59 +01:00
parent 48a944813c
commit 9f05a2bb16
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
imgui.cpp
View File

@ -348,7 +348,7 @@ static size_t ImStrlenW(const ImWchar* str);
void ImGuiIO::AddInputCharacter(ImWchar c) void ImGuiIO::AddInputCharacter(ImWchar c)
{ {
const size_t n = ImStrlenW(InputCharacters); const size_t n = ImStrlenW(InputCharacters);
if (n < sizeof(InputCharacters) / sizeof(InputCharacters[0])) if (n + 1 < sizeof(InputCharacters) / sizeof(InputCharacters[0]))
{ {
InputCharacters[n] = c; InputCharacters[n] = c;
InputCharacters[n+1] = 0; InputCharacters[n+1] = 0;

2
imgui.h
View File

@ -456,7 +456,7 @@ struct ImGuiIO
bool KeyCtrl; // Keyboard modifier pressed: Control bool KeyCtrl; // Keyboard modifier pressed: Control
bool KeyShift; // Keyboard modifier pressed: Shift bool KeyShift; // Keyboard modifier pressed: Shift
bool KeysDown[512]; // Keyboard keys that are pressed (in whatever order user naturally has access to keyboard data) bool KeysDown[512]; // Keyboard keys that are pressed (in whatever order user naturally has access to keyboard data)
ImWchar InputCharacters[16]; // List of characters input (translated by user from keypress+keyboard state). Fill using AddInputCharacter() helper. ImWchar InputCharacters[16+1]; // List of characters input (translated by user from keypress+keyboard state). Fill using AddInputCharacter() helper.
// Function // Function
void AddInputCharacter(ImWchar); // Helper to add a new character into InputCharacters[] void AddInputCharacter(ImWchar); // Helper to add a new character into InputCharacters[]