Skip to content

Commit 667867f

Browse files
author
DvirDukhan
committed
changed RDB decode according to memcheck PR refernce
1 parent 9a5d19b commit 667867f

File tree

2 files changed

+12
-18
lines changed

2 files changed

+12
-18
lines changed

src/serialization/RDB/decoder/current/v1/decode_v1.c

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -158,10 +158,9 @@ void *RAI_RDBLoadModel_v1(RedisModuleIO *io) {
158158
RedisModuleCtx *stats_ctx = RedisModule_GetContextFromIO(io);
159159
RedisModuleString *stats_keystr =
160160
RedisModule_CreateStringFromString(stats_ctx, RedisModule_GetKeyNameFromIO(io));
161-
RedisModuleString *stats_tag = RAI_HoldString(NULL, tag);
162161

163162
model->infokey =
164-
RAI_AddStatsEntry(stats_ctx, stats_keystr, RAI_MODEL, backend, devicestr, stats_tag);
163+
RAI_AddStatsEntry(stats_ctx, stats_keystr, RAI_MODEL, backend, devicestr, tag);
165164

166165
for (size_t i = 0; i < ninputs; i++) {
167166
RedisModule_Free((void *)inputs[i]);
@@ -174,14 +173,15 @@ void *RAI_RDBLoadModel_v1(RedisModuleIO *io) {
174173
RedisModule_Free(buffer);
175174
RedisModule_Free(devicestr);
176175
RedisModule_FreeString(NULL, stats_keystr);
176+
RedisModule_FreeString(NULL, tag);
177177

178178
return model;
179179

180180
cleanup:
181181
if (devicestr)
182182
RedisModule_Free(devicestr);
183183
if (tag)
184-
RedisModule_Free(tag);
184+
RedisModule_FreeString(NULL, tag);
185185
if (inputs) {
186186
for (size_t i = 0; i < ninputs; i++) {
187187
RedisModule_Free((void *)inputs[i]);
@@ -241,20 +241,19 @@ void *RAI_RDBLoadScript_v1(RedisModuleIO *io) {
241241
RedisModuleString *stats_keystr =
242242
RedisModule_CreateStringFromString(stats_ctx, RedisModule_GetKeyNameFromIO(io));
243243

244-
const char *stats_devicestr = RedisModule_Strdup(devicestr);
245-
246-
tag = RAI_HoldString(NULL, tag);
247-
248244
script->infokey =
249245
RAI_AddStatsEntry(stats_ctx, stats_keystr, RAI_SCRIPT, RAI_BACKEND_TORCH, devicestr, tag);
250246

251247
RedisModule_FreeString(NULL, stats_keystr);
248+
RedisModule_FreeString(NULL, tag);
249+
252250

253251
return script;
254252
cleanup:
255253
if (devicestr)
256254
RedisModule_Free(devicestr);
257255
if (scriptdef)
258256
RedisModule_Free(scriptdef);
257+
if(tag) RedisModule_FreeString(NULL, tag);
259258
return NULL;
260259
}

src/serialization/RDB/decoder/previous/v0/decode_v0.c

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ void *RAI_RDBLoadModel_v0(RedisModuleIO *io) {
109109
.backends_inter_op_parallelism = getBackendsInterOpParallelism(),
110110
};
111111

112-
size_t len;
112+
len;
113113
buffer = RedisModule_LoadStringBuffer(io, &len);
114114
if (RedisModule_IsIOError(io))
115115
goto cleanup;
@@ -142,10 +142,7 @@ void *RAI_RDBLoadModel_v0(RedisModuleIO *io) {
142142
RedisModuleString *stats_keystr =
143143
RedisModule_CreateStringFromString(stats_ctx, RedisModule_GetKeyNameFromIO(io));
144144

145-
RedisModuleString *stats_tag = RAI_HoldString(NULL, tag);
146-
147-
model->infokey =
148-
RAI_AddStatsEntry(stats_ctx, stats_keystr, RAI_MODEL, backend, devicestr, stats_tag);
145+
model->infokey = RAI_AddStatsEntry(stats_ctx, stats_keystr, RAI_MODEL, backend, devicestr, tag);
149146

150147
for (size_t i = 0; i < ninputs; i++) {
151148
RedisModule_Free((void *)inputs[i]);
@@ -156,9 +153,9 @@ void *RAI_RDBLoadModel_v0(RedisModuleIO *io) {
156153
}
157154
RedisModule_Free(outputs);
158155
RedisModule_Free(buffer);
159-
160156
RedisModule_Free(devicestr);
161157
RedisModule_FreeString(NULL, stats_keystr);
158+
RedisModule_FreeString(NULL, tag);
162159

163160
return model;
164161

@@ -200,7 +197,7 @@ void *RAI_RDBLoadScript_v0(RedisModuleIO *io) {
200197
tag = RedisModule_CreateString(NULL, cstr_tag, len);
201198
RedisModule_Free(cstr_tag);
202199

203-
size_t len;
200+
len;
204201
scriptdef = RedisModule_LoadStringBuffer(io, &len);
205202
if (RedisModule_IsIOError(io))
206203
goto cleanup;
@@ -229,14 +226,12 @@ void *RAI_RDBLoadScript_v0(RedisModuleIO *io) {
229226
RedisModuleString *stats_keystr =
230227
RedisModule_CreateStringFromString(stats_ctx, RedisModule_GetKeyNameFromIO(io));
231228

232-
const char *stats_devicestr = RedisModule_Strdup(devicestr);
233-
234-
tag = RAI_HoldString(NULL, tag);
235-
236229
script->infokey =
237230
RAI_AddStatsEntry(stats_ctx, stats_keystr, RAI_SCRIPT, RAI_BACKEND_TORCH, devicestr, tag);
238231

239232
RedisModule_FreeString(NULL, stats_keystr);
233+
RedisModule_FreeString(NULL, tag);
234+
240235

241236
return script;
242237
cleanup:

0 commit comments

Comments
 (0)