From b9ada819953303e708a376779ff27f75ff6bc51c Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Thu, 4 Jun 2015 14:24:31 -0700 Subject: [PATCH] cairo-script: Improve buffer length check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Quells the following warning: cairo-script-scanner.c: In function ‘_translate_string’: cairo-script-scanner.c:1623:18: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] if (buf_len <= 8 + 2*string->len) { ^ --- util/cairo-script/cairo-script-scanner.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/util/cairo-script/cairo-script-scanner.c b/util/cairo-script/cairo-script-scanner.c index 4254aa01e..84b45dff9 100644 --- a/util/cairo-script/cairo-script-scanner.c +++ b/util/cairo-script/cairo-script-scanner.c @@ -1620,7 +1620,8 @@ _translate_string (csi_t *ctx, if (uncompress ((Bytef *) buf, &buf_len, (Bytef *) string->string, string->len) == Z_OK) { - if (buf_len <= 8 + 2*string->len) { + assert(string->len > 0); + if (buf_len <= 8 + 2*((unsigned long)string->len)) { method = NONE; deflate = 0; } else {