handle negative ttl correctly

Signed-off-by: Ran Shidlansik <[email protected]>

Author: ranshid

src/t_hash.c

@@ -1569,18 +1569,20 @@ void hsetexCommand(client *c) {
         set_flags |= HASH_SET_KEEP_EXPIRY;
     else if (expire) {
         if (getLongLongFromObjectOrReply(c, expire, &when, NULL) != C_OK) return;
+        long long basetime = (flags & (OBJ_EXAT | OBJ_PXAT)) ? 0 : commandTimeSnapshot();
+
         if (unit == UNIT_SECONDS) {
             if (when > LLONG_MAX / 1000 || when < LLONG_MIN / 1000) {
                 addReplyErrorExpireTime(c);
                 return;
             }
             when *= 1000;
         }
-        if ((flags & (OBJ_EXAT | OBJ_PXAT)) && when > LLONG_MAX - commandTimeSnapshot()) {
+        if (when > LLONG_MAX - basetime) {
             addReplyErrorExpireTime(c);
             return;
         }
-        when += commandTimeSnapshot();
+        when += basetime;
 
         if (((flags & OBJ_PXAT) || (flags & OBJ_EXAT)) && checkAlreadyExpired(when)) {
             set_expired = 1;
@@ -1678,20 +1680,24 @@ void hgetexCommand(client *c) {
         persist = 1;
     } else if (expire) {
         if (getLongLongFromObjectOrReply(c, expire, &when, NULL) != C_OK) return;
+        long long basetime = (flags & (OBJ_EXAT | OBJ_PXAT)) ? 0 : commandTimeSnapshot();
+
         if (unit == UNIT_SECONDS) {
             if (when > LLONG_MAX / 1000 || when < LLONG_MIN / 1000) {
                 addReplyErrorExpireTime(c);
                 return;
             }
             when *= 1000;
         }
-        if ((flags & (OBJ_EXAT | OBJ_PXAT)) && when > LLONG_MAX - commandTimeSnapshot()) {
+        if (when > LLONG_MAX - basetime) {
             addReplyErrorExpireTime(c);
             return;
         }
-        when += commandTimeSnapshot();
+        when += basetime;
+
         if (((flags & OBJ_PXAT) || (flags & OBJ_EXAT)) && checkAlreadyExpired(when)) {
             set_expired = 1;
+            when = 0;
         } else {
             set_expiry = 1;
         }