diff options
| author | Emmanuele Bassi <ebassi@gmail.com> | 2022-10-11 13:37:13 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gmail.com> | 2022-10-11 13:37:13 +0000 |
| commit | 6bd106011e75552b97737f31ba79df9d7a695b02 (patch) | |
| tree | 8dae8398bbc332133b276d70ab60a7f55800b8f6 | |
| parent | 300e436fb2700eca15c8c3275e89b772f4ba38de (diff) | |
| parent | 2629c993cf1ef104cd343395aa45524836446577 (diff) | |
| download | json-glib-6bd106011e75552b97737f31ba79df9d7a695b02.tar.gz | |
Merge branch 'coverity-leak' into 'master'
builder: Don't leak memory if json_builder_get_root fails sanity check
See merge request GNOME/json-glib!46
| -rw-r--r-- | json-glib/json-builder.c | 6 | ||||
| -rw-r--r-- | json-glib/json-parser.c | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/json-glib/json-builder.c b/json-glib/json-builder.c index 15bbe37..28a55f7 100644 --- a/json-glib/json-builder.c +++ b/json-glib/json-builder.c @@ -315,9 +315,9 @@ json_builder_get_root (JsonBuilder *builder) root = json_node_copy (builder->priv->root); /* Sanity check. */ - g_return_val_if_fail (!builder->priv->immutable || - root == NULL || - json_node_is_immutable (root), NULL); + g_assert (!builder->priv->immutable || + root == NULL || + json_node_is_immutable (root)); return root; } diff --git a/json-glib/json-parser.c b/json-glib/json-parser.c index 3024a25..d344276 100644 --- a/json-glib/json-parser.c +++ b/json-glib/json-parser.c @@ -1297,9 +1297,9 @@ json_parser_get_root (JsonParser *parser) g_return_val_if_fail (JSON_IS_PARSER (parser), NULL); /* Sanity check. */ - g_return_val_if_fail (parser->priv->root == NULL || - !parser->priv->is_immutable || - json_node_is_immutable (parser->priv->root), NULL); + g_assert (parser->priv->root == NULL || + !parser->priv->is_immutable || + json_node_is_immutable (parser->priv->root)); return parser->priv->root; } @@ -1325,9 +1325,9 @@ json_parser_steal_root (JsonParser *parser) g_return_val_if_fail (JSON_IS_PARSER (parser), NULL); /* Sanity check. */ - g_return_val_if_fail (parser->priv->root == NULL || - !parser->priv->is_immutable || - json_node_is_immutable (parser->priv->root), NULL); + g_assert (parser->priv->root == NULL || + !parser->priv->is_immutable || + json_node_is_immutable (parser->priv->root)); return g_steal_pointer (&priv->root); } |