From 964fd1e4e96866bfaf8a772169797508444655bd Mon Sep 17 00:00:00 2001 From: Vadim Pakhnushev Date: Tue, 26 Jul 2016 14:54:26 +0300 Subject: [PATCH] 8161742: [parfait] Uninitialised memory in isXTestAvailable of awt_Robot.c:65 Reviewed-by: serb, ssadetsky --- jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Robot.c | 4 ++-- jdk/src/java.desktop/unix/native/libawt_xawt/xawt/XToolkit.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Robot.c b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Robot.c index 41bb1004a91..b69e2c03965 100644 --- a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Robot.c +++ b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Robot.c @@ -100,9 +100,9 @@ static int32_t isXTestAvailable() { /* check if XTest is available */ isXTestAvailable = XQueryExtension(awt_display, XTestExtensionName, &major_opcode, &first_event, &first_error); - DTRACE_PRINTLN3("RobotPeer: XQueryExtension(XTEST) returns major_opcode = %d, first_event = %d, first_error = %d", - major_opcode, first_event, first_error); if (isXTestAvailable) { + DTRACE_PRINTLN3("RobotPeer: XQueryExtension(XTEST) returns major_opcode = %d, first_event = %d, first_error = %d", + major_opcode, first_event, first_error); /* check if XTest version is OK */ XTestQueryExtension(awt_display, &event_basep, &error_basep, &majorp, &minorp); DTRACE_PRINTLN4("RobotPeer: XTestQueryExtension returns event_basep = %d, error_basep = %d, majorp = %d, minorp = %d", diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/xawt/XToolkit.c b/jdk/src/java.desktop/unix/native/libawt_xawt/xawt/XToolkit.c index db32a22ec6c..f8f68cece30 100644 --- a/jdk/src/java.desktop/unix/native/libawt_xawt/xawt/XToolkit.c +++ b/jdk/src/java.desktop/unix/native/libawt_xawt/xawt/XToolkit.c @@ -1021,9 +1021,9 @@ int32_t getNumButtons() { * before calling XTestFakeButtonEvent(). */ xinputAvailable = XQueryExtension(awt_display, INAME, &major_opcode, &first_event, &first_error); - DTRACE_PRINTLN3("RobotPeer: XQueryExtension(XINPUT) returns major_opcode = %d, first_event = %d, first_error = %d", - major_opcode, first_event, first_error); if (xinputAvailable) { + DTRACE_PRINTLN3("RobotPeer: XQueryExtension(XINPUT) returns major_opcode = %d, first_event = %d, first_error = %d", + major_opcode, first_event, first_error); devices = XListInputDevices(awt_display, &numDevices); for (devIdx = 0; devIdx < numDevices; devIdx++) { aDevice = &(devices[devIdx]);