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

Don't zero out potentially long buffers

Browse Source 
Former-commit-id: 91e76ab4a00546278100baf6dfe61c13e802b40e
This commit is contained in:
John Sully 2021-09-10 00:38:49 +00:00
parent f695e2e26c
commit 8210d67c24
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/object.cpp
View File

@ -102,10 +102,11 @@ robj *createEmbeddedStringObject(const char *ptr, size_t len) {
allocsize = sizeof(void*); allocsize = sizeof(void*);
size_t mvccExtraBytes = g_pserver->fActiveReplica ? sizeof(redisObjectExtended) : 0; size_t mvccExtraBytes = g_pserver->fActiveReplica ? sizeof(redisObjectExtended) : 0;
char *oB = (char*)zcalloc(sizeof(robj)+allocsize-sizeof(redisObject::m_ptr)+mvccExtraBytes, MALLOC_SHARED); char *oB = (char*)zmalloc(sizeof(robj)+allocsize-sizeof(redisObject::m_ptr)+mvccExtraBytes, MALLOC_SHARED);
robj *o = reinterpret_cast<robj*>(oB + mvccExtraBytes); robj *o = reinterpret_cast<robj*>(oB + mvccExtraBytes);
struct sdshdr8 *sh = (sdshdr8*)(&o->m_ptr); struct sdshdr8 *sh = (sdshdr8*)(&o->m_ptr);
new (o) redisObject;
o->type = OBJ_STRING; o->type = OBJ_STRING;
o->encoding = OBJ_ENCODING_EMBSTR; o->encoding = OBJ_ENCODING_EMBSTR;
o->setrefcount(1); o->setrefcount(1);

1
src/server.h
View File

@ -950,6 +950,7 @@ struct redisObjectExtended {
}; };
typedef struct redisObject { typedef struct redisObject {
friend redisObject *createEmbeddedStringObject(const char *ptr, size_t len);
protected: protected:
redisObject() {} redisObject() {}