diff options
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/libpng/README.chromium | 1 | ||||
| -rw-r--r-- | third_party/libpng/pngrutil.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/third_party/libpng/README.chromium b/third_party/libpng/README.chromium index 656d046..8f3a1ab 100644 --- a/third_party/libpng/README.chromium +++ b/third_party/libpng/README.chromium @@ -12,3 +12,4 @@ Updated to 1.2.45, no changes to the source files but all unneeded files stripped. - One custom patch for bug 112822, to be sent upstream. +- Also a signedness condition from upstream relating to the above, bug 116162. diff --git a/third_party/libpng/pngrutil.c b/third_party/libpng/pngrutil.c index bf64644..10588c4 100644 --- a/third_party/libpng/pngrutil.c +++ b/third_party/libpng/pngrutil.c @@ -247,8 +247,8 @@ png_inflate(png_structp png_ptr, const png_byte *data, png_size_t size, { if (output != 0 && output_size > count) { - int copy = output_size - count; - if (avail < copy) copy = avail; + png_size_t copy = output_size - count; + if ((png_size_t) avail < copy) copy = (png_size_t) avail; png_memcpy(output + count, png_ptr->zbuf, copy); } count += avail; |