Handle possible invalid date value (#61652)

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1855627 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/poi/ss/formula/functions/EDate.java b/src/java/org/apache/poi/ss/formula/functions/EDate.java
index d4998b84b40646b4469b140944d4dd7aeeee9584..3faec3dd84bce83ccccf8f2f9f1f056778011e17 100644 (file)
--- a/src/java/org/apache/poi/ss/formula/functions/EDate.java
+++ b/src/java/org/apache/poi/ss/formula/functions/EDate.java
@@ -45,6 +45,9 @@ public class EDate implements FreeRefFunction {
             int offsetInMonthAsNumber = (int) getValue(args[1]);
 
             Date startDate = DateUtil.getJavaDate(startDateAsNumber);
+            if (startDate == null) {
+                return ErrorEval.VALUE_INVALID;
+            }
             Calendar calendar = LocaleUtil.getLocaleCalendar();
             calendar.setTime(startDate);
             calendar.add(Calendar.MONTH, offsetInMonthAsNumber);