diff src/share/vm/prims/jvm.cpp @ 14704:b51e29501f30

Merged with jdk9/dev/hotspot changeset 9486a41de3b7
author twisti
date Tue, 18 Mar 2014 20:19:10 -0700
parents d8041d695d19 cd30121047ac
children 92aa6797d639
line wrap: on
line diff
--- a/src/share/vm/prims/jvm.cpp	Thu Mar 20 22:30:26 2014 +0100
+++ b/src/share/vm/prims/jvm.cpp	Tue Mar 18 20:19:10 2014 -0700
@@ -4373,7 +4373,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 */