mirror of
https://github.com/X11Libre/xserver.git
synced 2026-10-29 02:31:18 +00:00
xserver: os/log.c: ignore alternate forms in log formats
This patch fixes Xserver crashes when evdev or synaptics input drivers are used. These (and maybe other) driver use alternate forms "%#..." in formats for xf86IDrvLogVerb() function, which in turn uses signal-safe vpnprintf(). The last function does not recognize alternate forms and exits abnormally, which causes Xserver to crash. The patch make vpnprintf() to ignore alternate forms. Signed-off-by: Oleh Nykyforchyn <oleh.nyk@gmail.com>
This commit is contained in:
parent
d9330703c8
commit
0c23d26fb8
1 changed files with 4 additions and 0 deletions
4
os/log.c
4
os/log.c
|
|
@ -410,6 +410,10 @@ vpnprintf(char *string, int size_in, const char *f, va_list args)
|
|||
|
||||
f_idx++;
|
||||
|
||||
if (f[f_idx] == '#')
|
||||
/* silently ignore alternate form */
|
||||
f_idx++;
|
||||
|
||||
/* silently ignore reverse justification */
|
||||
if (f[f_idx] == '-')
|
||||
f_idx++;
|
||||
|
|
|
|||
Loading…
Reference in a new issue