122412 2013-10-06 07:33:01 -0700 Incorrect use of bool and boolean in JPEGImageDecoder.cpp 2014-03-31 03:21:57 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 0 griffon26 webkit-unassigned cgarcia commit-queue gnome mrobinson pachoramos1 zan oldest_to_newest 936769 0 griffon26 2013-10-06 07:33:01 -0700 webkit-gtk is using both the bool built-in type and the boolean type defined by libjpeg. In some cases built-in values false/true are used where a boolean is expected. The patch I'll attach in a moment fixes this problem by using TRUE/FALSE (defined by libjpeg) instead. 936771 1 213513 griffon26 2013-10-06 08:15:43 -0700 Created attachment 213513 Fixes mixed use of booleans in JPEGImageDecoder.cpp The attached patch fixes several compilation errors when compiling with libjpeg-9 installed. One example of those errors: Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp:345:47: error: cannot convert 'bool' to 'boolean' for argument '2' to 'int jpeg_read_header(j_decompress_ptr, boolean)' 937424 2 zan 2013-10-08 00:22:26 -0700 The fix looks OK, but the patch still needs to be applied on trunk and is missing the ChangeLog entry. The required steps are outlined at http://www.webkit.org/coding/contributing.html. 974769 3 pachoramos1 2014-02-02 06:03:27 -0800 Any news on this? 974794 4 222927 griffon26 2014-02-02 11:05:47 -0800 Created attachment 222927 Same patch as before, but including changelog entry and based on trunk 993661 5 pachoramos1 2014-03-23 08:38:29 -0700 ping! Maybe would be interesting to have it fixed for next major version :/ 993681 6 222927 zan 2014-03-23 12:59:51 -0700 Comment on attachment 222927 Same patch as before, but including changelog entry and based on trunk Flipping the review flag. 995806 7 222927 commit-queue 2014-03-31 03:21:53 -0700 Comment on attachment 222927 Same patch as before, but including changelog entry and based on trunk Clearing flags on attachment: 222927 Committed r166490: <http://trac.webkit.org/changeset/166490> 995807 8 commit-queue 2014-03-31 03:21:57 -0700 All reviewed patches have been landed. Closing bug. 213513 2013-10-06 08:15:43 -0700 2014-02-02 11:05:47 -0800 Fixes mixed use of booleans in JPEGImageDecoder.cpp webkit-gtk-2.0.4-mixed-booleans.patch text/plain 1688 griffon26 ZGlmZiAtcnVOIHdlYmtpdGd0ay0yLjAuNC9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1k ZWNvZGVycy9qcGVnL0pQRUdJbWFnZURlY29kZXIuY3BwIHdlYmtpdGd0ay0yLjAuNC1maXhlZC9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9qcGVnL0pQRUdJbWFnZURlY29k ZXIuY3BwCi0tLSB3ZWJraXRndGstMi4wLjQvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2Ut ZGVjb2RlcnMvanBlZy9KUEVHSW1hZ2VEZWNvZGVyLmNwcAkyMDEzLTA3LTE5IDA5OjA0OjEwLjAw MDAwMDAwMCArMDIwMAorKysgd2Via2l0Z3RrLTIuMC40LWZpeGVkL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2ltYWdlLWRlY29kZXJzL2pwZWcvSlBFR0ltYWdlRGVjb2Rlci5jcHAJMjAxMy0xMC0w NiAxNTowODoxMS4wMDAwMDAwMDAgKzAyMDAKQEAgLTM0Miw3ICszNDIsNyBAQAogICAgICAgICBz d2l0Y2ggKG1fc3RhdGUpIHsKICAgICAgICAgY2FzZSBKUEVHX0hFQURFUjoKICAgICAgICAgICAg IC8vIFJlYWQgZmlsZSBwYXJhbWV0ZXJzIHdpdGgganBlZ19yZWFkX2hlYWRlcigpLgotICAgICAg ICAgICAgaWYgKGpwZWdfcmVhZF9oZWFkZXIoJm1faW5mbywgdHJ1ZSkgPT0gSlBFR19TVVNQRU5E RUQpCisgICAgICAgICAgICBpZiAoanBlZ19yZWFkX2hlYWRlcigmbV9pbmZvLCBUUlVFKSA9PSBK UEVHX1NVU1BFTkRFRCkKICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7IC8vIEkvTyBzdXNw ZW5zaW9uLgogCiAgICAgICAgICAgICBzd2l0Y2ggKG1faW5mby5qcGVnX2NvbG9yX3NwYWNlKSB7 CkBAIC00MjgsOSArNDI4LDkgQEAKICAgICAgICAgICAgIC8vIG9mIHByb2dyZXNzaXZlIEpQRUcu CiAgICAgICAgICAgICBtX2luZm8uZGN0X21ldGhvZCA9IGRjdE1ldGhvZCgpOwogICAgICAgICAg ICAgbV9pbmZvLmRpdGhlcl9tb2RlID0gZGl0aGVyTW9kZSgpOwotICAgICAgICAgICAgbV9pbmZv LmRvX2ZhbmN5X3Vwc2FtcGxpbmcgPSBkb0ZhbmN5VXBzYW1wbGluZygpOwotICAgICAgICAgICAg bV9pbmZvLmVuYWJsZV8ycGFzc19xdWFudCA9IGZhbHNlOwotICAgICAgICAgICAgbV9pbmZvLmRv X2Jsb2NrX3Ntb290aGluZyA9IHRydWU7CisgICAgICAgICAgICBtX2luZm8uZG9fZmFuY3lfdXBz YW1wbGluZyA9IGRvRmFuY3lVcHNhbXBsaW5nKCkgPyBUUlVFIDogRkFMU0U7CisgICAgICAgICAg ICBtX2luZm8uZW5hYmxlXzJwYXNzX3F1YW50ID0gRkFMU0U7CisgICAgICAgICAgICBtX2luZm8u ZG9fYmxvY2tfc21vb3RoaW5nID0gVFJVRTsKIAogICAgICAgICAgICAgLy8gU3RhcnQgZGVjb21w cmVzc29yLgogICAgICAgICAgICAgaWYgKCFqcGVnX3N0YXJ0X2RlY29tcHJlc3MoJm1faW5mbykp CkBAIC01ODEsNyArNTgxLDcgQEAKICAgICAvLyBPdXIgZGVjb2RlIHN0ZXAgYWx3YXlzIHNldHMg dGhpbmdzIHVwIHByb3Blcmx5LCBzbyBpZiB0aGlzIG1ldGhvZCBpcyBldmVyCiAgICAgLy8gY2Fs bGVkLCB0aGVuIHdlIGhhdmUgaGl0IHRoZSBlbmQgb2YgdGhlIGJ1ZmZlci4gIEEgcmV0dXJuIHZh bHVlIG9mIGZhbHNlCiAgICAgLy8gaW5kaWNhdGVzIHRoYXQgd2UgaGF2ZSBubyBkYXRhIHRvIHN1 cHBseSB5ZXQuCi0gICAgcmV0dXJuIGZhbHNlOworICAgIHJldHVybiBGQUxTRTsKIH0KIAogdm9p ZCB0ZXJtX3NvdXJjZShqX2RlY29tcHJlc3NfcHRyIGpkKQo= 222927 2014-02-02 11:05:47 -0800 2014-03-31 03:21:53 -0700 Same patch as before, but including changelog entry and based on trunk webkit-trunk-mixed-booleans.patch text/plain 2431 griffon26 ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAyYTVjNzI0Li5hMTkxZDc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTQtMDItMDIgIE1hdXJpY2UgdmFuIGRlciBQb3QgIDxncmlmZm9uMjZAa2ZrNGV2ZXIu Y29tPgorCisgICAgICAgIEZpeCBtaXhlZCB1c2Ugb2YgYm9vbGVhbnMgaW4gSlBFR0ltYWdlRGVj b2Rlci5jcHAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEyMjQxMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRyaXZpYWwgZml4IGZvciBjb21waWxhdGlvbiBlcnJvcjsgbm8gbmV3IHRlc3RzLgorCisgICAg ICAgICogcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvanBlZy9KUEVHSW1hZ2VEZWNvZGVyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkpQRUdJbWFnZVJlYWRlcjo6ZGVjb2RlKToKKyAgICAgICAgKFdl YkNvcmU6OmZpbGxfaW5wdXRfYnVmZmVyKToKKyAgICAgICAgVXNlIFRSVUUvRkFMU0UgZGVmaW5l ZCBieSBsaWJqcGVnIGZvciBsaWJqcGVnIGJvb2xlYW5zCisKIDIwMTQtMDItMDIgIFphbGFuIEJ1 anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBTdWJwaXhlbCByZW5kZXJpbmc6IE1h a2UgQm9yZGVyRWRnZS9Sb3VuZGVkUmVjdDo6UmFkaWkgTGF5b3V0VW5pdCBhd2FyZS4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL2pwZWcvSlBFR0lt YWdlRGVjb2Rlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9q cGVnL0pQRUdJbWFnZURlY29kZXIuY3BwCmluZGV4IDM4ZTE4ZDMuLjM5YjFiMjYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL2pwZWcvSlBFR0ltYWdl RGVjb2Rlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMv anBlZy9KUEVHSW1hZ2VEZWNvZGVyLmNwcApAQCAtMzMzLDcgKzMzMyw3IEBAIHB1YmxpYzoKICAg ICAgICAgc3dpdGNoIChtX3N0YXRlKSB7CiAgICAgICAgIGNhc2UgSlBFR19IRUFERVI6CiAgICAg ICAgICAgICAvLyBSZWFkIGZpbGUgcGFyYW1ldGVycyB3aXRoIGpwZWdfcmVhZF9oZWFkZXIoKS4K LSAgICAgICAgICAgIGlmIChqcGVnX3JlYWRfaGVhZGVyKCZtX2luZm8sIHRydWUpID09IEpQRUdf U1VTUEVOREVEKQorICAgICAgICAgICAgaWYgKGpwZWdfcmVhZF9oZWFkZXIoJm1faW5mbywgVFJV RSkgPT0gSlBFR19TVVNQRU5ERUQpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOyAvLyBJ L08gc3VzcGVuc2lvbi4KIAogICAgICAgICAgICAgc3dpdGNoIChtX2luZm8uanBlZ19jb2xvcl9z cGFjZSkgewpAQCAtNDE5LDkgKzQxOSw5IEBAIHB1YmxpYzoKICAgICAgICAgICAgIC8vIG9mIHBy b2dyZXNzaXZlIEpQRUcuCiAgICAgICAgICAgICBtX2luZm8uZGN0X21ldGhvZCA9IGRjdE1ldGhv ZCgpOwogICAgICAgICAgICAgbV9pbmZvLmRpdGhlcl9tb2RlID0gZGl0aGVyTW9kZSgpOwotICAg ICAgICAgICAgbV9pbmZvLmRvX2ZhbmN5X3Vwc2FtcGxpbmcgPSBkb0ZhbmN5VXBzYW1wbGluZygp OwotICAgICAgICAgICAgbV9pbmZvLmVuYWJsZV8ycGFzc19xdWFudCA9IGZhbHNlOwotICAgICAg ICAgICAgbV9pbmZvLmRvX2Jsb2NrX3Ntb290aGluZyA9IHRydWU7CisgICAgICAgICAgICBtX2lu Zm8uZG9fZmFuY3lfdXBzYW1wbGluZyA9IGRvRmFuY3lVcHNhbXBsaW5nKCkgPyBUUlVFIDogRkFM U0U7CisgICAgICAgICAgICBtX2luZm8uZW5hYmxlXzJwYXNzX3F1YW50ID0gRkFMU0U7CisgICAg ICAgICAgICBtX2luZm8uZG9fYmxvY2tfc21vb3RoaW5nID0gVFJVRTsKIAogICAgICAgICAgICAg Ly8gU3RhcnQgZGVjb21wcmVzc29yLgogICAgICAgICAgICAgaWYgKCFqcGVnX3N0YXJ0X2RlY29t cHJlc3MoJm1faW5mbykpCkBAIC01NzIsNyArNTcyLDcgQEAgYm9vbGVhbiBmaWxsX2lucHV0X2J1 ZmZlcihqX2RlY29tcHJlc3NfcHRyKQogICAgIC8vIE91ciBkZWNvZGUgc3RlcCBhbHdheXMgc2V0 cyB0aGluZ3MgdXAgcHJvcGVybHksIHNvIGlmIHRoaXMgbWV0aG9kIGlzIGV2ZXIKICAgICAvLyBj YWxsZWQsIHRoZW4gd2UgaGF2ZSBoaXQgdGhlIGVuZCBvZiB0aGUgYnVmZmVyLiAgQSByZXR1cm4g dmFsdWUgb2YgZmFsc2UKICAgICAvLyBpbmRpY2F0ZXMgdGhhdCB3ZSBoYXZlIG5vIGRhdGEgdG8g c3VwcGx5IHlldC4KLSAgICByZXR1cm4gZmFsc2U7CisgICAgcmV0dXJuIEZBTFNFOwogfQogCiB2 b2lkIHRlcm1fc291cmNlKGpfZGVjb21wcmVzc19wdHIgamQpCg==