Backport 82e16ba248a97e3446d5b2d64c353b61dd6bdda6

duke · duke · commit 2e2580142398 · 2025-02-12T11:37:47.000Z
diff --git 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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* This code is free software; you can redistribute it and/or modify it`
`@@ -354,7 +354,9 @@ bool LogOutput::parse_options(const char* options, outputStream* errstream) {`
`354`	`354`	`}`
`355`	`355`	`break;`
`356`	`356`	`}`
`357`		`- pos = comma_pos + 1;`
	`357`	`+ if (comma_pos != nullptr) {`
	`358`	`+ pos = comma_pos + 1;`
	`359`	`+ }`
`358`	`360`	`} while (comma_pos != nullptr);`
`359`	`361`
`360`	`362`	`os::free(opts);`