diff options
| author | Mattias Andrée <maandree@operamail.com> | 2015-02-21 15:40:48 +0100 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2015-02-21 15:40:48 +0100 |
| commit | 0cb8ddb4414e268d56feeac09d9dc2e7b52adad6 (patch) | |
| tree | cd9d85aada7e955611213af1b619e03ef691024a /xorg-server-hwcursor-gamma/v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch | |
| parent | update xorg-server (diff) | |
| download | aur-packages-0cb8ddb4414e268d56feeac09d9dc2e7b52adad6.tar.gz aur-packages-0cb8ddb4414e268d56feeac09d9dc2e7b52adad6.tar.bz2 aur-packages-0cb8ddb4414e268d56feeac09d9dc2e7b52adad6.tar.xz | |
update xorg-server-hwcursor-gamma
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to '')
| -rw-r--r-- | xorg-server-hwcursor-gamma/v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/xorg-server-hwcursor-gamma/v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch b/xorg-server-hwcursor-gamma/v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch new file mode 100644 index 0000000..02dbaf2 --- /dev/null +++ b/xorg-server-hwcursor-gamma/v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch @@ -0,0 +1,23 @@ +diff --git a/os/xdmcp.c b/os/xdmcp.c +index b6e97c9..0e9e625 100644 +--- a/os/xdmcp.c ++++ b/os/xdmcp.c +@@ -1409,8 +1409,16 @@ recv_alive_msg(unsigned length) + static void + XdmcpFatal(const char *type, ARRAY8Ptr status) + { +- FatalError("XDMCP fatal error: %s %*.*s\n", type, +- status->length, status->length, status->data); ++ char *error_message; ++ ++ /* error_message is leaked, but that's fine, we're aborting */ ++ error_message = malloc (status->length + 1); ++ if (!error_message) ++ FatalError("XDMCP fatal error: %s", type); ++ ++ memcpy(error_message, status->data, status->length); ++ error_message[status->length] = '\0'; ++ FatalError("XDMCP fatal error: %s %s\n", type, error_message); + } + + static void |