Request to backport changeset 3a9d06af8830

[Dr Andrew John Hughes]

On 17:07 Thu 23 Dec     , Deepak Bhole wrote:
> * Joe Darcy <joe.darcy at oracle.com> [2010-12-23 16:40]:
> > On 12/23/2010 11:28 AM, Deepak Bhole wrote:
> > >Hi,
> > >
> > >I'd like to request a backport of the following changeset:
> > >
> > >changeset:   770:3a9d06af8830
> > >user:        bae
> > >date:        Sat Nov 01 20:42:18 2008 +0300
> > >summary:     6541476: PNG imageio plugin incorrectly handles iTXt chunk
> > >
> > >It addresses errors caused due to incorrect iTXt chunk handling (e.g.
> > >when it contains non-ascii/UTF8 data).
> > >
> > >Thanks,
> > >Deepak
> > 
> > Hi Deepak.
> > 
> > Looking over the files, it seems to me that
> > 
> >     6782079: PNG: reading metadata may cause OOM on truncated images.
> > 
> > should also be backported at the same time.  I'd be open to both
> > 6541476 and 6782079 being backported (along with a Sun -> Oracle
> > copyright update).
> > 
> 
> Hi Joe,
> 
> I was just trying to keep the backports to the minimum thats all. I am 
> completely fine with porting 6782079 as well as it certainly seems like a
> good-to-have fix!
> 
> Cheers,
> Deepak
> 
> > -Joe

I've committed these on Deepak's behalf as he does not yet have commit access:

http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/0e72e58a762d
http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/c267a33e76b0
-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8