diff --git a/ChangeLog b/ChangeLog
index 2cb180dc8..ae2d13228 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
+2019-03-05  Werner Lemberg  <wl@gnu.org>
+
+	[base] Handle numeric overflow (#55827).
+
+	* src/base/ftglyph.c (FT_Glyph_Get_CBox): Use `FT_PIX_CEIL_LONG'.
+
 2019-03-05  Sebastian Rasmussen  <sebras@gmail.com>
 
-	[psaux] Fix use of uninitialized memory.
+	[psaux] Fix use of uninitialized memory (#55832).
 
 	* src/psaux/psintrp.c (cf2_interpT2CharString): The call to
 	`cf2_arrstack_setCount' may fail because the allocator ran out of
diff --git a/src/base/ftglyph.c b/src/base/ftglyph.c
index 6d30be0b5..e6b132790 100644
--- a/src/base/ftglyph.c
+++ b/src/base/ftglyph.c
@@ -513,8 +513,8 @@
     {
       acbox->xMin = FT_PIX_FLOOR( acbox->xMin );
       acbox->yMin = FT_PIX_FLOOR( acbox->yMin );
-      acbox->xMax = FT_PIX_CEIL( acbox->xMax );
-      acbox->yMax = FT_PIX_CEIL( acbox->yMax );
+      acbox->xMax = FT_PIX_CEIL_LONG( acbox->xMax );
+      acbox->yMax = FT_PIX_CEIL_LONG( acbox->yMax );
     }
 
     /* convert to integer pixels if needed */