fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-19 17:10:50 +00:00
Code Issues Projects Releases Wiki Activity

Don't assume no padding or specific ordering in moduleLoadQueueEntry structure.

Browse Source 
We need to be free to shuffle fields or add more fields in a structure
without breaking code.

Related to issue #3293.
This commit is contained in:
antirez 2016-06-13 09:51:06 +02:00
parent 9a02dac2e8
commit a4bce77e92
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/config.c
View File

@ -154,10 +154,11 @@ void resetServerSaveParams(void) {
} }
void queueLoadModule(sds path, sds *argv, int argc) { void queueLoadModule(sds path, sds *argv, int argc) {
struct moduleLoadQueueEntry *loadmod =
zmalloc(sizeof(struct moduleLoadQueueEntry)+sizeof(robj*)*argc);
int i; int i;
struct moduleLoadQueueEntry *loadmod;
loadmod = zmalloc(sizeof(struct moduleLoadQueueEntry));
loadmod->argv = zmalloc(sizeof(robj*)*argc);
loadmod->path = sdsnew(path); loadmod->path = sdsnew(path);
loadmod->argc = argc; loadmod->argc = argc;
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {

2
src/server.h
View File

@ -686,7 +686,7 @@ struct saveparam {
struct moduleLoadQueueEntry { struct moduleLoadQueueEntry {
sds path; sds path;
int argc; int argc;
robj *argv[]; robj **argv;
}; };
struct sharedObjectsStruct { struct sharedObjectsStruct {