From d6eb9cc737ae6ce045aab05c6c181f05940f1f24 Mon Sep 17 00:00:00 2001 From: serb Date: Thu, 12 Jun 2014 00:19:00 +0400 Subject: [PATCH] 8040271: Uninitialised memory in jdk/src/windows/native/sun/windows: awt_List.cpp, awt_InputMethod.cpp Reviewed-by: pchelko, prr --- src/windows/native/sun/windows/awt_InputMethod.cpp | 2 +- src/windows/native/sun/windows/awt_List.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/windows/native/sun/windows/awt_InputMethod.cpp b/src/windows/native/sun/windows/awt_InputMethod.cpp index 1b087aa15..644750410 100644 --- a/src/windows/native/sun/windows/awt_InputMethod.cpp +++ b/src/windows/native/sun/windows/awt_InputMethod.cpp @@ -454,7 +454,7 @@ JNIEXPORT jobjectArray JNICALL Java_sun_awt_windows_WInputMethodDescriptor_getNa TRY; // get list of available HKLs - int layoutCount = ::GetKeyboardLayoutList(0, NULL); + const int layoutCount = ::GetKeyboardLayoutList(0, NULL); HKL FAR * hKLList = (HKL FAR *)SAFE_SIZE_ARRAY_ALLOC(safe_Malloc, sizeof(HKL), layoutCount); CHECK_NULL_RETURN(hKLList, NULL); ::GetKeyboardLayoutList(layoutCount, hKLList); diff --git a/src/windows/native/sun/windows/awt_List.cpp b/src/windows/native/sun/windows/awt_List.cpp index c35c0f420..c6cec8fe0 100644 --- a/src/windows/native/sun/windows/awt_List.cpp +++ b/src/windows/native/sun/windows/awt_List.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -219,7 +219,7 @@ void AwtList::SetMultiSelect(BOOL ms) { JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2); /* Copy current box's contents to string array */ - int nCount = GetCount(); + const int nCount = GetCount(); LPTSTR * strings = new LPTSTR[nCount]; int i; -- GitLab