Zero node padding before passing to reader sinks

1 files changed, 6 insertions, 3 deletions

diff --git a/src/n3.c b/src/n3.c
index a95a85b7..712c3cc7 100644
--- a/src/n3.c
+++ b/src/n3.c
@@ -1044,10 +1044,10 @@ read_object(SerdReader* reader, ReadContext* ctx, bool emit, bool* ate_dot)
 		o->flags = flags;
 	}
 
-	if (ret && emit && simple) {
+	if (ret && emit && simple && o) {
 		ret = emit_statement(reader, *ctx, o);
 	} else if (ret && !emit) {
-		ctx->object   = o;
+		ctx->object = o;
 		return true;
 	}
 
@@ -1255,6 +1255,7 @@ read_base(SerdReader* reader, bool sparql, bool token)
 	if (!uri) {
 		return false;
 	} else if (reader->sink->base) {
+		serd_node_zero_pad(uri);
 		reader->sink->base(reader->sink->handle, uri);
 	}
 
@@ -1289,12 +1290,14 @@ read_prefixID(SerdReader* reader, bool sparql, bool token)
 	}
 
 	read_ws_star(reader);
-	const SerdNode* uri = read_IRIREF(reader);
+	SerdNode* uri = read_IRIREF(reader);
 	if (!uri) {
 		return false;
 	}
 
 	if (reader->sink->prefix) {
+		serd_node_zero_pad(name);
+		serd_node_zero_pad(uri);
 		ret = !reader->sink->prefix(reader->sink->handle, name, uri);
 	}
 	if (!sparql) {