From 1d252c7845a042e034c01f56fe40ea7890fee5ed Mon Sep 17 00:00:00 2001 From: Greg Woolsey Date: Sat, 16 Mar 2019 06:55:16 +0000 Subject: [PATCH] Handle possible invalid date value (#61652) git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1855627 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/poi/ss/formula/functions/EDate.java | 3 +++ 1 file changed, 3 insertions(+) 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 d4998b84b4..3faec3dd84 100644 --- 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); -- 2.39.5