--- a/hotspot/src/share/vm/runtime/arguments.cpp	Fri Aug 07 17:14:26 2015 -0700
+++ b/hotspot/src/share/vm/runtime/arguments.cpp	Sun Aug 09 13:38:24 2015 +0300
@@ -3305,7 +3305,9 @@
 
   if (scp_assembly_required) {
     // Assemble the bootclasspath elements into the final path.
-    Arguments::set_sysclasspath(scp_p->combined_path());
+    char *combined_path = scp_p->combined_path();
+    Arguments::set_sysclasspath(combined_path);
+    FREE_C_HEAP_ARRAY(char, combined_path);
   }
 
   // This must be done after all arguments have been processed.