1 files changed, 22 insertions, 9 deletions

diff --git a/src/reader.c b/src/reader.c
index 985a9fd2..46390192 100644
--- a/src/reader.c
+++ b/src/reader.c
@@ -17,19 +17,18 @@
 #include "reader.h"
 
 #include "byte_source.h"
+#include "memory.h"
 #include "namespaces.h"
 #include "node.h"
 #include "read_nquads.h"
 #include "read_ntriples.h"
 #include "stack.h"
 #include "statement.h"
-#include "system.h"
 #include "world.h"
 
 #include <assert.h>
 #include <stdarg.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 static SerdStatus
@@ -247,17 +246,25 @@ serd_reader_new(SerdWorld* const      world,
     return NULL;
   }
 
-  SerdReader* me = (SerdReader*)calloc(1, sizeof(SerdReader));
+  SerdReader* me = (SerdReader*)serd_wcalloc(world, 1, sizeof(SerdReader));
+  if (!me) {
+    return NULL;
+  }
 
   me->world   = world;
   me->sink    = sink;
   me->env     = env;
-  me->stack   = serd_stack_new(stack_size, serd_node_align);
+  me->stack   = serd_stack_new(world->allocator, stack_size, serd_node_align);
   me->syntax  = syntax;
   me->flags   = flags;
   me->next_id = 1;
   me->strict  = !(flags & SERD_READ_LAX);
 
+  if (!me->stack.buf) {
+    serd_wfree(world, me);
+    return NULL;
+  }
+
   // Reserve a bit of space at the end of the stack to zero pad nodes
   me->stack.buf_size -= serd_node_align;
 
@@ -288,8 +295,8 @@ serd_reader_free(SerdReader* const reader)
 
   serd_reader_finish(reader);
 
-  serd_free_aligned(reader->stack.buf);
-  free(reader);
+  serd_aaligned_free(reader->world->allocator, reader->stack.buf);
+  serd_wfree(reader->world, reader);
 }
 
 static SerdStatus
@@ -318,11 +325,17 @@ serd_reader_start(SerdReader* const      reader,
   assert(reader);
   assert(input);
 
+  if (!block_size || !input->stream) {
+    return SERD_BAD_ARG;
+  }
+
   serd_reader_finish(reader);
 
-  reader->source = serd_byte_source_new_input(input, input_name, block_size);
+  assert(!reader->source);
+  reader->source = serd_byte_source_new_input(
+    reader->world->allocator, input, input_name, block_size);
 
-  return reader->source ? SERD_SUCCESS : SERD_BAD_ARG;
+  return reader->source ? SERD_SUCCESS : SERD_BAD_ALLOC;
 }
 
 static SerdStatus
@@ -361,7 +374,7 @@ serd_reader_finish(SerdReader* const reader)
 {
   assert(reader);
 
-  serd_byte_source_free(reader->source);
+  serd_byte_source_free(reader->world->allocator, reader->source);
   reader->source = NULL;
   return SERD_SUCCESS;
 }