Skip to content

[JdkInfo] handle invalid XML from /usr/libexec/java_home #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 4, 2021
Merged

[JdkInfo] handle invalid XML from /usr/libexec/java_home #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/Xamarin.Android.Tools.AndroidSdk/JdkInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,14 @@ static IEnumerable<string> GetLibexecJdkPaths (Action<TraceLevel, string> logger
return;
xml.Append (e.Data);
}, includeStderr: false);
var plist = XElement.Parse (xml.ToString ());

XElement plist;
try {
plist = XElement.Parse (xml.ToString ());
} catch (XmlException e) {
logger (TraceLevel.Warning, string.Format (Resources.InvalidXmlLibExecJdk_path_args_message, jhp.FileName, jhp.Arguments, e.Message));
yield break;
}
foreach (var info in plist.Elements ("array").Elements ("dict")) {
var JVMHomePath = (XNode) info.Elements ("key").FirstOrDefault (e => e.Value == "JVMHomePath");
if (JVMHomePath == null)
Expand Down
9 changes: 9 additions & 0 deletions src/Xamarin.Android.Tools.AndroidSdk/Properties/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions src/Xamarin.Android.Tools.AndroidSdk/Properties/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,4 +130,7 @@
{0} - The path of the file being read.
{1} - The exception message of the associated exception.</comment>
</data>
<data name="InvalidXmlLibExecJdk_path_args_message" xml:space="preserve">
<value>An exception occurred while reading the output of '{0} {1}'. Exception: {2}</value>
</data>
</root>
5 changes: 5 additions & 0 deletions src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.cs.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@
{0} - The path of the file being read.
{1} - The exception message of the associated exception.</note>
</trans-unit>
<trans-unit id="InvalidXmlLibExecJdk_path_args_message">
<source>An exception occurred while reading the output of '{0} {1}'. Exception: {2}</source>
<target state="new">An exception occurred while reading the output of '{0} {1}'. Exception: {2}</target>
<note />
</trans-unit>
</body>
</file>
</xliff>
5 changes: 5 additions & 0 deletions src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.de.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@
{0} - The path of the file being read.
{1} - The exception message of the associated exception.</note>
</trans-unit>
<trans-unit id="InvalidXmlLibExecJdk_path_args_message">
<source>An exception occurred while reading the output of '{0} {1}'. Exception: {2}</source>
<target state="new">An exception occurred while reading the output of '{0} {1}'. Exception: {2}</target>
<note />
</trans-unit>
</body>
</file>
</xliff>
5 changes: 5 additions & 0 deletions src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.es.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@
{0} - The path of the file being read.
{1} - The exception message of the associated exception.</note>
</trans-unit>
<trans-unit id="InvalidXmlLibExecJdk_path_args_message">
<source>An exception occurred while reading the output of '{0} {1}'. Exception: {2}</source>
<target state="new">An exception occurred while reading the output of '{0} {1}'. Exception: {2}</target>
<note />
</trans-unit>
</body>
</file>
</xliff>
5 changes: 5 additions & 0 deletions src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.fr.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@
{0} - The path of the file being read.
{1} - The exception message of the associated exception.</note>
</trans-unit>
<trans-unit id="InvalidXmlLibExecJdk_path_args_message">
<source>An exception occurred while reading the output of '{0} {1}'. Exception: {2}</source>
<target state="new">An exception occurred while reading the output of '{0} {1}'. Exception: {2}</target>
<note />
</trans-unit>
</body>
</file>
</xliff>
5 changes: 5 additions & 0 deletions src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.it.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@
{0} - The path of the file being read.
{1} - The exception message of the associated exception.</note>
</trans-unit>
<trans-unit id="InvalidXmlLibExecJdk_path_args_message">
<source>An exception occurred while reading the output of '{0} {1}'. Exception: {2}</source>
<target state="new">An exception occurred while reading the output of '{0} {1}'. Exception: {2}</target>
<note />
</trans-unit>
</body>
</file>
</xliff>
5 changes: 5 additions & 0 deletions src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.ja.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@
{0} - The path of the file being read.
{1} - The exception message of the associated exception.</note>
</trans-unit>
<trans-unit id="InvalidXmlLibExecJdk_path_args_message">
<source>An exception occurred while reading the output of '{0} {1}'. Exception: {2}</source>
<target state="new">An exception occurred while reading the output of '{0} {1}'. Exception: {2}</target>
<note />
</trans-unit>
</body>
</file>
</xliff>
5 changes: 5 additions & 0 deletions src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.ko.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@
{0} - The path of the file being read.
{1} - The exception message of the associated exception.</note>
</trans-unit>
<trans-unit id="InvalidXmlLibExecJdk_path_args_message">
<source>An exception occurred while reading the output of '{0} {1}'. Exception: {2}</source>
<target state="new">An exception occurred while reading the output of '{0} {1}'. Exception: {2}</target>
<note />
</trans-unit>
</body>
</file>
</xliff>
5 changes: 5 additions & 0 deletions src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.pl.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@
{0} - The path of the file being read.
{1} - The exception message of the associated exception.</note>
</trans-unit>
<trans-unit id="InvalidXmlLibExecJdk_path_args_message">
<source>An exception occurred while reading the output of '{0} {1}'. Exception: {2}</source>
<target state="new">An exception occurred while reading the output of '{0} {1}'. Exception: {2}</target>
<note />
</trans-unit>
</body>
</file>
</xliff>
5 changes: 5 additions & 0 deletions src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.pt-BR.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@
{0} - The path of the file being read.
{1} - The exception message of the associated exception.</note>
</trans-unit>
<trans-unit id="InvalidXmlLibExecJdk_path_args_message">
<source>An exception occurred while reading the output of '{0} {1}'. Exception: {2}</source>
<target state="new">An exception occurred while reading the output of '{0} {1}'. Exception: {2}</target>
<note />
</trans-unit>
</body>
</file>
</xliff>
5 changes: 5 additions & 0 deletions src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.ru.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@
{0} - The path of the file being read.
{1} - The exception message of the associated exception.</note>
</trans-unit>
<trans-unit id="InvalidXmlLibExecJdk_path_args_message">
<source>An exception occurred while reading the output of '{0} {1}'. Exception: {2}</source>
<target state="new">An exception occurred while reading the output of '{0} {1}'. Exception: {2}</target>
<note />
</trans-unit>
</body>
</file>
</xliff>
5 changes: 5 additions & 0 deletions src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.tr.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@
{0} - The path of the file being read.
{1} - The exception message of the associated exception.</note>
</trans-unit>
<trans-unit id="InvalidXmlLibExecJdk_path_args_message">
<source>An exception occurred while reading the output of '{0} {1}'. Exception: {2}</source>
<target state="new">An exception occurred while reading the output of '{0} {1}'. Exception: {2}</target>
<note />
</trans-unit>
</body>
</file>
</xliff>
5 changes: 5 additions & 0 deletions src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.zh-Hans.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@
{0} - The path of the file being read.
{1} - The exception message of the associated exception.</note>
</trans-unit>
<trans-unit id="InvalidXmlLibExecJdk_path_args_message">
<source>An exception occurred while reading the output of '{0} {1}'. Exception: {2}</source>
<target state="new">An exception occurred while reading the output of '{0} {1}'. Exception: {2}</target>
<note />
</trans-unit>
</body>
</file>
</xliff>
5 changes: 5 additions & 0 deletions src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.zh-Hant.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@
{0} - The path of the file being read.
{1} - The exception message of the associated exception.</note>
</trans-unit>
<trans-unit id="InvalidXmlLibExecJdk_path_args_message">
<source>An exception occurred while reading the output of '{0} {1}'. Exception: {2}</source>
<target state="new">An exception occurred while reading the output of '{0} {1}'. Exception: {2}</target>
<note />
</trans-unit>
</body>
</file>
</xliff>