mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-10 00:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

X11: Fix segfault on malformed INCR response

Browse Source 
The code assumed that at least some data would be received via the INCR
mechanism and that, as a result, the string buffer would be allocated.

Bug found by Clang static analysis.

(cherry picked from commit 23e6e8e4b7)
This commit is contained in:
Camilla Löwy 2022-04-18 23:22:25 +02:00
parent 946312fe93
commit 65b8c4a46b
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -134,6 +134,7 @@ information on what to include when reporting a bug.
- [Cocoa] Bugfix: A connected Apple AirPlay would emit a useless error (#1791) - [Cocoa] Bugfix: A connected Apple AirPlay would emit a useless error (#1791)
- [Cocoa] Bugfix: The EGL and OSMesa libraries were not unloaded on termination - [Cocoa] Bugfix: The EGL and OSMesa libraries were not unloaded on termination
- [X11] Bugfix: The OSMesa libray was not unloaded on termination - [X11] Bugfix: The OSMesa libray was not unloaded on termination
- [X11] Bugfix: A malformed response during selection transfer could cause a segfault
- [Wayland] Added support for file path drop events (#2040) - [Wayland] Added support for file path drop events (#2040)
- [Wayland] Bugfix: `glfwSetClipboardString` would fail if set to result of - [Wayland] Bugfix: `glfwSetClipboardString` would fail if set to result of
`glfwGetClipboardString` `glfwGetClipboardString`

3
src/x11_window.c
View File

@ -1048,6 +1048,8 @@ static const char* getSelectionString(Atom selection)
} }
if (!itemCount) if (!itemCount)
{
if (string)
{ {
if (targets[i] == XA_STRING) if (targets[i] == XA_STRING)
{ {
@ -1056,6 +1058,7 @@ static const char* getSelectionString(Atom selection)
} }
else else
*selectionString = string; *selectionString = string;
}
break; break;
} }