952505 - Update libpng to version 1.6.9

Status: RESOLVED FIXED

(Core :: Graphics: ImageLib, defect)

Description

[Glenn Randers-Pehrson]

Libpng-1.6.8 was released yesterday.  It fixes a potential null pointer dereference (see bug #945912) and is otherwise a simple cleanup release.

Comment 1

[Glenn Randers-Pehrson]

Attachment: v00 952505 update bundled libpng to version 1.6.8

Comment 2

[Glenn Randers-Pehrson]

Attachment: v01 952505 update bundled libpng to version 1.6.8

Don't delete "#include mozpngconf.h" from pngpriv.h

Comment 3

[Ryan VanderMeulen [:RyanVM]]

Glenn, IIUC, this fixes a known sec issue in 1.6.7? Do you need any extra assistance here?

Comment 4

[Glenn Randers-Pehrson]

Needs a try server run.  I know you'd prefer I do those myself but am not set up yet to do them.
The older versions can use the one-line-change patch in bug #945912 to simplify matters.

Comment 5

[Glenn Randers-Pehrson]

Incidentally, libpng-1.6.9 will be out tomorrow.  If Max releases the APNG patch for 1.6.9 soon, we can skip 1.6.8.

Comment 6

[Ryan VanderMeulen [:RyanVM]]

https://tbpl.mozilla.org/?tree=Try&rev=5d4826cbd6fd

Comment 7

[Glenn Randers-Pehrson]

Attachment: v02 952505 update bundled libpng to version 1.6.9

v02 updates libpng to version 1.6.9 instead of 1.6.8.  Also changed description accordingly.  Need try server run.

Comment 8

[Ryan VanderMeulen [:RyanVM]]

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

Comment 9

[Glenn Randers-Pehrson]

Attachment: v03 952505 update bundled libpng to version 1.6.9

Changed all EOL to newlines (in the v02 patch, 1590 lines out of 8592 ended with CR-LF, inherited from the apng.patch).  Changed CR-LF in the apng.patch to newlines as well.  These changes shouldn't require a new try server run.

Comment 10

[Glenn Randers-Pehrson]

Attachment: v04 952505 update bundled libpng to version 1.6.9

This patch fixes the small amount of bit rot caused by checkin of bug #945912.

Comment 11

[Glenn Randers-Pehrson]

Marking earlier releases "unaffected" since they have been fixed in bug #945912.  The remainder of the upgrade to libpng-1.6.9 is code cleanup, so I'm reducing the importance of this bug to "minor".

Comment 12

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/2f858de5e9dc

Comment 13

[Ryan VanderMeulen [:RyanVM]]

Backed out for Werror bustage.
https://hg.mozilla.org/integration/mozilla-inbound/rev/314f24c02ea5

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

Comment 14

[Ryan VanderMeulen [:RyanVM]]

I think this caused a lot of test failures as well. They went away after it was backed out.

https://tbpl.mozilla.org/php/getParsedLog.php?id=34694043&tree=Mozilla-Inbound
https://tbpl.mozilla.org/php/getParsedLog.php?id=34693418&tree=Mozilla-Inbound
https://tbpl.mozilla.org/php/getParsedLog.php?id=34694497&tree=Mozilla-Inbound
https://tbpl.mozilla.org/php/getParsedLog.php?id=34693537&tree=Mozilla-Inbound
https://tbpl.mozilla.org/php/getParsedLog.php?id=34693300&tree=Mozilla-Inbound

Comment 15

[Glenn Randers-Pehrson]

I'll look into this.

1951 ERROR TEST-UNEXPECTED-FAIL | /tests/content/base/test/test_mixed_content_blocker.html | image did not follow block_display_content pref
6571 ERROR TEST-UNEXPECTED-FAIL | /tests/content/canvas/test/webgl/test_webgl_conformance_test_suite.html | [conformance/textures/gl-teximage.html] Test failed - pixel 0, 15 should be 255, 0, 0, 255 was 0, 0, 0, 0
[8 more similar]
10:06:58     INFO -  6580 ERROR TEST-UNEXPECTED-FAIL | /tests/content/canvas/test/webgl
/test_webgl_conformance_test_suite.html | [conformance/textures/gl-teximage.html] Test failed - uploading PNGs with same data but various ICC profiles should generate the same results
[4 more similar]

ImageMagick built with libpng-1.6.9 detects problems with four of these images:
$ mogrify -format ppm *.png 
mogrify: iCCP: known incorrect sRGB profile `3x3.png'
mogrify: iCCP: profile 'Photoshop ICC profile': 1DAh: invalid length `small-square-with-colorspin-profile.png'
mogrify: cHRM: invalid chromaticities `small-square-with-e-srgb-profile.png'
mogrify: iCCP: known incorrect sRGB profile `small-square-with-srgb-iec61966-2.1-profile.png'

ImageMagick built with libpng-1.6.7 reports the same four problems.

The v04 patch of mozpngconf.h turns of PNG_BENIGN_ERRORS handling except
when MOZ_GONK is defined.  That's probably the mistake.

Comment 16

[Glenn Randers-Pehrson]

Attachment: v05 952505 update bundled libpng to version 1.6.9

The v04 patch of mozpngconf.h turns off PNG_BENIGN_ERRORS handling except
when MOZ_WIDGET_GONK is defined.  That's probably a mistake.  This patch keeps the current PNG_BENIGN_ERRORS handling instead.

Comment 17

[Glenn Randers-Pehrson]

Attachment: v06 952505 update bundled libpng to version 1.6.9

Exposed png_error() redefinition macro so it is visible to calling applications.
Disabled PNG_FIXED_POINT_SUPPORTED; we don't need both FIXED and FLOATING_POINT support.

Comment 18

[Glenn Randers-Pehrson]

Comment on attachment 8376775 [details] [diff] [review]
v06 952505 update bundled libpng to version 1.6.9

Sorry, The v06 patch is incomplete.  Marking it obsolete.

Comment 19

[Glenn Randers-Pehrson]

Attachment: v07 952505 update bundled libpng to version 1.6.9

v07 includes the changes to png.h and pngpriv.h that were omitted from v06.

Comment 20

[Ryan VanderMeulen [:RyanVM]]

https://tbpl.mozilla.org/?tree=Try&rev=06438602c765

Comment 21

[Ryan VanderMeulen [:RyanVM]]

Looks like this still has the test failures that led to the backout.

Comment 22

[Glenn Randers-Pehrson]

Attachment: v08 952505 update bundled libpng to version 1.6.9

Don't reject PNG images that have benign errors

Comment 23

[Ryan VanderMeulen [:RyanVM]]

https://tbpl.mozilla.org/?tree=Try&rev=226d95cc83f4

Comment 24

[Max Stepin]

Guys, I think I figured out how to decode APNG with standard libpng...
Should I pursue this further? 
It would be nice to retire apng patch eventually.

Comment 25

[Glenn Randers-Pehrson]

Comment on attachment 8377762 [details] [diff] [review]
v08 952505 update bundled libpng to version 1.6.9

Try server results mostly green.  The several failures don't appear to be related to this patch.

Comment 26

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/71a558bf7b6f

Comment 27

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/71a558bf7b6f