1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
Description: tools/jpackage/share/AppLauncherEnvTest.java fails with dynamically linked libstdc++
The generated image contains libjpackageapplauncheraux.so that
contains a destructor function dcon(). It calls already disposed
logger, causing a crash.
Author: Vladimir Petko <vpetko@openjdk.org>
Origin: upstream, https://github.com/openjdk/jdk/commit/78a8a99d990dcc0b77c096bb2ca2c1bb86462e3f
Bug: https://bugs.openjdk.org/browse/JDK-8312488
Reviewed-By: asemenyuk, almatvee
Last-Update: 2024-07-18
---
--- a/src/jdk.jpackage/share/native/common/app.cpp
+++ b/src/jdk.jpackage/share/native/common/app.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2023, 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
@@ -35,7 +35,7 @@
namespace {
const std::string* theLastErrorMsg = 0;
-NopLogAppender nopLogAppender;
+char nopLogAppenderMemory[sizeof(NopLogAppender)] = {};
class StandardLogAppender : public LogAppender {
public:
@@ -46,7 +46,9 @@
<< ": " << v.message
<< std::endl;
}
-} standardLogAppender;
+};
+
+char standardLogAppenderMemory[sizeof(StandardLogAppender)] = {};
class LastErrorLogAppender : public LogAppender {
public:
@@ -114,10 +116,13 @@
int launch(const std::nothrow_t&,
LauncherFunc func, LogAppender* lastErrorLogAppender) {
+ // The log appender is set for the lifetime of the application.
+ // Use in-place new to avoid accessing destroyed instance
+ // when the shared object destructor logs something.
if (isWithLogging()) {
- Logger::defaultLogger().setAppender(standardLogAppender);
+ Logger::defaultLogger().setAppender(*new (standardLogAppenderMemory) StandardLogAppender());
} else {
- Logger::defaultLogger().setAppender(nopLogAppender);
+ Logger::defaultLogger().setAppender(*new (nopLogAppenderMemory) NopLogAppender());
}
LOG_TRACE_FUNCTION();
|
