Fixed a few IO bugs.

cjdelisle · Nov 12, 2012 · 0f5ec62 · 0f5ec62
1 parent 5158d2b
commit 0f5ec62
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/io/ArrayReader.c b/io/ArrayReader.c
@@ -56,7 +56,7 @@ static int read(void* readInto, size_t length, const struct Reader* reader)
         (struct ArrayReader_context*) reader->context;
 
     /* Prove that it doesn't run off the end of the buffer or roll over. */
-    if (context->pointer + length >= context->endPointer
+    if (context->pointer + length > context->endPointer
         || context->pointer + length < context->pointer)
     {
         return -1;

diff --git a/io/Reader.h b/io/Reader.h
@@ -58,7 +58,7 @@ struct Reader {
     static inline uint##bytes##_t Reader_read##bytes (struct Reader* reader) \
     {                                                                        \
         uint##bytes##_t num;                                                 \
-        reader->read(&num, bytes, reader);                                   \
+        reader->read(&num, bytes/8, reader);                                 \
         return num;                                                          \
     }
 

diff --git a/io/Writer.h b/io/Writer.h
@@ -47,7 +47,7 @@ struct Writer {
     static inline int Writer_write##bytes (struct Writer* writer, uint##bytes##_t number) \
     {                                                                                     \
         uint##bytes##_t num = number;                                                     \
-        return writer->write(&num, bytes, writer);                                        \
+        return writer->write(&num, bytes/8, writer);                                      \
     }
 
 Writer_writeGeneric(8)