summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers@digital-scurf.org>2012-10-08 22:31:47 +0100
committerDaniel Silverstone <dsilvers@digital-scurf.org>2012-10-08 22:31:47 +0100
commit74687b5e942a71f4286121d0d2f0515cc3f3fc16 (patch)
tree244911b1dfcbdda67c9fe819d4e84f530d8378fd /src/core
parent52687feace9d5aabbea30f6ac6dffeb945591716 (diff)
downloadlibdom-74687b5e942a71f4286121d0d2f0515cc3f3fc16.tar.gz
libdom-74687b5e942a71f4286121d0d2f0515cc3f3fc16.tar.bz2
Close off two scan-build warnings as best as I can make out.
Diffstat (limited to 'src/core')
-rw-r--r--src/core/text.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/core/text.c b/src/core/text.c
index 94718a2..e84972a 100644
--- a/src/core/text.c
+++ b/src/core/text.c
@@ -473,8 +473,10 @@ dom_exception walk_logic_adjacent_text(dom_text *text,
/* Firstly, we look our left */
err = walk_logic_adjacent_text_in_order(left, opt, LEFT, ret, &cont);
if (err != DOM_NO_ERR) {
- dom_string_unref(*ret);
- *ret = NULL;
+ if (opt == COLLECT) {
+ dom_string_unref(*ret);
+ *ret = NULL;
+ }
return err;
}
@@ -508,8 +510,10 @@ dom_exception walk_logic_adjacent_text(dom_text *text,
/* Now, look right */
err = walk_logic_adjacent_text_in_order(right, opt, RIGHT, ret, &cont);
if (err != DOM_NO_ERR) {
- dom_string_unref(*ret);
- *ret = NULL;
+ if (opt == COLLECT) {
+ dom_string_unref(*ret);
+ *ret = NULL;
+ }
return err;
}