Add exception handling for BigDecimal parsing

DolphFlynn · Jan 11, 2025 · 9e7366b · 9e7366b
1 parent 6e09489
commit 9e7366b
Showing 1 changed file with 18 additions and 14 deletions.
diff --git a/src/main/java/com/blackberry/jwteditor/model/jose/TimeClaimFactory.java b/src/main/java/com/blackberry/jwteditor/model/jose/TimeClaimFactory.java
@@ -80,22 +80,26 @@ private static ZonedDateTime dateTimeValue(String numberValue) {
             return null;
         }
 
-        // Try to parse string time value as BigDecimal to keep the floating point precision
-        BigDecimal epochSecondsDecimal = new BigDecimal(numberValue);
-
-        // Truncate decimal part of the value to get the seconds
-        long seconds = epochSecondsDecimal.longValue();
-        if (seconds < 0) {
+        try {
+            // Try to parse string time value as BigDecimal to keep the floating point precision
+            BigDecimal epochSecondsDecimal = new BigDecimal(numberValue);
+
+            // Truncate decimal part of the value to get the seconds
+            long seconds = epochSecondsDecimal.longValue();
+            if (seconds < 0) {
+                return null;
+            }
+
+            // Get decimal part as nanoseconds
+            long nanoseconds = epochSecondsDecimal.subtract(new BigDecimal(seconds))
+                    .movePointRight(9)
+                    .longValue();
+
+            Instant instant = Instant.ofEpochSecond(seconds, nanoseconds);
+            return ZonedDateTime.ofInstant(instant, UTC);
+        } catch (NumberFormatException | ArithmeticException e) {
             return null;
         }
-
-        // Get decimal part as nanoseconds
-        long nanoseconds = epochSecondsDecimal.subtract(new BigDecimal(seconds))
-                .movePointRight(9)
-                .longValue();
-
-        Instant instant = Instant.ofEpochSecond(seconds, nanoseconds);
-        return ZonedDateTime.ofInstant(instant, UTC);
     }
 
     private static ZonedDateTime parseDateTime(String value) {