Fix buffer_getchar to only error if we'd exceed the buffer size

[onak.git] / charfuncs.c

diff --git a/charfuncs.c b/charfuncs.c
index fea0a99cf0081218b831794b55dc8db599e31176..8448aee1be579956a71b2480850fb534685b15d1 100644 (file)
--- a/charfuncs.c
+++ b/charfuncs.c
@@ -25,11 +25,15 @@ int buffer_fetchchar(void *ctx, size_t count, void *c)
        struct buffer_ctx *buf = NULL;
        
        buf = (struct buffer_ctx *) ctx;
+
+       if (buf->offset + count > buf->size) {
+               return 1;
+       }
        
        memcpy(c, &buf->buffer[buf->offset], count);
        buf->offset += count;
 
-       return (((buf->offset) == (buf->size)) ? 1 : 0);
+       return 0;
 }
 
 /**