Skip to content

[java] Guard against NPE in Platform.extractFromSysProperty #17151

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
asolntsev merged 3 commits into from
Mar 1, 2026
Merged

[java] Guard against NPE in Platform.extractFromSysProperty #17151

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
906b515
[java] Guard against NPE in Platform.extractFromSysProperty
seethinajayadileep Mar 1, 2026
d9b2aa7
[java] Improve null-safety and formatting in Platform.extractFromSysP…
seethinajayadileep Mar 1, 2026
95fc579
[java] Harden Platform.extractFromSysProperty against null inputs
seethinajayadileep Mar 1, 2026
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
4 changes: 3 additions & 1 deletion java/src/org/openqa/selenium/Platform.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ public static Platform getCurrent() {
* @return the most likely platform based on given operating system name
*/
public static Platform extractFromSysProperty(String osName) {
return extractFromSysProperty(osName, System.getProperty("os.version"));
return extractFromSysProperty(osName, System.getProperty("os.version", ""));
Comment thread
asolntsev marked this conversation as resolved.
}

/**
Expand All @@ -428,7 +428,9 @@ public static Platform extractFromSysProperty(String osName) {
* @return the most likely platform based on given operating system name and version
*/
public static Platform extractFromSysProperty(String osName, String osVersion) {
osName = osName == null ? "" : osName;
osName = osName.toLowerCase(Locale.ENGLISH);
osVersion = osVersion == null ? "" : osVersion;
Comment thread
asolntsev marked this conversation as resolved.
Outdated
// os.name for android is linux
if ("dalvik".equalsIgnoreCase(System.getProperty("java.vm.name"))) {
return Platform.ANDROID;
Expand Down
Loading