From 362f2a84bd67a1b65d810b064163e8432c79138e Mon Sep 17 00:00:00 2001
From: sundb <sundbcn@gmail.com>
Date: Mon, 22 Feb 2021 14:45:26 +0800
Subject: [PATCH] Improve overflow check of expire time (#8519)

When milliseconds == LLONG_MAX / 1000, *1000 will not overflow.
---
 src/t_string.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/t_string.c b/src/t_string.c
index cdf69110f..3f73363e0 100644
--- a/src/t_string.c
+++ b/src/t_string.c
@@ -78,7 +78,7 @@ void setGenericCommand(client *c, int flags, robj *key, robj *val, robj *expire,
     if (expire) {
         if (getLongLongFromObjectOrReply(c, expire, &milliseconds, NULL) != C_OK)
             return;
-        if (milliseconds <= 0 || (unit == UNIT_SECONDS && milliseconds >= LLONG_MAX / 1000)) {
+        if (milliseconds <= 0 || (unit == UNIT_SECONDS && milliseconds > LLONG_MAX / 1000)) {
             /* Negative value provided or multiplication is gonna overflow. */
             addReplyErrorFormat(c, "invalid expire time in %s", c->cmd->name);
             return;
@@ -344,7 +344,7 @@ void getexCommand(client *c) {
     if (expire) {
         if (getLongLongFromObjectOrReply(c, expire, &milliseconds, NULL) != C_OK)
             return;
-        if (milliseconds <= 0 || (unit == UNIT_SECONDS && milliseconds >= LLONG_MAX / 1000)) {
+        if (milliseconds <= 0 || (unit == UNIT_SECONDS && milliseconds > LLONG_MAX / 1000)) {
             /* Negative value provided or multiplication is gonna overflow. */
             addReplyErrorFormat(c, "invalid expire time in %s", c->cmd->name);
             return;