diff options
| author | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-12 19:39:16 +0000 |
|---|---|---|
| committer | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-12 19:39:16 +0000 |
| commit | 1620c7e345dae99246b4a0e5b414078009903344 (patch) | |
| tree | f2a5d1f6975d3d9d362ab9d828a1d2c0813d3007 /third_party | |
| parent | 951340415e7688f8700cadf284c6efa518ca2671 (diff) | |
| download | chromium_src-1620c7e345dae99246b4a0e5b414078009903344.zip chromium_src-1620c7e345dae99246b4a0e5b414078009903344.tar.gz chromium_src-1620c7e345dae99246b4a0e5b414078009903344.tar.bz2 | |
Merge 125311 - Pull follow-up tweak from upstream.
BUG=116162
Review URL: http://codereview.chromium.org/9546033
TBR=cevans@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9689019
git-svn-id: svn://svn.chromium.org/chrome/branches/1025/src@126193 0039d316-1c4b-4281-b951-d872f2087c98
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; |