tree 2ea44343e9c8d62a3791b01bd14e9facf889dd2d
parent 17b24482db9fb75020b91a9c17f2014beebc86ed
author Dave Burke <daveburke@google.com> 1331015773 -0800
committer Selim Gurun <sgurun@google.com> 1331844170 -0700

DO NOT MERGE Fix for CVE-2011-3026

Bug: 6085440

Note that this fix was borrowed from chromium and that the
issue was fixed in 1.2.47 of libpng (using a different approach).

Cherry pick from ccee121fae4c60a5dee6fce51195185694c376c3

Change-Id: I65f4ad400563f7e27ee73872f9c16f3ae4c8644d