diff options
| author | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-07 03:14:32 +0000 |
|---|---|---|
| committer | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-07 03:14:32 +0000 |
| commit | 4cf106cdb83dd6b35d3b26d06cc67d1d2d99041e (patch) | |
| tree | e09e4d81fe015948f11c4b9c5bb0d7eecfa0d4e3 | |
| parent | 4c6c09479dfd42b666218d793f1750d82194b6a5 (diff) | |
| download | chromium_src-4cf106cdb83dd6b35d3b26d06cc67d1d2d99041e.zip chromium_src-4cf106cdb83dd6b35d3b26d06cc67d1d2d99041e.tar.gz chromium_src-4cf106cdb83dd6b35d3b26d06cc67d1d2d99041e.tar.bz2 | |
Pull follow-up tweak from upstream.
BUG=116162
Review URL: http://codereview.chromium.org/9546033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125311 0039d316-1c4b-4281-b951-d872f2087c98
| -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; |