diff --git a/cJSON.c b/cJSON.c index d8ea4d3..8502423 100644 --- a/cJSON.c +++ b/cJSON.c @@ -269,9 +269,9 @@ typedef struct } parse_buffer; /* check if the given size is left to read in a given parse buffer (starting with 1) */ -#define can_read(buffer, size) ((buffer != NULL) && (((buffer)->offset + size) <= (buffer)->length)) +#define can_read(buffer, size) (((buffer)->offset + (size)) <= (buffer)->length) /* check if the buffer can be accessed at the given index (starting with 0) */ -#define can_access_at_index(buffer, index) ((buffer != NULL) && (((buffer)->offset + index) < (buffer)->length)) +#define can_access_at_index(buffer, index) (((buffer)->offset + (index)) < (buffer)->length) #define cannot_access_at_index(buffer, index) (!can_access_at_index(buffer, index)) /* get a pointer to the buffer at the position */ #define buffer_at_offset(buffer) ((buffer)->content + (buffer)->offset)