Skip to content
This repository was archived by the owner on Jun 27, 2019. It is now read-only.

Commit 5daa00e

Browse files
committed
Persistence: Do not let the string default value be NULL.
By doing so, the value variable at persist_do() will never be NULL. Signed-off-by: Guilherme Iscaro <[email protected]>
1 parent bc87c97 commit 5daa00e

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

src/modules/flow/persistence/persistence.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ persist_do(struct persist_data *mdata, struct sol_flow_node *node, void *value,
213213
else
214214
size = strlen(value) + 1; //To include the null terminating char
215215

216-
if (mdata->value_ptr && value) {
216+
if (mdata->value_ptr) {
217217
if (mdata->packet_data_size)
218218
r = memcmp(mdata->value_ptr, value, mdata->packet_data_size);
219219
else
@@ -676,10 +676,8 @@ persist_string_open(struct sol_flow_node *node,
676676
SOL_FLOW_NODE_OPTIONS_SUB_API_CHECK(options,
677677
SOL_FLOW_NODE_TYPE_PERSISTENCE_STRING_OPTIONS_API_VERSION, -EINVAL);
678678

679-
if (opts->default_value) {
680-
mdata->default_value = strdup((char *)opts->default_value);
681-
SOL_NULL_CHECK(mdata->default_value, -ENOMEM);
682-
}
679+
mdata->default_value = strdup(opts->default_value);
680+
SOL_NULL_CHECK(mdata->default_value, -ENOMEM);
683681

684682
r = persist_open(node, data, opts->storage, opts->name);
685683
if (r < 0)

0 commit comments

Comments
 (0)