77972 2012-02-07 05:17:37 -0800 Web Inspector: inspected object wrapper should be released by InjectedScript when popover closes 2012-02-08 07:52:21 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 yurys yurys abarth apavlov bweinstein japhet joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 550883 0 yurys 2012-02-07 05:17:37 -0800 When popover is displayed for an object the object gets wrapped by InjectedScript and never released until navigation. 550929 1 125834 yurys 2012-02-07 06:21:50 -0800 Created attachment 125834 Patch 552124 2 yurys 2012-02-08 07:52:21 -0800 Committed r107089: <http://trac.webkit.org/changeset/107089> 125834 2012-02-07 06:21:50 -0800 2012-02-08 06:15:43 -0800 Patch bug-77972-20120207182148.patch text/plain 17865 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2OTI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWQ0MjcxYTg5ZDUwNTQw ZDQyNTRjZmY0MDk3NjQ0MjE5NGE3OGY4Ny4uOTFhNWUyMDkwOGY3MGI0ODIzMDU3MDgzMzdkMzI1 NDM5ZmJkNjk0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQzIEBACisyMDEyLTAyLTA3ICBZdXJ5 IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGluc3BlY3RlZCBvYmplY3Qgd3JhcHBlciBzaG91bGQgYmUgcmVsZWFzZWQgYnkgSW5qZWN0 ZWRTY3JpcHQgd2hlbiBwb3BvdmVyIGNsb3NlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzc5NzIKKworICAgICAgICBXaGVuIG9iamVjdCBwb3BvdmVy IGlzIHNob3duIHRoZSBvYmplY3QgdW5kZXIgY3Vyc29yIGlzIHJlc29sdmVkIGFuZCBpdHMKKyAg ICAgICAgd3JhcHBlciBpcyBwdXQgaW50byAncG9wb3Zlcicgb2JqZWN0IHdyYXBwZXIgZ3JvdXAu IFRoZSBncm91cCBpcyBkaXNjYXJkZWQKKyAgICAgICAgd2hlbiB0aGUgcG9wb3ZlciBjbG9zZXMu CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBiaW5k aW5ncy9qcy9TY3JpcHRQcm9maWxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRQcm9m aWxlcjo6b2JqZWN0QnlIZWFwT2JqZWN0SWQpOgorICAgICAgICAqIGJpbmRpbmdzL2pzL1Njcmlw dFByb2ZpbGVyLmg6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFNjcmlwdFByb2ZpbGVy KToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9TY3JpcHRQcm9maWxlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpTY3JpcHRQcm9maWxlcjo6b2JqZWN0QnlIZWFwT2JqZWN0SWQpOgorICAgICAgICAo V2ViQ29yZSk6CisgICAgICAgICogYmluZGluZ3MvdjgvU2NyaXB0UHJvZmlsZXIuaDoKKyAgICAg ICAgKFdlYkNvcmUpOgorICAgICAgICAoU2NyaXB0UHJvZmlsZXIpOgorICAgICAgICAqIGluc3Bl Y3Rvci9JbnNwZWN0b3IuanNvbjoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yUHJvZmls ZXJBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JQcm9maWxlckFnZW50Ojpn ZXRPYmplY3RCeUhlYXBPYmplY3RJZCk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvclBy b2ZpbGVyQWdlbnQuaDoKKyAgICAgICAgKEluc3BlY3RvclByb2ZpbGVyQWdlbnQpOgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRGV0YWlsZWRIZWFwc2hvdEdyaWROb2Rlcy5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RHZW5lcmljT2JqZWN0Tm9kZS5wcm90b3R5 cGUucXVlcnlPYmplY3RDb250ZW50KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0Rl dGFpbGVkSGVhcHNob3RWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRldGFpbGVkSGVh cHNob3RWaWV3LnByb3RvdHlwZS5fcmVzb2x2ZU9iamVjdEZvclBvcG92ZXIpOgorICAgICAgICAq IGluc3BlY3Rvci9mcm9udC1lbmQvSmF2YVNjcmlwdFNvdXJjZUZyYW1lLmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZSk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuSmF2YVNjcmlwdFNvdXJjZUZyYW1lLnByb3RvdHlwZS5fcmVzb2x2ZU9iamVjdEZvclBvcG92 ZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZS5wcm90b3R5 cGUuX29uSGlkZVBvcG92ZXIpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvT2JqZWN0 UG9wb3ZlckhlbHBlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5PYmplY3RQb3BvdmVySGVs cGVyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5PYmplY3RQb3BvdmVySGVscGVyLnByb3RvdHlw ZS5fc2hvd09iamVjdFBvcG92ZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk9iamVjdFBvcG92 ZXJIZWxwZXIucHJvdG90eXBlLl9vbkhpZGVPYmplY3RQb3BvdmVyKToKKwogMjAxMi0wMi0wNiAg WXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5z cGVjdG9yOiBkb24ndCBtYXJrIG9iamVjdCBpcyBxdWVyaWFibGUgaWYgaXQgaXMgb25seSByZWFj aGFibGUgYnkgaW50ZXJuYWwgcmVmZXJlbmNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9qcy9TY3JpcHRQcm9maWxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9q cy9TY3JpcHRQcm9maWxlci5jcHAKaW5kZXggNGM4NGZiOTcxZTAzYzAwZDVlZmIyOGM1MmZhMDMz NThhMjVmNmExYi4uYTYzZmU0ZDllY2QyZmE3ZmVjYzIzNzQ5ZDJhMjNkZWQyMTM0NTljOSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0UHJvZmlsZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdFByb2ZpbGVyLmNwcApAQCAtMzEs OCArMzEsOCBAQAogI2luY2x1ZGUgIlNjcmlwdFByb2ZpbGVyLmgiCiAKICNpbmNsdWRlICJHQ0Nv bnRyb2xsZXIuaCIKLSNpbmNsdWRlICJJbnNwZWN0b3JWYWx1ZXMuaCIKICNpbmNsdWRlICJKU0RP TUJpbmRpbmcuaCIKKyNpbmNsdWRlICJTY3JpcHRPYmplY3QuaCIKICNpbmNsdWRlIDxwcm9maWxl ci9Qcm9maWxlci5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC00Miw5ICs0Miw5IEBAIHZv aWQgU2NyaXB0UHJvZmlsZXI6OmNvbGxlY3RHYXJiYWdlKCkKICAgICBnY0NvbnRyb2xsZXIoKS5n YXJiYWdlQ29sbGVjdE5vdygpOwogfQogCi1QYXNzUmVmUHRyPEluc3BlY3RvclZhbHVlPiBTY3Jp cHRQcm9maWxlcjo6b2JqZWN0QnlIZWFwT2JqZWN0SWQodW5zaWduZWQsIEluamVjdGVkU2NyaXB0 TWFuYWdlciopCitTY3JpcHRPYmplY3QgU2NyaXB0UHJvZmlsZXI6Om9iamVjdEJ5SGVhcE9iamVj dElkKHVuc2lnbmVkKQogewotICAgIHJldHVybiBJbnNwZWN0b3JWYWx1ZTo6bnVsbCgpOworICAg IHJldHVybiBTY3JpcHRPYmplY3QoKTsKIH0KIAogdm9pZCBTY3JpcHRQcm9maWxlcjo6c3RhcnQo U2NyaXB0U3RhdGUqIHN0YXRlLCBjb25zdCBTdHJpbmcmIHRpdGxlKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0UHJvZmlsZXIuaCBiL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL2pzL1NjcmlwdFByb2ZpbGVyLmgKaW5kZXggMjIxMTk3MWE4NDZjMzU2NjkxMTJi Y2NlNTQwZjVjODU5YTljNzNiOC4uYTIxZWFkYTRjNWQ4ODY3YTMwZmNiNDNhMTRhZTU2ZDI2NmYz NTJjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0UHJvZmls ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRQcm9maWxlci5oCkBA IC0yOCw3ICsyOCw2IEBACiAjZGVmaW5lIFNjcmlwdFByb2ZpbGVyX2gKIAogI2lmIEVOQUJMRShK QVZBU0NSSVBUX0RFQlVHR0VSKQotI2luY2x1ZGUgIkluc3BlY3RvclZhbHVlcy5oIgogI2luY2x1 ZGUgIlNjcmlwdEhlYXBTbmFwc2hvdC5oIgogI2luY2x1ZGUgIlNjcmlwdFByb2ZpbGUuaCIKICNp bmNsdWRlICJTY3JpcHRTdGF0ZS5oIgpAQCAtMzgsNyArMzcsNyBAQAogbmFtZXNwYWNlIFdlYkNv cmUgewogCiBjbGFzcyBET01XcmFwcGVyVmlzaXRvcjsKLWNsYXNzIEluamVjdGVkU2NyaXB0TWFu YWdlcjsKK2NsYXNzIFNjcmlwdE9iamVjdDsKIAogY2xhc3MgU2NyaXB0UHJvZmlsZXIgewogICAg IFdURl9NQUtFX05PTkNPUFlBQkxFKFNjcmlwdFByb2ZpbGVyKTsKQEAgLTUzLDcgKzUyLDcgQEAg cHVibGljOgogICAgIH07CiAKICAgICBzdGF0aWMgdm9pZCBjb2xsZWN0R2FyYmFnZSgpOwotICAg IHN0YXRpYyBQYXNzUmVmUHRyPEluc3BlY3RvclZhbHVlPiBvYmplY3RCeUhlYXBPYmplY3RJZCh1 bnNpZ25lZCBpZCwgSW5qZWN0ZWRTY3JpcHRNYW5hZ2VyKik7CisgICAgc3RhdGljIFNjcmlwdE9i amVjdCBvYmplY3RCeUhlYXBPYmplY3RJZCh1bnNpZ25lZCBpZCk7CiAgICAgc3RhdGljIHZvaWQg c3RhcnQoU2NyaXB0U3RhdGUqIHN0YXRlLCBjb25zdCBTdHJpbmcmIHRpdGxlKTsKICAgICBzdGF0 aWMgUGFzc1JlZlB0cjxTY3JpcHRQcm9maWxlPiBzdG9wKFNjcmlwdFN0YXRlKiBzdGF0ZSwgY29u c3QgU3RyaW5nJiB0aXRsZSk7CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8U2NyaXB0SGVhcFNuYXBz aG90PiB0YWtlSGVhcFNuYXBzaG90KGNvbnN0IFN0cmluZyYsIEhlYXBTbmFwc2hvdFByb2dyZXNz KikgeyByZXR1cm4gMDsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvdjgv U2NyaXB0UHJvZmlsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0UHJv ZmlsZXIuY3BwCmluZGV4IDQwMDdhOGYyYTc5YjUzNDg2YTYzMDk0NDNmMjk4MTcyZTgyNWM3YmUu LmE3ZjY1ZmFmMjc5MjEzZWM0ZTZiZjMzMWQzNDhmNmY0ZDAyZWQxYjMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdFByb2ZpbGVyLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRQcm9maWxlci5jcHAKQEAgLTMyLDkgKzMyLDggQEAK ICNpbmNsdWRlICJTY3JpcHRQcm9maWxlci5oIgogCiAjaW5jbHVkZSAiRE9NV3JhcHBlclZpc2l0 b3IuaCIKLSNpbmNsdWRlICJJbmplY3RlZFNjcmlwdC5oIgotI2luY2x1ZGUgIkluc3BlY3RvclZh bHVlcy5oIgogI2luY2x1ZGUgIlJldGFpbmVkRE9NSW5mby5oIgorI2luY2x1ZGUgIlNjcmlwdE9i amVjdC5oIgogI2luY2x1ZGUgIlY4QmluZGluZy5oIgogI2luY2x1ZGUgIlY4RE9NTWFwLmgiCiAj aW5jbHVkZSAiVjhOb2RlLmgiCkBAIC02NCw3ICs2Myw3IEBAIHZvaWQgU2NyaXB0UHJvZmlsZXI6 OmNvbGxlY3RHYXJiYWdlKCkKICAgICB2ODo6Vjg6Okxvd01lbW9yeU5vdGlmaWNhdGlvbigpOwog fQogCi1QYXNzUmVmUHRyPEluc3BlY3RvclZhbHVlPiBTY3JpcHRQcm9maWxlcjo6b2JqZWN0QnlI ZWFwT2JqZWN0SWQodW5zaWduZWQgaWQsIEluamVjdGVkU2NyaXB0TWFuYWdlciogaW5qZWN0ZWRT Y3JpcHRNYW5hZ2VyKQorU2NyaXB0T2JqZWN0IFNjcmlwdFByb2ZpbGVyOjpvYmplY3RCeUhlYXBP YmplY3RJZCh1bnNpZ25lZCBpZCkKIHsKICAgICAvLyBBcyBpZHMgYXJlIHVuaXF1ZSwgaXQgZG9l c24ndCBtYXR0ZXIgd2hpY2ggSGVhcFNuYXBzaG90IG93bnMgSGVhcEdyYXBoTm9kZS4KICAgICAv LyBXZSBuZWVkIHRvIGZpbmQgZmlyc3QgSGVhcFNuYXBzaG90IGNvbnRhaW5pbmcgYSBub2RlIHdp dGggdGhlIHNwZWNpZmllZCBpZC4KQEAgLTc2LDIwICs3NSwxNiBAQCBQYXNzUmVmUHRyPEluc3Bl Y3RvclZhbHVlPiBTY3JpcHRQcm9maWxlcjo6b2JqZWN0QnlIZWFwT2JqZWN0SWQodW5zaWduZWQg aWQsIEluagogICAgICAgICAgICAgYnJlYWs7CiAgICAgfQogICAgIGlmICghbm9kZSkKLSAgICAg ICAgcmV0dXJuIEluc3BlY3RvclZhbHVlOjpudWxsKCk7CisgICAgICAgIHJldHVybiBTY3JpcHRP YmplY3QoKTsKIAogICAgIHY4OjpIYW5kbGVTY29wZSBzY29wZTsKICAgICB2ODo6SGFuZGxlPHY4 OjpWYWx1ZT4gdmFsdWUgPSBub2RlLT5HZXRIZWFwVmFsdWUoKTsKICAgICBpZiAoIXZhbHVlLT5J c09iamVjdCgpKQotICAgICAgICByZXR1cm4gSW5zcGVjdG9yVmFsdWU6Om51bGwoKTsKLQotICAg IHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gb2JqZWN0KHZhbHVlLkFzPHY4OjpPYmplY3Q+KCkpOwot ICAgIHY4OjpMb2NhbDx2ODo6Q29udGV4dD4gY3JlYXRpb25Db250ZXh0ID0gb2JqZWN0LT5DcmVh dGlvbkNvbnRleHQoKTsKLSAgICB2ODo6Q29udGV4dDo6U2NvcGUgY3JlYXRpb25TY29wZShjcmVh dGlvbkNvbnRleHQpOwotICAgIFNjcmlwdFN0YXRlKiBzY3JpcHRTdGF0ZSA9IFNjcmlwdFN0YXRl Ojpmb3JDb250ZXh0KGNyZWF0aW9uQ29udGV4dCk7Ci0gICAgSW5qZWN0ZWRTY3JpcHQgaW5qZWN0 ZWRTY3JpcHQgPSBpbmplY3RlZFNjcmlwdE1hbmFnZXItPmluamVjdGVkU2NyaXB0Rm9yKHNjcmlw dFN0YXRlKTsKLSAgICByZXR1cm4gIWluamVjdGVkU2NyaXB0Lmhhc05vVmFsdWUoKSA/Ci0gICAg ICAgICAgICBSZWZQdHI8SW5zcGVjdG9yVmFsdWU+KGluamVjdGVkU2NyaXB0LndyYXBPYmplY3Qo dmFsdWUsICIiKSkucmVsZWFzZSgpIDogSW5zcGVjdG9yVmFsdWU6Om51bGwoKTsKKyAgICAgICAg cmV0dXJuIFNjcmlwdE9iamVjdCgpOworCisgICAgdjg6OkhhbmRsZTx2ODo6T2JqZWN0PiBvYmpl Y3QgPSB2YWx1ZS5Bczx2ODo6T2JqZWN0PigpOworICAgIFNjcmlwdFN0YXRlKiBzY3JpcHRTdGF0 ZSA9IFNjcmlwdFN0YXRlOjpmb3JDb250ZXh0KG9iamVjdC0+Q3JlYXRpb25Db250ZXh0KCkpOwor ICAgIHJldHVybiBTY3JpcHRPYmplY3Qoc2NyaXB0U3RhdGUsIG9iamVjdCk7CiB9CiAKIG5hbWVz cGFjZSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRQcm9m aWxlci5oIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0UHJvZmlsZXIuaAppbmRl eCA5ZjAyZjRiNTczNzBiYmNmM2ZmYmE0MGY5YjgxMmI4MzUwZDNhYzFjLi44ZThhMTYxNDRkZWM4 OTA5YjVkMWM4Mjc3NDYyYjhhZDJlZTU0ODkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy92OC9TY3JpcHRQcm9maWxlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L3Y4L1NjcmlwdFByb2ZpbGVyLmgKQEAgLTMxLDcgKzMxLDYgQEAKICNpZm5kZWYgU2NyaXB0UHJv ZmlsZXJfaAogI2RlZmluZSBTY3JpcHRQcm9maWxlcl9oCiAKLSNpbmNsdWRlICJJbnNwZWN0b3JW YWx1ZXMuaCIKICNpbmNsdWRlICJQbGF0Zm9ybVN0cmluZy5oIgogI2luY2x1ZGUgIlNjcmlwdEhl YXBTbmFwc2hvdC5oIgogI2luY2x1ZGUgIlNjcmlwdFByb2ZpbGUuaCIKQEAgLTQyLDcgKzQxLDcg QEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogY2xhc3MgRE9NV3JhcHBlclZpc2l0b3I7Ci1jbGFz cyBJbmplY3RlZFNjcmlwdE1hbmFnZXI7CitjbGFzcyBTY3JpcHRPYmplY3Q7CiAKIGNsYXNzIFNj cmlwdFByb2ZpbGVyIHsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShTY3JpcHRQcm9maWxlcik7 CkBAIC01Nyw3ICs1Niw3IEBAIHB1YmxpYzoKICAgICB9OwogCiAgICAgc3RhdGljIHZvaWQgY29s bGVjdEdhcmJhZ2UoKTsKLSAgICBzdGF0aWMgUGFzc1JlZlB0cjxJbnNwZWN0b3JWYWx1ZT4gb2Jq ZWN0QnlIZWFwT2JqZWN0SWQodW5zaWduZWQgaWQsIEluamVjdGVkU2NyaXB0TWFuYWdlciopOwor ICAgIHN0YXRpYyBTY3JpcHRPYmplY3Qgb2JqZWN0QnlIZWFwT2JqZWN0SWQodW5zaWduZWQgaWQp OwogICAgIHN0YXRpYyB2b2lkIHN0YXJ0KFNjcmlwdFN0YXRlKiBzdGF0ZSwgY29uc3QgU3RyaW5n JiB0aXRsZSk7CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8U2NyaXB0UHJvZmlsZT4gc3RvcChTY3Jp cHRTdGF0ZSogc3RhdGUsIGNvbnN0IFN0cmluZyYgdGl0bGUpOwogICAgIHN0YXRpYyBQYXNzUmVm UHRyPFNjcmlwdEhlYXBTbmFwc2hvdD4gdGFrZUhlYXBTbmFwc2hvdChjb25zdCBTdHJpbmcmIHRp dGxlLCBIZWFwU25hcHNob3RQcm9ncmVzcyopOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3Rvci5qc29uIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3Rvci5qc29uCmluZGV4IDMxZThkOGExMTAyZGJlYTgyZWIyOTM2MDBmM2Q1M2Q3Y2EyNTc1NzIu LjRhODdmY2YwNGJlMmU1NGQxY2EwZmZjYTFiMjFhMzRkNDRiYzEzZWEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgorKysgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KQEAgLTI0MDAsNyArMjQwMCw4IEBACiAgICAgICAg ICAgICB7CiAgICAgICAgICAgICAgICAgIm5hbWUiOiAiZ2V0T2JqZWN0QnlIZWFwT2JqZWN0SWQi LAogICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwotICAgICAgICAgICAgICAgICAgICB7 ICJuYW1lIjogIm9iamVjdElkIiwgInR5cGUiOiAiaW50ZWdlciIgfQorICAgICAgICAgICAgICAg ICAgICB7ICJuYW1lIjogIm9iamVjdElkIiwgInR5cGUiOiAiaW50ZWdlciIgfSwKKyAgICAgICAg ICAgICAgICAgICAgeyAibmFtZSI6ICJvYmplY3RHcm91cCIsICJ0eXBlIjogInN0cmluZyIsICJv cHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJTeW1ib2xpYyBncm91cCBuYW1lIHRoYXQg Y2FuIGJlIHVzZWQgdG8gcmVsZWFzZSBtdWx0aXBsZSBvYmplY3RzLiIgfQogICAgICAgICAgICAg ICAgIF0sCiAgICAgICAgICAgICAgICAgInJldHVybnMiOiBbCiAgICAgICAgICAgICAgICAgICAg IHsgIm5hbWUiOiAicmVzdWx0IiwgIiRyZWYiOiAiUnVudGltZS5SZW1vdGVPYmplY3QiLCAiZGVz Y3JpcHRpb24iOiAiRXZhbHVhdGlvbiByZXN1bHQuIiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUHJvZmlsZXJBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yUHJvZmlsZXJBZ2VudC5jcHAKaW5kZXggNmFkYWEzNDE0NTZj MmM0Mzg2MDA5ZTM5YmQxZDgxNTUzNzU4ODM1OS4uODc3NDI3NmNiMjMzYjFlN2VjMzczNDRhNThm NGJjOGNkNGYwYzVjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvclByb2ZpbGVyQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JQcm9maWxlckFnZW50LmNwcApAQCAtMzMsNiArMzMsNyBAQAogI2lmIEVOQUJMRShKQVZB U0NSSVBUX0RFQlVHR0VSKSAmJiBFTkFCTEUoSU5TUEVDVE9SKQogCiAjaW5jbHVkZSAiQ29uc29s ZS5oIgorI2luY2x1ZGUgIkluamVjdGVkU2NyaXB0LmgiCiAjaW5jbHVkZSAiSW5zcGVjdG9yQ29u c29sZUFnZW50LmgiCiAjaW5jbHVkZSAiSW5zcGVjdG9yRnJvbnRlbmQuaCIKICNpbmNsdWRlICJJ bnNwZWN0b3JTdGF0ZS5oIgpAQCAtNDIsNiArNDMsNyBAQAogI2luY2x1ZGUgIlBhZ2UuaCIKICNp bmNsdWRlICJQYWdlU2NyaXB0RGVidWdTZXJ2ZXIuaCIKICNpbmNsdWRlICJTY3JpcHRIZWFwU25h cHNob3QuaCIKKyNpbmNsdWRlICJTY3JpcHRPYmplY3QuaCIKICNpbmNsdWRlICJTY3JpcHRQcm9m aWxlLmgiCiAjaW5jbHVkZSAiU2NyaXB0UHJvZmlsZXIuaCIKICNpbmNsdWRlIDx3dGYvT3duUHRy Lmg+CkBAIC0zODksMTMgKzM5MSwyMSBAQCB2b2lkIEluc3BlY3RvclByb2ZpbGVyQWdlbnQ6OnRv Z2dsZVJlY29yZEJ1dHRvbihib29sIGlzUHJvZmlsaW5nKQogICAgICAgICBtX2Zyb250ZW5kLT5z ZXRSZWNvcmRpbmdQcm9maWxlKGlzUHJvZmlsaW5nKTsKIH0KIAotdm9pZCBJbnNwZWN0b3JQcm9m aWxlckFnZW50OjpnZXRPYmplY3RCeUhlYXBPYmplY3RJZChFcnJvclN0cmluZyogZXJyb3IsIGlu dCBpZCwgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4mIHJlc3VsdCkKK3ZvaWQgSW5zcGVjdG9yUHJv ZmlsZXJBZ2VudDo6Z2V0T2JqZWN0QnlIZWFwT2JqZWN0SWQoRXJyb3JTdHJpbmcqIGVycm9yLCBp bnQgaWQsIGNvbnN0IFN0cmluZyogb2JqZWN0R3JvdXAsIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+ JiByZXN1bHQpCiB7Ci0gICAgUmVmUHRyPEluc3BlY3RvclZhbHVlPiBoZWFwT2JqZWN0ID0gU2Ny aXB0UHJvZmlsZXI6Om9iamVjdEJ5SGVhcE9iamVjdElkKGlkLCBtX2luamVjdGVkU2NyaXB0TWFu YWdlcik7Ci0gICAgaWYgKCFoZWFwT2JqZWN0LT5pc051bGwoKSkKLSAgICAgICAgaGVhcE9iamVj dC0+YXNPYmplY3QoJnJlc3VsdCk7Ci0gICAgZWxzZQorICAgIFNjcmlwdE9iamVjdCBoZWFwT2Jq ZWN0ID0gU2NyaXB0UHJvZmlsZXI6Om9iamVjdEJ5SGVhcE9iamVjdElkKGlkKTsKKyAgICBpZiAo aGVhcE9iamVjdC5oYXNOb1ZhbHVlKCkpIHsKICAgICAgICAgKmVycm9yID0gIk9iamVjdCBpcyBu b3QgYXZhaWxhYmxlLiI7CisgICAgICAgIHJldHVybjsKKyAgICB9CisgICAgSW5qZWN0ZWRTY3Jp cHQgaW5qZWN0ZWRTY3JpcHQgPSBtX2luamVjdGVkU2NyaXB0TWFuYWdlci0+aW5qZWN0ZWRTY3Jp cHRGb3IoaGVhcE9iamVjdC5zY3JpcHRTdGF0ZSgpKTsKKyAgICBpZiAoaW5qZWN0ZWRTY3JpcHQu aGFzTm9WYWx1ZSgpKSB7CisgICAgICAgICplcnJvciA9ICJPYmplY3QgaXMgbm90IGF2YWlsYWJs ZS4gSW5zcGVjdGVkIGNvbnRleHQgaXMgZ29uZS4iOworICAgICAgICByZXR1cm47CisgICAgfQor ICAgIHJlc3VsdCA9IGluamVjdGVkU2NyaXB0LndyYXBPYmplY3QoaGVhcE9iamVjdCwgb2JqZWN0 R3JvdXAgPyAqb2JqZWN0R3JvdXAgOiAiIik7CisgICAgaWYgKCFyZXN1bHQpCisgICAgICAgICpl cnJvciA9ICJGYWlsZWQgdG8gd3JhcCBvYmplY3QuIjsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2Vi Q29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclByb2Zp bGVyQWdlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQcm9maWxlckFn ZW50LmgKaW5kZXggNjNmMjUwY2Y0ODFmZTQ0ZjIzNzBkYjM3YzZhOWFkNjgyNmM4NjRhOS4uYTU1 NzZkODk5OTJmYzZiZTA4OTdlNmFiNGIxZmY5YjMwYjY4MmRkNCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclByb2ZpbGVyQWdlbnQuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUHJvZmlsZXJBZ2VudC5oCkBAIC05Miw3ICs5Miw3 IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgdGFrZUhlYXBTbmFwc2hvdChFcnJvclN0cmlu ZyopOwogICAgIHZvaWQgdG9nZ2xlUmVjb3JkQnV0dG9uKGJvb2wgaXNQcm9maWxpbmcpOwogCi0g ICAgdmlydHVhbCB2b2lkIGdldE9iamVjdEJ5SGVhcE9iamVjdElkKEVycm9yU3RyaW5nKiwgaW50 IGlkLCBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiYgcmVzdWx0KTsKKyAgICB2aXJ0dWFsIHZvaWQg Z2V0T2JqZWN0QnlIZWFwT2JqZWN0SWQoRXJyb3JTdHJpbmcqLCBpbnQgaWQsIGNvbnN0IFN0cmlu Zyogb2JqZWN0R3JvdXAsIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+JiByZXN1bHQpOwogCiBwcml2 YXRlOgogICAgIHR5cGVkZWYgSGFzaE1hcDx1bnNpZ25lZCBpbnQsIFJlZlB0cjxTY3JpcHRQcm9m aWxlPiA+IFByb2ZpbGVzTWFwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9EZXRhaWxlZEhlYXBzaG90R3JpZE5vZGVzLmpzIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9EZXRhaWxlZEhlYXBzaG90R3JpZE5vZGVzLmpzCmluZGV4IDlm YzFlY2U4MzBmN2EzMjg4NDlmOGI2OWIyMmU2YzUyYTdmYWIyNTIuLmUxMjdlYjFmOTU2ZGJmZmIz OTFkMTBkOGQ5MzdmMmU2NmUxNDNkZWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvRGV0YWlsZWRIZWFwc2hvdEdyaWROb2Rlcy5qcworKysgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RldGFpbGVkSGVhcHNob3RHcmlkTm9kZXMuanMK QEAgLTMwOCw3ICszMDgsNyBAQCBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90R2VuZXJpY09iamVj dE5vZGUucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gdGhpcy5fZW5oYW5jZURhdGEgPyB0 aGlzLl9lbmhhbmNlRGF0YShkYXRhKSA6IGRhdGE7CiAgICAgfSwKIAotICAgIHF1ZXJ5T2JqZWN0 Q29udGVudDogZnVuY3Rpb24oY2FsbGJhY2spCisgICAgcXVlcnlPYmplY3RDb250ZW50OiBmdW5j dGlvbihjYWxsYmFjaywgb2JqZWN0R3JvdXBOYW1lKQogICAgIHsKICAgICAgICAgaWYgKHRoaXMu X3R5cGUgPT09ICJzdHJpbmciKQogICAgICAgICAgICAgY2FsbGJhY2soV2ViSW5zcGVjdG9yLlJl bW90ZU9iamVjdC5mcm9tUHJpbWl0aXZlVmFsdWUodGhpcy5fbmFtZSkpOwpAQCAtMzIwLDcgKzMy MCw3IEBAIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RHZW5lcmljT2JqZWN0Tm9kZS5wcm90b3R5 cGUgPSB7CiAgICAgICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgICAgICBjYWxsYmFj ayhXZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0LmZyb21QcmltaXRpdmVWYWx1ZShXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoIk5vdCBhdmFpbGFibGUiKSkpOwogICAgICAgICAgICAgfQotICAgICAgICAg ICAgUHJvZmlsZXJBZ2VudC5nZXRPYmplY3RCeUhlYXBPYmplY3RJZCh0aGlzLnNuYXBzaG90Tm9k ZUlkLCBmb3JtYXRSZXN1bHQpOworICAgICAgICAgICAgUHJvZmlsZXJBZ2VudC5nZXRPYmplY3RC eUhlYXBPYmplY3RJZCh0aGlzLnNuYXBzaG90Tm9kZUlkLCBvYmplY3RHcm91cE5hbWUsIGZvcm1h dFJlc3VsdCk7CiAgICAgICAgIH0KICAgICB9LAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RldGFpbGVkSGVhcHNob3RWaWV3LmpzIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZXRhaWxlZEhlYXBzaG90Vmlldy5qcwppbmRleCBm M2IyOTE4MTM5OGI5NDY2MGE5NmQzZGI0NTJiMTZkY2EyODg2ZTczLi41OGViMDhjNzY2ZDQ3Zjdm M2ZiOGExMTQzYzFhYzFiNjNkYjk2YjZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0RldGFpbGVkSGVhcHNob3RWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGV0YWlsZWRIZWFwc2hvdFZpZXcuanMKQEAgLTUwNiw3 ICs1MDYsNyBAQCBXZWJJbnNwZWN0b3IuRGV0YWlsZWRIZWFwc2hvdFZpZXcgPSBmdW5jdGlvbihw YXJlbnQsIHByb2ZpbGUpCiAgICAgdGhpcy5oZWxwQnV0dG9uID0gbmV3IFdlYkluc3BlY3Rvci5T dGF0dXNCYXJCdXR0b24oIiIsICJoZWFwc2hvdC1oZWxwLXN0YXR1cy1iYXItaXRlbSBzdGF0dXMt YmFyLWl0ZW0iKTsKICAgICB0aGlzLmhlbHBCdXR0b24uYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2si LCB0aGlzLl9oZWxwQ2xpY2tlZC5iaW5kKHRoaXMpLCBmYWxzZSk7CiAKLSAgICB0aGlzLl9wb3Bv dmVySGVscGVyID0gbmV3IFdlYkluc3BlY3Rvci5PYmplY3RQb3BvdmVySGVscGVyKHRoaXMuZWxl bWVudCwgdGhpcy5fZ2V0SG92ZXJBbmNob3IuYmluZCh0aGlzKSwgdGhpcy5fc2hvd09iamVjdFBv cG92ZXIuYmluZCh0aGlzKSwgbnVsbCwgdHJ1ZSk7CisgICAgdGhpcy5fcG9wb3ZlckhlbHBlciA9 IG5ldyBXZWJJbnNwZWN0b3IuT2JqZWN0UG9wb3ZlckhlbHBlcih0aGlzLmVsZW1lbnQsIHRoaXMu X2dldEhvdmVyQW5jaG9yLmJpbmQodGhpcyksIHRoaXMuX3Jlc29sdmVPYmplY3RGb3JQb3BvdmVy LmJpbmQodGhpcyksIG51bGwsIHRydWUpOwogCiAgICAgdGhpcy5fbG9hZFByb2ZpbGUodGhpcy5f cHJvZmlsZVVpZCwgcHJvZmlsZUNhbGxiYWNrLmJpbmQodGhpcykpOwogCkBAIC05MzksOSArOTM5 LDkgQEAgV2ViSW5zcGVjdG9yLkRldGFpbGVkSGVhcHNob3RWaWV3LnByb3RvdHlwZSA9IHsKICAg ICAgICAgdGhpcy5yZWZyZXNoU2hvd1BlcmNlbnRzKCk7CiAgICAgfSwKIAotICAgIF9zaG93T2Jq ZWN0UG9wb3ZlcjogZnVuY3Rpb24oZWxlbWVudCwgc2hvd0NhbGxiYWNrKQorICAgIF9yZXNvbHZl T2JqZWN0Rm9yUG9wb3ZlcjogZnVuY3Rpb24oZWxlbWVudCwgc2hvd0NhbGxiYWNrLCBvYmplY3RH cm91cE5hbWUpCiAgICAgewotICAgICAgICBlbGVtZW50Lm5vZGUucXVlcnlPYmplY3RDb250ZW50 KHNob3dDYWxsYmFjayk7CisgICAgICAgIGVsZW1lbnQubm9kZS5xdWVyeU9iamVjdENvbnRlbnQo c2hvd0NhbGxiYWNrLCBvYmplY3RHcm91cE5hbWUpOwogICAgIH0sCiAKICAgICBfaGVscENsaWNr ZWQ6IGZ1bmN0aW9uKGV2ZW50KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9KYXZhU2NyaXB0U291cmNlRnJhbWUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0phdmFTY3JpcHRTb3VyY2VGcmFtZS5qcwppbmRleCBmMjcyM2FlMDM2 OTJhM2RkOWU5N2Q3NzkwYWJjNGI1MDY1NGE0NzYwLi4zMmQ3YWZmZjEzMDRmYTcxZmE3NTc4YzI4 MmExZjQ2MjY5YmM0MTg2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0phdmFTY3JpcHRTb3VyY2VGcmFtZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0phdmFTY3JpcHRTb3VyY2VGcmFtZS5qcwpAQCAtNDAsMTMgKzQwLDEy IEBAIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUgPSBmdW5jdGlvbihzY3JpcHRz UGFuZWwsIG1vZGVsLCB1aVNvdXJjZUNvZGUpCiAgICAgdGhpcy5fc2NyaXB0c1BhbmVsID0gc2Ny aXB0c1BhbmVsOwogICAgIHRoaXMuX21vZGVsID0gbW9kZWw7CiAgICAgdGhpcy5fdWlTb3VyY2VD b2RlID0gdWlTb3VyY2VDb2RlOwotICAgIHRoaXMuX3BvcG92ZXJPYmplY3RHcm91cCA9ICJwb3Bv dmVyIjsKICAgICB0aGlzLl9icmVha3BvaW50cyA9IHt9OwogCiAgICAgV2ViSW5zcGVjdG9yLlNv dXJjZUZyYW1lLmNhbGwodGhpcywgdWlTb3VyY2VDb2RlLnVybCk7CiAKICAgICB0aGlzLl9wb3Bv dmVySGVscGVyID0gbmV3IFdlYkluc3BlY3Rvci5PYmplY3RQb3BvdmVySGVscGVyKHRoaXMudGV4 dFZpZXdlci5lbGVtZW50LAotICAgICAgICAgICAgdGhpcy5fZ2V0UG9wb3ZlckFuY2hvci5iaW5k KHRoaXMpLCB0aGlzLl9vblNob3dQb3BvdmVyLmJpbmQodGhpcyksIHRoaXMuX29uSGlkZVBvcG92 ZXIuYmluZCh0aGlzKSwgdHJ1ZSk7CisgICAgICAgICAgICB0aGlzLl9nZXRQb3BvdmVyQW5jaG9y LmJpbmQodGhpcyksIHRoaXMuX3Jlc29sdmVPYmplY3RGb3JQb3BvdmVyLmJpbmQodGhpcyksIHRo aXMuX29uSGlkZVBvcG92ZXIuYmluZCh0aGlzKSwgdHJ1ZSk7CiAKICAgICB0aGlzLnRleHRWaWV3 ZXIuZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZWRvd24iLCB0aGlzLl9vbk1vdXNlRG93 bi5iaW5kKHRoaXMpLCB0cnVlKTsKICAgICB0aGlzLl91aVNvdXJjZUNvZGUuYWRkRXZlbnRMaXN0 ZW5lcihXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLkV2ZW50cy5Db250ZW50Q2hhbmdlZCwgdGhp cy5fb25Db250ZW50Q2hhbmdlZCwgdGhpcyk7CkBAIC0yNzksNyArMjc4LDcgQEAgV2ViSW5zcGVj dG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiBl bGVtZW50OwogICAgIH0sCiAKLSAgICBfb25TaG93UG9wb3ZlcjogZnVuY3Rpb24oZWxlbWVudCwg c2hvd0NhbGxiYWNrKQorICAgIF9yZXNvbHZlT2JqZWN0Rm9yUG9wb3ZlcjogZnVuY3Rpb24oZWxl bWVudCwgc2hvd0NhbGxiYWNrLCBvYmplY3RHcm91cE5hbWUpCiAgICAgewogICAgICAgICBpZiAo IXRoaXMucmVhZE9ubHkpIHsKICAgICAgICAgICAgIHRoaXMuX3BvcG92ZXJIZWxwZXIuaGlkZVBv cG92ZXIoKTsKQEAgLTMwMCw3ICsyOTksNyBAQCBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJj ZUZyYW1lLnByb3RvdHlwZSA9IHsKICAgICAgICAgfQogCiAgICAgICAgIHZhciBzZWxlY3RlZENh bGxGcmFtZSA9IHRoaXMuX21vZGVsLnNlbGVjdGVkQ2FsbEZyYW1lOwotICAgICAgICBzZWxlY3Rl ZENhbGxGcmFtZS5ldmFsdWF0ZSh0aGlzLl9oaWdobGlnaHRFbGVtZW50LnRleHRDb250ZW50LCB0 aGlzLl9wb3BvdmVyT2JqZWN0R3JvdXAsIGZhbHNlLCBmYWxzZSwgc2hvd09iamVjdFBvcG92ZXIu YmluZCh0aGlzKSk7CisgICAgICAgIHNlbGVjdGVkQ2FsbEZyYW1lLmV2YWx1YXRlKHRoaXMuX2hp Z2hsaWdodEVsZW1lbnQudGV4dENvbnRlbnQsIG9iamVjdEdyb3VwTmFtZSwgZmFsc2UsIGZhbHNl LCBzaG93T2JqZWN0UG9wb3Zlci5iaW5kKHRoaXMpKTsKICAgICB9LAogCiAgICAgX29uSGlkZVBv cG92ZXI6IGZ1bmN0aW9uKCkKQEAgLTMyMiw3ICszMjEsNiBAQCBXZWJJbnNwZWN0b3IuSmF2YVNj cmlwdFNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHBhcmVudEVsZW1lbnQu cmVtb3ZlQ2hpbGQoaGlnaGxpZ2h0RWxlbWVudCk7CiAgICAgICAgIH0KICAgICAgICAgZGVsZXRl IHRoaXMuX2hpZ2hsaWdodEVsZW1lbnQ7Ci0gICAgICAgIFJ1bnRpbWVBZ2VudC5yZWxlYXNlT2Jq ZWN0R3JvdXAodGhpcy5fcG9wb3Zlck9iamVjdEdyb3VwKTsKICAgICB9LAogCiAgICAgX2hpZ2hs aWdodEV4cHJlc3Npb246IGZ1bmN0aW9uKGVsZW1lbnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL09iamVjdFBvcG92ZXJIZWxwZXIuanMgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL09iamVjdFBvcG92ZXJIZWxwZXIuanMKaW5kZXgg Y2FkODFlNDlmYTNjNGFlN2NjMzQ1ODkwMzk0ZDZiZDUyMWZmOTg1Yy4uM2E1NjBkYmYwY2RhZTg1 ODU1YTUwY2M1YzNkOTg2NDU4ZmQ2ZjI0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9PYmplY3RQb3BvdmVySGVscGVyLmpzCisrKyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvT2JqZWN0UG9wb3ZlckhlbHBlci5qcwpAQCAtMzcsNiAr MzcsNyBAQCBXZWJJbnNwZWN0b3IuT2JqZWN0UG9wb3ZlckhlbHBlciA9IGZ1bmN0aW9uKHBhbmVs RWxlbWVudCwgZ2V0QW5jaG9yLCBxdWVyeU9iamVjdAogICAgIFdlYkluc3BlY3Rvci5Qb3BvdmVy SGVscGVyLmNhbGwodGhpcywgcGFuZWxFbGVtZW50LCBnZXRBbmNob3IsIHRoaXMuX3Nob3dPYmpl Y3RQb3BvdmVyLmJpbmQodGhpcyksIHRoaXMuX29uSGlkZU9iamVjdFBvcG92ZXIuYmluZCh0aGlz KSwgZGlzYWJsZU9uQ2xpY2spOwogICAgIHRoaXMuX3F1ZXJ5T2JqZWN0ID0gcXVlcnlPYmplY3Q7 CiAgICAgdGhpcy5fb25IaWRlQ2FsbGJhY2sgPSBvbkhpZGU7CisgICAgdGhpcy5fcG9wb3Zlck9i amVjdEdyb3VwID0gInBvcG92ZXIiOwogICAgIHBhbmVsRWxlbWVudC5hZGRFdmVudExpc3RlbmVy KCJzY3JvbGwiLCB0aGlzLmhpZGVQb3BvdmVyLmJpbmQodGhpcyksIHRydWUpOwogfTsKIApAQCAt MTEwLDcgKzExMSw3IEBAIFdlYkluc3BlY3Rvci5PYmplY3RQb3BvdmVySGVscGVyLnByb3RvdHlw ZSA9IHsKICAgICAgICAgICAgICAgICBwb3BvdmVyLnNob3cocG9wb3ZlckNvbnRlbnRFbGVtZW50 LCBlbGVtZW50LCBwb3BvdmVyV2lkdGgsIHBvcG92ZXJIZWlnaHQpOwogICAgICAgICAgICAgfQog ICAgICAgICB9Ci0gICAgICAgIHRoaXMuX3F1ZXJ5T2JqZWN0KGVsZW1lbnQsIHNob3dPYmplY3RQ b3BvdmVyLmJpbmQodGhpcykpOworICAgICAgICB0aGlzLl9xdWVyeU9iamVjdChlbGVtZW50LCBz aG93T2JqZWN0UG9wb3Zlci5iaW5kKHRoaXMpLCB0aGlzLl9wb3BvdmVyT2JqZWN0R3JvdXApOwog ICAgIH0sCiAKICAgICBfb25IaWRlT2JqZWN0UG9wb3ZlcjogZnVuY3Rpb24oKQpAQCAtMTIxLDYg KzEyMiw3IEBAIFdlYkluc3BlY3Rvci5PYmplY3RQb3BvdmVySGVscGVyLnByb3RvdHlwZSA9IHsK ICAgICAgICAgfQogICAgICAgICBpZiAodGhpcy5fb25IaWRlQ2FsbGJhY2spCiAgICAgICAgICAg ICB0aGlzLl9vbkhpZGVDYWxsYmFjaygpOworICAgICAgICBSdW50aW1lQWdlbnQucmVsZWFzZU9i amVjdEdyb3VwKHRoaXMuX3BvcG92ZXJPYmplY3RHcm91cCk7CiAgICAgfSwKIAogICAgIF91cGRh dGVIVE1MSWQ6IGZ1bmN0aW9uKHByb3BlcnRpZXMsIHJvb3RUcmVlRWxlbWVudENvbnN0cnVjdG9y LCByb290UHJvcGVydHlDb21wYXJlcikK