fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-05-01 13:32:13 +00:00
Code Issues Projects Releases Wiki Activity

Fix RESTORE ttl handling in 32 bit archs.

Browse Source 
long was used instead of long long in order to handle a 64 bit
resolution millisecond timestamp.

This fixes issue #1483.
This commit is contained in:
antirez 2014-01-09 11:09:23 +01:00
parent 51f71e2d8e
commit e4c51759f5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/migrate.c
View File

@ -84,7 +84,7 @@ void dumpCommand(redisClient *c) {
/* RESTORE key ttl serialized-value */ /* RESTORE key ttl serialized-value */
void restoreCommand(redisClient *c) { void restoreCommand(redisClient *c) {
long ttl; long long ttl;
rio payload; rio payload;
int type; int type;
robj *obj; robj *obj;
@ -96,7 +96,7 @@ void restoreCommand(redisClient *c) {
} }
/* Check if the TTL value makes sense */ /* Check if the TTL value makes sense */
if (getLongFromObjectOrReply(c,c->argv[2],&ttl,NULL) != REDIS_OK) { if (getLongLongFromObjectOrReply(c,c->argv[2],&ttl,NULL) != REDIS_OK) {
return; return;
} else if (ttl < 0) { } else if (ttl < 0) {
addReplyError(c,"Invalid TTL value, must be >= 0"); addReplyError(c,"Invalid TTL value, must be >= 0");
@ -104,7 +104,8 @@ void restoreCommand(redisClient *c) {
} }
/* Verify RDB version and data checksum. */ /* Verify RDB version and data checksum. */
if (verifyDumpPayload(c->argv[3]->ptr,sdslen(c->argv[3]->ptr)) == REDIS_ERR) { if (verifyDumpPayload(c->argv[3]->ptr,sdslen(c->argv[3]->ptr)) == REDIS_ERR)
{
addReplyError(c,"DUMP payload version or checksum are wrong"); addReplyError(c,"DUMP payload version or checksum are wrong");
return; return;
} }