[librsvg] Oops, don't assert on null nodes
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg] Oops, don't assert on null nodes
- Date: Fri, 17 Feb 2017 16:39:54 +0000 (UTC)
commit 6c36a2fdf268e715da2636b4bf201816a2cf7cd9
Author: Federico Mena Quintero <federico gnome org>
Date: Thu Feb 16 23:10:24 2017 -0600
Oops, don't assert on null nodes
rsvg-base.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/rsvg-base.c b/rsvg-base.c
index 78beb70..66137de 100644
--- a/rsvg-base.c
+++ b/rsvg-base.c
@@ -422,6 +422,7 @@ rsvg_standard_element_start (RsvgHandle * ctx, const char *name, RsvgPropertyBag
if (ctx->priv->currentnode) {
rsvg_node_add_child (ctx->priv->currentnode, newnode);
+ ctx->priv->currentnode = rsvg_node_unref (ctx->priv->currentnode);
} else if (rsvg_node_get_type (newnode) == RSVG_NODE_TYPE_SVG) {
ctx->priv->treebase = rsvg_node_ref (newnode);
}
@@ -939,10 +940,10 @@ rsvg_characters_impl (RsvgHandle * ctx, const xmlChar * ch, int len)
find_last_chars_node,
&node);
- g_assert (rsvg_node_get_type (node) == RSVG_NODE_TYPE_CHARS);
- self = rsvg_rust_cnode_get_impl (node);
+ if (node) {
+ g_assert (rsvg_node_get_type (node) == RSVG_NODE_TYPE_CHARS);
+ self = rsvg_rust_cnode_get_impl (node);
- if (self != NULL) {
if (!g_utf8_validate ((char *) ch, len, NULL)) {
char *utf8;
utf8 = rsvg_make_valid_utf8 ((char *) ch, len);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]