diff options
author | David Robillard <d@drobilla.net> | 2018-05-13 00:48:31 +0200 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2018-05-27 21:10:21 +0200 |
commit | 52d0ac81eee3462c6839c7374ffe57329f7702b7 (patch) | |
tree | e40ed9149fb64122f8e4bc349639762baed11c3f /src | |
parent | 48a9091b17435512f85d9ff202a5a7ea46c6af2a (diff) | |
download | serd-52d0ac81eee3462c6839c7374ffe57329f7702b7.tar.gz serd-52d0ac81eee3462c6839c7374ffe57329f7702b7.tar.bz2 serd-52d0ac81eee3462c6839c7374ffe57329f7702b7.zip |
Zero node padding before passing to reader sinks
Diffstat (limited to 'src')
-rw-r--r-- | src/n3.c | 9 | ||||
-rw-r--r-- | src/node.c | 25 | ||||
-rw-r--r-- | src/node.h | 1 | ||||
-rw-r--r-- | src/reader.c | 5 | ||||
-rw-r--r-- | src/stack.h | 1 |
5 files changed, 38 insertions, 3 deletions
@@ -1050,10 +1050,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; } @@ -1261,6 +1261,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); } @@ -1295,12 +1296,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) { @@ -217,6 +217,24 @@ serd_node_new_uri(const char* str) return serd_node_new_simple(SERD_URI, str); } +/** + Zero node padding. + + This is used for nodes which live in re-used stack memory during reading, + which must be normalized before being passed to a sink so comparison will + work correctly. +*/ +void +serd_node_zero_pad(SerdNode* node) +{ + char* buf = serd_node_buffer(node); + const size_t size = node->n_bytes; + const size_t padded_size = serd_node_pad_size(node->n_bytes); + if (padded_size > size) { + memset(buf + size, 0, padded_size - size); + } +} + SERD_API SerdNode* serd_node_copy(const SerdNode* node) @@ -226,6 +244,13 @@ serd_node_copy(const SerdNode* node) } const size_t size = serd_node_total_size(node); +#ifndef NDEBUG + const size_t unpadded_size = node->n_bytes; + const size_t padded_size = serd_node_pad_size(node->n_bytes); + for (size_t i = 0; i < padded_size - unpadded_size; ++i) { + assert(serd_node_buffer_c(node)[unpadded_size + i] == '\0'); + } +#endif SerdNode* copy = (SerdNode*)calloc(1, size + 3); memcpy(copy, node, size); return copy; @@ -42,6 +42,7 @@ serd_node_buffer_c(const SerdNode* node) SerdNode* serd_node_malloc(size_t n_bytes, SerdNodeFlags flags, SerdType type); void serd_node_set(SerdNode** dst, const SerdNode* src); +void serd_node_zero_pad(SerdNode* node); size_t serd_node_total_size(const SerdNode* node); SerdNode* serd_node_new_resolved_uri_i(const char* str, const SerdURI* base); int serd_node_compare(const SerdNode* a, const SerdNode* b, bool wildcards); diff --git a/src/reader.c b/src/reader.c index cf806259..4c448de6 100644 --- a/src/reader.c +++ b/src/reader.c @@ -115,6 +115,11 @@ emit_statement(SerdReader* reader, ReadContext ctx, SerdNode* o) if (!graph && reader->default_graph) { graph = reader->default_graph; } + + /* Zero the pad of the object node on the top of the stack. Lower nodes + (subject and predicate) were already zeroed by subsequent pushes. */ + serd_node_zero_pad(o); + bool ret = !reader->sink->statement || !reader->sink->statement( reader->sink->handle, *ctx.flags, graph, diff --git a/src/stack.h b/src/stack.h index 466a6027..11b31222 100644 --- a/src/stack.h +++ b/src/stack.h @@ -80,6 +80,7 @@ static inline void serd_stack_pop_to(SerdStack* stack, size_t n_bytes) { assert(stack->size >= n_bytes); + memset(stack->buf + n_bytes, 0, stack->size - n_bytes); stack->size = n_bytes; } |