diff --git a/ext/calendar/gregor.c b/ext/calendar/gregor.c
index dab12e5187df5..17dc6db0e6315 100644
--- a/ext/calendar/gregor.c
+++ b/ext/calendar/gregor.c
@@ -148,11 +148,15 @@ void SdnToGregorian(
 	int dayOfYear;
 
 	if (sdn <= 0 ||
-			sdn > (LONG_MAX - 4 * GREGOR_SDN_OFFSET) / 4) {
+			sdn > (ZEND_LONG_MAX - 4 * GREGOR_SDN_OFFSET) / 4) {
 		goto fail;
 	}
 	temp = (sdn + GREGOR_SDN_OFFSET) * 4 - 1;
 
+	if (temp < 0 || (temp / DAYS_PER_400_YEARS) > INT_MAX) {
+		goto fail;
+	}
+
 	/* Calculate the century (year/100). */
 	century = temp / DAYS_PER_400_YEARS;
 
diff --git a/ext/calendar/tests/gh16235.phpt b/ext/calendar/tests/gh16235.phpt
new file mode 100644
index 0000000000000..6b8856209828c
--- /dev/null
+++ b/ext/calendar/tests/gh16235.phpt
@@ -0,0 +1,11 @@
+--TEST--
+GH-16235 (jdtogregorian overflow on argument)
+--EXTENSIONS--
+calendar
+--FILE--
+<?php
+jdtogregorian(536838867);
+echo "DONE";
+?>
+--EXPECT--
+DONE