Raincloud/sheepit-shadow-nabber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Utils-fixes' into 'master'

Browse Source 
Fix numeric overflow

See merge request sheepitrenderfarm/client!247
This commit is contained in:
Sheepit Renderfarm
2023-10-01 16:30:02 +00:00
parent 6d050d7fd9 e99d1fa668
commit 3000bac86c
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/com/sheepit/client/Utils.java
View File

@@ -255,23 +255,16 @@ public class Utils {
} }
final Matcher m = Pattern.compile("([\\d.,]+)\\s*(\\w)").matcher(in); final Matcher m = Pattern.compile("([\\d.,]+)\\s*(\\w)").matcher(in);
m.find(); m.find();
int scale = 1; long scale = 1;
switch (m.group(2).charAt(0)) { switch (Character.toUpperCase(m.group(2).charAt(0))) {
case 'T': case 'T':
case 't': scale *= 1000; //Multiply by 1000 each time the higher the metric prefix
scale = 1000 * 1000 * 1000 * 1000; case 'G': //Note the lack of break statements, thus it executes through
break; scale *= 1000;
case 'G':
case 'g':
scale = 1000 * 1000 * 1000;
break;
case 'M': case 'M':
case 'm': scale *= 1000;
scale = 1000 * 1000;
break;
case 'K': case 'K':
case 'k': scale *= 1000;
scale = 1000;
break; break;
} }
return Math.round(Double.parseDouble(m.group(1)) * scale); return Math.round(Double.parseDouble(m.group(1)) * scale);