51385 2010-12-21 00:58:09 -0800 Move V8 to common implementation of window.open 2010-12-21 19:10:27 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 abarth abarth antonm commit-queue darin sam oldest_to_newest 324906 0 abarth 2010-12-21 00:58:09 -0800 Move V8 to common implementation of window.open 324908 1 77091 abarth 2010-12-21 01:00:44 -0800 Created attachment 77091 Patch 324960 2 77091 antonm 2010-12-21 05:29:48 -0800 Comment on attachment 77091 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=77091&action=review > WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp:519 > + EXCEPTION_BLOCK(String, urlString, toWebCoreStringWithNullOrUndefinedCheck(args[0])); I am not sure EXCEPTION_BLOCK does what it promises in the case of string conversion: if memory serves, our functions do eat thrown exceptions. If it's indeed the case, I would recommend using STRING_TO_V8PARAMETER_EXCEPTION_BLOCK. Adam, maybe you can give it a quick informal try just in Inspector? 324961 3 antonm 2010-12-21 05:30:05 -0800 And overall LGTM (In reply to comment #2) > (From update of attachment 77091 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=77091&action=review > > > WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp:519 > > + EXCEPTION_BLOCK(String, urlString, toWebCoreStringWithNullOrUndefinedCheck(args[0])); > > I am not sure EXCEPTION_BLOCK does what it promises in the case of string conversion: if memory serves, our functions do eat thrown exceptions. If it's indeed the case, I would recommend using STRING_TO_V8PARAMETER_EXCEPTION_BLOCK. > > Adam, maybe you can give it a quick informal try just in Inspector? 325225 4 abarth 2010-12-21 15:16:02 -0800 > Adam, maybe you can give it a quick informal try just in Inspector? Will do. 325227 5 77091 darin 2010-12-21 15:18:43 -0800 Comment on attachment 77091 Patch Looks good to me. 325330 6 77091 commit-queue 2010-12-21 19:10:20 -0800 Comment on attachment 77091 Patch Clearing flags on attachment: 77091 Committed r74449: <http://trac.webkit.org/changeset/74449> 325331 7 commit-queue 2010-12-21 19:10:27 -0800 All reviewed patches have been landed. Closing bug. 77091 2010-12-21 01:00:44 -0800 2010-12-21 19:10:20 -0800 Patch bug-51385-20101221010043.patch text/plain 11707 abarth SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3NDQwNSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsNDMgQEAKKzIwMTAtMTItMjEgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3Zl IFY4IHRvIGNvbW1vbiBpbXBsZW1lbnRhdGlvbiBvZiB3aW5kb3cub3BlbgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTEzODUKKworICAgICAgICBJIGFs c28gY2hhbmdlZCBzb21lIGZ1bmN0aW9uIG5hbWVzIHRvIG1hdGNoIFdlYktpdCBzdHlsZS4gIFRo ZXJlJ3MgYQorICAgICAgICBidW5jaCBvZiBjb2RlIHdlIGNhbiByZW1vdmUgaW4gdGhlIGdlbmVy aWMgYmluZGluZ3Mgbm93LiAgSSdsbCBkbyB0aGF0CisgICAgICAgIGluIHRoZSBuZXh0IHBhdGNo LgorCisgICAgICAgICogYmluZGluZ3MvZ2VuZXJpYy9CaW5kaW5nRE9NV2luZG93Lmg6CisgICAg ICAgIChXZWJDb3JlOjo6Om9wZW4pOgorICAgICAgICAqIGJpbmRpbmdzL2dlbmVyaWMvQmluZGlu Z0ZyYW1lLmg6CisgICAgICAgIChXZWJDb3JlOjo6Om5hdmlnYXRlSWZBbGxvd2VkKToKKyAgICAg ICAgKiBiaW5kaW5ncy9nZW5lcmljL0JpbmRpbmdTZWN1cml0eS5oOgorICAgICAgICAoV2ViQ29y ZTo6OjpjYW5BY2Nlc3NXaW5kb3cpOgorICAgICAgICAoV2ViQ29yZTo6OjphbGxvd1BvcFVwKToK KyAgICAgICAgKFdlYkNvcmU6Ojo6c2hvdWxkQWxsb3dOYXZpZ2F0aW9uKToKKyAgICAgICAgKiBi aW5kaW5ncy9nZW5lcmljL0dlbmVyaWNCaW5kaW5nLmg6CisgICAgICAgIChXZWJDb3JlOjpjb21w bGV0ZVVSTCk6CisgICAgICAgICogYmluZGluZ3MvanMvSlNET01CaW5kaW5nLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OnRvTGV4aWNhbEZyYW1lKToKKyAgICAgICAgKFdlYkNvcmU6OnRvRHluYW1p Y0ZyYW1lKToKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9zcGVjaWFsaXphdGlvbi9KU0JpbmRpbmdT dGF0ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjo6OmFjdGl2ZUZyYW1lKToKKyAgICAgICAgKFdl YkNvcmU6Ojo6Zmlyc3RGcmFtZSk6CisgICAgICAgICogYmluZGluZ3MvanMvc3BlY2lhbGl6YXRp b24vSlNCaW5kaW5nU3RhdGUuaDoKKyAgICAgICAgKiBiaW5kaW5ncy92OC9WOFV0aWxpdGllcy5j cHA6CisgICAgICAgIChXZWJDb3JlOjpjYWxsaW5nT3JFbnRlcmVkRnJhbWUpOgorICAgICAgICAq IGJpbmRpbmdzL3Y4L2N1c3RvbS9WOERPTVdpbmRvd0N1c3RvbS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpWOERPTVdpbmRvdzo6bG9jYXRpb25BY2Nlc3NvclNldHRlcik6CisgICAgICAgIChXZWJD b3JlOjpWOERPTVdpbmRvdzo6b3BlbkNhbGxiYWNrKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9z cGVjaWFsaXphdGlvbi9WOEJpbmRpbmdTdGF0ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjo6OmFj dGl2ZVdpbmRvdyk6CisgICAgICAgIChXZWJDb3JlOjo6OmZpcnN0V2luZG93KToKKyAgICAgICAg KFdlYkNvcmU6Ojo6YWN0aXZlRnJhbWUpOgorICAgICAgICAoV2ViQ29yZTo6OjpmaXJzdEZyYW1l KToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9zcGVjaWFsaXphdGlvbi9WOEJpbmRpbmdTdGF0ZS5o OgorCiAyMDEwLTEyLTIwICBNYWhlc2ggS3Vsa2FybmkgIDxtYWhlc2gua3Vsa2FybmlAbm9raWEu Y29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFuZHJlYXMgS2xpbmcuCkluZGV4OiBXZWJDb3Jl L2JpbmRpbmdzL2dlbmVyaWMvQmluZGluZ0RPTVdpbmRvdy5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvYmluZGluZ3MvZ2VuZXJpYy9CaW5kaW5nRE9NV2luZG93LmgJKHJldmlzaW9uIDc0NDA0KQor KysgV2ViQ29yZS9iaW5kaW5ncy9nZW5lcmljL0JpbmRpbmdET01XaW5kb3cuaAkod29ya2luZyBj b3B5KQpAQCAtMTQyLDExICsxNDIsMTEgQEAgV2ViQ29yZTo6RE9NV2luZG93KiBCaW5kaW5nRE9N V2luZG93PEJpbgogICAgIGlmICghQmluZGluZ1NlY3VyaXR5PEJpbmRpbmc+OjpjYW5BY2Nlc3NG cmFtZShzdGF0ZSwgZnJhbWUsIHRydWUpKQogICAgICAgICByZXR1cm4gMDsKIAotICAgIEZyYW1l KiBmaXJzdEZyYW1lID0gc3RhdGUtPmdldEZpcnN0RnJhbWUoKTsKKyAgICBGcmFtZSogZmlyc3RG cmFtZSA9IHN0YXRlLT5maXJzdEZyYW1lKCk7CiAgICAgaWYgKCFmaXJzdEZyYW1lKQogICAgICAg ICByZXR1cm4gMDsKIAotICAgIEZyYW1lKiBhY3RpdmVGcmFtZSA9IHN0YXRlLT5nZXRBY3RpdmVG cmFtZSgpOworICAgIEZyYW1lKiBhY3RpdmVGcmFtZSA9IHN0YXRlLT5hY3RpdmVGcmFtZSgpOwog ICAgIC8vIFdlIG1heSBub3QgaGF2ZSBhIGNhbGxpbmcgY29udGV4dCBpZiB3ZSBhcmUgaW52b2tl ZCBieSBhIHBsdWdpbgogICAgIC8vIHZpYSBOUEFQSS4KICAgICBpZiAoIWFjdGl2ZUZyYW1lKQpJ bmRleDogV2ViQ29yZS9iaW5kaW5ncy9nZW5lcmljL0JpbmRpbmdGcmFtZS5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYkNvcmUvYmluZGluZ3MvZ2VuZXJpYy9CaW5kaW5nRnJhbWUuaAkocmV2aXNpb24gNzQ0 MDQpCisrKyBXZWJDb3JlL2JpbmRpbmdzL2dlbmVyaWMvQmluZGluZ0ZyYW1lLmgJKHdvcmtpbmcg Y29weSkKQEAgLTQ1LDcgKzQ1LDcgQEAgcHVibGljOgogdGVtcGxhdGUgPGNsYXNzIEJpbmRpbmc+ CiB2b2lkIEJpbmRpbmdGcmFtZTxCaW5kaW5nPjo6bmF2aWdhdGVJZkFsbG93ZWQoU3RhdGU8Qmlu ZGluZz4qIHN0YXRlLCBGcmFtZSogZnJhbWUsIGNvbnN0IEtVUkwmIHVybCwgYm9vbCBsb2NrSGlz dG9yeSwgYm9vbCBsb2NrQmFja0ZvcndhcmRMaXN0KQogewotICAgIEZyYW1lKiBhY3RpdmVGcmFt ZSA9IHN0YXRlLT5nZXRBY3RpdmVGcmFtZSgpOworICAgIEZyYW1lKiBhY3RpdmVGcmFtZSA9IHN0 YXRlLT5hY3RpdmVGcmFtZSgpOwogICAgIGlmICghYWN0aXZlRnJhbWUpCiAgICAgICAgIHJldHVy bjsKICAgICBpZiAoIXByb3RvY29sSXNKYXZhU2NyaXB0KHVybCkgfHwgc3RhdGUtPmFsbG93c0Fj Y2Vzc0Zyb21GcmFtZShmcmFtZSkpCkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL2dlbmVyaWMvQmlu ZGluZ1NlY3VyaXR5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy9nZW5lcmljL0Jp bmRpbmdTZWN1cml0eS5oCShyZXZpc2lvbiA3NDQwNCkKKysrIFdlYkNvcmUvYmluZGluZ3MvZ2Vu ZXJpYy9CaW5kaW5nU2VjdXJpdHkuaAkod29ya2luZyBjb3B5KQpAQCAtNzgsNyArNzgsNyBAQCB0 ZW1wbGF0ZSA8Y2xhc3MgQmluZGluZz4KIGJvb2wgQmluZGluZ1NlY3VyaXR5PEJpbmRpbmc+Ojpj YW5BY2Nlc3NXaW5kb3coU3RhdGU8QmluZGluZz4qIHN0YXRlLAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBET01XaW5kb3cqIHRhcmdldFdpbmRvdykKIHsK LSAgICBET01XaW5kb3cqIGFjdGl2ZVdpbmRvdyA9IHN0YXRlLT5nZXRBY3RpdmVXaW5kb3coKTsK KyAgICBET01XaW5kb3cqIGFjdGl2ZVdpbmRvdyA9IHN0YXRlLT5hY3RpdmVXaW5kb3coKTsKICAg ICByZXR1cm4gY2FuQWNjZXNzKGFjdGl2ZVdpbmRvdywgdGFyZ2V0V2luZG93KTsKIH0KIApAQCAt MTE5LDcgKzExOSw3IEBAIGJvb2wgQmluZGluZ1NlY3VyaXR5PEJpbmRpbmc+OjphbGxvd1BvcFUK ICAgICBpZiAoc3RhdGUtPnByb2Nlc3NpbmdVc2VyR2VzdHVyZSgpKQogICAgICAgICByZXR1cm4g dHJ1ZTsKIAotICAgIEZyYW1lKiBmcmFtZSA9IHN0YXRlLT5nZXRGaXJzdEZyYW1lKCk7CisgICAg RnJhbWUqIGZyYW1lID0gc3RhdGUtPmZpcnN0RnJhbWUoKTsKICAgICBBU1NFUlQoZnJhbWUpOwog ICAgIFNldHRpbmdzKiBzZXR0aW5ncyA9IGZyYW1lLT5zZXR0aW5ncygpOwogICAgIHJldHVybiBz ZXR0aW5ncyAmJiBzZXR0aW5ncy0+amF2YVNjcmlwdENhbk9wZW5XaW5kb3dzQXV0b21hdGljYWxs eSgpOwpAQCAtMTQ3LDcgKzE0Nyw3IEBAIGJvb2wgQmluZGluZ1NlY3VyaXR5PEJpbmRpbmc+Ojph bGxvd1NldHQKIHRlbXBsYXRlIDxjbGFzcyBCaW5kaW5nPgogYm9vbCBCaW5kaW5nU2VjdXJpdHk8 QmluZGluZz46OnNob3VsZEFsbG93TmF2aWdhdGlvbihTdGF0ZTxCaW5kaW5nPiogc3RhdGUsIEZy YW1lKiBmcmFtZSkKIHsKLSAgICBGcmFtZSogYWN0aXZlRnJhbWUgPSBzdGF0ZS0+Z2V0QWN0aXZl RnJhbWUoKTsKKyAgICBGcmFtZSogYWN0aXZlRnJhbWUgPSBzdGF0ZS0+YWN0aXZlRnJhbWUoKTsK ICAgICByZXR1cm4gYWN0aXZlRnJhbWUgJiYgYWN0aXZlRnJhbWUtPmxvYWRlcigpLT5zaG91bGRB bGxvd05hdmlnYXRpb24oZnJhbWUpOwogfQogCkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL2dlbmVy aWMvR2VuZXJpY0JpbmRpbmcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL2dlbmVy aWMvR2VuZXJpY0JpbmRpbmcuaAkocmV2aXNpb24gNzQ0MDQpCisrKyBXZWJDb3JlL2JpbmRpbmdz L2dlbmVyaWMvR2VuZXJpY0JpbmRpbmcuaAkod29ya2luZyBjb3B5KQpAQCAtNTUsNyArNTUsNyBA QCBLVVJMIGNvbXBsZXRlVVJMKFN0YXRlPEJpbmRpbmc+KiBzdGF0ZSwgCiB7CiAgICAgLy8gRm9y IGhpc3RvcmljYWwgcmVhc29ucywgd2UgbmVlZCB0byBjb21wbGV0ZSB0aGUgVVJMIHVzaW5nIHRo ZQogICAgIC8vIGR5bmFtaWMgZnJhbWUuCi0gICAgRnJhbWUqIGZyYW1lID0gc3RhdGUtPmdldEZp cnN0RnJhbWUoKTsKKyAgICBGcmFtZSogZnJhbWUgPSBzdGF0ZS0+Zmlyc3RGcmFtZSgpOwogICAg IGlmICghZnJhbWUpCiAgICAgICAgIHJldHVybiBLVVJMKCk7CiAgICAgcmV0dXJuIGZyYW1lLT5s b2FkZXIoKS0+Y29tcGxldGVVUkwocmVsYXRpdmVVUkwpOwpJbmRleDogV2ViQ29yZS9iaW5kaW5n cy9qcy9KU0RPTUJpbmRpbmcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmluZGluZ3MvanMv SlNET01CaW5kaW5nLmNwcAkocmV2aXNpb24gNzQ0MDQpCisrKyBXZWJDb3JlL2JpbmRpbmdzL2pz L0pTRE9NQmluZGluZy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTcxMiwxMiArNzEyLDEyIEBAIHZv aWQgcHJpbnRFcnJvck1lc3NhZ2VGb3JGcmFtZShGcmFtZSogZnIKIAogRnJhbWUqIHRvTGV4aWNh bEZyYW1lKEV4ZWNTdGF0ZSogZXhlYykKIHsKLSAgICByZXR1cm4gSlNCaW5kaW5nU3RhdGUoZXhl YykuZ2V0QWN0aXZlRnJhbWUoKTsKKyAgICByZXR1cm4gSlNCaW5kaW5nU3RhdGUoZXhlYykuYWN0 aXZlRnJhbWUoKTsKIH0KIAogRnJhbWUqIHRvRHluYW1pY0ZyYW1lKEV4ZWNTdGF0ZSogZXhlYykK IHsKLSAgICByZXR1cm4gSlNCaW5kaW5nU3RhdGUoZXhlYykuZ2V0Rmlyc3RGcmFtZSgpOworICAg IHJldHVybiBKU0JpbmRpbmdTdGF0ZShleGVjKS5maXJzdEZyYW1lKCk7CiB9CiAKIGJvb2wgcHJv Y2Vzc2luZ1VzZXJHZXN0dXJlKCkKSW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvanMvc3BlY2lhbGl6 YXRpb24vSlNCaW5kaW5nU3RhdGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmluZGluZ3Mv anMvc3BlY2lhbGl6YXRpb24vSlNCaW5kaW5nU3RhdGUuY3BwCShyZXZpc2lvbiA3NDQwNCkKKysr IFdlYkNvcmUvYmluZGluZ3MvanMvc3BlY2lhbGl6YXRpb24vSlNCaW5kaW5nU3RhdGUuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC00MCwxMiArNDAsMTIgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBj bGFzcyBGcmFtZTsKIAotRnJhbWUqIFN0YXRlPEpTQmluZGluZz46OmdldEFjdGl2ZUZyYW1lKCkK K0ZyYW1lKiBTdGF0ZTxKU0JpbmRpbmc+OjphY3RpdmVGcmFtZSgpCiB7CiAgICAgcmV0dXJuIGFz SlNET01XaW5kb3cobV9leGVjLT5sZXhpY2FsR2xvYmFsT2JqZWN0KCkpLT5pbXBsKCktPmZyYW1l KCk7CiB9CiAKLUZyYW1lKiBTdGF0ZTxKU0JpbmRpbmc+OjpnZXRGaXJzdEZyYW1lKCkKK0ZyYW1l KiBTdGF0ZTxKU0JpbmRpbmc+OjpmaXJzdEZyYW1lKCkKIHsKICAgICByZXR1cm4gYXNKU0RPTVdp bmRvdyhtX2V4ZWMtPmR5bmFtaWNHbG9iYWxPYmplY3QoKSktPmltcGwoKS0+ZnJhbWUoKTsKIH0K SW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvanMvc3BlY2lhbGl6YXRpb24vSlNCaW5kaW5nU3RhdGUu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL2pzL3NwZWNpYWxpemF0aW9uL0pTQmlu ZGluZ1N0YXRlLmgJKHJldmlzaW9uIDc0NDA0KQorKysgV2ViQ29yZS9iaW5kaW5ncy9qcy9zcGVj aWFsaXphdGlvbi9KU0JpbmRpbmdTdGF0ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC01Niw4ICs1Niw4 IEBAIHB1YmxpYzoKICAgICB7CiAgICAgfQogCi0gICAgRnJhbWUqIGdldEFjdGl2ZUZyYW1lKCk7 Ci0gICAgRnJhbWUqIGdldEZpcnN0RnJhbWUoKTsKKyAgICBGcmFtZSogYWN0aXZlRnJhbWUoKTsK KyAgICBGcmFtZSogZmlyc3RGcmFtZSgpOwogCiAgICAgYm9vbCBwcm9jZXNzaW5nVXNlckdlc3R1 cmUoKTsKIApJbmRleDogV2ViQ29yZS9iaW5kaW5ncy92OC9WOFV0aWxpdGllcy5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy92OC9WOFV0aWxpdGllcy5jcHAJKHJldmlzaW9uIDc0 NDA0KQorKysgV2ViQ29yZS9iaW5kaW5ncy92OC9WOFV0aWxpdGllcy5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTEwMSw3ICsxMDEsNyBAQCBib29sIHByb2Nlc3NpbmdVc2VyR2VzdHVyZSgpCiAKIEZy YW1lKiBjYWxsaW5nT3JFbnRlcmVkRnJhbWUoKQogewotICAgIHJldHVybiBWOEJpbmRpbmdTdGF0 ZTo6T25seSgpLT5nZXRBY3RpdmVGcmFtZSgpOworICAgIHJldHVybiBWOEJpbmRpbmdTdGF0ZTo6 T25seSgpLT5hY3RpdmVGcmFtZSgpOwogfQogCiBib29sIHNob3VsZEFsbG93TmF2aWdhdGlvbihG cmFtZSogZnJhbWUpCkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOERPTVdpbmRv d0N1c3RvbS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhE T01XaW5kb3dDdXN0b20uY3BwCShyZXZpc2lvbiA3NDQwNCkKKysrIFdlYkNvcmUvYmluZGluZ3Mv djgvY3VzdG9tL1Y4RE9NV2luZG93Q3VzdG9tLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTk1LDEx ICsxOTUsMTEgQEAgdm9pZCBWOERPTVdpbmRvdzo6bG9jYXRpb25BY2Nlc3NvclNldHRlcgogICAg IERPTVdpbmRvdyogaW1wID0gVjhET01XaW5kb3c6OnRvTmF0aXZlKGluZm8uSG9sZGVyKCkpOwog ICAgIFN0YXRlPFY4QmluZGluZz4qIHN0YXRlID0gVjhCaW5kaW5nU3RhdGU6Ok9ubHkoKTsKIAot ICAgIERPTVdpbmRvdyogYWN0aXZlV2luZG93ID0gc3RhdGUtPmdldEFjdGl2ZVdpbmRvdygpOwor ICAgIERPTVdpbmRvdyogYWN0aXZlV2luZG93ID0gc3RhdGUtPmFjdGl2ZVdpbmRvdygpOwogICAg IGlmICghYWN0aXZlV2luZG93KQogICAgICAgcmV0dXJuOwogCi0gICAgRE9NV2luZG93KiBmaXJz dFdpbmRvdyA9IHN0YXRlLT5nZXRGaXJzdFdpbmRvdygpOworICAgIERPTVdpbmRvdyogZmlyc3RX aW5kb3cgPSBzdGF0ZS0+Zmlyc3RXaW5kb3coKTsKICAgICBpZiAoIWZpcnN0V2luZG93KQogICAg ICAgcmV0dXJuOwogCkBAIC01MDksMTkgKzUwOSwyMiBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4g VjhET01XaW5kb3c6OnNob3dNCiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhET01XaW5kb3c6Om9w ZW5DYWxsYmFjayhjb25zdCB2ODo6QXJndW1lbnRzJiBhcmdzKQogewogICAgIElOQ19TVEFUUygi RE9NLkRPTVdpbmRvdy5vcGVuKCkiKTsKKyAgICBET01XaW5kb3cqIGltcGwgPSBWOERPTVdpbmRv dzo6dG9OYXRpdmUoYXJncy5Ib2xkZXIoKSk7CiAKLSAgICBET01XaW5kb3cqIHBhcmVudCA9IFY4 RE9NV2luZG93Ojp0b05hdGl2ZShhcmdzLkhvbGRlcigpKTsKLSAgICBTdHJpbmcgdXJsU3RyaW5n ID0gdG9XZWJDb3JlU3RyaW5nV2l0aE51bGxPclVuZGVmaW5lZENoZWNrKGFyZ3NbMF0pOwotICAg IEF0b21pY1N0cmluZyBmcmFtZU5hbWUgPSAoYXJnc1sxXS0+SXNVbmRlZmluZWQoKSB8fCBhcmdz WzFdLT5Jc051bGwoKSkgPyAiX2JsYW5rIiA6IEF0b21pY1N0cmluZyh0b1dlYkNvcmVTdHJpbmco YXJnc1sxXSkpOwotICAgIFdpbmRvd0ZlYXR1cmVzIHJhd0ZlYXR1cmVzKHRvV2ViQ29yZVN0cmlu Z1dpdGhOdWxsT3JVbmRlZmluZWRDaGVjayhhcmdzWzJdKSk7Ci0gICAgRE9NV2luZG93KiBjaGls ZCA9IFY4QmluZGluZ0RPTVdpbmRvdzo6b3BlbihWOEJpbmRpbmdTdGF0ZTo6T25seSgpLCBwYXJl bnQsIHVybFN0cmluZywgZnJhbWVOYW1lLCByYXdGZWF0dXJlcyk7CisgICAgVjhCaW5kaW5nU3Rh dGUqIHN0YXRlID0gVjhCaW5kaW5nU3RhdGU6Ok9ubHkoKTsKIAotICAgIGlmICghY2hpbGQpCi0g ICAgICAgIHJldHVybiB2ODo6VW5kZWZpbmVkKCk7CisgICAgRE9NV2luZG93KiBhY3RpdmVXaW5k b3cgPSBzdGF0ZS0+YWN0aXZlV2luZG93KCk7CisgICAgRE9NV2luZG93KiBmaXJzdFdpbmRvdyA9 IHN0YXRlLT5maXJzdFdpbmRvdygpOwogCi0gICAgcmV0dXJuIHRvVjgoY2hpbGQpOwotfQorICAg IEVYQ0VQVElPTl9CTE9DSyhTdHJpbmcsIHVybFN0cmluZywgdG9XZWJDb3JlU3RyaW5nV2l0aE51 bGxPclVuZGVmaW5lZENoZWNrKGFyZ3NbMF0pKTsKKyAgICBFWENFUFRJT05fQkxPQ0soQXRvbWlj U3RyaW5nLCBmcmFtZU5hbWUsIChhcmdzWzFdLT5Jc1VuZGVmaW5lZCgpIHx8IGFyZ3NbMV0tPklz TnVsbCgpKSA/ICJfYmxhbmsiIDogQXRvbWljU3RyaW5nKHRvV2ViQ29yZVN0cmluZyhhcmdzWzFd KSkpOworICAgIEVYQ0VQVElPTl9CTE9DSyhTdHJpbmcsIHdpbmRvd0ZlYXR1cmVzU3RyaW5nLCB0 b1dlYkNvcmVTdHJpbmdXaXRoTnVsbE9yVW5kZWZpbmVkQ2hlY2soYXJnc1syXSkpOwogCisgICAg UmVmUHRyPERPTVdpbmRvdz4gb3BlbmVkV2luZG93ID0gaW1wbC0+b3Blbih1cmxTdHJpbmcsIGZy YW1lTmFtZSwgd2luZG93RmVhdHVyZXNTdHJpbmcsIGFjdGl2ZVdpbmRvdywgZmlyc3RXaW5kb3cp OworICAgIGlmICghb3BlbmVkV2luZG93KQorICAgICAgICByZXR1cm4gdjg6OlVuZGVmaW5lZCgp OworICAgIHJldHVybiB0b1Y4KG9wZW5lZFdpbmRvdy5yZWxlYXNlKCkpOworfQogCiB2ODo6SGFu ZGxlPHY4OjpWYWx1ZT4gVjhET01XaW5kb3c6OmluZGV4ZWRQcm9wZXJ0eUdldHRlcih1aW50MzJf dCBpbmRleCwgY29uc3Qgdjg6OkFjY2Vzc29ySW5mbyYgaW5mbykKIHsKSW5kZXg6IFdlYkNvcmUv YmluZGluZ3Mvdjgvc3BlY2lhbGl6YXRpb24vVjhCaW5kaW5nU3RhdGUuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYkNvcmUvYmluZGluZ3Mvdjgvc3BlY2lhbGl6YXRpb24vVjhCaW5kaW5nU3RhdGUuY3Bw CShyZXZpc2lvbiA3NDQwNCkKKysrIFdlYkNvcmUvYmluZGluZ3Mvdjgvc3BlY2lhbGl6YXRpb24v VjhCaW5kaW5nU3RhdGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NCw3ICs0NCw3IEBAIFN0YXRl PFY4QmluZGluZz4qIFN0YXRlPFY4QmluZGluZz46Ok9ubHkKICAgICByZXR1cm4gJmdsb2JhbFY4 QmluZGluZ1N0YXRlOwogfQogCi1ET01XaW5kb3cqIFN0YXRlPFY4QmluZGluZz46OmdldEFjdGl2 ZVdpbmRvdygpCitET01XaW5kb3cqIFN0YXRlPFY4QmluZGluZz46OmFjdGl2ZVdpbmRvdygpCiB7 CiAgICAgdjg6OkxvY2FsPHY4OjpDb250ZXh0PiBhY3RpdmVDb250ZXh0ID0gdjg6OkNvbnRleHQ6 OkdldENhbGxpbmcoKTsKICAgICBpZiAoYWN0aXZlQ29udGV4dC5Jc0VtcHR5KCkpIHsKQEAgLTU1 LDEyICs1NSwxMiBAQCBET01XaW5kb3cqIFN0YXRlPFY4QmluZGluZz46OmdldEFjdGl2ZVdpCiAg ICAgcmV0dXJuIFY4UHJveHk6OnJldHJpZXZlV2luZG93KGFjdGl2ZUNvbnRleHQpOwogfQogCi1E T01XaW5kb3cqIFN0YXRlPFY4QmluZGluZz46OmdldEZpcnN0V2luZG93KCkKK0RPTVdpbmRvdyog U3RhdGU8VjhCaW5kaW5nPjo6Zmlyc3RXaW5kb3coKQogewogICAgIHJldHVybiBWOFByb3h5Ojpy ZXRyaWV2ZVdpbmRvdyh2ODo6Q29udGV4dDo6R2V0RW50ZXJlZCgpKTsKIH0KIAotRnJhbWUqIFN0 YXRlPFY4QmluZGluZz46OmdldEFjdGl2ZUZyYW1lKCkKK0ZyYW1lKiBTdGF0ZTxWOEJpbmRpbmc+ OjphY3RpdmVGcmFtZSgpCiB7CiAgICAgRnJhbWUqIGZyYW1lID0gVjhQcm94eTo6cmV0cmlldmVG cmFtZUZvckNhbGxpbmdDb250ZXh0KCk7CiAgICAgaWYgKCFmcmFtZSkgewpAQCAtNzQsNyArNzQs NyBAQCBGcmFtZSogU3RhdGU8VjhCaW5kaW5nPjo6Z2V0QWN0aXZlRnJhbWUoCiAgICAgcmV0dXJu IGZyYW1lOwogfQogCi1GcmFtZSogU3RhdGU8VjhCaW5kaW5nPjo6Z2V0Rmlyc3RGcmFtZSgpCitG cmFtZSogU3RhdGU8VjhCaW5kaW5nPjo6Zmlyc3RGcmFtZSgpCiB7CiAgICAgcmV0dXJuIFY4UHJv eHk6OnJldHJpZXZlRnJhbWVGb3JFbnRlcmVkQ29udGV4dCgpOwogfQpJbmRleDogV2ViQ29yZS9i aW5kaW5ncy92OC9zcGVjaWFsaXphdGlvbi9WOEJpbmRpbmdTdGF0ZS5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYkNvcmUvYmluZGluZ3Mvdjgvc3BlY2lhbGl6YXRpb24vVjhCaW5kaW5nU3RhdGUuaAkocmV2 aXNpb24gNzQ0MDQpCisrKyBXZWJDb3JlL2JpbmRpbmdzL3Y4L3NwZWNpYWxpemF0aW9uL1Y4Qmlu ZGluZ1N0YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ5LDExICs0OSwxMSBAQCBwdWJsaWM6CiAg ICAgLy8gUmVwb3J0cyBhbiBlcnJvciBtZXNzYWdlICh3aXRob3V0IGRlbGF5KSBpZiB0aGUgc2Vj dXJpdHkgY2hlY2sgZmFpbHMuCiAgICAgc3RhdGljIHZvaWQgaW1tZWRpYXRlbHlSZXBvcnRVbnNh ZmVBY2Nlc3NUbyhGcmFtZSopOwogCi0gICAgRE9NV2luZG93KiBnZXRBY3RpdmVXaW5kb3coKTsK LSAgICBET01XaW5kb3cqIGdldEZpcnN0V2luZG93KCk7CisgICAgRE9NV2luZG93KiBhY3RpdmVX aW5kb3coKTsKKyAgICBET01XaW5kb3cqIGZpcnN0V2luZG93KCk7CiAKLSAgICBGcmFtZSogZ2V0 QWN0aXZlRnJhbWUoKTsKLSAgICBGcmFtZSogZ2V0Rmlyc3RGcmFtZSgpOworICAgIEZyYW1lKiBh Y3RpdmVGcmFtZSgpOworICAgIEZyYW1lKiBmaXJzdEZyYW1lKCk7CiAKICAgICBib29sIHByb2Nl c3NpbmdVc2VyR2VzdHVyZSgpOwogCg==