40907 2010-06-21 02:44:10 -0700 [PNG decoder] direct access to jmpbuf is deprecated in libpng >= 1.4.0beta103 2012-04-29 19:24:53 -0700 1 1 1 Unclassified WebKit Images 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 pnormand webkit-unassigned commit-queue noel.gordon oldest_to_newest 240641 0 pnormand 2010-06-21 02:44:10 -0700 Extract from libpng/CHANGES: Make the 'png_jmpbuf' macro expand to a call that records the correct longjmp function as well as returning a pointer to the setjmp jmp_buf buffer, and marked direct access to jmpbuf 'deprecated'. (John Bowler) So the PNGImageDecoder should use png_jmpbuf(m_png) instead of m_png->jmpbuf if libpng >= 1.4 is used. 240644 1 59237 pnormand 2010-06-21 03:10:46 -0700 Created attachment 59237 proposed patch 244233 2 59237 xan.lopez 2010-06-29 05:30:09 -0700 Comment on attachment 59237 proposed patch Looks good to me. 244259 3 59237 commit-queue 2010-06-29 06:39:35 -0700 Comment on attachment 59237 proposed patch Rejecting patch 59237 from commit-queue. Failed to run "[u'/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', u'--reviewer', u'Xan Lopez', u'--force']" exit_code: 1 Parsed 2 diffs from patch file(s). patching file WebCore/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file WebCore/platform/image-decoders/png/PNGImageDecoder.cpp Hunk #3 FAILED at 131. Hunk #4 FAILED at 219. Hunk #5 succeeded at 303 (offset 14 lines). 2 out of 5 hunks FAILED -- saving rejects to file WebCore/platform/image-decoders/png/PNGImageDecoder.cpp.rej patch unexpectedly ends in middle of line Full output: http://webkit-commit-queue.appspot.com/results/3339000 244267 4 pnormand 2010-06-29 06:59:22 -0700 Manually landed a rebased patch as http://trac.webkit.org/changeset/62114 Sorry for the noise Eric 612482 5 noel.gordon 2012-04-29 19:24:53 -0700 Question: would the following work for you? #ifndef png_jmpbuf #define png_jmpbuf(png_ptr) ((png_ptr)->jmpbuf) #endif 59237 2010-06-21 03:10:46 -0700 2010-06-29 06:39:35 -0700 proposed patch proposed-patch.patch text/plain 3536 pnormand RnJvbSBkYjlkNzM1MDQ0ZWU3MDE0YWIyYjliNTJkODRhM2RkZjE3YTg2ZDg0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBNb24sIDIxIEp1biAyMDEwIDEyOjEwOjI4ICswMjAwClN1YmplY3Q6IFtQQVRDSF0g cHJvcG9zZWQgcGF0Y2gKCi0tLQogV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgfCAgIDE2ICsrKysrKysrKysrKysrKysKIC4uLi9pbWFnZS1kZWNvZGVy cy9wbmcvUE5HSW1hZ2VEZWNvZGVyLmNwcCAgICAgICAgIHwgICAxNiArKysrKysrKysrKy0tLS0t CiAyIGZpbGVzIGNoYW5nZWQsIDI3IGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBjMzM3 NGVhLi5jMjY2YTJjIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3Jl L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEwLTA2LTIxICBQaGlsaXBwZSBOb3JtYW5k ICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBbUE5HIGRlY29kZXJdIGRpcmVjdCBhY2Nlc3MgdG8gam1wYnVmIGlz IGRlcHJlY2F0ZWQgaW4gbGlicG5nID49IDEuNC4wYmV0YTEwMworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDA5MDcKKworICAgICAgICBEZWZpbmUgYSBK TVBCVUYgbWFjcm8gdG8gY29wZSB3aXRoIGRlcHJlY2F0aW9uIG9mIHRoZSBqbXBidWYKKyAgICAg ICAgYXR0cmlidXRlIGluIGxpYnBuZyA+PSAxLjQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9pbWFn ZS1kZWNvZGVycy9wbmcvUE5HSW1hZ2VEZWNvZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmRl Y29kaW5nRmFpbGVkKToKKyAgICAgICAgKFdlYkNvcmU6OlBOR0ltYWdlUmVhZGVyOjpkZWNvZGUp OgorICAgICAgICAoV2ViQ29yZTo6UE5HSW1hZ2VEZWNvZGVyOjpoZWFkZXJBdmFpbGFibGUpOgor ICAgICAgICAoV2ViQ29yZTo6UE5HSW1hZ2VEZWNvZGVyOjpyb3dBdmFpbGFibGUpOgorCiAyMDEw LTA2LTIxICBCZW5qYW1pbiBQb3VsYWluICA8YmVuamFtaW4ucG91bGFpbkBub2tpYS5jb20+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4uCmRpZmYgLS1n aXQgYS9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL3BuZy9QTkdJbWFnZURlY29kZXIu Y3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9wbmcvUE5HSW1hZ2VEZWNvZGVy LmNwcAppbmRleCAxZGNmNmM3Li5mMzZlNmYzIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3Jt L2ltYWdlLWRlY29kZXJzL3BuZy9QTkdJbWFnZURlY29kZXIuY3BwCisrKyBiL1dlYkNvcmUvcGxh dGZvcm0vaW1hZ2UtZGVjb2RlcnMvcG5nL1BOR0ltYWdlRGVjb2Rlci5jcHAKQEAgLTQxLDYgKzQx LDEyIEBACiAjaW5jbHVkZSAiUE5HSW1hZ2VEZWNvZGVyLmgiCiAjaW5jbHVkZSAicG5nLmgiCiAK KyNpZiBkZWZpbmVkKFBOR19MSUJQTkdfVkVSX01BSk9SKSAmJiBkZWZpbmVkKFBOR19MSUJQTkdf VkVSX01JTk9SKSAmJiAoUE5HX0xJQlBOR19WRVJfTUFKT1IgPiAxIHx8IChQTkdfTElCUE5HX1ZF Ul9NQUpPUiA9PSAxICYmIFBOR19MSUJQTkdfVkVSX01JTk9SID49IDQpKQorI2RlZmluZSBKTVBC VUYocG5nX3B0cikgcG5nX2ptcGJ1ZihwbmdfcHRyKQorI2Vsc2UKKyNkZWZpbmUgSk1QQlVGKHBu Z19wdHIpIHBuZ19wdHItPmptcGJ1ZgorI2VuZGlmCisKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAog Ly8gR2FtbWEgY29uc3RhbnRzLgpAQCAtNTQsNyArNjAsNyBAQCBjb25zdCB1bnNpZ25lZCBsb25n IGNNYXhQTkdTaXplID0gMTAwMDAwMFVMOwogLy8gQ2FsbGVkIGlmIHRoZSBkZWNvZGluZyBvZiB0 aGUgaW1hZ2UgZmFpbHMuCiBzdGF0aWMgdm9pZCBQTkdBUEkgZGVjb2RpbmdGYWlsZWQocG5nX3N0 cnVjdHAgcG5nLCBwbmdfY29uc3RfY2hhcnApCiB7Ci0gICAgbG9uZ2ptcChwbmctPmptcGJ1Ziwg MSk7CisgICAgbG9uZ2ptcChKTVBCVUYocG5nKSwgMSk7CiB9CiAKIC8vIENhbGxiYWNrcyBnaXZl biB0byB0aGUgcmVhZCBzdHJ1Y3QuICBUaGUgZmlyc3QgaXMgZm9yIHdhcm5pbmdzICh3ZSB3YW50 IHRvCkBAIC0xMjUsNyArMTMxLDcgQEAgcHVibGljOgogICAgICAgICBQTkdJbWFnZURlY29kZXIq IGRlY29kZXIgPSBzdGF0aWNfY2FzdDxQTkdJbWFnZURlY29kZXIqPihwbmdfZ2V0X3Byb2dyZXNz aXZlX3B0cihtX3BuZykpOwogCiAgICAgICAgIC8vIFdlIG5lZWQgdG8gZG8gdGhlIHNldGptcCBo ZXJlLiBPdGhlcndpc2UgYmFkIHRoaW5ncyB3aWxsIGhhcHBlbi4KLSAgICAgICAgaWYgKHNldGpt cChtX3BuZy0+am1wYnVmKSkgeworICAgICAgICBpZiAoc2V0am1wKEpNUEJVRihtX3BuZykpKSB7 CiAgICAgICAgICAgICBjbG9zZSgpOwogICAgICAgICAgICAgcmV0dXJuIGRlY29kZXItPnNldEZh aWxlZCgpOwogICAgICAgICB9CkBAIC0yMTMsMTMgKzIxOSwxMyBAQCB2b2lkIFBOR0ltYWdlRGVj b2Rlcjo6aGVhZGVyQXZhaWxhYmxlKCkKICAgICAKICAgICAvLyBQcm90ZWN0IGFnYWluc3QgbGFy Z2UgaW1hZ2VzLgogICAgIGlmIChwbmctPndpZHRoID4gY01heFBOR1NpemUgfHwgcG5nLT5oZWln aHQgPiBjTWF4UE5HU2l6ZSkgewotICAgICAgICBsb25nam1wKHBuZy0+am1wYnVmLCAxKTsKKyAg ICAgICAgbG9uZ2ptcChKTVBCVUYocG5nKSwgMSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAg ICAgCiAgICAgLy8gV2UgY2FuIGZpbGwgaW4gdGhlIHNpemUgbm93IHRoYXQgdGhlIGhlYWRlciBp cyBhdmFpbGFibGUuCiAgICAgaWYgKCFzZXRTaXplKHdpZHRoLCBoZWlnaHQpKSB7Ci0gICAgICAg IGxvbmdqbXAocG5nLT5qbXBidWYsIDEpOworICAgICAgICBsb25nam1wKEpNUEJVRihwbmcpLCAx KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtMjgzLDcgKzI4OSw3IEBAIHZvaWQgUE5H SW1hZ2VEZWNvZGVyOjpyb3dBdmFpbGFibGUodW5zaWduZWQgY2hhciogcm93QnVmZmVyLCB1bnNp Z25lZCByb3dJbmRleCwKICAgICBSR0JBMzJCdWZmZXImIGJ1ZmZlciA9IG1fZnJhbWVCdWZmZXJD YWNoZVswXTsKICAgICBpZiAoYnVmZmVyLnN0YXR1cygpID09IFJHQkEzMkJ1ZmZlcjo6RnJhbWVF bXB0eSkgewogICAgICAgICBpZiAoIWJ1ZmZlci5zZXRTaXplKHNjYWxlZFNpemUoKS53aWR0aCgp LCBzY2FsZWRTaXplKCkuaGVpZ2h0KCkpKSB7Ci0gICAgICAgICAgICBsb25nam1wKG1fcmVhZGVy LT5wbmdQdHIoKS0+am1wYnVmLCAxKTsKKyAgICAgICAgICAgIGxvbmdqbXAoSk1QQlVGKG1fcmVh ZGVyLT5wbmdQdHIoKSksIDEpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAg ICAgIGJ1ZmZlci5zZXRTdGF0dXMoUkdCQTMyQnVmZmVyOjpGcmFtZVBhcnRpYWwpOwotLSAKMS43 LjE=