stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8040271: Uninitialised memory in jdk/src/windows/native/sun/windows: awt_List.cpp, awt_InputMethod.cpp

Browse Source 
Reviewed-by: pchelko, prr
This commit is contained in:
Sergey Bylokhov 2014-06-12 00:19:00 +04:00
parent f829432469
commit 4a9ad9f15f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jdk/src/windows/native/sun/windows/awt_InputMethod.cpp
View File

@ -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);

4
jdk/src/windows/native/sun/windows/awt_List.cpp
View File

@ -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;