From 1c467483d806d3bad9b2d90b581ec055ef7a4684 Mon Sep 17 00:00:00 2001 From: thestig Date: Wed, 26 Oct 2016 23:55:14 -0700 Subject: libtiff: Fix unsigned vs signed comparison warning. tif_pixarlog.c revision 1.45. commitid: IX5L3QQ5Qtzcofcz BUG=chromium:654172 Review-Url: https://codereview.chromium.org/2452293002 --- third_party/libtiff/0009-HeapBufferOverflow-PixarLogDecode.patch | 2 +- third_party/libtiff/tif_pixarlog.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/third_party/libtiff/0009-HeapBufferOverflow-PixarLogDecode.patch b/third_party/libtiff/0009-HeapBufferOverflow-PixarLogDecode.patch index 745da03d80..57dbe2efb7 100644 --- a/third_party/libtiff/0009-HeapBufferOverflow-PixarLogDecode.patch +++ b/third_party/libtiff/0009-HeapBufferOverflow-PixarLogDecode.patch @@ -23,7 +23,7 @@ index b93b4c7..0674fa4 100644 return (0); } + /* Check that we will not fill more than what was allocated */ -+ if (sp->stream.avail_out > sp->tbuf_size) ++ if ((tmsize_t)sp->stream.avail_out > sp->tbuf_size) + { + TIFFErrorExt(tif->tif_clientdata, module, "sp->stream.avail_out > sp->tbuf_size"); + return (0); diff --git a/third_party/libtiff/tif_pixarlog.c b/third_party/libtiff/tif_pixarlog.c index 0674fa48d6..29535d31ee 100644 --- a/third_party/libtiff/tif_pixarlog.c +++ b/third_party/libtiff/tif_pixarlog.c @@ -784,7 +784,7 @@ PixarLogDecode(TIFF* tif, uint8* op, tmsize_t occ, uint16 s) return (0); } /* Check that we will not fill more than what was allocated */ - if (sp->stream.avail_out > sp->tbuf_size) + if ((tmsize_t)sp->stream.avail_out > sp->tbuf_size) { TIFFErrorExt(tif->tif_clientdata, module, "sp->stream.avail_out > sp->tbuf_size"); return (0); -- cgit v1.2.3