1 files changed, 8 insertions, 6 deletions
diff --git a/src/buffer.c b/src/buffer.c
index 85ec09de..8d9eb95d 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -14,11 +14,12 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#include "memory.h"
+
 #include "serd/serd.h"
 
 #include <assert.h>
 #include <stddef.h>
-#include <stdlib.h>
 #include <string.h>
 
 size_t
@@ -33,20 +34,21 @@ serd_buffer_write(const void* const buf,
   SerdBuffer* const buffer  = (SerdBuffer*)stream;
   const size_t      n_bytes = size * nmemb;
 
-  char* const new_buf = (char*)realloc(buffer->buf, buffer->len + n_bytes);
+  char* const new_buf =
+    (char*)serd_arealloc(buffer->allocator, buffer->buf, buffer->len + n_bytes);
+
   if (new_buf) {
     memcpy(new_buf + buffer->len, buf, n_bytes);
     buffer->buf = new_buf;
     buffer->len += nmemb;
+    return n_bytes;
   }
 
-  return new_buf ? nmemb : 0;
+  return 0;
 }
 
 int
 serd_buffer_close(void* const stream)
 {
-  serd_buffer_write("", 1, 1, stream); // Write null terminator
-
-  return 0;
+  return serd_buffer_write("", 1, 1, stream) != 1; // Write null terminator
 }