changeset 9673:7c50b9026951

8040271: Uninitialised memory in jdk/src/windows/native/sun/windows: awt_List.cpp, awt_InputMethod.cpp Reviewed-by: pchelko, prr
author serb
date Thu, 12 Jun 2014 00:19:00 +0400
parents 062de21fd23b
children 1270cec9be32
files src/windows/native/sun/windows/awt_InputMethod.cpp src/windows/native/sun/windows/awt_List.cpp
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/windows/native/sun/windows/awt_InputMethod.cpp	Wed Jun 11 14:38:50 2014 +0400
+++ b/src/windows/native/sun/windows/awt_InputMethod.cpp	Thu Jun 12 00:19:00 2014 +0400
@@ -454,7 +454,7 @@
     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);
--- a/src/windows/native/sun/windows/awt_List.cpp	Wed Jun 11 14:38:50 2014 +0400
+++ b/src/windows/native/sun/windows/awt_List.cpp	Thu Jun 12 00:19:00 2014 +0400
@@ -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 @@
     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;