Skip to content

Commit 6afff3e

Browse files
committed
NOISSUE prevent -version being passed to the JRE
We want specific JREs, always, not something that is magically resolved. This counteracts some really bad advice recently being spread on reddit.
1 parent e4d8ae5 commit 6afff3e

File tree

3 files changed

+15
-2
lines changed

3 files changed

+15
-2
lines changed

launcher/JavaCommon.cpp

+11
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,17 @@ bool JavaCommon::checkJVMArgs(QString jvmargs, QWidget *parent)
1717
QMessageBox::Warning)->exec();
1818
return false;
1919
}
20+
// block lunacy with passing required version to the JVM
21+
if (jvmargs.contains(QRegExp("-version:.*"))) {
22+
auto warnStr = QObject::tr(
23+
"You tried to pass required java version argument to the JVM (using \"-version=xxx\"). This is not safe and will not be allowed.\n"
24+
"This message will be displayed until you remove this from the JVM arguments.");
25+
CustomMessageBox::selectable(
26+
parent, QObject::tr("JVM arguments warning"),
27+
warnStr,
28+
QMessageBox::Warning)->exec();
29+
return false;
30+
}
2031
return true;
2132
}
2233

launcher/LaunchController.cpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@ void LaunchController::executeTask()
3636
return;
3737
}
3838

39-
JavaCommon::checkJVMArgs(m_instance->settings()->get("JvmArgs").toString(), m_parentWidget);
39+
if(!JavaCommon::checkJVMArgs(m_instance->settings()->get("JvmArgs").toString(), m_parentWidget)) {
40+
emitFailed(tr("Invalid Java arguments specified. Please fix this first."));
41+
return;
42+
}
4043

4144
login();
4245
}

launcher/ui/pages/instance/InstanceSettingsPage.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@ void InstanceSettingsPage::applySettings()
141141
if(javaArgs)
142142
{
143143
m_settings->set("JvmArgs", ui->jvmArgsTextBox->toPlainText().replace("\n", " "));
144-
JavaCommon::checkJVMArgs(m_settings->get("JvmArgs").toString(), this->parentWidget());
145144
}
146145
else
147146
{

0 commit comments

Comments
 (0)