980488 - Update in-tree libpng to version 1.6.10

Status: RESOLVED FIXED

(Core :: Graphics: ImageLib, enhancement)

Description

[Glenn Randers-Pehrson]

libpng-1.6.10 was released today.  This is not urgently needed because the security issue that it address has already been fixed in bug #974825.

Comment 1

[Glenn Randers-Pehrson]

Attachment: v00 952505 update in-tree ibpng to version 1.6.10

Needs try server run.

Comment 2

[Glenn Randers-Pehrson]

The patch restores the png_error handling that was changed in bug #969814.  J. Kew, please see if it works for you.

Comment 3

[Jonathan Kew [:jfkthame]]

I pushed this to tryserver, and it appears to build fine on all platforms, so I'm OK with it.

Comment 4

[Jonathan Kew [:jfkthame]]

Sorry, meant to include a link to the try run:
https://tbpl.mozilla.org/?tree=Try&rev=5bb2e7a63ec4

Comment 5

[Ryan VanderMeulen [:RyanVM]]

Looks like you ignored the linux.c hunk that failed to apply?

unable to find 'media/libpng/arm/linux.c' for patching
patching file media/libpng/arm/linux.c
1 out of 1 hunks FAILED -- saving rejects to file media/libpng/arm/linux.c.rej

Also, libpng updates can and have broken tests, so a build-only Try run just means we're going to have to do another push anyway.

Comment 6

[Ryan VanderMeulen [:RyanVM]]

Looks like the only reason this didn't burn was that arm/linux.c wasn't added to moz.build either.

Comment 7

[Jonathan Kew [:jfkthame]]

Oops - yes, it looks like I missed that. I know it failed to apply cleanly, but I thought I'd fixed up the issues before pushing. Apparently not. :(

Comment 8

[Glenn Randers-Pehrson]

Attachment: v01 952505 update in-tree ibpng to version 1.6.10

linux.c is actually an "included" file (not a header but a snippet of executable code) that is only conditionally included, so failing to add it did not hurt anything.  The v01 patch puts the "new file mode 100644" in the right place -- it was off by one.  I was thinking the file would be more appropriately named arm_linux.c or arm_linux.h but for now I've left it as it's called in libpng16.

Comment 9

[Ryan VanderMeulen [:RyanVM]]

https://tbpl.mozilla.org/?tree=Try&rev=9472f965e9d5

Comment 10

[Glenn Randers-Pehrson]

Comment on attachment 8388455 [details] [diff] [review]
v01 952505 update in-tree ibpng to version 1.6.10

Only one red "R", for Windows-8, that seems to be unrelated.

Comment 11

[Glenn Randers-Pehrson]

Attachment: v02-952505 update in-tree ibpng to version 1.6.10

Sets limit on dimensions to 32767 instead of 1000000 in mozpngconf.h.  I don't think this needs another tryserver run.

Comment 12

[Jeff Muizelaar [:jrmuizel]]

Comment on attachment 8394383 [details] [diff] [review]
v02-952505 update in-tree ibpng to version 1.6.10

Review of attachment 8394383 [details] [diff] [review]:
-----------------------------------------------------------------

FWIW, it would be nicer to read these patches if they didn't include so much boiler plate churn. e.g. The "Last changed in libpng ..." information can easily be obtained from git log.

Comment 13

[Ryan VanderMeulen [:RyanVM]]

(In reply to Glenn Randers-Pehrson from comment #11)
> I don't think this needs another tryserver run.

Funny story:
https://tbpl.mozilla.org/php/getParsedLog.php?id=36621854&tree=Mozilla-Inbound

Pushed a follow-up:
https://hg.mozilla.org/integration/mozilla-inbound/rev/db4bcc7605be

Comment 14

[Glenn Randers-Pehrson]

I've posted a patch for the MOZ_PNG_MAX_DIMENSION defines to bug #987625.

Comment 15

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/5f91b2fc6812
https://hg.mozilla.org/mozilla-central/rev/db4bcc7605be