From 6615a233612b1ff01a57f500d43d8caabaac877f Mon Sep 17 00:00:00 2001 From: Devaev Maxim Date: Mon, 6 Jul 2020 14:36:05 +0300 Subject: [PATCH] safer picture_compare(), removed one assert --- src/picture.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/picture.c b/src/picture.c index 10c93a7..46cab06 100644 --- a/src/picture.c +++ b/src/picture.c @@ -73,8 +73,6 @@ void picture_append_data(struct picture_t *picture, const unsigned char *data, s } void picture_copy(const struct picture_t *src, struct picture_t *dest) { - assert(src->allocated); - picture_set_data(dest, src->data, src->used); # define COPY(_field) dest->_field = src->_field @@ -92,5 +90,9 @@ void picture_copy(const struct picture_t *src, struct picture_t *dest) { } bool picture_compare(const struct picture_t *a, const struct picture_t *b) { - return (a->used == b->used && !memcmp(a->data, b->data, b->used)); + return ( + a->allocated && b->allocated + && a->used == b->used + && !memcmp(a->data, b->data, b->used) + ); }