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

Merge pull request #7375 from hwware/lcs_crash_fix

Browse Source 
Fix Server Crash in LCS Command
This commit is contained in:
Salvatore Sanfilippo 2020-06-12 12:31:15 +02:00 committed by GitHub
commit a66298e6f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/t_string.c
View File

@ -516,13 +516,13 @@ void stralgoLCS(client *c) {
withmatchlen = 1; withmatchlen = 1;
} else if (!strcasecmp(opt,"MINMATCHLEN") && moreargs) { } else if (!strcasecmp(opt,"MINMATCHLEN") && moreargs) {
if (getLongLongFromObjectOrReply(c,c->argv[j+1],&minmatchlen,NULL) if (getLongLongFromObjectOrReply(c,c->argv[j+1],&minmatchlen,NULL)
!= C_OK) return; != C_OK) goto clean_up_obj;
if (minmatchlen < 0) minmatchlen = 0; if (minmatchlen < 0) minmatchlen = 0;
j++; j++;
} else if (!strcasecmp(opt,"STRINGS") && moreargs > 1) { } else if (!strcasecmp(opt,"STRINGS") && moreargs > 1) {
if (a != NULL) { if (a != NULL) {
addReplyError(c,"Either use STRINGS or KEYS"); addReplyError(c,"Either use STRINGS or KEYS");
return; goto clean_up_obj;
} }
a = c->argv[j+1]->ptr; a = c->argv[j+1]->ptr;
b = c->argv[j+2]->ptr; b = c->argv[j+2]->ptr;
@ -530,10 +530,14 @@ void stralgoLCS(client *c) {
} else if (!strcasecmp(opt,"KEYS") && moreargs > 1) { } else if (!strcasecmp(opt,"KEYS") && moreargs > 1) {
if (a != NULL) { if (a != NULL) {
addReplyError(c,"Either use STRINGS or KEYS"); addReplyError(c,"Either use STRINGS or KEYS");
return; goto clean_up_obj;
} }
obja = lookupKeyRead(c->db,c->argv[j+1]); obja = lookupKeyRead(c->db,c->argv[j+1]);
objb = lookupKeyRead(c->db,c->argv[j+2]); objb = lookupKeyRead(c->db,c->argv[j+2]);
if ( !(obja->type == OBJ_STRING) || !(objb->type == OBJ_STRING) ) {
addReplyError(c,"Object associate with KEYS option should only be string type");
goto clean_up_obj;
}
obja = obja ? getDecodedObject(obja) : createStringObject("",0); obja = obja ? getDecodedObject(obja) : createStringObject("",0);
objb = objb ? getDecodedObject(objb) : createStringObject("",0); objb = objb ? getDecodedObject(objb) : createStringObject("",0);
a = obja->ptr; a = obja->ptr;
@ -541,7 +545,7 @@ void stralgoLCS(client *c) {
j += 2; j += 2;
} else { } else {
addReply(c,shared.syntaxerr); addReply(c,shared.syntaxerr);
return; goto clean_up_obj;
} }
} }
@ -549,12 +553,12 @@ void stralgoLCS(client *c) {
if (a == NULL) { if (a == NULL) {
addReplyError(c,"Please specify two strings: " addReplyError(c,"Please specify two strings: "
"STRINGS or KEYS options are mandatory"); "STRINGS or KEYS options are mandatory");
return; goto clean_up_obj;
} else if (getlen && getidx) { } else if (getlen && getidx) {
addReplyError(c, addReplyError(c,
"If you want both the length and indexes, please " "If you want both the length and indexes, please "
"just use IDX."); "just use IDX.");
return; goto clean_up_obj;
} }
/* Compute the LCS using the vanilla dynamic programming technique of /* Compute the LCS using the vanilla dynamic programming technique of
@ -689,10 +693,12 @@ void stralgoLCS(client *c) {
} }
/* Cleanup. */ /* Cleanup. */
if (obja) decrRefCount(obja);
if (objb) decrRefCount(objb);
sdsfree(result); sdsfree(result);
zfree(lcs); zfree(lcs);
clean_up_obj:
if (obja) decrRefCount(obja);
if (objb) decrRefCount(objb);
return; return;
} }