diff options
Diffstat (limited to 'obinsectd.c')
| -rw-r--r-- | obinsectd.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/obinsectd.c b/obinsectd.c index 29de55b..7829592 100644 --- a/obinsectd.c +++ b/obinsectd.c @@ -1252,6 +1252,10 @@ static json_object *format_value(const char *key, json_object *val) } ival = json_object_get_int(val); + + /* we can drop val now */ + json_object_put(val); + if (ifactor) { if (!unit) return json_object_new_int(ival * ifactor); @@ -1269,16 +1273,16 @@ static void add_obis(json_object *pubcfg, json_object *pub, const char *key, jso const char *alias = get_alias(key); json_object *tmp, *newval = val; + /* we take an extra ref every time newval is used, and then drop one of them in the end */ newval = format_value(key, val); if (json_object_object_get_ex(pub, "normal", &tmp)) - json_object_object_add(tmp, key, newval); + json_object_object_add(tmp, key, json_object_get(newval)); - /* taking extra ref in case we need to use newval below */ add_keyval(pubcfg, pub, key, json_object_get(newval), true); if (alias) { if (json_object_object_get_ex(pub, "alias", &tmp)) json_object_object_add(tmp, alias, json_object_get(newval)); - add_keyval(pubcfg, pub, alias, newval, true); + add_keyval(pubcfg, pub, alias, json_object_get(newval), true); } /* drop the extra ref */ |