caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-23 00:28:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Free fakeclient argv on AOF error.

Browse Source 
We exit later, so no bug fixed, but it is more correct.

See #6054, thanks to @ShooterIT for finding the issue.
This commit is contained in:
antirez 2020-01-10 13:02:45 +01:00
parent 5234bff579
commit 9466dae4e5
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/aof.c
View File

@ -781,18 +781,24 @@ int loadAppendOnlyFile(char *filename) {
argc = atoi(buf+1); argc = atoi(buf+1);
if (argc < 1) goto fmterr; if (argc < 1) goto fmterr;
/* Load the next command in the AOF as our fake client
* argv. */
argv = zmalloc(sizeof(robj*)*argc); argv = zmalloc(sizeof(robj*)*argc);
fakeClient->argc = argc; fakeClient->argc = argc;
fakeClient->argv = argv; fakeClient->argv = argv;
for (j = 0; j < argc; j++) { for (j = 0; j < argc; j++) {
if (fgets(buf,sizeof(buf),fp) == NULL) { /* Parse the argument len. */
if (fgets(buf,sizeof(buf),fp) == NULL ||
buf[0] != '$')
{
fakeClient->argc = j; /* Free up to j-1. */ fakeClient->argc = j; /* Free up to j-1. */
freeFakeClientArgv(fakeClient); freeFakeClientArgv(fakeClient);
goto readerr; goto readerr;
} }
if (buf[0] != '$') goto fmterr;
len = strtol(buf+1,NULL,10); len = strtol(buf+1,NULL,10);
/* Read it into a string object. */
argsds = sdsnewlen(SDS_NOINIT,len); argsds = sdsnewlen(SDS_NOINIT,len);
if (len && fread(argsds,len,1,fp) == 0) { if (len && fread(argsds,len,1,fp) == 0) {
sdsfree(argsds); sdsfree(argsds);
@ -801,10 +807,12 @@ int loadAppendOnlyFile(char *filename) {
goto readerr; goto readerr;
} }
argv[j] = createObject(OBJ_STRING,argsds); argv[j] = createObject(OBJ_STRING,argsds);
/* Discard CRLF. */
if (fread(buf,2,1,fp) == 0) { if (fread(buf,2,1,fp) == 0) {
fakeClient->argc = j+1; /* Free up to j. */ fakeClient->argc = j+1; /* Free up to j. */
freeFakeClientArgv(fakeClient); freeFakeClientArgv(fakeClient);
goto readerr; /* discard CRLF */ goto readerr;
} }
} }