changeset 20691:03b7d9efd9fd

Merge
author dbuck
date Thu, 04 Dec 2014 07:54:25 +0000
parents d4caf9c96afd (diff) 3f4a5fdca318 (current diff)
children bc5a90a4db47
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/prims/jvm.cpp	Wed Dec 03 17:41:47 2014 -0800
+++ b/src/share/vm/prims/jvm.cpp	Thu Dec 04 07:54:25 2014 +0000
@@ -4544,7 +4544,7 @@
 
 JVM_ENTRY(void, JVM_GetVersionInfo(JNIEnv* env, jvm_version_info* info, size_t info_size))
 {
-  memset(info, 0, sizeof(info_size));
+  memset(info, 0, info_size);
 
   info->jvm_version = Abstract_VM_Version::jvm_version();
   info->update_version = 0;          /* 0 in HotSpot Express VM */