101014 2012-11-01 22:08:15 -0700 visitedHashLink() converts 8 bit URLs and attributes to 16 bits. 2012-11-02 16:08:40 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 msaboff msaboff webkit.review.bot oldest_to_newest 756885 0 msaboff 2012-11-01 22:08:15 -0700 visitedHashLink() calls characters() on both the base URL and attribute do compute the hash. This code should check the bitness of the strings and use characters8() or characters16() as appropriate. 756887 1 171985 msaboff 2012-11-01 22:16:24 -0700 Created attachment 171985 Patch 757494 2 171985 ggaren 2012-11-02 12:52:42 -0700 Comment on attachment 171985 Patch r=me 757524 3 171985 webkit.review.bot 2012-11-02 13:22:22 -0700 Comment on attachment 171985 Patch Clearing flags on attachment: 171985 Committed r133334: <http://trac.webkit.org/changeset/133334> 757525 4 webkit.review.bot 2012-11-02 13:22:25 -0700 All reviewed patches have been landed. Closing bug. 757716 5 171985 darin 2012-11-02 16:08:40 -0700 Comment on attachment 171985 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=171985&action=review > Source/WebCore/platform/LinkHash.cpp:179 > +template <typename CharacterType> > +static inline bool matchLetter(CharacterType c, char lowercaseLetter) > { > return (c | 0x20) == lowercaseLetter; > } This is a duplicate of the isASCIIAlphaCaselessEqual function from ASCIICType.h; we should use that instead of duplicating it. 171985 2012-11-01 22:16:24 -0700 2012-11-02 16:08:40 -0700 Patch 101014.patch text/plain 8967 msaboff SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzMzI2NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBACisyMDEyLTExLTAxICBNaWNoYWVs IFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgorCisgICAgICAgIHZpc2l0ZWRIYXNoTGluaygp IGNvbnZlcnRzIDggYml0IFVSTHMgYW5kIGF0dHJpYnV0ZXMgdG8gMTYgYml0cy4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMTAxNAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENvbnZlcnRlZCBtb3N0IG9m IHRoZSBzdGF0aWMgbWV0aG9kcyB0byB0ZW1wbGF0ZWQgYmFzZWQgb24gY2hhcmFjdGVyIHR5cGUu ICBDaGFuZ2VkIHZpc2l0ZWRIYXNoTGluayB0byAKKyAgICAgICAgY2hlY2sgYml0bmVzcyBvZiBi b3RoIHRoZSBiYXNlIFVSTCBhbmQgYXR0cmlidXRlLiAgSWYgYm90aCBhcmUgOCBiaXQsIHRoZW4g d2UgcHJvY2VzcyB1c2luZyB0aGUgTENoYXIKKyAgICAgICAgdmVyc2lvbiBvZiB0aGUgdGVtcGxh dGVkIG1ldGhvZHMuICBPdGhlcndpc2Ugd2UgdXNlIHRoZSAxNiBiaXQgZmxhdm9yLgorCisgICAg ICAgIENoYW5nZXMgY292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAgICAgICAqIHBsYXRm b3JtL0xpbmtIYXNoLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmZpbmRTbGFzaERvdERvdFNsYXNo KToKKyAgICAgICAgKFdlYkNvcmU6OmZpbmRTbGFzaFNsYXNoKToKKyAgICAgICAgKFdlYkNvcmU6 OmZpbmRTbGFzaERvdFNsYXNoKToKKyAgICAgICAgKFdlYkNvcmU6OmNvbnRhaW5zQ29sb25TbGFz aFNsYXNoKToKKyAgICAgICAgKFdlYkNvcmU6OnNxdWVlemVPdXROdWxsQ2hhcmFjdGVycyk6Cisg ICAgICAgIChXZWJDb3JlOjpjbGVhblNsYXNoRG90RG90U2xhc2hlcyk6CisgICAgICAgIChXZWJD b3JlOjptZXJnZURvdWJsZVNsYXNoZXMpOgorICAgICAgICAoV2ViQ29yZTo6Y2xlYW5TbGFzaERv dFNsYXNoZXMpOgorICAgICAgICAoV2ViQ29yZTo6Y2xlYW5QYXRoKToKKyAgICAgICAgKFdlYkNv cmU6Om1hdGNoTGV0dGVyKToKKyAgICAgICAgKFdlYkNvcmU6Om5lZWRzVHJhaWxpbmdTbGFzaCk6 CisgICAgICAgIChXZWJDb3JlOjp2aXNpdGVkVVJMSW5saW5lKToKKyAgICAgICAgKFdlYkNvcmU6 OnZpc2l0ZWRVUkwpOgorICAgICAgICAoV2ViQ29yZTo6dmlzaXRlZExpbmtIYXNoKToKKwogMjAx Mi0xMS0wMSAgUm9nZXIgRm9uZyAgPHJvZ2VyX2ZvbmdAYXBwbGUuY29tPgogCiAgICAgICAgIEJ1 aWxkIGZpeC4gaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvMTMzMjUyIGJyb2tlIHRo ZSBXaW5kb3dzIGJ1aWxkLgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTGlua0hhc2gu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0xpbmtIYXNoLmNwcAko cmV2aXNpb24gMTMyOTcwKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTGlua0hhc2guY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0zMCw3ICszMCw4IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsK IAotc3RhdGljIGlubGluZSBzaXplX3QgZmluZFNsYXNoRG90RG90U2xhc2goY29uc3QgVUNoYXIq IGNoYXJhY3RlcnMsIHNpemVfdCBsZW5ndGgsIHNpemVfdCBwb3NpdGlvbikKK3RlbXBsYXRlIDx0 eXBlbmFtZSBDaGFyYWN0ZXJUeXBlPgorc3RhdGljIGlubGluZSBzaXplX3QgZmluZFNsYXNoRG90 RG90U2xhc2goY29uc3QgQ2hhcmFjdGVyVHlwZSogY2hhcmFjdGVycywgc2l6ZV90IGxlbmd0aCwg c2l6ZV90IHBvc2l0aW9uKQogewogICAgIGlmIChsZW5ndGggPCA0KQogICAgICAgICByZXR1cm4g bm90Rm91bmQ7CkBAIC00Miw3ICs0Myw4IEBAIHN0YXRpYyBpbmxpbmUgc2l6ZV90IGZpbmRTbGFz aERvdERvdFNsYXMKICAgICByZXR1cm4gbm90Rm91bmQ7CiB9CiAKLXN0YXRpYyBpbmxpbmUgc2l6 ZV90IGZpbmRTbGFzaFNsYXNoKGNvbnN0IFVDaGFyKiBjaGFyYWN0ZXJzLCBzaXplX3QgbGVuZ3Ro LCBzaXplX3QgcG9zaXRpb24pCit0ZW1wbGF0ZSA8dHlwZW5hbWUgQ2hhcmFjdGVyVHlwZT4KK3N0 YXRpYyBpbmxpbmUgc2l6ZV90IGZpbmRTbGFzaFNsYXNoKGNvbnN0IENoYXJhY3RlclR5cGUqIGNo YXJhY3RlcnMsIHNpemVfdCBsZW5ndGgsIHNpemVfdCBwb3NpdGlvbikKIHsKICAgICBpZiAobGVu Z3RoIDwgMikKICAgICAgICAgcmV0dXJuIG5vdEZvdW5kOwpAQCAtNTQsNyArNTYsOCBAQCBzdGF0 aWMgaW5saW5lIHNpemVfdCBmaW5kU2xhc2hTbGFzaChjb25zCiAgICAgcmV0dXJuIG5vdEZvdW5k OwogfQogCi1zdGF0aWMgaW5saW5lIHNpemVfdCBmaW5kU2xhc2hEb3RTbGFzaChjb25zdCBVQ2hh ciogY2hhcmFjdGVycywgc2l6ZV90IGxlbmd0aCwgc2l6ZV90IHBvc2l0aW9uKQordGVtcGxhdGUg PHR5cGVuYW1lIENoYXJhY3RlclR5cGU+CitzdGF0aWMgaW5saW5lIHNpemVfdCBmaW5kU2xhc2hE b3RTbGFzaChjb25zdCBDaGFyYWN0ZXJUeXBlKiBjaGFyYWN0ZXJzLCBzaXplX3QgbGVuZ3RoLCBz aXplX3QgcG9zaXRpb24pCiB7CiAgICAgaWYgKGxlbmd0aCA8IDMpCiAgICAgICAgIHJldHVybiBu b3RGb3VuZDsKQEAgLTY2LDcgKzY5LDggQEAgc3RhdGljIGlubGluZSBzaXplX3QgZmluZFNsYXNo RG90U2xhc2goYwogICAgIHJldHVybiBub3RGb3VuZDsKIH0KIAotc3RhdGljIGlubGluZSBib29s IGNvbnRhaW5zQ29sb25TbGFzaFNsYXNoKGNvbnN0IFVDaGFyKiBjaGFyYWN0ZXJzLCB1bnNpZ25l ZCBsZW5ndGgpCit0ZW1wbGF0ZSA8dHlwZW5hbWUgQ2hhcmFjdGVyVHlwZT4KK3N0YXRpYyBpbmxp bmUgYm9vbCBjb250YWluc0NvbG9uU2xhc2hTbGFzaChjb25zdCBDaGFyYWN0ZXJUeXBlKiBjaGFy YWN0ZXJzLCB1bnNpZ25lZCBsZW5ndGgpCiB7CiAgICAgaWYgKGxlbmd0aCA8IDMpCiAgICAgICAg IHJldHVybiBmYWxzZTsKQEAgLTc4LDcgKzgyLDggQEAgc3RhdGljIGlubGluZSBib29sIGNvbnRh aW5zQ29sb25TbGFzaFNsYQogICAgIHJldHVybiBmYWxzZTsKIH0KIAotc3RhdGljIGlubGluZSB2 b2lkIHNxdWVlemVPdXROdWxsQ2hhcmFjdGVycyhWZWN0b3I8VUNoYXIsIDUxMj4mIHN0cmluZykK K3RlbXBsYXRlIDx0eXBlbmFtZSBDaGFyYWN0ZXJUeXBlPgorc3RhdGljIGlubGluZSB2b2lkIHNx dWVlemVPdXROdWxsQ2hhcmFjdGVycyhWZWN0b3I8Q2hhcmFjdGVyVHlwZSwgNTEyPiYgc3RyaW5n KQogewogICAgIHNpemVfdCBzaXplID0gc3RyaW5nLnNpemUoKTsKICAgICBzaXplX3QgaSA9IDA7 CkBAIC05MCwxNCArOTUsMTUgQEAgc3RhdGljIGlubGluZSB2b2lkIHNxdWVlemVPdXROdWxsQ2hh cmFjdAogICAgICAgICByZXR1cm47CiAgICAgc2l6ZV90IGogPSBpOwogICAgIGZvciAoKytpOyBp IDwgc2l6ZTsgKytpKSB7Ci0gICAgICAgIGlmIChVQ2hhciBjaGFyYWN0ZXIgPSBzdHJpbmdbaV0p CisgICAgICAgIGlmIChDaGFyYWN0ZXJUeXBlIGNoYXJhY3RlciA9IHN0cmluZ1tpXSkKICAgICAg ICAgICAgIHN0cmluZ1tqKytdID0gY2hhcmFjdGVyOwogICAgIH0KICAgICBBU1NFUlQoaiA8IHNp emUpOwogICAgIHN0cmluZy5zaHJpbmsoaik7CiB9CiAKLXN0YXRpYyB2b2lkIGNsZWFuU2xhc2hE b3REb3RTbGFzaGVzKFZlY3RvcjxVQ2hhciwgNTEyPiYgcGF0aCwgc2l6ZV90IGZpcnN0U2xhc2gp Cit0ZW1wbGF0ZSA8dHlwZW5hbWUgQ2hhcmFjdGVyVHlwZT4KK3N0YXRpYyB2b2lkIGNsZWFuU2xh c2hEb3REb3RTbGFzaGVzKFZlY3RvcjxDaGFyYWN0ZXJUeXBlLCA1MTI+JiBwYXRoLCBzaXplX3Qg Zmlyc3RTbGFzaCkKIHsKICAgICBzaXplX3Qgc2xhc2ggPSBmaXJzdFNsYXNoOwogICAgIGRvIHsK QEAgLTExNiw3ICsxMjIsOCBAQCBzdGF0aWMgdm9pZCBjbGVhblNsYXNoRG90RG90U2xhc2hlcyhW ZWN0CiAgICAgc3F1ZWV6ZU91dE51bGxDaGFyYWN0ZXJzKHBhdGgpOwogfQogCi1zdGF0aWMgdm9p ZCBtZXJnZURvdWJsZVNsYXNoZXMoVmVjdG9yPFVDaGFyLCA1MTI+JiBwYXRoLCBzaXplX3QgZmly c3RTbGFzaCkKK3RlbXBsYXRlIDx0eXBlbmFtZSBDaGFyYWN0ZXJUeXBlPgorc3RhdGljIHZvaWQg bWVyZ2VEb3VibGVTbGFzaGVzKFZlY3RvcjxDaGFyYWN0ZXJUeXBlLCA1MTI+JiBwYXRoLCBzaXpl X3QgZmlyc3RTbGFzaCkKIHsKICAgICBzaXplX3QgcmVmUG9zID0gZmluZChwYXRoLmRhdGEoKSwg cGF0aC5zaXplKCksICcjJyk7CiAgICAgaWYgKCFyZWZQb3MgfHwgcmVmUG9zID09IG5vdEZvdW5k KQpAQCAtMTM0LDcgKzE0MSw4IEBAIHN0YXRpYyB2b2lkIG1lcmdlRG91YmxlU2xhc2hlcyhWZWN0 b3I8VUMKICAgICBzcXVlZXplT3V0TnVsbENoYXJhY3RlcnMocGF0aCk7CiB9CiAKLXN0YXRpYyB2 b2lkIGNsZWFuU2xhc2hEb3RTbGFzaGVzKFZlY3RvcjxVQ2hhciwgNTEyPiYgcGF0aCwgc2l6ZV90 IGZpcnN0U2xhc2gpCit0ZW1wbGF0ZSA8dHlwZW5hbWUgQ2hhcmFjdGVyVHlwZT4KK3N0YXRpYyB2 b2lkIGNsZWFuU2xhc2hEb3RTbGFzaGVzKFZlY3RvcjxDaGFyYWN0ZXJUeXBlLCA1MTI+JiBwYXRo LCBzaXplX3QgZmlyc3RTbGFzaCkKIHsKICAgICBzaXplX3Qgc2xhc2ggPSBmaXJzdFNsYXNoOwog ICAgIGRvIHsKQEAgLTE0NSw3ICsxNTMsOCBAQCBzdGF0aWMgdm9pZCBjbGVhblNsYXNoRG90U2xh c2hlcyhWZWN0b3I8CiAgICAgc3F1ZWV6ZU91dE51bGxDaGFyYWN0ZXJzKHBhdGgpOwogfQogCi1z dGF0aWMgaW5saW5lIHZvaWQgY2xlYW5QYXRoKFZlY3RvcjxVQ2hhciwgNTEyPiYgcGF0aCkKK3Rl bXBsYXRlIDx0eXBlbmFtZSBDaGFyYWN0ZXJUeXBlPgorc3RhdGljIGlubGluZSB2b2lkIGNsZWFu UGF0aChWZWN0b3I8Q2hhcmFjdGVyVHlwZSwgNTEyPiYgcGF0aCkKIHsKICAgICAvLyBGSVhNRTog U2hvdWxkIG5vdCBkbyB0aGlzIGluIHRoZSBxdWVyeSBvciBhbmNob3IgcGFydCBvZiB0aGUgVVJM LgogICAgIHNpemVfdCBmaXJzdFNsYXNoID0gZmluZFNsYXNoRG90RG90U2xhc2gocGF0aC5kYXRh KCksIHBhdGguc2l6ZSgpLCAwKTsKQEAgLTE2MywxMiArMTcyLDE0IEBAIHN0YXRpYyBpbmxpbmUg dm9pZCBjbGVhblBhdGgoVmVjdG9yPFVDaGEKICAgICAgICAgY2xlYW5TbGFzaERvdFNsYXNoZXMo cGF0aCwgZmlyc3RTbGFzaCk7CiB9CiAKLXN0YXRpYyBpbmxpbmUgYm9vbCBtYXRjaExldHRlcihV Q2hhciBjLCBVQ2hhciBsb3dlcmNhc2VMZXR0ZXIpCit0ZW1wbGF0ZSA8dHlwZW5hbWUgQ2hhcmFj dGVyVHlwZT4KK3N0YXRpYyBpbmxpbmUgYm9vbCBtYXRjaExldHRlcihDaGFyYWN0ZXJUeXBlIGMs IGNoYXIgbG93ZXJjYXNlTGV0dGVyKQogewogICAgIHJldHVybiAoYyB8IDB4MjApID09IGxvd2Vy Y2FzZUxldHRlcjsKIH0KIAotc3RhdGljIGlubGluZSBib29sIG5lZWRzVHJhaWxpbmdTbGFzaChj b25zdCBVQ2hhciogY2hhcmFjdGVycywgdW5zaWduZWQgbGVuZ3RoKQordGVtcGxhdGUgPHR5cGVu YW1lIENoYXJhY3RlclR5cGU+CitzdGF0aWMgaW5saW5lIGJvb2wgbmVlZHNUcmFpbGluZ1NsYXNo KGNvbnN0IENoYXJhY3RlclR5cGUqIGNoYXJhY3RlcnMsIHVuc2lnbmVkIGxlbmd0aCkKIHsKICAg ICBpZiAobGVuZ3RoIDwgNikKICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtMjE0LDE0ICsyMjUs MTIgQEAgTGlua0hhc2ggdmlzaXRlZExpbmtIYXNoKGNvbnN0IFVDaGFyKiB1cgogICAgIHJldHVy biB2aXNpdGVkTGlua0hhc2hJbmxpbmUodXJsLCBsZW5ndGgpOwogfQogCi1zdGF0aWMgQUxXQVlT X0lOTElORSB2b2lkIHZpc2l0ZWRVUkxJbmxpbmUoY29uc3QgS1VSTCYgYmFzZSwgY29uc3QgQXRv bWljU3RyaW5nJiBhdHRyaWJ1dGVVUkwsIFZlY3RvcjxVQ2hhciwgNTEyPiYgYnVmZmVyKQordGVt cGxhdGUgPHR5cGVuYW1lIENoYXJhY3RlclR5cGU+CitzdGF0aWMgQUxXQVlTX0lOTElORSB2b2lk IHZpc2l0ZWRVUkxJbmxpbmUoY29uc3QgS1VSTCYgYmFzZSwgY29uc3QgQ2hhcmFjdGVyVHlwZSog Y2hhcmFjdGVycywgdW5zaWduZWQgbGVuZ3RoLCBWZWN0b3I8Q2hhcmFjdGVyVHlwZSwgNTEyPiYg YnVmZmVyKQogewotICAgIGlmIChhdHRyaWJ1dGVVUkwuaXNOdWxsKCkpCisgICAgaWYgKCFsZW5n dGgpCiAgICAgICAgIHJldHVybjsKIAotICAgIGNvbnN0IFVDaGFyKiBjaGFyYWN0ZXJzID0gYXR0 cmlidXRlVVJMLmNoYXJhY3RlcnMoKTsKLSAgICB1bnNpZ25lZCBsZW5ndGggPSBhdHRyaWJ1dGVV UkwubGVuZ3RoKCk7Ci0KICAgICAvLyBUaGlzIGlzIGEgcG9vciBtYW4ncyBjb21wbGV0ZVVSTC4g RmFzdGVyIHdpdGggbGVzcyBtZW1vcnkgYWxsb2NhdGlvbi4KICAgICAvLyBGSVhNRTogSXQncyBt aXNzaW5nIGEgbG90IG9mIHdoYXQgY29tcGxldGVVUkwgZG9lcyBhbmQgYSBsb3Qgb2Ygd2hhdCBL VVJMIGRvZXMuCiAgICAgLy8gRm9yIGV4YW1wbGUsIGl0IGRvZXMgbm90IGhhbmRsZSBpbnRlcm5h dGlvbmFsIGRvbWFpbiBuYW1lcyBwcm9wZXJseS4KQEAgLTIzNiw3ICsyNDUsNyBAQCBzdGF0aWMg QUxXQVlTX0lOTElORSB2b2lkIHZpc2l0ZWRVUkxJbmxpCiAgICAgYm9vbCBoYXNDb2xvblNsYXNo U2xhc2ggPSBjb250YWluc0NvbG9uU2xhc2hTbGFzaChjaGFyYWN0ZXJzLCBsZW5ndGgpOwogCiAg ICAgaWYgKGhhc0NvbG9uU2xhc2hTbGFzaCAmJiAhbmVlZHNUcmFpbGluZ1NsYXNoKGNoYXJhY3Rl cnMsIGxlbmd0aCkpIHsKLSAgICAgICAgYnVmZmVyLmFwcGVuZChhdHRyaWJ1dGVVUkwuY2hhcmFj dGVycygpLCBhdHRyaWJ1dGVVUkwubGVuZ3RoKCkpOworICAgICAgICBidWZmZXIuYXBwZW5kKGNo YXJhY3RlcnMsIGxlbmd0aCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTI1MCwxNyAr MjU5LDE3IEBAIHN0YXRpYyBBTFdBWVNfSU5MSU5FIHZvaWQgdmlzaXRlZFVSTElubGkKICAgICB9 CiAKICAgICBpZiAoIWxlbmd0aCkKLSAgICAgICAgYnVmZmVyLmFwcGVuZChiYXNlLnN0cmluZygp LmNoYXJhY3RlcnMoKSwgYmFzZS5zdHJpbmcoKS5sZW5ndGgoKSk7CisgICAgICAgIGJ1ZmZlci5h cHBlbmQoYmFzZS5zdHJpbmcoKS5nZXRDaGFyYWN0ZXJzV2l0aFVwY29udmVydDxDaGFyYWN0ZXJU eXBlPigpLCBiYXNlLnN0cmluZygpLmxlbmd0aCgpKTsKICAgICBlbHNlIHsKICAgICAgICAgc3dp dGNoIChjaGFyYWN0ZXJzWzBdKSB7CiAgICAgICAgICAgICBjYXNlICcvJzoKLSAgICAgICAgICAg ICAgICBidWZmZXIuYXBwZW5kKGJhc2Uuc3RyaW5nKCkuY2hhcmFjdGVycygpLCBiYXNlLnBhdGhT dGFydCgpKTsKKyAgICAgICAgICAgICAgICBidWZmZXIuYXBwZW5kKGJhc2Uuc3RyaW5nKCkuZ2V0 Q2hhcmFjdGVyc1dpdGhVcGNvbnZlcnQ8Q2hhcmFjdGVyVHlwZT4oKSwgYmFzZS5wYXRoU3RhcnQo KSk7CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICBjYXNlICcjJzoKLSAgICAg ICAgICAgICAgICBidWZmZXIuYXBwZW5kKGJhc2Uuc3RyaW5nKCkuY2hhcmFjdGVycygpLCBiYXNl LnBhdGhFbmQoKSk7CisgICAgICAgICAgICAgICAgYnVmZmVyLmFwcGVuZChiYXNlLnN0cmluZygp LmdldENoYXJhY3RlcnNXaXRoVXBjb252ZXJ0PENoYXJhY3RlclR5cGU+KCksIGJhc2UucGF0aEVu ZCgpKTsKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIGRlZmF1bHQ6Ci0gICAg ICAgICAgICAgICAgYnVmZmVyLmFwcGVuZChiYXNlLnN0cmluZygpLmNoYXJhY3RlcnMoKSwgYmFz ZS5wYXRoQWZ0ZXJMYXN0U2xhc2goKSk7CisgICAgICAgICAgICAgICAgYnVmZmVyLmFwcGVuZChi YXNlLnN0cmluZygpLmdldENoYXJhY3RlcnNXaXRoVXBjb252ZXJ0PENoYXJhY3RlclR5cGU+KCks IGJhc2UucGF0aEFmdGVyTGFzdFNsYXNoKCkpOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAg ICAgICB9CiAgICAgfQpAQCAtMjc3LDEzICsyODYsMjIgQEAgc3RhdGljIEFMV0FZU19JTkxJTkUg dm9pZCB2aXNpdGVkVVJMSW5saQogCiB2b2lkIHZpc2l0ZWRVUkwoY29uc3QgS1VSTCYgYmFzZSwg Y29uc3QgQXRvbWljU3RyaW5nJiBhdHRyaWJ1dGVVUkwsIFZlY3RvcjxVQ2hhciwgNTEyPiYgYnVm ZmVyKQogewotICAgIHJldHVybiB2aXNpdGVkVVJMSW5saW5lKGJhc2UsIGF0dHJpYnV0ZVVSTCwg YnVmZmVyKTsKKyAgICByZXR1cm4gdmlzaXRlZFVSTElubGluZShiYXNlLCBhdHRyaWJ1dGVVUkwu Y2hhcmFjdGVycygpLCBhdHRyaWJ1dGVVUkwubGVuZ3RoKCksIGJ1ZmZlcik7CiB9CiAKIExpbmtI YXNoIHZpc2l0ZWRMaW5rSGFzaChjb25zdCBLVVJMJiBiYXNlLCBjb25zdCBBdG9taWNTdHJpbmcm IGF0dHJpYnV0ZVVSTCkKIHsKKyAgICBpZiAoYmFzZS5zdHJpbmcoKS5pczhCaXQoKSAmJiBhdHRy aWJ1dGVVUkwuaXM4Qml0KCkpIHsKKyAgICAgICAgVmVjdG9yPExDaGFyLCA1MTI+IHVybDsKKyAg ICAgICAgdmlzaXRlZFVSTElubGluZShiYXNlLCBhdHRyaWJ1dGVVUkwuY2hhcmFjdGVyczgoKSwg YXR0cmlidXRlVVJMLmxlbmd0aCgpLCB1cmwpOworICAgICAgICBpZiAodXJsLmlzRW1wdHkoKSkK KyAgICAgICAgICAgIHJldHVybiAwOworCisgICAgICAgIHJldHVybiB2aXNpdGVkTGlua0hhc2hJ bmxpbmUodXJsLmRhdGEoKSwgdXJsLnNpemUoKSk7CisgICAgfQorCiAgICAgVmVjdG9yPFVDaGFy LCA1MTI+IHVybDsKLSAgICB2aXNpdGVkVVJMSW5saW5lKGJhc2UsIGF0dHJpYnV0ZVVSTCwgdXJs KTsKKyAgICB2aXNpdGVkVVJMSW5saW5lKGJhc2UsIGF0dHJpYnV0ZVVSTC5jaGFyYWN0ZXJzKCks IGF0dHJpYnV0ZVVSTC5sZW5ndGgoKSwgdXJsKTsKICAgICBpZiAodXJsLmlzRW1wdHkoKSkKICAg ICAgICAgcmV0dXJuIDA7CiAK