From f2a4b931e85438381eb56051947cef58b364c3eb Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 19 Jun 2011 01:26:44 +0000 Subject: Fix abbreviation of repeated predicates with blank objects, and abbreviation memory errors (hopefully fix ticket #710). Add example test from ticket #710 (as of this revision, this graph, tests/test-blank-cont.ttl, correctly serialises with serdi -i turtle -o turtle, though the indentation is a bit off...). git-svn-id: http://svn.drobilla.net/serd/trunk@205 490d8e77-9747-427b-9fa3-0b8f29cee8a0 --- src/writer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/writer.c') diff --git a/src/writer.c b/src/writer.c index a1004ca9..137fed93 100644 --- a/src/writer.c +++ b/src/writer.c @@ -394,12 +394,13 @@ serd_writer_write_statement(SerdWriter* writer, WriteContext* ctx = (WriteContext*)serd_stack_push( &writer->anon_stack, sizeof(WriteContext)); *ctx = writer->context; + writer->context = WRITE_CONTEXT_NULL; // Prevent deletion... } const WriteContext new_context = { serd_node_copy(graph), serd_node_copy(subject), serd_node_copy(predicate) }; - reset_context(writer); + reset_context(writer); // ... here writer->context = new_context; return SERD_SUCCESS; } @@ -420,11 +421,12 @@ serd_writer_end_anon(SerdWriter* writer, --writer->indent; serd_writer_write_delim(writer, '\n'); writer->sink("]", 1, writer->stream); - const bool is_subject = serd_node_equals(node, &writer->context.subject); reset_context(writer); writer->context = *anon_stack_top(writer); serd_stack_pop(&writer->anon_stack, sizeof(WriteContext)); + const bool is_subject = serd_node_equals(node, &writer->context.subject); if (is_subject) { + serd_node_free(&writer->context.predicate); writer->context.subject = serd_node_copy(node); writer->context.predicate = SERD_NODE_NULL; } -- cgit v1.2.1