From f16559168af0e11f74ccb3bfca7961d57a2de84e Mon Sep 17 00:00:00 2001 From: MBaesken Date: Wed, 8 Jan 2025 15:51:33 +0100 Subject: [PATCH 1/2] JDK-8347268 --- src/hotspot/share/logging/logOutput.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/hotspot/share/logging/logOutput.cpp b/src/hotspot/share/logging/logOutput.cpp index 17d0e8b555d60..c768a9d810931 100644 --- a/src/hotspot/share/logging/logOutput.cpp +++ b/src/hotspot/share/logging/logOutput.cpp @@ -354,7 +354,9 @@ bool LogOutput::parse_options(const char* options, outputStream* errstream) { } break; } - pos = comma_pos + 1; + if (comma_pos != nullptr) { + pos = comma_pos + 1; + } } while (comma_pos != nullptr); os::free(opts); From 7823d2a00a72a0d21f4cd926ebc86b5d12d4817b Mon Sep 17 00:00:00 2001 From: MBaesken Date: Wed, 8 Jan 2025 15:55:09 +0100 Subject: [PATCH 2/2] adjust COPYRIGHT year info --- src/hotspot/share/logging/logOutput.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hotspot/share/logging/logOutput.cpp b/src/hotspot/share/logging/logOutput.cpp index c768a9d810931..6eba01d8aa6c6 100644 --- a/src/hotspot/share/logging/logOutput.cpp +++ b/src/hotspot/share/logging/logOutput.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2025, 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