Google Git
Sign in
qemu / qemu / a12ff7f807e3ae2e254ac1de45c3892831479a0f
commita12ff7f807e3ae2e254ac1de45c3892831479a0f[log] [tgz]
authorMarkus Armbruster <armbru@redhat.com>Wed Jul 23 15:15:04 2025 +0200
committerMarkus Armbruster <armbru@redhat.com>Mon Sep 01 12:51:37 2025 +0200
treeec7a11ee2aa2fcfde340e86b330c276e8424d2eb
parent91589bcd9fee0e66b241d04e5f37cd4f218187a2 [diff]
ui/keymaps: Avoid trace crash and improve error messages

parse_keyboard_layout() passes a possibly null @filename to
trace_keymap_parse().  Trace backend log then formats it with %s,
which crashes on some systems.

Fix by moving the null check before the trace_keymap_parse().

While there, improve the error messages a bit.

Fixes: d3b787fa7dde (keymaps: add tracing)
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20250723131504.1482657-1-armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
1 file changed
tree: ec7a11ee2aa2fcfde340e86b330c276e8424d2eb
  1. .github/
  2. .gitlab/
  3. .gitlab-ci.d/
  4. accel/
  5. audio/
  6. authz/
  7. backends/
  8. block/
  9. bsd-user/
  10. chardev/
  11. common-user/
  12. configs/
  13. contrib/
  14. crypto/
  15. disas/
  16. docs/
  17. dump/
  18. ebpf/
  19. fpu/
  20. fsdev/
  21. gdb-xml/
  22. gdbstub/
  23. host/
  24. hw/
  25. include/
  26. io/
  27. libdecnumber/
  28. linux-headers/
  29. linux-user/
  30. migration/
  31. monitor/
  32. nbd/
  33. net/
  34. pc-bios/
  35. plugins/
  36. po/
  37. python/
  38. qapi/
  39. qga/
  40. qobject/
  41. qom/
  42. replay/
  43. roms/
  44. rust/
  45. scripts/
  46. scsi/
  47. semihosting/
  48. stats/
  49. storage-daemon/
  50. stubs/
  51. subprojects/
  52. system/
  53. target/
  54. tcg/
  55. tests/
  56. tools/
  57. trace/
  58. ui/
  59. util/
  60. .b4-config
  61. .dir-locals.el
  62. .editorconfig
  63. .exrc
  64. .gdbinit
  65. .git-blame-ignore-revs
  66. .gitattributes
  67. .gitignore
  68. .gitlab-ci.yml
  69. .gitmodules
  70. .gitpublish
  71. .mailmap
  72. .patchew.yml
  73. .readthedocs.yml
  74. .travis.yml
  75. block.c
  76. blockdev-nbd.c
  77. blockdev.c
  78. blockjob.c
  79. clippy.toml
  80. configure
  81. COPYING
  82. COPYING.LIB
  83. cpu-common.c
  84. cpu-target.c
  85. event-loop-base.c
  86. gitdm.config
  87. hmp-commands-info.hx
  88. hmp-commands.hx
  89. iothread.c
  90. job-qmp.c
  91. job.c
  92. Kconfig
  93. Kconfig.host
  94. LICENSE
  95. MAINTAINERS
  96. Makefile
  97. meson.build
  98. meson_options.txt
  99. module-common.c
  100. os-posix.c
  101. os-wasm.c
  102. os-win32.c
  103. page-target.c
  104. page-vary-common.c
  105. page-vary-target.c
  106. pythondeps.toml
  107. qemu-bridge-helper.c
  108. qemu-edid.c
  109. qemu-img-cmds.hx
  110. qemu-img.c
  111. qemu-io-cmds.c
  112. qemu-io.c
  113. qemu-keymap.c
  114. qemu-nbd.c
  115. qemu-options.hx
  116. qemu.nsi
  117. qemu.sasl
  118. README.rst
  119. replication.c
  120. target-info-stub.c
  121. target-info.c
  122. trace-events
  123. VERSION
  124. version.rc