From 986647e3726faa3ae94aa84201d316fb03eaa151 Mon Sep 17 00:00:00 2001 From: Chris Frohoff Date: Fri, 16 Nov 2018 17:35:24 -0800 Subject: [PATCH] more robust java version parsing --- src/main/java/ysoserial/payloads/util/JavaVersion.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/ysoserial/payloads/util/JavaVersion.java b/src/main/java/ysoserial/payloads/util/JavaVersion.java index bba90b9..0c43c87 100644 --- a/src/main/java/ysoserial/payloads/util/JavaVersion.java +++ b/src/main/java/ysoserial/payloads/util/JavaVersion.java @@ -21,9 +21,10 @@ public class JavaVersion { } JavaVersion v = new JavaVersion(); String parts[] = property.split("\\.|_|-"); - v.major = Integer.parseInt(parts[1]); - v.minor = Integer.parseInt(parts[2]); - v.update = Integer.parseInt(parts[3]); + int start = "1".equals(parts[0]) ? 1 : 0; // skip "1." prefix + v.major = Integer.parseInt(parts[start + 0]); + v.minor = Integer.parseInt(parts[start + 1]); + v.update = Integer.parseInt(parts[start + 2]); return v; }