Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-22 04:05:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

GP-4874: Cleanup

Browse Source
This commit is contained in:
Ryan Kurtz 2024-08-27 13:19:39 -04:00
parent 62b96db10b
commit 1e68becd75
2 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Ghidra/Features/Base/src/main/java/ghidra/app/script/AskDialog.java
View File

@ -246,17 +246,12 @@ public class AskDialog<T> extends DialogComponentProvider {
protected Integer getValueAsInt() {
String text = getValueAsString();
if (text == null) {
return null;
}
return NumericUtilities.parseInt(text);
return text != null ? NumericUtilities.parseInt(text) : null;
}
protected Long getValueAsLong() {
String text = getValueAsString();
return text != null ? Long.decode(text) : null;
return text != null ? NumericUtilities.parseLong(text) : null;
}
protected Double getValueAsDouble() {

51
Ghidra/Framework/Generic/src/main/java/ghidra/util/NumericUtilities.java
View File

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -98,36 +98,39 @@ public final class NumericUtilities {
}
/**
* Parses the given string as a numeric value, detecting whether or not it begins with a Hex
* prefix, and if not, parses as a int value.
* Parses the given decimal/hex string as an {@code int} value. This method allows values with
* the top bit set to be implicitly parsed as negative values.
*
* @param s the string to parse
* @return the {@code int} value, or 0 if the string to parse is null or blank
* @throws NumberFormatException if the string does not represent a valid {@code int} value
*/
public static int parseInt(String numStr) {
String origStr = numStr;
int value = 0;
public static int parseInt(String s) {
String origStr = s;
int sign = 1;
numStr = (numStr == null ? "" : numStr.trim());
if (numStr.length() == 0) {
return value;
s = (s == null ? "" : s.trim());
if (s.length() == 0) {
return 0;
}
if (numStr.startsWith("-")) {
if (s.startsWith("-")) {
sign = -1;
numStr = numStr.substring(1);
s = s.substring(1);
}
int radix = 10;
if (numStr.startsWith(HEX_PREFIX_x) || numStr.startsWith(HEX_PREFIX_X)) {
if (numStr.length() > 10) {
throw new NumberFormatException(numStr + " has too many digits.");
if (s.startsWith(HEX_PREFIX_x) || s.startsWith(HEX_PREFIX_X)) {
if (s.length() > 10) {
throw new NumberFormatException(s + " has too many digits.");
}
numStr = numStr.substring(2);
s = s.substring(2);
radix = 16;
}
if (numStr.length() == 0) {
if (s.length() == 0) {
return 0;
}
try {
BigInteger bi = new BigInteger(numStr, radix);
BigInteger bi = new BigInteger(s, radix);
return bi.intValue() * sign;
}
catch (NumberFormatException e) {
@ -144,20 +147,20 @@ public final class NumericUtilities {
}
/**
* Parses the given string as a numeric value, detecting whether or not it begins with a Hex
* prefix, and if not, parses as a long int value.
* Parses the given decimal/hex string as a {@code long} value. This method allows values with
* the top bit set to be implicitly parsed as negative values.
*
* @param s the string to parse
* @return the long value
* @throws NumberFormatException if the string is blank or has too many digits
* @return the {@code long} value, or 0 if the string to parse is null or blank
* @throws NumberFormatException if the string does not represent a valid {@code long} value
*/
public static long parseLong(String s) {
String origStr = s;
long value = 0;
long sign = 1;
s = (s == null ? "" : s.trim());
if (s.length() == 0) {
return value;
return 0;
}
if (s.startsWith("-")) {
sign = -1;