# HG changeset patch
# User dbuck
# Date 1417679665 0
# Node ID 03b7d9efd9fd2e928e02953c72a69ffb94f614c6
# Parent  d4caf9c96afd5931c4c15e91b7594fe21a520f29# Parent  3f4a5fdca31864f08eddeca56a1a7cf95270e70d
Merge

diff -r 3f4a5fdca318 -r 03b7d9efd9fd src/share/vm/prims/jvm.cpp
--- 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 */