194489 2019-02-10 21:18:21 -0800 [LFC] Fix spelling error. 2019-02-10 22:18:28 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1504792 0 zalan 2019-02-10 21:18:21 -0800 instrinsic -> intrinsic 1504793 1 361656 zalan 2019-02-10 21:25:33 -0800 Created attachment 361656 Patch 1504801 2 361656 commit-queue 2019-02-10 22:17:59 -0800 Comment on attachment 361656 Patch Clearing flags on attachment: 361656 Committed r241257: <https://trac.webkit.org/changeset/241257> 1504802 3 commit-queue 2019-02-10 22:18:00 -0800 All reviewed patches have been landed. Closing bug. 1504803 4 webkit-bug-importer 2019-02-10 22:18:28 -0800 <rdar://problem/47955225> 361656 2019-02-10 21:25:33 -0800 2019-02-10 22:17:59 -0800 Patch bug-194489-20190210212532.patch text/plain 22199 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQxMjU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzlkZWM1NzE0NjM1YjRh MWI4NzI3MWI4YmRjMTQyY2NmY2ZlMjJiMC4uYTE2MThkYTU4ZWMyOTVlNTJjMzRkZmEyMjk5MjUw MDQ1NzU0MjE4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDE5LTAyLTEwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gRml4IHNwZWxsaW5n IGVycm9yLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTk0NDg5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg aW5zdHJpbnNpYyAtPiBpbnRyaW5zaWMKKworICAgICAgICAqIGxheW91dC9Gb3JtYXR0aW5nQ29u dGV4dC5oOgorICAgICAgICAqIGxheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5Ojpz aHJpbmtUb0ZpdFdpZHRoKToKKyAgICAgICAgKiBsYXlvdXQvRm9ybWF0dGluZ1N0YXRlLmg6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdTdGF0ZTo6c2V0SW50cmluc2ljV2lk dGhDb25zdHJhaW50cyk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdTdGF0 ZTo6Y2xlYXJJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzKToKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6Rm9ybWF0dGluZ1N0YXRlOjppbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzIGNvbnN0KToK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0dGluZ1N0YXRlOjpzZXRJbnN0cmluc2lj V2lkdGhDb25zdHJhaW50cyk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZv cm1hdHRpbmdTdGF0ZTo6Y2xlYXJJbnN0cmluc2ljV2lkdGhDb25zdHJhaW50cyk6IERlbGV0ZWQu CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdTdGF0ZTo6aW5zdHJpbnNpY1dp ZHRoQ29uc3RyYWludHMgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIGxheW91dC9ibG9ja2Zv cm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmludHJpbnNpY1dpZHRoQ29uc3RyYWludHMg Y29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0 OjppbnN0cmluc2ljV2lkdGhDb25zdHJhaW50cyBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgICog bGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0Lmg6CisgICAgICAg ICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnku Y3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpH ZW9tZXRyeTo6aW50cmluc2ljV2lkdGhDb25zdHJhaW50c05lZWRDaGlsZHJlbldpZHRoKToKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6 OmludHJpbnNpY1dpZHRoQ29uc3RyYWludHMpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpC bG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6aW5zdHJpbnNpY1dpZHRoQ29uc3RyYWlu dHNOZWVkQ2hpbGRyZW5XaWR0aCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6 OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjppbnN0cmluc2ljV2lkdGhDb25zdHJh aW50cyk6IERlbGV0ZWQuCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l Rm9ybWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVG b3JtYXR0aW5nQ29udGV4dDo6aW50cmluc2ljV2lkdGhDb25zdHJhaW50cyBjb25zdCk6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlSW50 cmluc2ljV2lkdGhGb3JGb3JtYXR0aW5nQ29udGV4dFJvb3QgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6aW5zdHJpbnNpY1dpZHRoQ29u c3RyYWludHMgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0Lmg6CisKIDIwMTktMDItMTAgIFBhYmxvIFNhYXZl ZHJhICA8cHNhYXZlZHJhQGlnYWxpYS5jb20+CiAKICAgICAgICAgbGliV1BFV2ViS2l0LTAuMS5z bzogdW5kZWZpbmVkIHJlZmVyZW5jZSB0byBgSlNDOjpKU1ZhbHVlOjphc0NlbGwoKSBjb25zdApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmggYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuaAppbmRleCA2MjUzMGEzZmRl MGQxN2U0Njg4NzNhY2VhMGUzYzQ2OTkxZDUzNTljLi44MjFiZGY3ZDZmMzYyMTAyYmI2NDc4NmE3 MmFiYTljYmVhYmRiNmM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0 dGluZ0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRl eHQuaApAQCAtNTIsMTEgKzUyLDExIEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgbGF5b3V0 KCkgY29uc3QgPSAwOwogICAgIHZvaWQgbGF5b3V0T3V0T2ZGbG93RGVzY2VuZGFudHMoY29uc3Qg Qm94JikgY29uc3Q7CiAKLSAgICBzdHJ1Y3QgSW5zdHJpbnNpY1dpZHRoQ29uc3RyYWludHMgewor ICAgIHN0cnVjdCBJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzIHsKICAgICAgICAgTGF5b3V0VW5p dCBtaW5pbXVtOwogICAgICAgICBMYXlvdXRVbml0IG1heGltdW07CiAgICAgfTsKLSAgICB2aXJ0 dWFsIEluc3RyaW5zaWNXaWR0aENvbnN0cmFpbnRzIGluc3RyaW5zaWNXaWR0aENvbnN0cmFpbnRz KCkgY29uc3QgPSAwOworICAgIHZpcnR1YWwgSW50cmluc2ljV2lkdGhDb25zdHJhaW50cyBpbnRy aW5zaWNXaWR0aENvbnN0cmFpbnRzKCkgY29uc3QgPSAwOwogCiAgICAgc3RhdGljIERpc3BsYXk6 OkJveCBtYXBCb3hUb0FuY2VzdG9yKGNvbnN0IExheW91dFN0YXRlJiwgY29uc3QgQm94JiwgY29u c3QgQ29udGFpbmVyJiBhbmNlc3Rvcik7CiAgICAgc3RhdGljIExheW91dFVuaXQgbWFwVG9wVG9B bmNlc3Rvcihjb25zdCBMYXlvdXRTdGF0ZSYsIGNvbnN0IEJveCYsIGNvbnN0IENvbnRhaW5lciYg YW5jZXN0b3IpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdD b250ZXh0R2VvbWV0cnkuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250 ZXh0R2VvbWV0cnkuY3BwCmluZGV4IGFmYTBiYzQ4OWQ4Yjc5OTUzYWJhYjhjODMyMWFhOTdjZTc0 NDU2NzUuLjFiOTZhMzk5NWJkYjdjNTQ1NjIzMGVkYzFhMDExMjNlMWMwYmM0NWIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAK QEAgLTI0OCw4ICsyNDgsOCBAQCBMYXlvdXRVbml0IEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRy eTo6c2hyaW5rVG9GaXRXaWR0aChMYXlvdXRTdGF0ZSYgbGF5b3V0U3RhdAogICAgIC8vIFRoZW4g dGhlIHNocmluay10by1maXQgd2lkdGggaXM6IG1pbihtYXgocHJlZmVycmVkIG1pbmltdW0gd2lk dGgsIGF2YWlsYWJsZSB3aWR0aCksIHByZWZlcnJlZCB3aWR0aCkuCiAgICAgQVNTRVJUKHVzZWRW YWx1ZXMuY29udGFpbmluZ0Jsb2NrV2lkdGguaGFzVmFsdWUoKSk7CiAgICAgYXV0byBhdmFpbGFi bGVXaWR0aCA9ICp1c2VkVmFsdWVzLmNvbnRhaW5pbmdCbG9ja1dpZHRoOwotICAgIGF1dG8gaW5z dHJpbnNpY1dpZHRoQ29uc3RyYWludHMgPSBsYXlvdXRTdGF0ZS5jcmVhdGVGb3JtYXR0aW5nQ29u dGV4dChmb3JtYXR0aW5nUm9vdCktPmluc3RyaW5zaWNXaWR0aENvbnN0cmFpbnRzKCk7Ci0gICAg cmV0dXJuIHN0ZDo6bWluKHN0ZDo6bWF4KGluc3RyaW5zaWNXaWR0aENvbnN0cmFpbnRzLm1pbmlt dW0sIGF2YWlsYWJsZVdpZHRoKSwgaW5zdHJpbnNpY1dpZHRoQ29uc3RyYWludHMubWF4aW11bSk7 CisgICAgYXV0byBpbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzID0gbGF5b3V0U3RhdGUuY3JlYXRl Rm9ybWF0dGluZ0NvbnRleHQoZm9ybWF0dGluZ1Jvb3QpLT5pbnRyaW5zaWNXaWR0aENvbnN0cmFp bnRzKCk7CisgICAgcmV0dXJuIHN0ZDo6bWluKHN0ZDo6bWF4KGludHJpbnNpY1dpZHRoQ29uc3Ry YWludHMubWluaW11bSwgYXZhaWxhYmxlV2lkdGgpLCBpbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRz Lm1heGltdW0pOwogfQogCiBWZXJ0aWNhbEdlb21ldHJ5IEZvcm1hdHRpbmdDb250ZXh0OjpHZW9t ZXRyeTo6b3V0T2ZGbG93Tm9uUmVwbGFjZWRWZXJ0aWNhbEdlb21ldHJ5KGNvbnN0IExheW91dFN0 YXRlJiBsYXlvdXRTdGF0ZSwgY29uc3QgQm94JiBsYXlvdXRCb3gsIFVzZWRWZXJ0aWNhbFZhbHVl cyB1c2VkVmFsdWVzKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRp bmdTdGF0ZS5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdTdGF0ZS5oCmluZGV4 IDBjMzRjNzBhMjIyNjJiOTc4N2M0YjUyYjQ5OWY5OWUyYzVlNzA0MDYuLjdiZGM3MTEzZjg1MTRk ZDA4N2M0NTgzNWZiOGIzNzdiYjcyYjIyNmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9Gb3JtYXR0aW5nU3RhdGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0 dGluZ1N0YXRlLmgKQEAgLTUxLDkgKzUxLDkgQEAgcHVibGljOgogICAgIHZvaWQgbWFya05lZWRz TGF5b3V0KGNvbnN0IEJveCYsIFN0eWxlRGlmZik7CiAgICAgYm9vbCBuZWVkc0xheW91dChjb25z dCBCb3gmKTsKIAotICAgIHZvaWQgc2V0SW5zdHJpbnNpY1dpZHRoQ29uc3RyYWludHMoY29uc3Qg Qm94JiwgIEZvcm1hdHRpbmdDb250ZXh0OjpJbnN0cmluc2ljV2lkdGhDb25zdHJhaW50cyk7Ci0g ICAgdm9pZCBjbGVhckluc3RyaW5zaWNXaWR0aENvbnN0cmFpbnRzKGNvbnN0IEJveCYpOwotICAg IE9wdGlvbmFsPEZvcm1hdHRpbmdDb250ZXh0OjpJbnN0cmluc2ljV2lkdGhDb25zdHJhaW50cz4g aW5zdHJpbnNpY1dpZHRoQ29uc3RyYWludHMoY29uc3QgQm94JikgY29uc3Q7CisgICAgdm9pZCBz ZXRJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzKGNvbnN0IEJveCYsICBGb3JtYXR0aW5nQ29udGV4 dDo6SW50cmluc2ljV2lkdGhDb25zdHJhaW50cyk7CisgICAgdm9pZCBjbGVhckludHJpbnNpY1dp ZHRoQ29uc3RyYWludHMoY29uc3QgQm94Jik7CisgICAgT3B0aW9uYWw8Rm9ybWF0dGluZ0NvbnRl eHQ6OkludHJpbnNpY1dpZHRoQ29uc3RyYWludHM+IGludHJpbnNpY1dpZHRoQ29uc3RyYWludHMo Y29uc3QgQm94JikgY29uc3Q7CiAKICAgICBib29sIGlzQmxvY2tGb3JtYXR0aW5nU3RhdGUoKSBj b25zdCB7IHJldHVybiBtX3R5cGUgPT0gVHlwZTo6QmxvY2s7IH0KICAgICBib29sIGlzSW5saW5l Rm9ybWF0dGluZ1N0YXRlKCkgY29uc3QgeyByZXR1cm4gbV90eXBlID09IFR5cGU6OklubGluZTsg fQpAQCAtNjcsMjcgKzY3LDI3IEBAIHByb3RlY3RlZDoKIHByaXZhdGU6CiAgICAgTGF5b3V0U3Rh dGUmIG1fbGF5b3V0U3RhdGU7CiAgICAgUmVmPEZsb2F0aW5nU3RhdGU+IG1fZmxvYXRpbmdTdGF0 ZTsKLSAgICBIYXNoTWFwPGNvbnN0IEJveCosIEZvcm1hdHRpbmdDb250ZXh0OjpJbnN0cmluc2lj V2lkdGhDb25zdHJhaW50cz4gbV9pbnN0cmluc2ljV2lkdGhDb25zdHJhaW50czsKKyAgICBIYXNo TWFwPGNvbnN0IEJveCosIEZvcm1hdHRpbmdDb250ZXh0OjpJbnRyaW5zaWNXaWR0aENvbnN0cmFp bnRzPiBtX2ludHJpbnNpY1dpZHRoQ29uc3RyYWludHM7CiAgICAgVHlwZSBtX3R5cGU7CiB9Owog Ci1pbmxpbmUgdm9pZCBGb3JtYXR0aW5nU3RhdGU6OnNldEluc3RyaW5zaWNXaWR0aENvbnN0cmFp bnRzKGNvbnN0IEJveCYgbGF5b3V0Qm94LCBGb3JtYXR0aW5nQ29udGV4dDo6SW5zdHJpbnNpY1dp ZHRoQ29uc3RyYWludHMgaW5zdHJpbnNpY1dpZHRoQ29uc3RyYWludHMpCitpbmxpbmUgdm9pZCBG b3JtYXR0aW5nU3RhdGU6OnNldEludHJpbnNpY1dpZHRoQ29uc3RyYWludHMoY29uc3QgQm94JiBs YXlvdXRCb3gsIEZvcm1hdHRpbmdDb250ZXh0OjpJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzIGlu dHJpbnNpY1dpZHRoQ29uc3RyYWludHMpCiB7Ci0gICAgQVNTRVJUKCFtX2luc3RyaW5zaWNXaWR0 aENvbnN0cmFpbnRzLmNvbnRhaW5zKCZsYXlvdXRCb3gpKTsKKyAgICBBU1NFUlQoIW1faW50cmlu c2ljV2lkdGhDb25zdHJhaW50cy5jb250YWlucygmbGF5b3V0Qm94KSk7CiAgICAgQVNTRVJUKCZt X2xheW91dFN0YXRlLmZvcm1hdHRpbmdTdGF0ZUZvckJveChsYXlvdXRCb3gpID09IHRoaXMpOwot ICAgIG1faW5zdHJpbnNpY1dpZHRoQ29uc3RyYWludHMuc2V0KCZsYXlvdXRCb3gsIGluc3RyaW5z aWNXaWR0aENvbnN0cmFpbnRzKTsKKyAgICBtX2ludHJpbnNpY1dpZHRoQ29uc3RyYWludHMuc2V0 KCZsYXlvdXRCb3gsIGludHJpbnNpY1dpZHRoQ29uc3RyYWludHMpOwogfQogCi1pbmxpbmUgdm9p ZCBGb3JtYXR0aW5nU3RhdGU6OmNsZWFySW5zdHJpbnNpY1dpZHRoQ29uc3RyYWludHMoY29uc3Qg Qm94JiBsYXlvdXRCb3gpCitpbmxpbmUgdm9pZCBGb3JtYXR0aW5nU3RhdGU6OmNsZWFySW50cmlu c2ljV2lkdGhDb25zdHJhaW50cyhjb25zdCBCb3gmIGxheW91dEJveCkKIHsKLSAgICBtX2luc3Ry aW5zaWNXaWR0aENvbnN0cmFpbnRzLnJlbW92ZSgmbGF5b3V0Qm94KTsKKyAgICBtX2ludHJpbnNp Y1dpZHRoQ29uc3RyYWludHMucmVtb3ZlKCZsYXlvdXRCb3gpOwogfQogCi1pbmxpbmUgT3B0aW9u YWw8Rm9ybWF0dGluZ0NvbnRleHQ6Okluc3RyaW5zaWNXaWR0aENvbnN0cmFpbnRzPiBGb3JtYXR0 aW5nU3RhdGU6Omluc3RyaW5zaWNXaWR0aENvbnN0cmFpbnRzKGNvbnN0IEJveCYgbGF5b3V0Qm94 KSBjb25zdAoraW5saW5lIE9wdGlvbmFsPEZvcm1hdHRpbmdDb250ZXh0OjpJbnRyaW5zaWNXaWR0 aENvbnN0cmFpbnRzPiBGb3JtYXR0aW5nU3RhdGU6OmludHJpbnNpY1dpZHRoQ29uc3RyYWludHMo Y29uc3QgQm94JiBsYXlvdXRCb3gpIGNvbnN0CiB7CiAgICAgQVNTRVJUKCZtX2xheW91dFN0YXRl LmZvcm1hdHRpbmdTdGF0ZUZvckJveChsYXlvdXRCb3gpID09IHRoaXMpOwotICAgIGF1dG8gaXRl cmF0b3IgPSBtX2luc3RyaW5zaWNXaWR0aENvbnN0cmFpbnRzLmZpbmQoJmxheW91dEJveCk7Ci0g ICAgaWYgKGl0ZXJhdG9yID09IG1faW5zdHJpbnNpY1dpZHRoQ29uc3RyYWludHMuZW5kKCkpCisg ICAgYXV0byBpdGVyYXRvciA9IG1faW50cmluc2ljV2lkdGhDb25zdHJhaW50cy5maW5kKCZsYXlv dXRCb3gpOworICAgIGlmIChpdGVyYXRvciA9PSBtX2ludHJpbnNpY1dpZHRoQ29uc3RyYWludHMu ZW5kKCkpCiAgICAgICAgIHJldHVybiB7IH07CiAgICAgcmV0dXJuIGl0ZXJhdG9yLT52YWx1ZTsK IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxv Y2tGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3Jt YXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IDU1N2QxZWEzY2JiYmVmMzAw YjhmMmFiYTE2YzkzMjkyYTRkZDVmNmMuLmM3NjkwMDA0NTc2ZDAxZWMwMWUzNjAzMWU2YjhhZTc1 ZmRjZWIxZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRp bmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAtMzkyLDE5ICsz OTIsMTkgQEAgdm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlSGVpZ2h0QW5kTWFy Z2luKGNvbnN0IEJveCYgbGF5b3V0Qm94KSBjb25zdAogICAgIE1hcmdpbkNvbGxhcHNlOjp1cGRh dGVNYXJnaW5BZnRlckZvclByZXZpb3VzU2libGluZyhsYXlvdXRTdGF0ZSwgbGF5b3V0Qm94KTsK IH0KIAotRm9ybWF0dGluZ0NvbnRleHQ6Okluc3RyaW5zaWNXaWR0aENvbnN0cmFpbnRzIEJsb2Nr Rm9ybWF0dGluZ0NvbnRleHQ6Omluc3RyaW5zaWNXaWR0aENvbnN0cmFpbnRzKCkgY29uc3QKK0Zv cm1hdHRpbmdDb250ZXh0OjpJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzIEJsb2NrRm9ybWF0dGlu Z0NvbnRleHQ6OmludHJpbnNpY1dpZHRoQ29uc3RyYWludHMoKSBjb25zdAogewogICAgIGF1dG8m IGxheW91dFN0YXRlID0gdGhpcy0+bGF5b3V0U3RhdGUoKTsKICAgICBhdXRvJiBmb3JtYXR0aW5n Um9vdCA9IHJvb3QoKTsKICAgICBhdXRvJiBmb3JtYXR0aW5nU3RhdGVGb3JSb290ID0gbGF5b3V0 U3RhdGUuZm9ybWF0dGluZ1N0YXRlRm9yQm94KGZvcm1hdHRpbmdSb290KTsKLSAgICBpZiAoYXV0 byBpbnN0cmluc2ljV2lkdGhDb25zdHJhaW50cyA9IGZvcm1hdHRpbmdTdGF0ZUZvclJvb3QuaW5z dHJpbnNpY1dpZHRoQ29uc3RyYWludHMoZm9ybWF0dGluZ1Jvb3QpKQotICAgICAgICByZXR1cm4g Kmluc3RyaW5zaWNXaWR0aENvbnN0cmFpbnRzOworICAgIGlmIChhdXRvIGludHJpbnNpY1dpZHRo Q29uc3RyYWludHMgPSBmb3JtYXR0aW5nU3RhdGVGb3JSb290LmludHJpbnNpY1dpZHRoQ29uc3Ry YWludHMoZm9ybWF0dGluZ1Jvb3QpKQorICAgICAgICByZXR1cm4gKmludHJpbnNpY1dpZHRoQ29u c3RyYWludHM7CiAKICAgICAvLyBDYW4gd2UganVzdCBjb21wdXRlIHRoZW0gd2l0aG91dCBjaGVj a2luZyB0aGUgY2hpbGRyZW4/Ci0gICAgaWYgKCFHZW9tZXRyeTo6aW5zdHJpbnNpY1dpZHRoQ29u c3RyYWludHNOZWVkQ2hpbGRyZW5XaWR0aChmb3JtYXR0aW5nUm9vdCkpIHsKLSAgICAgICAgYXV0 byBpbnN0cmluc2ljV2lkdGhDb25zdHJhaW50cyA9IEdlb21ldHJ5OjppbnN0cmluc2ljV2lkdGhD b25zdHJhaW50cyhsYXlvdXRTdGF0ZSwgZm9ybWF0dGluZ1Jvb3QpOwotICAgICAgICBmb3JtYXR0 aW5nU3RhdGVGb3JSb290LnNldEluc3RyaW5zaWNXaWR0aENvbnN0cmFpbnRzKGZvcm1hdHRpbmdS b290LCBpbnN0cmluc2ljV2lkdGhDb25zdHJhaW50cyk7Ci0gICAgICAgIHJldHVybiBpbnN0cmlu c2ljV2lkdGhDb25zdHJhaW50czsKKyAgICBpZiAoIUdlb21ldHJ5OjppbnRyaW5zaWNXaWR0aENv bnN0cmFpbnRzTmVlZENoaWxkcmVuV2lkdGgoZm9ybWF0dGluZ1Jvb3QpKSB7CisgICAgICAgIGF1 dG8gaW50cmluc2ljV2lkdGhDb25zdHJhaW50cyA9IEdlb21ldHJ5OjppbnRyaW5zaWNXaWR0aENv bnN0cmFpbnRzKGxheW91dFN0YXRlLCBmb3JtYXR0aW5nUm9vdCk7CisgICAgICAgIGZvcm1hdHRp bmdTdGF0ZUZvclJvb3Quc2V0SW50cmluc2ljV2lkdGhDb25zdHJhaW50cyhmb3JtYXR0aW5nUm9v dCwgaW50cmluc2ljV2lkdGhDb25zdHJhaW50cyk7CisgICAgICAgIHJldHVybiBpbnRyaW5zaWNX aWR0aENvbnN0cmFpbnRzOwogICAgIH0KIAogICAgIC8vIFZpc2l0IHRoZSBpbi1mbG93IGRlc2Nl bmRhbnRzIGFuZCBjb21wdXRlIHRoZWlyIG1pbi9tYXggaW50cmluc2ljIHdpZHRoIGlmIG5lZWRl ZC4KQEAgLTQyMSwxNSArNDIxLDE1IEBAIEZvcm1hdHRpbmdDb250ZXh0OjpJbnN0cmluc2ljV2lk dGhDb25zdHJhaW50cyBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjppbnN0cmluc2ljCiAgICAgd2hp bGUgKCFxdWV1ZS5pc0VtcHR5KCkpIHsKICAgICAgICAgd2hpbGUgKHRydWUpIHsKICAgICAgICAg ICAgIGF1dG8mIGNoaWxkQm94ID0gKnF1ZXVlLmxhc3QoKTsKLSAgICAgICAgICAgIGF1dG8gc2tp cERlc2NlbmRhbnRzID0gZm9ybWF0dGluZ1N0YXRlLmluc3RyaW5zaWNXaWR0aENvbnN0cmFpbnRz KGNoaWxkQm94KSB8fCAhR2VvbWV0cnk6Omluc3RyaW5zaWNXaWR0aENvbnN0cmFpbnRzTmVlZENo aWxkcmVuV2lkdGgoY2hpbGRCb3gpIHx8IGNoaWxkQm94LmVzdGFibGlzaGVzRm9ybWF0dGluZ0Nv bnRleHQoKTsKKyAgICAgICAgICAgIGF1dG8gc2tpcERlc2NlbmRhbnRzID0gZm9ybWF0dGluZ1N0 YXRlLmludHJpbnNpY1dpZHRoQ29uc3RyYWludHMoY2hpbGRCb3gpIHx8ICFHZW9tZXRyeTo6aW50 cmluc2ljV2lkdGhDb25zdHJhaW50c05lZWRDaGlsZHJlbldpZHRoKGNoaWxkQm94KSB8fCBjaGls ZEJveC5lc3RhYmxpc2hlc0Zvcm1hdHRpbmdDb250ZXh0KCk7CiAKICAgICAgICAgICAgIGlmIChz a2lwRGVzY2VuZGFudHMpIHsKLSAgICAgICAgICAgICAgICBJbnN0cmluc2ljV2lkdGhDb25zdHJh aW50cyBpbnN0cmluc2ljV2lkdGhDb25zdHJhaW50czsKLSAgICAgICAgICAgICAgICBpZiAoIUdl b21ldHJ5OjppbnN0cmluc2ljV2lkdGhDb25zdHJhaW50c05lZWRDaGlsZHJlbldpZHRoKGNoaWxk Qm94KSkKLSAgICAgICAgICAgICAgICAgICAgaW5zdHJpbnNpY1dpZHRoQ29uc3RyYWludHMgPSBH ZW9tZXRyeTo6aW5zdHJpbnNpY1dpZHRoQ29uc3RyYWludHMobGF5b3V0U3RhdGUsIGNoaWxkQm94 KTsKKyAgICAgICAgICAgICAgICBJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzIGludHJpbnNpY1dp ZHRoQ29uc3RyYWludHM7CisgICAgICAgICAgICAgICAgaWYgKCFHZW9tZXRyeTo6aW50cmluc2lj V2lkdGhDb25zdHJhaW50c05lZWRDaGlsZHJlbldpZHRoKGNoaWxkQm94KSkKKyAgICAgICAgICAg ICAgICAgICAgaW50cmluc2ljV2lkdGhDb25zdHJhaW50cyA9IEdlb21ldHJ5OjppbnRyaW5zaWNX aWR0aENvbnN0cmFpbnRzKGxheW91dFN0YXRlLCBjaGlsZEJveCk7CiAgICAgICAgICAgICAgICAg ZWxzZSBpZiAoY2hpbGRCb3guZXN0YWJsaXNoZXNGb3JtYXR0aW5nQ29udGV4dCgpKQotICAgICAg ICAgICAgICAgICAgICBpbnN0cmluc2ljV2lkdGhDb25zdHJhaW50cyA9IGxheW91dFN0YXRlLmNy ZWF0ZUZvcm1hdHRpbmdDb250ZXh0KGNoaWxkQm94KS0+aW5zdHJpbnNpY1dpZHRoQ29uc3RyYWlu dHMoKTsKLSAgICAgICAgICAgICAgICBmb3JtYXR0aW5nU3RhdGUuc2V0SW5zdHJpbnNpY1dpZHRo Q29uc3RyYWludHMoY2hpbGRCb3gsIGluc3RyaW5zaWNXaWR0aENvbnN0cmFpbnRzKTsKKyAgICAg ICAgICAgICAgICAgICAgaW50cmluc2ljV2lkdGhDb25zdHJhaW50cyA9IGxheW91dFN0YXRlLmNy ZWF0ZUZvcm1hdHRpbmdDb250ZXh0KGNoaWxkQm94KS0+aW50cmluc2ljV2lkdGhDb25zdHJhaW50 cygpOworICAgICAgICAgICAgICAgIGZvcm1hdHRpbmdTdGF0ZS5zZXRJbnRyaW5zaWNXaWR0aENv bnN0cmFpbnRzKGNoaWxkQm94LCBpbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzKTsKIAogICAgICAg ICAgICAgICAgIHF1ZXVlLnJlbW92ZUxhc3QoKTsKICAgICAgICAgICAgICAgICBpZiAoIWNoaWxk Qm94Lm5leHRJbkZsb3dPckZsb2F0aW5nU2libGluZygpKQpAQCAtNDQzLDcgKzQ0Myw3IEBAIEZv cm1hdHRpbmdDb250ZXh0OjpJbnN0cmluc2ljV2lkdGhDb25zdHJhaW50cyBCbG9ja0Zvcm1hdHRp bmdDb250ZXh0OjppbnN0cmluc2ljCiAgICAgICAgIC8vIENvbXB1dGUgbWluL21heCBpbnRyaW5z aWMgd2lkdGggYm90dG9tIHVwLgogICAgICAgICB3aGlsZSAoIXF1ZXVlLmlzRW1wdHkoKSkgewog ICAgICAgICAgICAgYXV0byYgY2hpbGRCb3ggPSAqcXVldWUudGFrZUxhc3QoKTsKLSAgICAgICAg ICAgIGZvcm1hdHRpbmdTdGF0ZS5zZXRJbnN0cmluc2ljV2lkdGhDb25zdHJhaW50cyhjaGlsZEJv eCwgR2VvbWV0cnk6Omluc3RyaW5zaWNXaWR0aENvbnN0cmFpbnRzKGxheW91dFN0YXRlLCBjaGls ZEJveCkpOyAKKyAgICAgICAgICAgIGZvcm1hdHRpbmdTdGF0ZS5zZXRJbnRyaW5zaWNXaWR0aENv bnN0cmFpbnRzKGNoaWxkQm94LCBHZW9tZXRyeTo6aW50cmluc2ljV2lkdGhDb25zdHJhaW50cyhs YXlvdXRTdGF0ZSwgY2hpbGRCb3gpKTsgCiAgICAgICAgICAgICAvLyBNb3ZlIG92ZXIgdG8gdGhl IG5leHQgc2libGluZyBvciB0YWtlIHRoZSBuZXh0IGJveCBpbiB0aGUgcXVldWUuCiAgICAgICAg ICAgICBpZiAoIWlzPENvbnRhaW5lcj4oY2hpbGRCb3gpIHx8ICFkb3duY2FzdDxDb250YWluZXI+ KGNoaWxkQm94KS5uZXh0SW5GbG93T3JGbG9hdGluZ1NpYmxpbmcoKSkKICAgICAgICAgICAgICAg ICBjb250aW51ZTsKQEAgLTQ1MSw5ICs0NTEsOSBAQCBGb3JtYXR0aW5nQ29udGV4dDo6SW5zdHJp bnNpY1dpZHRoQ29uc3RyYWludHMgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6aW5zdHJpbnNpYwog ICAgICAgICB9CiAgICAgfQogCi0gICAgYXV0byBpbnN0cmluc2ljV2lkdGhDb25zdHJhaW50cyA9 IEdlb21ldHJ5OjppbnN0cmluc2ljV2lkdGhDb25zdHJhaW50cyhsYXlvdXRTdGF0ZSwgZm9ybWF0 dGluZ1Jvb3QpOwotICAgIGZvcm1hdHRpbmdTdGF0ZUZvclJvb3Quc2V0SW5zdHJpbnNpY1dpZHRo Q29uc3RyYWludHMoZm9ybWF0dGluZ1Jvb3QsIGluc3RyaW5zaWNXaWR0aENvbnN0cmFpbnRzKTsg Ci0gICAgcmV0dXJuIGluc3RyaW5zaWNXaWR0aENvbnN0cmFpbnRzOworICAgIGF1dG8gaW50cmlu c2ljV2lkdGhDb25zdHJhaW50cyA9IEdlb21ldHJ5OjppbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRz KGxheW91dFN0YXRlLCBmb3JtYXR0aW5nUm9vdCk7CisgICAgZm9ybWF0dGluZ1N0YXRlRm9yUm9v dC5zZXRJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzKGZvcm1hdHRpbmdSb290LCBpbnRyaW5zaWNX aWR0aENvbnN0cmFpbnRzKTsgCisgICAgcmV0dXJuIGludHJpbnNpY1dpZHRoQ29uc3RyYWludHM7 CiB9CiAKIExheW91dFVuaXQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6dmVydGljYWxQb3NpdGlv bldpdGhNYXJnaW4oY29uc3QgQm94JiBsYXlvdXRCb3gsIGNvbnN0IFVzZWRWZXJ0aWNhbE1hcmdp biYgdmVydGljYWxNYXJnaW4pIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuaCBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oCmluZGV4 IDdkOTVjYjRkYzQ5YWQ1NDc1OTRkNGNjOGI5YTRmMDZkNDBhNDQwY2MuLjk5ZDRkZjllMWFmMmQ2 ZDdmNDQ2MjFjZTFmM2VlMmNlNmEyYTY2OTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5o CkBAIC02Nyw3ICs2Nyw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBjb21wdXRlRXN0aW1hdGVkVmVy dGljYWxQb3NpdGlvbkZvckZvcm1hdHRpbmdSb290KGNvbnN0IEJveCYpIGNvbnN0OwogICAgIHZv aWQgY29tcHV0ZUVzdGltYXRlZFZlcnRpY2FsUG9zaXRpb25Gb3JGbG9hdENsZWFyKGNvbnN0IEZs b2F0aW5nQ29udGV4dCYsIGNvbnN0IEJveCYpIGNvbnN0OwogCi0gICAgSW5zdHJpbnNpY1dpZHRo Q29uc3RyYWludHMgaW5zdHJpbnNpY1dpZHRoQ29uc3RyYWludHMoKSBjb25zdCBvdmVycmlkZTsK KyAgICBJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzIGludHJpbnNpY1dpZHRoQ29uc3RyYWludHMo KSBjb25zdCBvdmVycmlkZTsKICAgICBMYXlvdXRVbml0IHZlcnRpY2FsUG9zaXRpb25XaXRoTWFy Z2luKGNvbnN0IEJveCYsIGNvbnN0IFVzZWRWZXJ0aWNhbE1hcmdpbiYpIGNvbnN0OwogCiAgICAg Ly8gVGhpcyBjbGFzcyBpbXBsZW1lbnRzIHBvc2l0aW9uaW5nIGFuZCBzaXppbmcgZm9yIGJveGVz IHBhcnRpY2lwYXRpbmcgaW4gYSBibG9jayBmb3JtYXR0aW5nIGNvbnRleHQuCkBAIC03OCw4ICs3 OCw4IEBAIHByaXZhdGU6CiAKICAgICAgICAgc3RhdGljIFBvaW50IHN0YXRpY1Bvc2l0aW9uKGNv bnN0IExheW91dFN0YXRlJiwgY29uc3QgQm94Jik7CiAKLSAgICAgICAgc3RhdGljIGJvb2wgaW5z dHJpbnNpY1dpZHRoQ29uc3RyYWludHNOZWVkQ2hpbGRyZW5XaWR0aChjb25zdCBCb3gmKTsKLSAg ICAgICAgc3RhdGljIEluc3RyaW5zaWNXaWR0aENvbnN0cmFpbnRzIGluc3RyaW5zaWNXaWR0aENv bnN0cmFpbnRzKGNvbnN0IExheW91dFN0YXRlJiwgY29uc3QgQm94Jik7CisgICAgICAgIHN0YXRp YyBib29sIGludHJpbnNpY1dpZHRoQ29uc3RyYWludHNOZWVkQ2hpbGRyZW5XaWR0aChjb25zdCBC b3gmKTsKKyAgICAgICAgc3RhdGljIEludHJpbnNpY1dpZHRoQ29uc3RyYWludHMgaW50cmluc2lj V2lkdGhDb25zdHJhaW50cyhjb25zdCBMYXlvdXRTdGF0ZSYsIGNvbnN0IEJveCYpOwogCiAgICAg cHJpdmF0ZToKICAgICAgICAgc3RhdGljIEhlaWdodEFuZE1hcmdpbiBpbkZsb3dOb25SZXBsYWNl ZEhlaWdodEFuZE1hcmdpbihjb25zdCBMYXlvdXRTdGF0ZSYsIGNvbnN0IEJveCYsIFVzZWRWZXJ0 aWNhbFZhbHVlcyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3Jt YXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5j cHAKaW5kZXggZDQzNTlkMjE2OWZjYWYwMGU2NzRkODFjYTZlMDZiMmIyNDMwODUwYi4uN2UzN2Vi YmI3MDdjOTU1MzVjNmMzZTQwZWFmNTg0MDExZjc2OTA0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0 cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tG b3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcApAQCAtMjc5LDE0ICsyNzksMTQgQEAgV2lkdGhB bmRNYXJnaW4gQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmluRmxvd1dpZHRoQW5k TWFyZ2luKGNvbnN0IExheW8KICAgICByZXR1cm4gaW5GbG93UmVwbGFjZWRXaWR0aEFuZE1hcmdp bihsYXlvdXRTdGF0ZSwgbGF5b3V0Qm94LCB1c2VkVmFsdWVzKTsKIH0KIAotYm9vbCBCbG9ja0Zv cm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6aW5zdHJpbnNpY1dpZHRoQ29uc3RyYWludHNOZWVk Q2hpbGRyZW5XaWR0aChjb25zdCBCb3gmIGxheW91dEJveCkKK2Jvb2wgQmxvY2tGb3JtYXR0aW5n Q29udGV4dDo6R2VvbWV0cnk6OmludHJpbnNpY1dpZHRoQ29uc3RyYWludHNOZWVkQ2hpbGRyZW5X aWR0aChjb25zdCBCb3gmIGxheW91dEJveCkKIHsKICAgICBpZiAoIWlzPENvbnRhaW5lcj4obGF5 b3V0Qm94KSB8fCAhZG93bmNhc3Q8Q29udGFpbmVyPihsYXlvdXRCb3gpLmhhc0luRmxvd09yRmxv YXRpbmdDaGlsZCgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgcmV0dXJuIGxheW91dEJv eC5zdHlsZSgpLndpZHRoKCkuaXNBdXRvKCk7CiB9CiAKLUZvcm1hdHRpbmdDb250ZXh0OjpJbnN0 cmluc2ljV2lkdGhDb25zdHJhaW50cyBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6 aW5zdHJpbnNpY1dpZHRoQ29uc3RyYWludHMoY29uc3QgTGF5b3V0U3RhdGUmIGxheW91dFN0YXRl LCBjb25zdCBCb3gmIGxheW91dEJveCkKK0Zvcm1hdHRpbmdDb250ZXh0OjpJbnRyaW5zaWNXaWR0 aENvbnN0cmFpbnRzIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjppbnRyaW5zaWNX aWR0aENvbnN0cmFpbnRzKGNvbnN0IExheW91dFN0YXRlJiBsYXlvdXRTdGF0ZSwgY29uc3QgQm94 JiBsYXlvdXRCb3gpCiB7CiAgICAgYXV0byYgc3R5bGUgPSBsYXlvdXRCb3guc3R5bGUoKTsKICAg ICBpZiAoYXV0byB3aWR0aCA9IGZpeGVkVmFsdWUoc3R5bGUubG9naWNhbFdpZHRoKCkpKQpAQCAt MzA3LDggKzMwNyw4IEBAIEZvcm1hdHRpbmdDb250ZXh0OjpJbnN0cmluc2ljV2lkdGhDb25zdHJh aW50cyBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6CiAgICAgICAgICAgICBjb250 aW51ZTsKICAgICAgICAgYXV0byYgZm9ybWF0dGluZ1N0YXRlID0gbGF5b3V0U3RhdGUuZm9ybWF0 dGluZ1N0YXRlRm9yQm94KGNoaWxkKTsKICAgICAgICAgQVNTRVJUKGZvcm1hdHRpbmdTdGF0ZS5p c0Jsb2NrRm9ybWF0dGluZ1N0YXRlKCkpOwotICAgICAgICBhdXRvIGNoaWxkSW5zdHJpbnNpY1dp ZHRoQ29uc3RyYWludHMgPSBmb3JtYXR0aW5nU3RhdGUuaW5zdHJpbnNpY1dpZHRoQ29uc3RyYWlu dHMoY2hpbGQpOwotICAgICAgICBBU1NFUlQoY2hpbGRJbnN0cmluc2ljV2lkdGhDb25zdHJhaW50 cyk7CisgICAgICAgIGF1dG8gY2hpbGRJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzID0gZm9ybWF0 dGluZ1N0YXRlLmludHJpbnNpY1dpZHRoQ29uc3RyYWludHMoY2hpbGQpOworICAgICAgICBBU1NF UlQoY2hpbGRJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzKTsKICAgICAgICAgCiAgICAgICAgIGF1 dG8mIHN0eWxlID0gY2hpbGQuc3R5bGUoKTsKICAgICAgICAgYXV0byBob3Jpem9udGFsTWFyZ2lu Qm9yZGVyQW5kUGFkZGluZyA9IGZpeGVkVmFsdWUoc3R5bGUubWFyZ2luU3RhcnQoKSkudmFsdWVP cigwKQpAQCAtMzE4LDggKzMxOCw4IEBAIEZvcm1hdHRpbmdDb250ZXh0OjpJbnN0cmluc2ljV2lk dGhDb25zdHJhaW50cyBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6CiAgICAgICAg ICAgICArIExheW91dFVuaXQgeyBzdHlsZS5ib3JkZXJSaWdodFdpZHRoKCkgfQogICAgICAgICAg ICAgKyBmaXhlZFZhbHVlKHN0eWxlLm1hcmdpbkVuZCgpKS52YWx1ZU9yKDApOwogCi0gICAgICAg IG1pbmltdW1JbnRyaW5zaWNXaWR0aCA9IHN0ZDo6bWF4KG1pbmltdW1JbnRyaW5zaWNXaWR0aCwg Y2hpbGRJbnN0cmluc2ljV2lkdGhDb25zdHJhaW50cy0+bWluaW11bSArIGhvcml6b250YWxNYXJn aW5Cb3JkZXJBbmRQYWRkaW5nKTsgCi0gICAgICAgIG1heGltdW1JbnRyaW5zaWNXaWR0aCA9IHN0 ZDo6bWF4KG1heGltdW1JbnRyaW5zaWNXaWR0aCwgY2hpbGRJbnN0cmluc2ljV2lkdGhDb25zdHJh aW50cy0+bWF4aW11bSArIGhvcml6b250YWxNYXJnaW5Cb3JkZXJBbmRQYWRkaW5nKTsgCisgICAg ICAgIG1pbmltdW1JbnRyaW5zaWNXaWR0aCA9IHN0ZDo6bWF4KG1pbmltdW1JbnRyaW5zaWNXaWR0 aCwgY2hpbGRJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzLT5taW5pbXVtICsgaG9yaXpvbnRhbE1h cmdpbkJvcmRlckFuZFBhZGRpbmcpOyAKKyAgICAgICAgbWF4aW11bUludHJpbnNpY1dpZHRoID0g c3RkOjptYXgobWF4aW11bUludHJpbnNpY1dpZHRoLCBjaGlsZEludHJpbnNpY1dpZHRoQ29uc3Ry YWludHMtPm1heGltdW0gKyBob3Jpem9udGFsTWFyZ2luQm9yZGVyQW5kUGFkZGluZyk7IAogICAg IH0KIAogICAgIHJldHVybiB7IG1pbmltdW1JbnRyaW5zaWNXaWR0aCwgbWF4aW11bUludHJpbnNp Y1dpZHRoIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0 dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggOTM3NjJj NjUyM2RjNjBlNzY0YTAwNjY5MjMwNmZkZmExY2EzMmY2Ny4uZDk0ODZjZTZlYTc1YmUzOTU1Njg5 MjFkMzZhZTFhMDEzOTNhNzkyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNw cApAQCAtOTIsMTQgKzkyLDE0IEBAIHZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91 dCgpIGNvbnN0CiAgICAgTE9HX1dJVEhfU1RSRUFNKEZvcm1hdHRpbmdDb250ZXh0TGF5b3V0LCBz dHJlYW0gPDwgIltFbmRdIC0+IGlubGluZSBmb3JtYXR0aW5nIGNvbnRleHQgLT4gZm9ybWF0dGlu ZyByb290KCIgPDwgJnJvb3QgPDwgIikiKTsKIH0KIAotRm9ybWF0dGluZ0NvbnRleHQ6Okluc3Ry aW5zaWNXaWR0aENvbnN0cmFpbnRzIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjppbnN0cmluc2lj V2lkdGhDb25zdHJhaW50cygpIGNvbnN0CitGb3JtYXR0aW5nQ29udGV4dDo6SW50cmluc2ljV2lk dGhDb25zdHJhaW50cyBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6aW50cmluc2ljV2lkdGhDb25z dHJhaW50cygpIGNvbnN0CiB7CiAgICAgQVNTRVJUKGlzPENvbnRhaW5lcj4ocm9vdCgpKSk7CiAK ICAgICBhdXRvJiBsYXlvdXRTdGF0ZSA9IHRoaXMtPmxheW91dFN0YXRlKCk7CiAgICAgYXV0byYg cm9vdCA9IGRvd25jYXN0PENvbnRhaW5lcj4odGhpcy0+cm9vdCgpKTsKLSAgICBpZiAoYXV0byBp bnN0cmluc2ljV2lkdGhDb25zdHJhaW50cyA9IGxheW91dFN0YXRlLmZvcm1hdHRpbmdTdGF0ZUZv ckJveChyb290KS5pbnN0cmluc2ljV2lkdGhDb25zdHJhaW50cyhyb290KSkKLSAgICAgICAgcmV0 dXJuICppbnN0cmluc2ljV2lkdGhDb25zdHJhaW50czsKKyAgICBpZiAoYXV0byBpbnRyaW5zaWNX aWR0aENvbnN0cmFpbnRzID0gbGF5b3V0U3RhdGUuZm9ybWF0dGluZ1N0YXRlRm9yQm94KHJvb3Qp LmludHJpbnNpY1dpZHRoQ29uc3RyYWludHMocm9vdCkpCisgICAgICAgIHJldHVybiAqaW50cmlu c2ljV2lkdGhDb25zdHJhaW50czsKIAogICAgIFZlY3Rvcjxjb25zdCBCb3gqPiBmb3JtYXR0aW5n Q29udGV4dFJvb3RMaXN0OwogICAgIGF1dG8gdXNlZFZhbHVlcyA9IFVzZWRIb3Jpem9udGFsVmFs dWVzIHsgfTsKQEAgLTEzNCw4ICsxMzQsOCBAQCBGb3JtYXR0aW5nQ29udGV4dDo6SW5zdHJpbnNp Y1dpZHRoQ29uc3RyYWludHMgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6Omluc3RyaW5zaQogCiAg ICAgICAgIC8vIFN3aXRjaCB0byB0aGUgbWluL21heCBmb3JtYXR0aW5nIHJvb3Qgd2lkdGggdmFs dWVzIGJlZm9yZSBmb3JtYXR0aW5nIHRoZSBsaW5lcy4KICAgICAgICAgZm9yIChhdXRvKiBmb3Jt YXR0aW5nUm9vdCA6IGZvcm1hdHRpbmdDb250ZXh0Um9vdExpc3QpIHsKLSAgICAgICAgICAgIGF1 dG8gaW5zdHJpbnNpY1dpZHRocyA9IGxheW91dFN0YXRlLmZvcm1hdHRpbmdTdGF0ZUZvckJveCgq Zm9ybWF0dGluZ1Jvb3QpLmluc3RyaW5zaWNXaWR0aENvbnN0cmFpbnRzKCpmb3JtYXR0aW5nUm9v dCk7Ci0gICAgICAgICAgICBsYXlvdXRTdGF0ZS5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KCpmb3Jt YXR0aW5nUm9vdCkuc2V0Q29udGVudEJveFdpZHRoKGF2YWlsYWJsZVdpZHRoID8gaW5zdHJpbnNp Y1dpZHRocy0+bWF4aW11bSA6IGluc3RyaW5zaWNXaWR0aHMtPm1pbmltdW0pOworICAgICAgICAg ICAgYXV0byBpbnRyaW5zaWNXaWR0aHMgPSBsYXlvdXRTdGF0ZS5mb3JtYXR0aW5nU3RhdGVGb3JC b3goKmZvcm1hdHRpbmdSb290KS5pbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzKCpmb3JtYXR0aW5n Um9vdCk7CisgICAgICAgICAgICBsYXlvdXRTdGF0ZS5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KCpm b3JtYXR0aW5nUm9vdCkuc2V0Q29udGVudEJveFdpZHRoKGF2YWlsYWJsZVdpZHRoID8gaW50cmlu c2ljV2lkdGhzLT5tYXhpbXVtIDogaW50cmluc2ljV2lkdGhzLT5taW5pbXVtKTsKICAgICAgICAg fQogCiAgICAgICAgIHdoaWxlIChhdXRvIHJ1biA9IGxpbmVCcmVha2VyLm5leHRSdW4obGluZUxv Z2ljYWxSaWdodCwgYXZhaWxhYmxlV2lkdGgsICFsaW5lTG9naWNhbFJpZ2h0KSkgewpAQCAtMTQ4 LDkgKzE0OCw5IEBAIEZvcm1hdHRpbmdDb250ZXh0OjpJbnN0cmluc2ljV2lkdGhDb25zdHJhaW50 cyBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6aW5zdHJpbnNpCiAgICAgICAgIHJldHVybiBtYXhD b250ZW50TG9naWNhbFJpZ2h0OwogICAgIH07CiAKLSAgICBhdXRvIGluc3RyaW5zaWNXaWR0aENv bnN0cmFpbnRzID0gRm9ybWF0dGluZ0NvbnRleHQ6Okluc3RyaW5zaWNXaWR0aENvbnN0cmFpbnRz IHsgbWF4aW11bUxpbmVXaWR0aCgwKSwgbWF4aW11bUxpbmVXaWR0aChMYXlvdXRVbml0OjptYXgo KSkgfTsKLSAgICBsYXlvdXRTdGF0ZS5mb3JtYXR0aW5nU3RhdGVGb3JCb3gocm9vdCkuc2V0SW5z dHJpbnNpY1dpZHRoQ29uc3RyYWludHMocm9vdCwgaW5zdHJpbnNpY1dpZHRoQ29uc3RyYWludHMp OwotICAgIHJldHVybiBpbnN0cmluc2ljV2lkdGhDb25zdHJhaW50czsKKyAgICBhdXRvIGludHJp bnNpY1dpZHRoQ29uc3RyYWludHMgPSBGb3JtYXR0aW5nQ29udGV4dDo6SW50cmluc2ljV2lkdGhD b25zdHJhaW50cyB7IG1heGltdW1MaW5lV2lkdGgoMCksIG1heGltdW1MaW5lV2lkdGgoTGF5b3V0 VW5pdDo6bWF4KCkpIH07CisgICAgbGF5b3V0U3RhdGUuZm9ybWF0dGluZ1N0YXRlRm9yQm94KHJv b3QpLnNldEludHJpbnNpY1dpZHRoQ29uc3RyYWludHMocm9vdCwgaW50cmluc2ljV2lkdGhDb25z dHJhaW50cyk7CisgICAgcmV0dXJuIGludHJpbnNpY1dpZHRoQ29uc3RyYWludHM7CiB9CiAKIHZv aWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVJbnRyaW5zaWNXaWR0aEZvckZvcm1h dHRpbmdDb250ZXh0Um9vdChjb25zdCBCb3gmIGxheW91dEJveCkgY29uc3QKQEAgLTE2MCw3ICsx NjAsNyBAQCB2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlSW50cmluc2ljV2lk dGhGb3JGb3JtYXR0aW5nQ29udGV4dFJvb3QoY29ucwogICAgIGF1dG8gdXNlZFZhbHVlcyA9IFVz ZWRIb3Jpem9udGFsVmFsdWVzIHsgfTsKICAgICBjb21wdXRlQm9yZGVyQW5kUGFkZGluZyhsYXlv dXRCb3gsIHVzZWRWYWx1ZXMpOwogICAgIGNvbXB1dGVNYXJnaW4oZG93bmNhc3Q8SW5saW5lQ29u dGFpbmVyPihsYXlvdXRCb3gpLCB1c2VkVmFsdWVzKTsKLSAgICBsYXlvdXRTdGF0ZSgpLmNyZWF0 ZUZvcm1hdHRpbmdDb250ZXh0KGxheW91dEJveCktPmluc3RyaW5zaWNXaWR0aENvbnN0cmFpbnRz KCk7CisgICAgbGF5b3V0U3RhdGUoKS5jcmVhdGVGb3JtYXR0aW5nQ29udGV4dChsYXlvdXRCb3gp LT5pbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzKCk7CiB9CiAKIHZvaWQgSW5saW5lRm9ybWF0dGlu Z0NvbnRleHQ6OmNvbXB1dGVNYXJnaW4oY29uc3QgSW5saW5lQ29udGFpbmVyJiBpbmxpbmVDb250 YWluZXIsIFVzZWRIb3Jpem9udGFsVmFsdWVzIHVzZWRWYWx1ZXMpIGNvbnN0CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5n Q29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l Rm9ybWF0dGluZ0NvbnRleHQuaAppbmRleCA2ZjljN2FjYmE5NGUwODM4NDA5ODJjNmRiNmRkYmRk ZTZlMjdiNGU5Li44MTUwMzU4YmRjNzY5YTdlNTM2MDMwMTJiMmVhYjFiN2U4NDk2MzYwIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3Jt YXR0aW5nQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmgKQEAgLTk0LDcgKzk0LDcgQEAgcHJpdmF0ZToK ICAgICB2b2lkIGNvbXB1dGVXaWR0aEFuZE1hcmdpbihjb25zdCBCb3gmLCBVc2VkSG9yaXpvbnRh bFZhbHVlcykgY29uc3Q7CiAKICAgICB2b2lkIGNvbGxlY3RJbmxpbmVDb250ZW50KElubGluZVJ1 blByb3ZpZGVyJikgY29uc3Q7Ci0gICAgSW5zdHJpbnNpY1dpZHRoQ29uc3RyYWludHMgaW5zdHJp bnNpY1dpZHRoQ29uc3RyYWludHMoKSBjb25zdCBvdmVycmlkZTsKKyAgICBJbnRyaW5zaWNXaWR0 aENvbnN0cmFpbnRzIGludHJpbnNpY1dpZHRoQ29uc3RyYWludHMoKSBjb25zdCBvdmVycmlkZTsK IAogICAgIElubGluZUZvcm1hdHRpbmdTdGF0ZSYgZm9ybWF0dGluZ1N0YXRlKCkgY29uc3QgeyBy ZXR1cm4gZG93bmNhc3Q8SW5saW5lRm9ybWF0dGluZ1N0YXRlPihGb3JtYXR0aW5nQ29udGV4dDo6 Zm9ybWF0dGluZ1N0YXRlKCkpOyB9CiB9Owo=