commit | b4e0b528f5c1856d8d03caff5b47c8a5b4b905b9 | [log] [tgz] |
---|---|---|
author | Geremy Condra <gcondra@google.com> | Thu Apr 12 10:36:24 2012 -0700 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Apr 12 10:36:24 2012 -0700 |
tree | 1257afdb6b0568634b4d31f9d993579e8c4ac851 | |
parent | 07fde26d99f1da11fc514b2aeef7ae0620f85a63 [diff] | |
parent | e347efe72f8a6b6bc77a7270e6bfd2235e5d8021 [diff] |
Merge "DO NOT MERGE Fix for CVE-2011-3045" into ics-mr1
diff --git a/pngrutil.c b/pngrutil.c index d67af58..31c9b01 100644 --- a/pngrutil.c +++ b/pngrutil.c
@@ -264,8 +264,8 @@ { 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;