am e2146085: (-s ours) am b4e0b528: (-s ours) Merge "DO NOT MERGE Fix for CVE-2011-3045" into ics-mr1
* commit 'e21460858932813a0873f96e1ddc2bc6f36d7c56':
DO NOT MERGE Fix for CVE-2011-3045
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;