--- old/src/hotspot/cpu/x86/macroAssembler_x86.hpp	2019-10-10 16:39:29.941216900 +0900
+++ new/src/hotspot/cpu/x86/macroAssembler_x86.hpp	2019-10-10 16:39:29.300973000 +0900
@@ -114,7 +114,8 @@
       // short offset operators (jmp and jcc)
       char* disp = (char*) &branch[1];
       int imm8 = target - (address) &disp[1];
-      guarantee(this->is8bit(imm8), "Short forward jump exceeds 8-bit offset at %s:%d", file, line);
+      guarantee(this->is8bit(imm8), "Short forward jump exceeds 8-bit offset at %s:%d",
+                file == NULL ? "<NULL>" : file, line);
       *disp = imm8;
     } else {
       int* disp = (int*) &branch[(op == 0x0F || op == 0xC7)? 2: 1];
--- old/src/hotspot/share/services/diagnosticArgument.cpp	2019-10-10 16:39:32.595617800 +0900
+++ new/src/hotspot/share/services/diagnosticArgument.cpp	2019-10-10 16:39:32.061426500 +0900
@@ -151,8 +151,7 @@
       ResourceMark rm;
 
       char* buf = NEW_RESOURCE_ARRAY(char, len + 1);
-      strncpy(buf, str, len);
-      buf[len] = '\0';
+      strncpy(buf, str, len + 1);
       Exceptions::fthrow(THREAD_AND_LOCATION, vmSymbols::java_lang_IllegalArgumentException(),
         "Boolean parsing error in command argument '%s'. Could not parse: %s.\n", _name, buf);
     }