--- a/hotspot/src/share/vm/compiler/disassembler.cpp	Tue Apr 21 10:23:13 2015 +0200
+++ b/hotspot/src/share/vm/compiler/disassembler.cpp	Tue Apr 07 14:19:03 2015 +0200
@@ -300,6 +300,7 @@
         strlen((const char*)arg) > sizeof(buffer) - 1) {
       // Only print this when the mach changes
       strncpy(buffer, (const char*)arg, sizeof(buffer) - 1);
+      buffer[sizeof(buffer) - 1] = '\0';
       output()->print_cr("[Disassembling for mach='%s']", arg);
     }
   } else if (match(event, "format bytes-per-line")) {