From 5a3eee3350124080011922f654c511b4120e76a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Fri, 10 Dec 2010 20:38:22 +0000 Subject: [PATCH] * Keyboard input device addon: fix deadkey string leak. * consoled: CID 1696, the found deadkey string is unused. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39811 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../input_server/devices/keyboard/KeyboardInputDevice.cpp | 1 + src/bin/consoled/consoled.cpp | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp b/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp index 018c9f41e8..a491ab8309 100644 --- a/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp +++ b/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp @@ -474,6 +474,7 @@ KeyboardDevice::_ControlThread() fInputMethodStarted = true; activeDeadKey = newDeadKey; + delete[] string; } if (msg != NULL && fOwner->EnqueueMessage(msg) != B_OK) diff --git a/src/bin/consoled/consoled.cpp b/src/bin/consoled/consoled.cpp index 71b40b2644..dc577fe7f6 100644 --- a/src/bin/consoled/consoled.cpp +++ b/src/bin/consoled/consoled.cpp @@ -167,10 +167,6 @@ keyboard_reader(void* arg) } } else if (isKeyDown) { // start of a dead key - char* string = NULL; - int32 numBytes = 0; - keymap.GetChars(keycode, modifiers, 0, &string, &numBytes); - activeDeadKey = newDeadKey; } }