diff options
| author | Hein-Pieter van Braam <hp@tmm.cx> | 2019-04-10 11:06:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-10 11:06:37 +0200 |
| commit | f75b9e62468ba65753f2ce49c02f1a129c08b717 (patch) | |
| tree | 87fde15eeffdde3fa2bcd239fce64b153ef67c92 | |
| parent | 5772f60f960ee8c396574f0c6f94def18bb210c7 (diff) | |
| parent | 0bcf0314f7a2d832622a87fe2bb04022a889ac54 (diff) | |
Merge pull request #27815 from Faless/unix/mem_access
Fix jump over uninitialized value in OS Unix/X11
| -rw-r--r-- | drivers/unix/os_unix.cpp | 1 | ||||
| -rw-r--r-- | platform/x11/os_x11.cpp | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp index e7550903a8..2778590658 100644 --- a/drivers/unix/os_unix.cpp +++ b/drivers/unix/os_unix.cpp @@ -108,6 +108,7 @@ void OS_Unix::initialize_debugging() { if (ScriptDebugger::get_singleton() != NULL) { struct sigaction action; + memset(&action, 0, sizeof(action)); action.sa_handler = handle_interrupt; sigaction(SIGINT, &action, NULL); } diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index 0fe91f3d00..ba74ba2437 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -3238,6 +3238,8 @@ OS_X11::OS_X11() { AudioDriverManager::add_driver(&driver_alsa); #endif + xi.opcode = 0; + xi.last_relative_time = 0; layered_window = false; minimized = false; xim_style = 0L; |