From 0350ba1d16fccb8438060ba2b732b4fe3845970e Mon Sep 17 00:00:00 2001 From: Andri Yngvason Date: Fri, 10 Apr 2020 12:36:51 +0000 Subject: [PATCH] zrle: Replace an assert with return -1 --- src/zrle.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/zrle.c b/src/zrle.c index 9fd2be8..7faff31 100644 --- a/src/zrle.c +++ b/src/zrle.c @@ -178,8 +178,6 @@ void zrle_encode_tile(struct vec* dst, const struct rfb_pixel_format* dst_fmt, int zrle_deflate(struct vec* dst, const struct vec* src, z_stream* zs, bool flush) { - int r = Z_STREAM_ERROR; - zs->next_in = src->data; zs->avail_in = src->len; @@ -190,8 +188,9 @@ int zrle_deflate(struct vec* dst, const struct vec* src, z_stream* zs, bool flus zs->next_out = ((Bytef*)dst->data) + dst->len; zs->avail_out = dst->cap - dst->len; - r = deflate(zs, flush ? Z_SYNC_FLUSH : Z_NO_FLUSH); - assert(r != Z_STREAM_ERROR); + int r = deflate(zs, flush ? Z_SYNC_FLUSH : Z_NO_FLUSH); + if (r == Z_STREAM_ERROR) + return -1; dst->len = zs->next_out - (Bytef*)dst->data; } while (zs->avail_out == 0);