147199 2015-07-22 11:58:18 -0700 Encode/Decode underlying errors when serializing NSErrors 2015-07-22 12:57:41 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam oldest_to_newest 1111370 0 sam 2015-07-22 11:58:18 -0700 Encode/Decode underlying errors when serializing NSErrors 1111371 1 257284 sam 2015-07-22 11:59:44 -0700 Created attachment 257284 Patch 1111384 2 sam 2015-07-22 12:57:41 -0700 Committed revision 187174. 257284 2015-07-22 11:59:44 -0700 2015-07-22 12:00:12 -0700 Patch bug-147199-20150722115830.patch text/plain 4602 sam SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4NzE3MSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE1LTA3LTIyICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRW5jb2RlL0RlY29kZSB1bmRlcmx5aW5n IGVycm9ycyB3aGVuIHNlcmlhbGl6aW5nIE5TRXJyb3JzCisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS8yMTgxODExNz4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE0NzE5OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogU2hhcmVkL21hYy9XZWJDb3JlQXJndW1lbnRDb2RlcnNNYWMubW06CisgICAgICAgIChJ UEM6OkFyZ3VtZW50Q29kZXI8Q2VydGlmaWNhdGVJbmZvPjo6ZGVjb2RlKToKKyAgICAgICAgKElQ Qzo6ZW5jb2RlTlNFcnJvcik6CisgICAgICAgIChJUEM6OkFyZ3VtZW50Q29kZXI8UmVzb3VyY2VF cnJvcj46OmVuY29kZVBsYXRmb3JtRGF0YSk6CisgICAgICAgIChJUEM6OmRlY29kZU5TRXJyb3Ip OgorICAgICAgICAoSVBDOjpBcmd1bWVudENvZGVyPFJlc291cmNlRXJyb3I+OjpkZWNvZGVQbGF0 Zm9ybURhdGEpOgorICAgICAgICBCcmVhayBvdXQgZW5jb2RpbmcvZGVjb2Rpbmcgb2YgdGhlIE5T RXJyb3JzIGludG8gYSBoZWxwZXJzIHNvIHRoZXkgY2FuIGJlIGNhbGxlZAorICAgICAgICBmb3Ig dGhlIHVuZGVybHlpbmcgZXJyb3IuCisKIDIwMTUtMDctMjIgIE1pY2hhZWwgQ2F0YW56YXJvICA8 bWNhdGFuemFyb0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtTZWNjb21wIEZpbHRlcnNdIEFkZCBo ZWxwZXJzIHRvIGdldCBYREcgYmFzZSBkaXJlY3RvcnkgbG9jYXRpb25zCkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvbWFjL1dlYkNvcmVBcmd1bWVudENvZGVyc01hYy5tbQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL1dlYkNvcmVBcmd1bWVudENvZGVyc01hYy5t bQkocmV2aXNpb24gMTg3MTYyKQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9XZWJDb3Jl QXJndW1lbnRDb2RlcnNNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTE5MSwxNiArMTkxLDggQEAg Ym9vbCBBcmd1bWVudENvZGVyPENlcnRpZmljYXRlSW5mbz46OmRlYwogICAgIHJldHVybiB0cnVl OwogfQogCi12b2lkIEFyZ3VtZW50Q29kZXI8UmVzb3VyY2VFcnJvcj46OmVuY29kZVBsYXRmb3Jt RGF0YShBcmd1bWVudEVuY29kZXImIGVuY29kZXIsIGNvbnN0IFJlc291cmNlRXJyb3ImIHJlc291 cmNlRXJyb3IpCitzdGF0aWMgdm9pZCBlbmNvZGVOU0Vycm9yKEFyZ3VtZW50RW5jb2RlciYgZW5j b2RlciwgTlNFcnJvciAqbnNFcnJvcikKIHsKLSAgICBib29sIGVycm9ySXNOdWxsID0gcmVzb3Vy Y2VFcnJvci5pc051bGwoKTsKLSAgICBlbmNvZGVyIDw8IGVycm9ySXNOdWxsOwotCi0gICAgaWYg KGVycm9ySXNOdWxsKQotICAgICAgICByZXR1cm47Ci0KLSAgICBOU0Vycm9yICpuc0Vycm9yID0g cmVzb3VyY2VFcnJvci5uc0Vycm9yKCk7Ci0KICAgICBTdHJpbmcgZG9tYWluID0gW25zRXJyb3Ig ZG9tYWluXTsKICAgICBlbmNvZGVyIDw8IGRvbWFpbjsKIApAQCAtMjQyLDE5ICsyMzQsMjkgQEAg dm9pZCBBcmd1bWVudENvZGVyPFJlc291cmNlRXJyb3I+OjplbmNvZAogICAgIH0KICAgICBBU1NF UlQoIXBlZXJDZXJ0aWZpY2F0ZUNoYWluIHx8IFtwZWVyQ2VydGlmaWNhdGVDaGFpbiBpc0tpbmRP ZkNsYXNzOltOU0FycmF5IGNsYXNzXV0pOwogICAgIGVuY29kZXIgPDwgQ2VydGlmaWNhdGVJbmZv KChDRkFycmF5UmVmKXBlZXJDZXJ0aWZpY2F0ZUNoYWluKTsKKworICAgIGlmIChpZCB1bmRlcmx5 aW5nRXJyb3IgPSBbdXNlckluZm8gb2JqZWN0Rm9yS2V5Ok5TVW5kZXJseWluZ0Vycm9yS2V5XSkg eworICAgICAgICBBU1NFUlQoW3VuZGVybHlpbmdFcnJvciBpc0tpbmRPZkNsYXNzOltOU0Vycm9y IGNsYXNzXV0pOworICAgICAgICBlbmNvZGVyIDw8IHRydWU7CisgICAgICAgIGVuY29kZU5TRXJy b3IoZW5jb2RlciwgdW5kZXJseWluZ0Vycm9yKTsKKyAgICB9IGVsc2UKKyAgICAgICAgZW5jb2Rl ciA8PCBmYWxzZTsKIH0KIAotYm9vbCBBcmd1bWVudENvZGVyPFJlc291cmNlRXJyb3I+OjpkZWNv ZGVQbGF0Zm9ybURhdGEoQXJndW1lbnREZWNvZGVyJiBkZWNvZGVyLCBSZXNvdXJjZUVycm9yJiBy ZXNvdXJjZUVycm9yKQordm9pZCBBcmd1bWVudENvZGVyPFJlc291cmNlRXJyb3I+OjplbmNvZGVQ bGF0Zm9ybURhdGEoQXJndW1lbnRFbmNvZGVyJiBlbmNvZGVyLCBjb25zdCBSZXNvdXJjZUVycm9y JiByZXNvdXJjZUVycm9yKQogewotICAgIGJvb2wgZXJyb3JJc051bGw7Ci0gICAgaWYgKCFkZWNv ZGVyLmRlY29kZShlcnJvcklzTnVsbCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAKLSAg ICBpZiAoZXJyb3JJc051bGwpIHsKLSAgICAgICAgcmVzb3VyY2VFcnJvciA9IFJlc291cmNlRXJy b3IoKTsKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgfQorICAgIGJvb2wgZXJyb3JJc051bGwg PSByZXNvdXJjZUVycm9yLmlzTnVsbCgpOworICAgIGVuY29kZXIgPDwgZXJyb3JJc051bGw7CisK KyAgICBpZiAoZXJyb3JJc051bGwpCisgICAgICAgIHJldHVybjsKIAorICAgIE5TRXJyb3IgKm5z RXJyb3IgPSByZXNvdXJjZUVycm9yLm5zRXJyb3IoKTsKKyAgICBlbmNvZGVOU0Vycm9yKGVuY29k ZXIsIG5zRXJyb3IpOworfQorCitzdGF0aWMgYm9vbCBkZWNvZGVOU0Vycm9yKEFyZ3VtZW50RGVj b2RlciYgZGVjb2RlciwgUmV0YWluUHRyPE5TRXJyb3I+JiBuc0Vycm9yKQorewogICAgIFN0cmlu ZyBkb21haW47CiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShkb21haW4pKQogICAgICAgICByZXR1 cm4gZmFsc2U7CkBAIC0yNzYsNyArMjc4LDM3IEBAIGJvb2wgQXJndW1lbnRDb2RlcjxSZXNvdXJj ZUVycm9yPjo6ZGVjb2QKICAgICAgICAgQ0ZEaWN0aW9uYXJ5U2V0VmFsdWUoKENGTXV0YWJsZURp Y3Rpb25hcnlSZWYpdXNlckluZm8uZ2V0KCksIENGU1RSKCJOU0Vycm9yUGVlckNlcnRpZmljYXRl Q2hhaW5LZXkiKSwgKENGQXJyYXlSZWYpY2VydGlmaWNhdGUuY2VydGlmaWNhdGVDaGFpbigpKTsK ICAgICB9CiAKLSAgICBSZXRhaW5QdHI8TlNFcnJvcj4gbnNFcnJvciA9IGFkb3B0TlMoW1tOU0Vy cm9yIGFsbG9jXSBpbml0V2l0aERvbWFpbjpkb21haW4gY29kZTpjb2RlIHVzZXJJbmZvOihOU0Rp Y3Rpb25hcnkgKil1c2VySW5mby5nZXQoKV0pOworICAgIGJvb2wgaGFzVW5kZXJseWluZ0Vycm9y ID0gZmFsc2U7CisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShoYXNVbmRlcmx5aW5nRXJyb3IpKQor ICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBpZiAoaGFzVW5kZXJseWluZ0Vycm9yKSB7Cisg ICAgICAgIFJldGFpblB0cjxOU0Vycm9yPiB1bmRlcmx5aW5nTlNFcnJvcjsKKyAgICAgICAgaWYg KCFkZWNvZGVOU0Vycm9yKGRlY29kZXIsIHVuZGVybHlpbmdOU0Vycm9yKSkKKyAgICAgICAgICAg IHJldHVybiBmYWxzZTsKKworICAgICAgICB1c2VySW5mbyA9IGFkb3B0Q0YoQ0ZEaWN0aW9uYXJ5 Q3JlYXRlTXV0YWJsZUNvcHkoa0NGQWxsb2NhdG9yRGVmYXVsdCwgQ0ZEaWN0aW9uYXJ5R2V0Q291 bnQodXNlckluZm8uZ2V0KCkpICsgMSwgdXNlckluZm8uZ2V0KCkpKTsKKyAgICAgICAgQ0ZEaWN0 aW9uYXJ5U2V0VmFsdWUoKENGTXV0YWJsZURpY3Rpb25hcnlSZWYpdXNlckluZm8uZ2V0KCksIE5T VW5kZXJseWluZ0Vycm9yS2V5LCB1bmRlcmx5aW5nTlNFcnJvci5nZXQoKSk7CisgICAgfQorCisg ICAgbnNFcnJvciA9IGFkb3B0TlMoW1tOU0Vycm9yIGFsbG9jXSBpbml0V2l0aERvbWFpbjpkb21h aW4gY29kZTpjb2RlIHVzZXJJbmZvOihOU0RpY3Rpb25hcnkgKil1c2VySW5mby5nZXQoKV0pOwor ICAgIHJldHVybiB0cnVlOworfQorCitib29sIEFyZ3VtZW50Q29kZXI8UmVzb3VyY2VFcnJvcj46 OmRlY29kZVBsYXRmb3JtRGF0YShBcmd1bWVudERlY29kZXImIGRlY29kZXIsIFJlc291cmNlRXJy b3ImIHJlc291cmNlRXJyb3IpCit7CisgICAgYm9vbCBlcnJvcklzTnVsbDsKKyAgICBpZiAoIWRl Y29kZXIuZGVjb2RlKGVycm9ySXNOdWxsKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIAor ICAgIGlmIChlcnJvcklzTnVsbCkgeworICAgICAgICByZXNvdXJjZUVycm9yID0gUmVzb3VyY2VF cnJvcigpOworICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisgICAgCisgICAgUmV0YWluUHRy PE5TRXJyb3I+IG5zRXJyb3I7CisgICAgaWYgKCFkZWNvZGVOU0Vycm9yKGRlY29kZXIsIG5zRXJy b3IpKQorICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICByZXNvdXJjZUVycm9yID0gUmVzb3Vy Y2VFcnJvcihuc0Vycm9yLmdldCgpKTsKICAgICByZXR1cm4gdHJ1ZTsK