commit c484d8904285652246c3af212a4211b9a8955149

Author: Thomas Stuefe <stuefe@openjdk.org>

Date:   Tue Mar 16 05:49:01 2021 +0000

    8263557: Possible NULL dereference in Arena::destruct_contents()

    Reviewed-by: kbarrett, coleenp

diff --git src/hotspot/share/memory/arena.cpp src/hotspot/share/memory/arena.cpp

index 8388f68c359..16059bed9be 100644

--- src/hotspot/share/memory/arena.cpp

+++ src/hotspot/share/memory/arena.cpp

@@ -310,7 +310,9 @@ void Arena::destruct_contents() {

   // reset size before chop to avoid a rare racing condition

   // that can have total arena memory exceed total chunk memory

   set_size_in_bytes(0);

-  _first->chop();

+  if (_first != NULL) {

+    _first->chop();

+  }

   reset();

 }

commit f8a9602a0a65cdc98eb940aac9529256ded2bf42

Author: Yasumasa Suenaga <ysuenaga@openjdk.org>

Date:   Thu Jan 21 06:08:13 2021 +0000

    8260025: Missing comma in VM_Version_Ext::_family_id_amd

    Reviewed-by: dholmes, stuefe

diff --git src/hotspot/cpu/x86/vm_version_ext_x86.cpp src/hotspot/cpu/x86/vm_version_ext_x86.cpp

index 30d9494c654..a84b37f7977 100644

--- src/hotspot/cpu/x86/vm_version_ext_x86.cpp

+++ src/hotspot/cpu/x86/vm_version_ext_x86.cpp

@@ -1,5 +1,5 @@

 /*

- * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.

+ * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.

  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

  *

  * This code is free software; you can redistribute it and/or modify it

@@ -739,7 +739,7 @@ const char* const VM_Version_Ext::_family_id_amd[ExtendedFamilyIdLength_AMD] = {

   "",

   "",

   "Opteron/Athlon64",

-  "Opteron QC/Phenom"  // Barcelona et.al.

+  "Opteron QC/Phenom",  // Barcelona et.al.

   "",

   "",

   "",