diff --git a/third_party/hiredis/hiredis.c b/third_party/hiredis/hiredis.c
index 67c2185ac..1178e0275 100644
--- a/third_party/hiredis/hiredis.c
+++ b/third_party/hiredis/hiredis.c
@@ -194,6 +194,7 @@ static void *createArrayObject(const redisReadTask *task, size_t elements) {
         return NULL;
 
     if (elements > 0) {
+        if (SIZE_MAX / sizeof(redisReply*) < elements) return NULL;  /* Don't overflow */
         r->element = hi_calloc(elements,sizeof(redisReply*));
         if (r->element == NULL) {
             freeReplyObject(r);