200571 2019-08-09 05:10:40 -0700 Pass a ScriptExecutionContext as input to register/unregister URLRegistry routines 2019-08-09 13:55:14 -0700 1 1 1 Unclassified WebKit Page Loading WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 200567 1 youennf youennf achristensen beidson cdumez commit-queue darin webkit-bug-importer oldest_to_newest 1559852 0 youennf 2019-08-09 05:10:40 -0700 Pass a ScriptExecutionContext as input to register/unregister URLRegistry routines 1559853 1 375907 youennf 2019-08-09 05:12:34 -0700 Created attachment 375907 Patch 1559864 2 webkit-bug-importer 2019-08-09 06:31:54 -0700 <rdar://problem/54123571> 1559912 3 375907 darin 2019-08-09 09:31:02 -0700 Comment on attachment 375907 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=375907&action=review > Source/WebCore/html/PublicURLManager.cpp:54 > + found->key->registerURL(*scriptExecutionContext(), url, registrable); What guarantees it’s non-null? > Source/WebCore/html/PublicURLManager.cpp:62 > + registry.key->unregisterURL(*scriptExecutionContext(), url); What guarantees it’s non-null? > Source/WebCore/html/PublicURLManager.cpp:77 > + registry.key->unregisterURL(*scriptExecutionContext(), URL({ }, url)); What guarantees it’s non-null? 1559992 4 youennf 2019-08-09 13:32:46 -0700 Thanks for the review. (In reply to Darin Adler from comment #3) > Comment on attachment 375907 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=375907&action=review > > > Source/WebCore/html/PublicURLManager.cpp:54 > > + found->key->registerURL(*scriptExecutionContext(), url, registrable); > > What guarantees it’s non-null? PublicURLManager is an ActiveDOMObject and all call sites doing '*scriptExecutionContext()' cannot be called after the manager is stopped or are no-op once the manager is stopped (all urls are cleared). 1559993 5 375945 youennf 2019-08-09 13:33:34 -0700 Created attachment 375945 Rebasing 1559998 6 375945 commit-queue 2019-08-09 13:55:12 -0700 Comment on attachment 375945 Rebasing Clearing flags on attachment: 375945 Committed r248473: <https://trac.webkit.org/changeset/248473> 1559999 7 commit-queue 2019-08-09 13:55:14 -0700 All reviewed patches have been landed. Closing bug. 375907 2019-08-09 05:12:34 -0700 2019-08-09 13:33:30 -0700 Patch bug-200571-20190809141232.patch text/plain 11027 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ4NDY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjcyNmE1ODU2NjcyNzc2 NGRjNTcxMzY0YjY5YjdhYzQ3NzQ4NGI2Mi4uZGQ1MTUwMTNjZWQ5NDQ1ZGFlMjBiYmM2MGY2MzMz YTJjN2QyMzJiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDE5LTA4LTA5ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBQYXNzIGEgU2NyaXB0RXhl Y3V0aW9uQ29udGV4dCBhcyBpbnB1dCB0byByZWdpc3Rlci91bnJlZ2lzdGVyIFVSTFJlZ2lzdHJ5 IHJvdXRpbmVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMDA1NzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBQYXNzaW5nIGEgU2NyaXB0RXhlY3V0aW9uQ29udGV4dCB0byByZWdpc3Rlci91bnJlZ2lzdGVy IHJvdXRpbmVzIHdpbGwgYWxsb3cKKyAgICAgICAgdG8gaGF2ZSBzZXNzaW9uIElEIGJhc2VkIGhh bmRsaW5nIGZvciBibG9icywgaW4gcGFydGljdWxhciB0byB1c2Ugc2Vzc2lvbiBwYXJ0aXRpb25l ZCBibG9iIHJlZ2lzdHJpZXMuCisgICAgICAgIE5vIGNoYW5nZSBvZiBiZWhhdmlvci4KKworICAg ICAgICAqIE1vZHVsZXMvbWVkaWFzb3VyY2UvTWVkaWFTb3VyY2VSZWdpc3RyeS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpNZWRpYVNvdXJjZVJlZ2lzdHJ5OjpyZWdpc3RlclVSTCk6CisgICAgICAg IChXZWJDb3JlOjpNZWRpYVNvdXJjZVJlZ2lzdHJ5Ojp1bnJlZ2lzdGVyVVJMKToKKyAgICAgICAg KiBNb2R1bGVzL21lZGlhc291cmNlL01lZGlhU291cmNlUmVnaXN0cnkuaDoKKyAgICAgICAgKiBN b2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtUmVnaXN0cnkuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6TWVkaWFTdHJlYW1SZWdpc3RyeTo6cmVnaXN0ZXJVUkwpOgorICAgICAgICAoV2ViQ29y ZTo6TWVkaWFTdHJlYW1SZWdpc3RyeTo6dW5yZWdpc3RlclVSTCk6CisgICAgICAgICogTW9kdWxl cy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbVJlZ2lzdHJ5Lmg6CisgICAgICAgICogZmlsZWFwaS9C bG9iLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkJsb2JVUkxSZWdpc3RyeTo6cmVnaXN0ZXJVUkwp OgorICAgICAgICAoV2ViQ29yZTo6QmxvYlVSTFJlZ2lzdHJ5Ojp1bnJlZ2lzdGVyVVJMKToKKyAg ICAgICAgKiBodG1sL0RPTVVSTC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpET01VUkw6OmNyZWF0 ZVB1YmxpY1VSTCk6CisgICAgICAgICogaHRtbC9QdWJsaWNVUkxNYW5hZ2VyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlB1YmxpY1VSTE1hbmFnZXI6OnJlZ2lzdGVyVVJMKToKKyAgICAgICAgKFdl YkNvcmU6OlB1YmxpY1VSTE1hbmFnZXI6OnJldm9rZSk6CisgICAgICAgIChXZWJDb3JlOjpQdWJs aWNVUkxNYW5hZ2VyOjpzdG9wKToKKyAgICAgICAgKiBodG1sL1B1YmxpY1VSTE1hbmFnZXIuaDoK KyAgICAgICAgKiBodG1sL1VSTFJlZ2lzdHJ5Lmg6CisKIDIwMTktMDgtMDkgIFbDrWN0b3IgTWFu dWVsIErDoXF1ZXogTGVhbCAgPHZqYXF1ZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR0xdW0dT dHJlYW1lcl0gYWN0aXZhdGUgd3JhcHBlZCBzaGFyZWQgY29udGV4dApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9NZWRpYVNvdXJjZVJlZ2lzdHJ5LmNwcCBi L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzb3VyY2UvTWVkaWFTb3VyY2VSZWdpc3RyeS5j cHAKaW5kZXggOThjNjYzYjZmYzZkYmRhMjkzNmE3ZGEyNjg5NmRmMDAzMjMzYmRiOS4uZWJkODE1 MjE1MWVjMWU3ZDNlM2U2NmM2Y2NhNDMzMzU2YTcwZGYyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9NZWRpYVNvdXJjZVJlZ2lzdHJ5LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc291cmNlL01lZGlhU291cmNlUmVnaXN0cnkuY3Bw CkBAIC00OCw3ICs0OCw3IEBAIE1lZGlhU291cmNlUmVnaXN0cnkmIE1lZGlhU291cmNlUmVnaXN0 cnk6OnJlZ2lzdHJ5KCkKICAgICByZXR1cm4gaW5zdGFuY2U7CiB9CiAKLXZvaWQgTWVkaWFTb3Vy Y2VSZWdpc3RyeTo6cmVnaXN0ZXJVUkwoU2VjdXJpdHlPcmlnaW4qLCBjb25zdCBVUkwmIHVybCwg VVJMUmVnaXN0cmFibGUmIHJlZ2lzdHJhYmxlKQordm9pZCBNZWRpYVNvdXJjZVJlZ2lzdHJ5Ojpy ZWdpc3RlclVSTChTY3JpcHRFeGVjdXRpb25Db250ZXh0JiwgY29uc3QgVVJMJiB1cmwsIFVSTFJl Z2lzdHJhYmxlJiByZWdpc3RyYWJsZSkKIHsKICAgICBBU1NFUlQoJnJlZ2lzdHJhYmxlLnJlZ2lz dHJ5KCkgPT0gdGhpcyk7CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKQEAgLTU4LDcgKzU4 LDcgQEAgdm9pZCBNZWRpYVNvdXJjZVJlZ2lzdHJ5OjpyZWdpc3RlclVSTChTZWN1cml0eU9yaWdp biosIGNvbnN0IFVSTCYgdXJsLCBVUkxSZWdpc3QKICAgICBtX21lZGlhU291cmNlcy5zZXQodXJs LnN0cmluZygpLCAmc291cmNlKTsKIH0KIAotdm9pZCBNZWRpYVNvdXJjZVJlZ2lzdHJ5Ojp1bnJl Z2lzdGVyVVJMKGNvbnN0IFVSTCYgdXJsKQordm9pZCBNZWRpYVNvdXJjZVJlZ2lzdHJ5Ojp1bnJl Z2lzdGVyVVJMKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmLCBjb25zdCBVUkwmIHVybCkKIHsKICAg ICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwogICAgIGlmIChhdXRvIHNvdXJjZSA9IG1fbWVkaWFT b3VyY2VzLnRha2UodXJsLnN0cmluZygpKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvbWVkaWFzb3VyY2UvTWVkaWFTb3VyY2VSZWdpc3RyeS5oIGIvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9tZWRpYXNvdXJjZS9NZWRpYVNvdXJjZVJlZ2lzdHJ5LmgKaW5kZXggMDMzNjc0ZjI2 ZDM0NTg1OWE0YWExY2RhMTIwZTZkODg0MTU0NmQ4NS4uMDJkNmVmYmNiYmRjZDgzMWIyOGFiN2U4 YmQ2YmI1NGQ0NzU3M2M2YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRp YXNvdXJjZS9NZWRpYVNvdXJjZVJlZ2lzdHJ5LmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9tZWRpYXNvdXJjZS9NZWRpYVNvdXJjZVJlZ2lzdHJ5LmgKQEAgLTQ3LDkgKzQ3LDkgQEAgcHVi bGljOgogICAgIHN0YXRpYyBNZWRpYVNvdXJjZVJlZ2lzdHJ5JiByZWdpc3RyeSgpOwogCiAgICAg Ly8gUmVnaXN0ZXJzIGEgYmxvYiBVUkwgcmVmZXJyaW5nIHRvIHRoZSBzcGVjaWZpZWQgbWVkaWEg c291cmNlLgotICAgIHZvaWQgcmVnaXN0ZXJVUkwoU2VjdXJpdHlPcmlnaW4qLCBjb25zdCBVUkwm LCBVUkxSZWdpc3RyYWJsZSYpIG92ZXJyaWRlOwotICAgIHZvaWQgdW5yZWdpc3RlclVSTChjb25z dCBVUkwmKSBvdmVycmlkZTsKLSAgICBVUkxSZWdpc3RyYWJsZSogbG9va3VwKGNvbnN0IFN0cmlu ZyYpIGNvbnN0IG92ZXJyaWRlOworICAgIHZvaWQgcmVnaXN0ZXJVUkwoU2NyaXB0RXhlY3V0aW9u Q29udGV4dCYsIGNvbnN0IFVSTCYsIFVSTFJlZ2lzdHJhYmxlJilmaW5hbDsKKyAgICB2b2lkIHVu cmVnaXN0ZXJVUkwoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYsIGNvbnN0IFVSTCYpIGZpbmFsOwor ICAgIFVSTFJlZ2lzdHJhYmxlKiBsb29rdXAoY29uc3QgU3RyaW5nJikgY29uc3QgZmluYWw7CiAK IHByaXZhdGU6CiAgICAgTWVkaWFTb3VyY2VSZWdpc3RyeSgpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbVJlZ2lzdHJ5LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1SZWdpc3RyeS5jcHAK aW5kZXggNjQxNWZmYWJhNWM5YTg0ODEzNGU1MjIzMzRkZDNhNjAxZWMyYmYyZS4uNGEzYjRlY2M1 NWRiMmU2ZGE3YTE4MGYzMTIzYTViNTY5YTNmMjlkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbVJlZ2lzdHJ5LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtUmVnaXN0cnkuY3BwCkBA IC00MywxNCArNDMsMTQgQEAgTWVkaWFTdHJlYW1SZWdpc3RyeSYgTWVkaWFTdHJlYW1SZWdpc3Ry eTo6c2hhcmVkKCkKICAgICByZXR1cm4gaW5zdGFuY2U7CiB9CiAKLXZvaWQgTWVkaWFTdHJlYW1S ZWdpc3RyeTo6cmVnaXN0ZXJVUkwoU2VjdXJpdHlPcmlnaW4qLCBjb25zdCBVUkwmIHVybCwgVVJM UmVnaXN0cmFibGUmIHN0cmVhbSkKK3ZvaWQgTWVkaWFTdHJlYW1SZWdpc3RyeTo6cmVnaXN0ZXJV UkwoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYsIGNvbnN0IFVSTCYgdXJsLCBVUkxSZWdpc3RyYWJs ZSYgc3RyZWFtKQogewogICAgIEFTU0VSVCgmc3RyZWFtLnJlZ2lzdHJ5KCkgPT0gdGhpcyk7CiAg ICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKICAgICBtX21lZGlhU3RyZWFtcy5zZXQodXJsLnN0 cmluZygpLCBzdGF0aWNfY2FzdDxNZWRpYVN0cmVhbSo+KCZzdHJlYW0pKTsKIH0KIAotdm9pZCBN ZWRpYVN0cmVhbVJlZ2lzdHJ5Ojp1bnJlZ2lzdGVyVVJMKGNvbnN0IFVSTCYgdXJsKQordm9pZCBN ZWRpYVN0cmVhbVJlZ2lzdHJ5Ojp1bnJlZ2lzdGVyVVJMKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQm LCBjb25zdCBVUkwmIHVybCkKIHsKICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwogICAgIG1f bWVkaWFTdHJlYW1zLnJlbW92ZSh1cmwuc3RyaW5nKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbVJlZ2lzdHJ5LmggYi9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtUmVnaXN0cnkuaAppbmRleCBm NmQyM2QyZDc5MGYwZDRmMjc1MTA1YmI0MDZiMTllM2NlMGU0OTNkLi5lZThlOWQ5ZjYzZWIwNTBj ODc2MWE0NDI2NTE2NTdjYmRiZWI3ZmM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtUmVnaXN0cnkuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtUmVnaXN0cnkuaApAQCAtNDUsMTAgKzQ1 LDEwIEBAIHB1YmxpYzoKICAgICBzdGF0aWMgTWVkaWFTdHJlYW1SZWdpc3RyeSYgc2hhcmVkKCk7 CiAKICAgICAvLyBSZWdpc3RlcnMgYSBibG9iIFVSTCByZWZlcnJpbmcgdG8gdGhlIHNwZWNpZmll ZCBzdHJlYW0gZGF0YS4KLSAgICB2b2lkIHJlZ2lzdGVyVVJMKFNlY3VyaXR5T3JpZ2luKiwgY29u c3QgVVJMJiwgVVJMUmVnaXN0cmFibGUmKSBvdmVycmlkZTsKLSAgICB2b2lkIHVucmVnaXN0ZXJV UkwoY29uc3QgVVJMJikgb3ZlcnJpZGU7CisgICAgdm9pZCByZWdpc3RlclVSTChTY3JpcHRFeGVj dXRpb25Db250ZXh0JiwgY29uc3QgVVJMJiwgVVJMUmVnaXN0cmFibGUmKSBmaW5hbDsKKyAgICB2 b2lkIHVucmVnaXN0ZXJVUkwoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYsIGNvbnN0IFVSTCYpIGZp bmFsOwogCi0gICAgVVJMUmVnaXN0cmFibGUqIGxvb2t1cChjb25zdCBTdHJpbmcmKSBjb25zdCBv dmVycmlkZTsKKyAgICBVUkxSZWdpc3RyYWJsZSogbG9va3VwKGNvbnN0IFN0cmluZyYpIGNvbnN0 IGZpbmFsOwogCiAgICAgdm9pZCByZWdpc3RlclN0cmVhbShNZWRpYVN0cmVhbSYpOwogICAgIHZv aWQgdW5yZWdpc3RlclN0cmVhbShNZWRpYVN0cmVhbSYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvZmlsZWFwaS9CbG9iLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2ZpbGVhcGkvQmxvYi5jcHAK aW5kZXggMTRjNTE3MmI3ZTk1NDIzZGFjYTI4ZDU0ZmY1ZGJkNmYzY2NhZWU5OC4uNDdiNDM5Yzg1 YzhmOTE4MGUxMDUxYTk1YWQxNTQ1MTUyMTFjODM2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvZmlsZWFwaS9CbG9iLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9maWxlYXBpL0Jsb2IuY3Bw CkBAIC00OCwyMCArNDgsMjAgQEAgV1RGX01BS0VfSVNPX0FMTE9DQVRFRF9JTVBMKEJsb2IpOwog CiBjbGFzcyBCbG9iVVJMUmVnaXN0cnkgZmluYWwgOiBwdWJsaWMgVVJMUmVnaXN0cnkgewogcHVi bGljOgotICAgIHZvaWQgcmVnaXN0ZXJVUkwoU2VjdXJpdHlPcmlnaW4qLCBjb25zdCBVUkwmLCBV UkxSZWdpc3RyYWJsZSYpIG92ZXJyaWRlOwotICAgIHZvaWQgdW5yZWdpc3RlclVSTChjb25zdCBV UkwmKSBvdmVycmlkZTsKKyAgICB2b2lkIHJlZ2lzdGVyVVJMKFNjcmlwdEV4ZWN1dGlvbkNvbnRl eHQmLCBjb25zdCBVUkwmLCBVUkxSZWdpc3RyYWJsZSYpIGZpbmFsOworICAgIHZvaWQgdW5yZWdp c3RlclVSTChTY3JpcHRFeGVjdXRpb25Db250ZXh0JiwgY29uc3QgVVJMJikgZmluYWw7CiAKICAg ICBzdGF0aWMgVVJMUmVnaXN0cnkmIHJlZ2lzdHJ5KCk7CiB9OwogCiAKLXZvaWQgQmxvYlVSTFJl Z2lzdHJ5OjpyZWdpc3RlclVSTChTZWN1cml0eU9yaWdpbiogb3JpZ2luLCBjb25zdCBVUkwmIHB1 YmxpY1VSTCwgVVJMUmVnaXN0cmFibGUmIGJsb2IpCit2b2lkIEJsb2JVUkxSZWdpc3RyeTo6cmVn aXN0ZXJVUkwoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYgY29udGV4dCwgY29uc3QgVVJMJiBwdWJs aWNVUkwsIFVSTFJlZ2lzdHJhYmxlJiBibG9iKQogewogICAgIEFTU0VSVCgmYmxvYi5yZWdpc3Ry eSgpID09IHRoaXMpOwotICAgIFRocmVhZGFibGVCbG9iUmVnaXN0cnk6OnJlZ2lzdGVyQmxvYlVS TChvcmlnaW4sIHB1YmxpY1VSTCwgc3RhdGljX2Nhc3Q8QmxvYiY+KGJsb2IpLnVybCgpKTsKKyAg ICBUaHJlYWRhYmxlQmxvYlJlZ2lzdHJ5OjpyZWdpc3RlckJsb2JVUkwoY29udGV4dC5zZWN1cml0 eU9yaWdpbigpLCBwdWJsaWNVUkwsIHN0YXRpY19jYXN0PEJsb2ImPihibG9iKS51cmwoKSk7CiB9 CiAKLXZvaWQgQmxvYlVSTFJlZ2lzdHJ5Ojp1bnJlZ2lzdGVyVVJMKGNvbnN0IFVSTCYgdXJsKQor dm9pZCBCbG9iVVJMUmVnaXN0cnk6OnVucmVnaXN0ZXJVUkwoU2NyaXB0RXhlY3V0aW9uQ29udGV4 dCYsIGNvbnN0IFVSTCYgdXJsKQogewogICAgIFRocmVhZGFibGVCbG9iUmVnaXN0cnk6OnVucmVn aXN0ZXJCbG9iVVJMKHVybCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0RP TVVSTC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0RPTVVSTC5jcHAKaW5kZXggMGEwOGI1OTQ2 ODY1NzMyZjI4ZGEzMGZiN2Y2M2NhNGQzMTRlYTkxNy4uNDAyMmRhMTY3ZjA4OGZmYmY1NDFiNDkx MDEzMDJhZjlkMGE3Yzg1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9ET01VUkwu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvRE9NVVJMLmNwcApAQCAtMTAzLDcgKzEwMyw3 IEBAIFN0cmluZyBET01VUkw6OmNyZWF0ZVB1YmxpY1VSTChTY3JpcHRFeGVjdXRpb25Db250ZXh0 JiBzY3JpcHRFeGVjdXRpb25Db250ZXh0LCBVCiAgICAgaWYgKHB1YmxpY1VSTC5pc0VtcHR5KCkp CiAgICAgICAgIHJldHVybiBTdHJpbmcoKTsKIAotICAgIHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQu cHVibGljVVJMTWFuYWdlcigpLnJlZ2lzdGVyVVJMKHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQuc2Vj dXJpdHlPcmlnaW4oKSwgcHVibGljVVJMLCByZWdpc3RyYWJsZSk7CisgICAgc2NyaXB0RXhlY3V0 aW9uQ29udGV4dC5wdWJsaWNVUkxNYW5hZ2VyKCkucmVnaXN0ZXJVUkwocHVibGljVVJMLCByZWdp c3RyYWJsZSk7CiAKICAgICByZXR1cm4gcHVibGljVVJMLnN0cmluZygpOwogfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaHRtbC9QdWJsaWNVUkxNYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvUHVibGljVVJMTWFuYWdlci5jcHAKaW5kZXggNzNiNTQ3MzU3OGUzYjBiMzFlYWY5 NWRhNDBjMjBhYzA5OWMwNzM2Ny4uZDViOWJlZGJhZDA0NzA0NjFhNThhYjVjYjAxNGE2OGMwNDdk N2ZiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9QdWJsaWNVUkxNYW5hZ2VyLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL1B1YmxpY1VSTE1hbmFnZXIuY3BwCkBAIC00NSwx MyArNDUsMTMgQEAgUHVibGljVVJMTWFuYWdlcjo6UHVibGljVVJMTWFuYWdlcihTY3JpcHRFeGVj dXRpb25Db250ZXh0KiBjb250ZXh0KQogewogfQogCi12b2lkIFB1YmxpY1VSTE1hbmFnZXI6OnJl Z2lzdGVyVVJMKFNlY3VyaXR5T3JpZ2luKiBvcmlnaW4sIGNvbnN0IFVSTCYgdXJsLCBVUkxSZWdp c3RyYWJsZSYgcmVnaXN0cmFibGUpCit2b2lkIFB1YmxpY1VSTE1hbmFnZXI6OnJlZ2lzdGVyVVJM KGNvbnN0IFVSTCYgdXJsLCBVUkxSZWdpc3RyYWJsZSYgcmVnaXN0cmFibGUpCiB7CiAgICAgaWYg KG1faXNTdG9wcGVkKQogICAgICAgICByZXR1cm47CiAKICAgICBSZWdpc3RyeVVSTE1hcDo6aXRl cmF0b3IgZm91bmQgPSBtX3JlZ2lzdHJ5VG9VUkwuYWRkKCZyZWdpc3RyYWJsZS5yZWdpc3RyeSgp LCBVUkxTZXQoKSkuaXRlcmF0b3I7Ci0gICAgZm91bmQtPmtleS0+cmVnaXN0ZXJVUkwob3JpZ2lu LCB1cmwsIHJlZ2lzdHJhYmxlKTsKKyAgICBmb3VuZC0+a2V5LT5yZWdpc3RlclVSTCgqc2NyaXB0 RXhlY3V0aW9uQ29udGV4dCgpLCB1cmwsIHJlZ2lzdHJhYmxlKTsKICAgICBmb3VuZC0+dmFsdWUu YWRkKHVybC5zdHJpbmcoKSk7CiB9CiAKQEAgLTU5LDcgKzU5LDcgQEAgdm9pZCBQdWJsaWNVUkxN YW5hZ2VyOjpyZXZva2UoY29uc3QgVVJMJiB1cmwpCiB7CiAgICAgZm9yIChhdXRvJiByZWdpc3Ry eSA6IG1fcmVnaXN0cnlUb1VSTCkgewogICAgICAgICBpZiAocmVnaXN0cnkudmFsdWUuY29udGFp bnModXJsLnN0cmluZygpKSkgewotICAgICAgICAgICAgcmVnaXN0cnkua2V5LT51bnJlZ2lzdGVy VVJMKHVybCk7CisgICAgICAgICAgICByZWdpc3RyeS5rZXktPnVucmVnaXN0ZXJVUkwoKnNjcmlw dEV4ZWN1dGlvbkNvbnRleHQoKSwgdXJsKTsKICAgICAgICAgICAgIHJlZ2lzdHJ5LnZhbHVlLnJl bW92ZSh1cmwuc3RyaW5nKCkpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KQEAgLTc0 LDcgKzc0LDcgQEAgdm9pZCBQdWJsaWNVUkxNYW5hZ2VyOjpzdG9wKCkKICAgICBtX2lzU3RvcHBl ZCA9IHRydWU7CiAgICAgZm9yIChhdXRvJiByZWdpc3RyeSA6IG1fcmVnaXN0cnlUb1VSTCkgewog ICAgICAgICBmb3IgKGF1dG8mIHVybCA6IHJlZ2lzdHJ5LnZhbHVlKQotICAgICAgICAgICAgcmVn aXN0cnkua2V5LT51bnJlZ2lzdGVyVVJMKFVSTCh7IH0sIHVybCkpOworICAgICAgICAgICAgcmVn aXN0cnkua2V5LT51bnJlZ2lzdGVyVVJMKCpzY3JpcHRFeGVjdXRpb25Db250ZXh0KCksIFVSTCh7 IH0sIHVybCkpOwogICAgIH0KIAogICAgIG1fcmVnaXN0cnlUb1VSTC5jbGVhcigpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9QdWJsaWNVUkxNYW5hZ2VyLmggYi9Tb3VyY2UvV2Vi Q29yZS9odG1sL1B1YmxpY1VSTE1hbmFnZXIuaAppbmRleCBlNjlkZTRlZDhjODNiYjhhOGRjNGQz NjY4NjIyY2QzZmRkNTM3ZTc1Li45YmZlNzNlNjI4MGI5NDRjNjVkMGRkZDgxMWM2ZjE3YTc0MjE5 ZmQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL1B1YmxpY1VSTE1hbmFnZXIuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL1B1YmxpY1VSTE1hbmFnZXIuaApAQCAtMzMsNyArMzMs NiBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLWNsYXNzIFNjcmlwdEV4ZWN1dGlvbkNvbnRl eHQ7CiBjbGFzcyBTZWN1cml0eU9yaWdpbjsKIGNsYXNzIFVSTFJlZ2lzdHJ5OwogY2xhc3MgVVJM UmVnaXN0cmFibGU7CkBAIC00NSw3ICs0NCw3IEBAIHB1YmxpYzoKIAogICAgIHN0YXRpYyBzdGQ6 OnVuaXF1ZV9wdHI8UHVibGljVVJMTWFuYWdlcj4gY3JlYXRlKFNjcmlwdEV4ZWN1dGlvbkNvbnRl eHQqKTsKIAotICAgIHZvaWQgcmVnaXN0ZXJVUkwoU2VjdXJpdHlPcmlnaW4qLCBjb25zdCBVUkwm LCBVUkxSZWdpc3RyYWJsZSYpOworICAgIHZvaWQgcmVnaXN0ZXJVUkwoY29uc3QgVVJMJiwgVVJM UmVnaXN0cmFibGUmKTsKICAgICB2b2lkIHJldm9rZShjb25zdCBVUkwmKTsKIAogcHJpdmF0ZToK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvVVJMUmVnaXN0cnkuaCBiL1NvdXJjZS9X ZWJDb3JlL2h0bWwvVVJMUmVnaXN0cnkuaAppbmRleCA4MjIzYmJkMDc1OTBkZGFjY2U5ZmQxNjA0 ZTNhYzBiYzAxNWY2NGFlLi5lM2RjNDZhOWU5Mjc0MTAxMGY0YTdjYjJjNWJjZjA2NmU3YTI0Zjcy IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL1VSTFJlZ2lzdHJ5LmgKKysrIGIvU291 cmNlL1dlYkNvcmUvaHRtbC9VUkxSZWdpc3RyeS5oCkBAIC0zNCw3ICszNCw3IEBACiAKIG5hbWVz cGFjZSBXZWJDb3JlIHsKIAotY2xhc3MgU2VjdXJpdHlPcmlnaW47CitjbGFzcyBTY3JpcHRFeGVj dXRpb25Db250ZXh0OwogY2xhc3MgVVJMUmVnaXN0cnk7CiAKIGNsYXNzIFVSTFJlZ2lzdHJhYmxl IHsKQEAgLTQ3LDggKzQ3LDggQEAgY2xhc3MgVVJMUmVnaXN0cnkgewogICAgIFdURl9NQUtFX0ZB U1RfQUxMT0NBVEVEOwogcHVibGljOgogICAgIHZpcnR1YWwgflVSTFJlZ2lzdHJ5KCkgPSBkZWZh dWx0OwotICAgIHZpcnR1YWwgdm9pZCByZWdpc3RlclVSTChTZWN1cml0eU9yaWdpbiosIGNvbnN0 IFVSTCYsIFVSTFJlZ2lzdHJhYmxlJikgPSAwOwotICAgIHZpcnR1YWwgdm9pZCB1bnJlZ2lzdGVy VVJMKGNvbnN0IFVSTCYpID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgcmVnaXN0ZXJVUkwoU2NyaXB0 RXhlY3V0aW9uQ29udGV4dCYsIGNvbnN0IFVSTCYsIFVSTFJlZ2lzdHJhYmxlJikgPSAwOworICAg IHZpcnR1YWwgdm9pZCB1bnJlZ2lzdGVyVVJMKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmLCBjb25z dCBVUkwmKSA9IDA7CiAKICAgICAvLyBUaGlzIGlzIGFuIG9wdGlvbmFsIEFQSQogICAgIHZpcnR1 YWwgVVJMUmVnaXN0cmFibGUqIGxvb2t1cChjb25zdCBTdHJpbmcmKSBjb25zdCB7IEFTU0VSVF9O T1RfUkVBQ0hFRCgpOyByZXR1cm4gMDsgfQo= 375945 2019-08-09 13:33:34 -0700 2019-08-09 13:55:12 -0700 Rebasing bug-200571-20190809223333.patch text/plain 8775 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ4NDcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDM4NTI4MGM2OWQ4YWIw NmYwOWE3YmRjM2MxNDdhM2I4NTU1ODc3Mi4uOTc5YTc5ODNkOTkyYTBlMDNkM2FjZTVmZWE4MWFm MDczZjI3ZTcxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE5LTA4LTA5ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBQYXNzIGEgU2NyaXB0RXhl Y3V0aW9uQ29udGV4dCBhcyBpbnB1dCB0byByZWdpc3Rlci91bnJlZ2lzdGVyIFVSTFJlZ2lzdHJ5 IHJvdXRpbmVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMDA1NzEKKworICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBQ YXNzaW5nIGEgU2NyaXB0RXhlY3V0aW9uQ29udGV4dCB0byByZWdpc3Rlci91bnJlZ2lzdGVyIHJv dXRpbmVzIHdpbGwgYWxsb3cKKyAgICAgICAgdG8gaGF2ZSBzZXNzaW9uIElEIGJhc2VkIGhhbmRs aW5nIGZvciBibG9icywgaW4gcGFydGljdWxhciB0byB1c2Ugc2Vzc2lvbiBwYXJ0aXRpb25lZCBi bG9iIHJlZ2lzdHJpZXMuCisgICAgICAgIE5vIGNoYW5nZSBvZiBiZWhhdmlvci4KKworICAgICAg ICAqIE1vZHVsZXMvbWVkaWFzb3VyY2UvTWVkaWFTb3VyY2VSZWdpc3RyeS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpNZWRpYVNvdXJjZVJlZ2lzdHJ5OjpyZWdpc3RlclVSTCk6CisgICAgICAgIChX ZWJDb3JlOjpNZWRpYVNvdXJjZVJlZ2lzdHJ5Ojp1bnJlZ2lzdGVyVVJMKToKKyAgICAgICAgKiBN b2R1bGVzL21lZGlhc291cmNlL01lZGlhU291cmNlUmVnaXN0cnkuaDoKKyAgICAgICAgKiBmaWxl YXBpL0Jsb2IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QmxvYlVSTFJlZ2lzdHJ5OjpyZWdpc3Rl clVSTCk6CisgICAgICAgIChXZWJDb3JlOjpCbG9iVVJMUmVnaXN0cnk6OnVucmVnaXN0ZXJVUkwp OgorICAgICAgICAqIGh0bWwvRE9NVVJMLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRPTVVSTDo6 Y3JlYXRlUHVibGljVVJMKToKKyAgICAgICAgKiBodG1sL1B1YmxpY1VSTE1hbmFnZXIuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6UHVibGljVVJMTWFuYWdlcjo6cmVnaXN0ZXJVUkwpOgorICAgICAg ICAoV2ViQ29yZTo6UHVibGljVVJMTWFuYWdlcjo6cmV2b2tlKToKKyAgICAgICAgKFdlYkNvcmU6 OlB1YmxpY1VSTE1hbmFnZXI6OnN0b3ApOgorICAgICAgICAqIGh0bWwvUHVibGljVVJMTWFuYWdl ci5oOgorICAgICAgICAqIGh0bWwvVVJMUmVnaXN0cnkuaDoKKwogMjAxOS0wOC0wOSAgWW91ZW5u IEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIE1lZGlhU3RyZWFt UmVnaXN0cnkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzb3VyY2Uv TWVkaWFTb3VyY2VSZWdpc3RyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc291 cmNlL01lZGlhU291cmNlUmVnaXN0cnkuY3BwCmluZGV4IDk4YzY2M2I2ZmM2ZGJkYTI5MzZhN2Rh MjY4OTZkZjAwMzIzM2JkYjkuLmViZDgxNTIxNTFlYzFlN2QzZTNlNjZjNmNjYTQzMzM1NmE3MGRm MmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzb3VyY2UvTWVkaWFT b3VyY2VSZWdpc3RyeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJj ZS9NZWRpYVNvdXJjZVJlZ2lzdHJ5LmNwcApAQCAtNDgsNyArNDgsNyBAQCBNZWRpYVNvdXJjZVJl Z2lzdHJ5JiBNZWRpYVNvdXJjZVJlZ2lzdHJ5OjpyZWdpc3RyeSgpCiAgICAgcmV0dXJuIGluc3Rh bmNlOwogfQogCi12b2lkIE1lZGlhU291cmNlUmVnaXN0cnk6OnJlZ2lzdGVyVVJMKFNlY3VyaXR5 T3JpZ2luKiwgY29uc3QgVVJMJiB1cmwsIFVSTFJlZ2lzdHJhYmxlJiByZWdpc3RyYWJsZSkKK3Zv aWQgTWVkaWFTb3VyY2VSZWdpc3RyeTo6cmVnaXN0ZXJVUkwoU2NyaXB0RXhlY3V0aW9uQ29udGV4 dCYsIGNvbnN0IFVSTCYgdXJsLCBVUkxSZWdpc3RyYWJsZSYgcmVnaXN0cmFibGUpCiB7CiAgICAg QVNTRVJUKCZyZWdpc3RyYWJsZS5yZWdpc3RyeSgpID09IHRoaXMpOwogICAgIEFTU0VSVChpc01h aW5UaHJlYWQoKSk7CkBAIC01OCw3ICs1OCw3IEBAIHZvaWQgTWVkaWFTb3VyY2VSZWdpc3RyeTo6 cmVnaXN0ZXJVUkwoU2VjdXJpdHlPcmlnaW4qLCBjb25zdCBVUkwmIHVybCwgVVJMUmVnaXN0CiAg ICAgbV9tZWRpYVNvdXJjZXMuc2V0KHVybC5zdHJpbmcoKSwgJnNvdXJjZSk7CiB9CiAKLXZvaWQg TWVkaWFTb3VyY2VSZWdpc3RyeTo6dW5yZWdpc3RlclVSTChjb25zdCBVUkwmIHVybCkKK3ZvaWQg TWVkaWFTb3VyY2VSZWdpc3RyeTo6dW5yZWdpc3RlclVSTChTY3JpcHRFeGVjdXRpb25Db250ZXh0 JiwgY29uc3QgVVJMJiB1cmwpCiB7CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKICAgICBp ZiAoYXV0byBzb3VyY2UgPSBtX21lZGlhU291cmNlcy50YWtlKHVybC5zdHJpbmcoKSkpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc291cmNlL01lZGlhU291cmNlUmVn aXN0cnkuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzb3VyY2UvTWVkaWFTb3VyY2VS ZWdpc3RyeS5oCmluZGV4IDAzMzY3NGYyNmQzNDU4NTlhNGFhMWNkYTEyMGU2ZDg4NDE1NDZkODUu LjAyZDZlZmJjYmJkY2Q4MzFiMjhhYjdlOGJkNmJiNTRkNDc1NzNjNmIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzb3VyY2UvTWVkaWFTb3VyY2VSZWdpc3RyeS5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzb3VyY2UvTWVkaWFTb3VyY2VSZWdpc3Ry eS5oCkBAIC00Nyw5ICs0Nyw5IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgTWVkaWFTb3VyY2VSZWdp c3RyeSYgcmVnaXN0cnkoKTsKIAogICAgIC8vIFJlZ2lzdGVycyBhIGJsb2IgVVJMIHJlZmVycmlu ZyB0byB0aGUgc3BlY2lmaWVkIG1lZGlhIHNvdXJjZS4KLSAgICB2b2lkIHJlZ2lzdGVyVVJMKFNl Y3VyaXR5T3JpZ2luKiwgY29uc3QgVVJMJiwgVVJMUmVnaXN0cmFibGUmKSBvdmVycmlkZTsKLSAg ICB2b2lkIHVucmVnaXN0ZXJVUkwoY29uc3QgVVJMJikgb3ZlcnJpZGU7Ci0gICAgVVJMUmVnaXN0 cmFibGUqIGxvb2t1cChjb25zdCBTdHJpbmcmKSBjb25zdCBvdmVycmlkZTsKKyAgICB2b2lkIHJl Z2lzdGVyVVJMKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmLCBjb25zdCBVUkwmLCBVUkxSZWdpc3Ry YWJsZSYpZmluYWw7CisgICAgdm9pZCB1bnJlZ2lzdGVyVVJMKFNjcmlwdEV4ZWN1dGlvbkNvbnRl eHQmLCBjb25zdCBVUkwmKSBmaW5hbDsKKyAgICBVUkxSZWdpc3RyYWJsZSogbG9va3VwKGNvbnN0 IFN0cmluZyYpIGNvbnN0IGZpbmFsOwogCiBwcml2YXRlOgogICAgIE1lZGlhU291cmNlUmVnaXN0 cnkoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2ZpbGVhcGkvQmxvYi5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9maWxlYXBpL0Jsb2IuY3BwCmluZGV4IDE0YzUxNzJiN2U5NTQyM2RhY2EyOGQ1 NGZmNWRiZDZmM2NjYWVlOTguLjQ3YjQzOWM4NWM4ZjkxODBlMTA1MWE5NWFkMTU0NTE1MjExYzgz NmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2ZpbGVhcGkvQmxvYi5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvZmlsZWFwaS9CbG9iLmNwcApAQCAtNDgsMjAgKzQ4LDIwIEBAIFdURl9NQUtF X0lTT19BTExPQ0FURURfSU1QTChCbG9iKTsKIAogY2xhc3MgQmxvYlVSTFJlZ2lzdHJ5IGZpbmFs IDogcHVibGljIFVSTFJlZ2lzdHJ5IHsKIHB1YmxpYzoKLSAgICB2b2lkIHJlZ2lzdGVyVVJMKFNl Y3VyaXR5T3JpZ2luKiwgY29uc3QgVVJMJiwgVVJMUmVnaXN0cmFibGUmKSBvdmVycmlkZTsKLSAg ICB2b2lkIHVucmVnaXN0ZXJVUkwoY29uc3QgVVJMJikgb3ZlcnJpZGU7CisgICAgdm9pZCByZWdp c3RlclVSTChTY3JpcHRFeGVjdXRpb25Db250ZXh0JiwgY29uc3QgVVJMJiwgVVJMUmVnaXN0cmFi bGUmKSBmaW5hbDsKKyAgICB2b2lkIHVucmVnaXN0ZXJVUkwoU2NyaXB0RXhlY3V0aW9uQ29udGV4 dCYsIGNvbnN0IFVSTCYpIGZpbmFsOwogCiAgICAgc3RhdGljIFVSTFJlZ2lzdHJ5JiByZWdpc3Ry eSgpOwogfTsKIAogCi12b2lkIEJsb2JVUkxSZWdpc3RyeTo6cmVnaXN0ZXJVUkwoU2VjdXJpdHlP cmlnaW4qIG9yaWdpbiwgY29uc3QgVVJMJiBwdWJsaWNVUkwsIFVSTFJlZ2lzdHJhYmxlJiBibG9i KQordm9pZCBCbG9iVVJMUmVnaXN0cnk6OnJlZ2lzdGVyVVJMKFNjcmlwdEV4ZWN1dGlvbkNvbnRl eHQmIGNvbnRleHQsIGNvbnN0IFVSTCYgcHVibGljVVJMLCBVUkxSZWdpc3RyYWJsZSYgYmxvYikK IHsKICAgICBBU1NFUlQoJmJsb2IucmVnaXN0cnkoKSA9PSB0aGlzKTsKLSAgICBUaHJlYWRhYmxl QmxvYlJlZ2lzdHJ5OjpyZWdpc3RlckJsb2JVUkwob3JpZ2luLCBwdWJsaWNVUkwsIHN0YXRpY19j YXN0PEJsb2ImPihibG9iKS51cmwoKSk7CisgICAgVGhyZWFkYWJsZUJsb2JSZWdpc3RyeTo6cmVn aXN0ZXJCbG9iVVJMKGNvbnRleHQuc2VjdXJpdHlPcmlnaW4oKSwgcHVibGljVVJMLCBzdGF0aWNf Y2FzdDxCbG9iJj4oYmxvYikudXJsKCkpOwogfQogCi12b2lkIEJsb2JVUkxSZWdpc3RyeTo6dW5y ZWdpc3RlclVSTChjb25zdCBVUkwmIHVybCkKK3ZvaWQgQmxvYlVSTFJlZ2lzdHJ5Ojp1bnJlZ2lz dGVyVVJMKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmLCBjb25zdCBVUkwmIHVybCkKIHsKICAgICBU aHJlYWRhYmxlQmxvYlJlZ2lzdHJ5Ojp1bnJlZ2lzdGVyQmxvYlVSTCh1cmwpOwogfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9ET01VUkwuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRt bC9ET01VUkwuY3BwCmluZGV4IDBhMDhiNTk0Njg2NTczMmYyOGRhMzBmYjdmNjNjYTRkMzE0ZWE5 MTcuLjQwMjJkYTE2N2YwODhmZmJmNTQxYjQ5MTAxMzAyYWY5ZDBhN2M4NTMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvRE9NVVJMLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1s L0RPTVVSTC5jcHAKQEAgLTEwMyw3ICsxMDMsNyBAQCBTdHJpbmcgRE9NVVJMOjpjcmVhdGVQdWJs aWNVUkwoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYgc2NyaXB0RXhlY3V0aW9uQ29udGV4dCwgVQog ICAgIGlmIChwdWJsaWNVUkwuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm4gU3RyaW5nKCk7CiAK LSAgICBzY3JpcHRFeGVjdXRpb25Db250ZXh0LnB1YmxpY1VSTE1hbmFnZXIoKS5yZWdpc3RlclVS TChzY3JpcHRFeGVjdXRpb25Db250ZXh0LnNlY3VyaXR5T3JpZ2luKCksIHB1YmxpY1VSTCwgcmVn aXN0cmFibGUpOworICAgIHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQucHVibGljVVJMTWFuYWdlcigp LnJlZ2lzdGVyVVJMKHB1YmxpY1VSTCwgcmVnaXN0cmFibGUpOwogCiAgICAgcmV0dXJuIHB1Ymxp Y1VSTC5zdHJpbmcoKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvUHVibGlj VVJMTWFuYWdlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL1B1YmxpY1VSTE1hbmFnZXIuY3Bw CmluZGV4IDczYjU0NzM1NzhlM2IwYjMxZWFmOTVkYTQwYzIwYWMwOTljMDczNjcuLmQ1YjliZWRi YWQwNDcwNDYxYTU4YWI1Y2IwMTRhNjhjMDQ3ZDdmYjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2h0bWwvUHVibGljVVJMTWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9Q dWJsaWNVUkxNYW5hZ2VyLmNwcApAQCAtNDUsMTMgKzQ1LDEzIEBAIFB1YmxpY1VSTE1hbmFnZXI6 OlB1YmxpY1VSTE1hbmFnZXIoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4dCkKIHsKIH0K IAotdm9pZCBQdWJsaWNVUkxNYW5hZ2VyOjpyZWdpc3RlclVSTChTZWN1cml0eU9yaWdpbiogb3Jp Z2luLCBjb25zdCBVUkwmIHVybCwgVVJMUmVnaXN0cmFibGUmIHJlZ2lzdHJhYmxlKQordm9pZCBQ dWJsaWNVUkxNYW5hZ2VyOjpyZWdpc3RlclVSTChjb25zdCBVUkwmIHVybCwgVVJMUmVnaXN0cmFi bGUmIHJlZ2lzdHJhYmxlKQogewogICAgIGlmIChtX2lzU3RvcHBlZCkKICAgICAgICAgcmV0dXJu OwogCiAgICAgUmVnaXN0cnlVUkxNYXA6Oml0ZXJhdG9yIGZvdW5kID0gbV9yZWdpc3RyeVRvVVJM LmFkZCgmcmVnaXN0cmFibGUucmVnaXN0cnkoKSwgVVJMU2V0KCkpLml0ZXJhdG9yOwotICAgIGZv dW5kLT5rZXktPnJlZ2lzdGVyVVJMKG9yaWdpbiwgdXJsLCByZWdpc3RyYWJsZSk7CisgICAgZm91 bmQtPmtleS0+cmVnaXN0ZXJVUkwoKnNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKSwgdXJsLCByZWdp c3RyYWJsZSk7CiAgICAgZm91bmQtPnZhbHVlLmFkZCh1cmwuc3RyaW5nKCkpOwogfQogCkBAIC01 OSw3ICs1OSw3IEBAIHZvaWQgUHVibGljVVJMTWFuYWdlcjo6cmV2b2tlKGNvbnN0IFVSTCYgdXJs KQogewogICAgIGZvciAoYXV0byYgcmVnaXN0cnkgOiBtX3JlZ2lzdHJ5VG9VUkwpIHsKICAgICAg ICAgaWYgKHJlZ2lzdHJ5LnZhbHVlLmNvbnRhaW5zKHVybC5zdHJpbmcoKSkpIHsKLSAgICAgICAg ICAgIHJlZ2lzdHJ5LmtleS0+dW5yZWdpc3RlclVSTCh1cmwpOworICAgICAgICAgICAgcmVnaXN0 cnkua2V5LT51bnJlZ2lzdGVyVVJMKCpzY3JpcHRFeGVjdXRpb25Db250ZXh0KCksIHVybCk7CiAg ICAgICAgICAgICByZWdpc3RyeS52YWx1ZS5yZW1vdmUodXJsLnN0cmluZygpKTsKICAgICAgICAg ICAgIGJyZWFrOwogICAgICAgICB9CkBAIC03NCw3ICs3NCw3IEBAIHZvaWQgUHVibGljVVJMTWFu YWdlcjo6c3RvcCgpCiAgICAgbV9pc1N0b3BwZWQgPSB0cnVlOwogICAgIGZvciAoYXV0byYgcmVn aXN0cnkgOiBtX3JlZ2lzdHJ5VG9VUkwpIHsKICAgICAgICAgZm9yIChhdXRvJiB1cmwgOiByZWdp c3RyeS52YWx1ZSkKLSAgICAgICAgICAgIHJlZ2lzdHJ5LmtleS0+dW5yZWdpc3RlclVSTChVUkwo eyB9LCB1cmwpKTsKKyAgICAgICAgICAgIHJlZ2lzdHJ5LmtleS0+dW5yZWdpc3RlclVSTCgqc2Ny aXB0RXhlY3V0aW9uQ29udGV4dCgpLCBVUkwoeyB9LCB1cmwpKTsKICAgICB9CiAKICAgICBtX3Jl Z2lzdHJ5VG9VUkwuY2xlYXIoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvUHVi bGljVVJMTWFuYWdlci5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9QdWJsaWNVUkxNYW5hZ2VyLmgK aW5kZXggZTY5ZGU0ZWQ4YzgzYmI4YThkYzRkMzY2ODYyMmNkM2ZkZDUzN2U3NS4uOWJmZTczZTYy ODBiOTQ0YzY1ZDBkZGQ4MTFjNmYxN2E3NDIxOWZkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaHRtbC9QdWJsaWNVUkxNYW5hZ2VyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9QdWJs aWNVUkxNYW5hZ2VyLmgKQEAgLTMzLDcgKzMzLDYgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewog Ci1jbGFzcyBTY3JpcHRFeGVjdXRpb25Db250ZXh0OwogY2xhc3MgU2VjdXJpdHlPcmlnaW47CiBj bGFzcyBVUkxSZWdpc3RyeTsKIGNsYXNzIFVSTFJlZ2lzdHJhYmxlOwpAQCAtNDUsNyArNDQsNyBA QCBwdWJsaWM6CiAKICAgICBzdGF0aWMgc3RkOjp1bmlxdWVfcHRyPFB1YmxpY1VSTE1hbmFnZXI+ IGNyZWF0ZShTY3JpcHRFeGVjdXRpb25Db250ZXh0Kik7CiAKLSAgICB2b2lkIHJlZ2lzdGVyVVJM KFNlY3VyaXR5T3JpZ2luKiwgY29uc3QgVVJMJiwgVVJMUmVnaXN0cmFibGUmKTsKKyAgICB2b2lk IHJlZ2lzdGVyVVJMKGNvbnN0IFVSTCYsIFVSTFJlZ2lzdHJhYmxlJik7CiAgICAgdm9pZCByZXZv a2UoY29uc3QgVVJMJik7CiAKIHByaXZhdGU6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9o dG1sL1VSTFJlZ2lzdHJ5LmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL1VSTFJlZ2lzdHJ5LmgKaW5k ZXggODIyM2JiZDA3NTkwZGRhY2NlOWZkMTYwNGUzYWMwYmMwMTVmNjRhZS4uZTNkYzQ2YTllOTI3 NDEwMTBmNGE3Y2IyYzViY2YwNjZlN2EyNGY3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aHRtbC9VUkxSZWdpc3RyeS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvVVJMUmVnaXN0cnku aApAQCAtMzQsNyArMzQsNyBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLWNsYXNzIFNlY3Vy aXR5T3JpZ2luOworY2xhc3MgU2NyaXB0RXhlY3V0aW9uQ29udGV4dDsKIGNsYXNzIFVSTFJlZ2lz dHJ5OwogCiBjbGFzcyBVUkxSZWdpc3RyYWJsZSB7CkBAIC00Nyw4ICs0Nyw4IEBAIGNsYXNzIFVS TFJlZ2lzdHJ5IHsKICAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKIHB1YmxpYzoKICAgICB2 aXJ0dWFsIH5VUkxSZWdpc3RyeSgpID0gZGVmYXVsdDsKLSAgICB2aXJ0dWFsIHZvaWQgcmVnaXN0 ZXJVUkwoU2VjdXJpdHlPcmlnaW4qLCBjb25zdCBVUkwmLCBVUkxSZWdpc3RyYWJsZSYpID0gMDsK LSAgICB2aXJ0dWFsIHZvaWQgdW5yZWdpc3RlclVSTChjb25zdCBVUkwmKSA9IDA7CisgICAgdmly dHVhbCB2b2lkIHJlZ2lzdGVyVVJMKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmLCBjb25zdCBVUkwm LCBVUkxSZWdpc3RyYWJsZSYpID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgdW5yZWdpc3RlclVSTChT Y3JpcHRFeGVjdXRpb25Db250ZXh0JiwgY29uc3QgVVJMJikgPSAwOwogCiAgICAgLy8gVGhpcyBp cyBhbiBvcHRpb25hbCBBUEkKICAgICB2aXJ0dWFsIFVSTFJlZ2lzdHJhYmxlKiBsb29rdXAoY29u c3QgU3RyaW5nJikgY29uc3QgeyBBU1NFUlRfTk9UX1JFQUNIRUQoKTsgcmV0dXJuIDA7IH0K