From: OpenJDK Team <openjdk-17@packages.debian.org>
Date: Thu, 17 Oct 2024 20:50:46 +0000 (+0200)
Subject: default-jvm-cfg
X-Git-Tag: archive/raspbian/17.0.13+11-2_deb12u1+rpi1^2~35
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=73e8f722b5a68bed468c0e6ddecb1346f7198df3;p=openjdk-17.git

default-jvm-cfg


Gbp-Pq: Name default-jvm-cfg.diff
---

diff --git a/src/java.base/share/native/libjli/java.c b/src/java.base/share/native/libjli/java.c
index 18c515d86..ddfe4aad4 100644
--- a/src/java.base/share/native/libjli/java.c
+++ b/src/java.base/share/native/libjli/java.c
@@ -2004,7 +2004,7 @@ jint
 ReadKnownVMs(const char *jvmCfgName, jboolean speculative)
 {
     FILE *jvmCfg;
-    char line[MAXPATHLEN+20];
+    char line[MAXPATHLEN+30];
     int cnt = 0;
     int lineno = 0;
     jlong start = 0, end = 0;
@@ -2018,6 +2018,11 @@ ReadKnownVMs(const char *jvmCfgName, jboolean speculative)
     }
 
     jvmCfg = fopen(jvmCfgName, "r");
+    if (jvmCfg == NULL) {
+      char cfgName[strlen(jvmCfgName)+10];
+      sprintf(cfgName, "%s-default", jvmCfgName);
+      jvmCfg = fopen(cfgName, "r");
+    }
     if (jvmCfg == NULL) {
       if (!speculative) {
         JLI_ReportErrorMessage(CFG_ERROR6, jvmCfgName);