gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #6656 from oranagra/leak_rm_load_from_str

Browse Source 
fix leak in RM_LoadDataTypeFromString, and save
This commit is contained in:
Salvatore Sanfilippo 2019-12-11 11:39:27 +01:00 committed by GitHub
commit c6fb9d0963
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/module.c
View File

@ -3963,6 +3963,7 @@ void RM_DigestEndSequence(RedisModuleDigest *md) {
void *RM_LoadDataTypeFromString(const RedisModuleString *str, const moduleType *mt) { void *RM_LoadDataTypeFromString(const RedisModuleString *str, const moduleType *mt) {
rio payload; rio payload;
RedisModuleIO io; RedisModuleIO io;
void *ret;
rioInitWithBuffer(&payload, str->ptr); rioInitWithBuffer(&payload, str->ptr);
moduleInitIOContext(io,(moduleType *)mt,&payload,NULL); moduleInitIOContext(io,(moduleType *)mt,&payload,NULL);
@ -3971,7 +3972,12 @@ void *RM_LoadDataTypeFromString(const RedisModuleString *str, const moduleType *
* need to make sure we read the same. * need to make sure we read the same.
*/ */
io.ver = 2; io.ver = 2;
return mt->rdb_load(&io,0); ret = mt->rdb_load(&io,0);
if (io.ctx) {
moduleFreeContext(io.ctx);
zfree(io.ctx);
}
return ret;
} }
/* Encode a module data type 'mt' value 'data' into serialized form, and return it /* Encode a module data type 'mt' value 'data' into serialized form, and return it
@ -3989,11 +3995,15 @@ RedisModuleString *RM_SaveDataTypeToString(RedisModuleCtx *ctx, void *data, cons
rioInitWithBuffer(&payload,sdsempty()); rioInitWithBuffer(&payload,sdsempty());
moduleInitIOContext(io,(moduleType *)mt,&payload,NULL); moduleInitIOContext(io,(moduleType *)mt,&payload,NULL);
mt->rdb_save(&io,data); mt->rdb_save(&io,data);
if (io.ctx) {
moduleFreeContext(io.ctx);
zfree(io.ctx);
}
if (io.error) { if (io.error) {
return NULL; return NULL;
} else { } else {
robj *str = createObject(OBJ_STRING,payload.io.buffer.ptr); robj *str = createObject(OBJ_STRING,payload.io.buffer.ptr);
autoMemoryAdd(ctx,REDISMODULE_AM_STRING,str); if (ctx != NULL) autoMemoryAdd(ctx,REDISMODULE_AM_STRING,str);
return str; return str;
} }
} }