188011 2018-07-25 11:01:45 -0700 REGRESSION(r234196): broke API tests (Requested by alexchristensen on #webkit). 2018-07-25 11:05:22 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 187975 1 commit-queue commit-queue achristensen cdumez webkit-bug-importer oldest_to_newest 1445086 0 commit-queue 2018-07-25 11:01:45 -0700 https://trac.webkit.org/changeset/234196 broke the build: broke API tests (Requested by alexchristensen on #webkit). This is an automatic bug report generated by webkitbot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests fail. 1445088 1 345767 commit-queue 2018-07-25 11:01:53 -0700 Created attachment 345767 ROLLOUT of r234196 Any committer can land this patch automatically by marking it commit-queue+. The commit-queue will build and test the patch before landing to ensure that the rollout will be successful. This process takes approximately 15 minutes. If you would like to land the rollout faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID where ATTACHMENT_ID is the ID of this attachment. 1445089 2 345767 commit-queue 2018-07-25 11:04:58 -0700 Comment on attachment 345767 ROLLOUT of r234196 Clearing flags on attachment: 345767 Committed r234209: <https://trac.webkit.org/changeset/234209> 1445090 3 commit-queue 2018-07-25 11:04:59 -0700 All reviewed patches have been landed. Closing bug. 1445092 4 webkit-bug-importer 2018-07-25 11:05:22 -0700 <rdar://problem/42590012> 345767 2018-07-25 11:01:53 -0700 2018-07-25 11:04:58 -0700 ROLLOUT of r234196 bug-188011-20180725140153.patch text/plain 17418 commit-queue U3VidmVyc2lvbiBSZXZpc2lvbjogMjM0MjA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDRlZGI1MzJjMTQ3MmFjODcz YjFmMTE4OTQ0NjYyM2I2ODY5MjY5MjUuLjk4MjNhNzQ4YzVlZGYxZWIyMjcxOGM3NzVlZDRjODY1 YjFlMmNiOWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTgtMDctMjUgIENvbW1pdCBR dWV1ZSAgPGNvbW1pdC1xdWV1ZUB3ZWJraXQub3JnPgorCisgICAgICAgIFVucmV2aWV3ZWQsIHJv bGxpbmcgb3V0IHIyMzQxOTYuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xODgwMTEKKworICAgICAgICBicm9rZSBBUEkgdGVzdHMgKFJlcXVlc3RlZCBi eSBhbGV4Y2hyaXN0ZW5zZW4gb24gI3dlYmtpdCkuCisKKyAgICAgICAgUmV2ZXJ0ZWQgY2hhbmdl c2V0OgorCisgICAgICAgICJVc2UgQ29tcGxldGlvbkhhbmRsZXIgZm9yIHBvbGljeSBkZWNpc2lv bnMiCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODc5 NzUKKyAgICAgICAgaHR0cHM6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzIzNDE5NgorCiAy MDE4LTA3LTI1ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgVXNlIENvbXBsZXRpb25IYW5kbGVyIGZvciBwb2xpY3kgZGVjaXNpb25zCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJv eHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQb2xpY3lMaXN0ZW5lclBy b3h5LmNwcAppbmRleCBmZTQzMDhkMGU1N2JjNWU0Yjc2NTE3ZGFjNDEyZDdlZDIzZTI1NWJmLi5j NDk0MjA0NmRlMTNkYzk4NjBiNzNmZDI3ZWZmMTU1ZmY4OWEzNTJkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHkuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eS5jcHAK QEAgLTM1LDI0ICszNSw0NyBAQAogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotV2ViRnJhbWVQb2xp Y3lMaXN0ZW5lclByb3h5OjpXZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHkoQ29tcGxldGlvbkhh bmRsZXI8dm9pZChXZWJDb3JlOjpQb2xpY3lBY3Rpb24sIEFQSTo6V2Vic2l0ZVBvbGljaWVzKiwg U2hvdWxkUHJvY2Vzc1N3YXBJZlBvc3NpYmxlKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKLSAgICA6 IG1fY29tcGxldGlvbkhhbmRsZXIoV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpCitXZWJGcmFt ZVBvbGljeUxpc3RlbmVyUHJveHk6OldlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eShXZWJGcmFt ZVByb3h5KiBmcmFtZSwgdWludDY0X3QgbGlzdGVuZXJJRCwgUG9saWN5TGlzdGVuZXJUeXBlIHBv bGljeVR5cGUpCisgICAgOiBtX3BvbGljeVR5cGUocG9saWN5VHlwZSkKKyAgICAsIG1fZnJhbWUo ZnJhbWUpCisgICAgLCBtX2xpc3RlbmVySUQobGlzdGVuZXJJRCkKIHsKIH0KIAordm9pZCBXZWJG cmFtZVBvbGljeUxpc3RlbmVyUHJveHk6OnJlY2VpdmVkUG9saWN5RGVjaXNpb24oV2ViQ29yZTo6 UG9saWN5QWN0aW9uIGFjdGlvbiwgc3RkOjpvcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYm IGRhdGEsIFNob3VsZFByb2Nlc3NTd2FwSWZQb3NzaWJsZSBzd2FwKQoreworICAgIGlmICghbV9m cmFtZSkKKyAgICAgICAgcmV0dXJuOworICAgIAorICAgIG1fZnJhbWUtPnJlY2VpdmVkUG9saWN5 RGVjaXNpb24oYWN0aW9uLCBtX2xpc3RlbmVySUQsIG1fbmF2aWdhdGlvbi5nZXQoKSwgV1RGTW92 ZShkYXRhKSwgc3dhcCk7CisgICAgbV9mcmFtZSA9IG51bGxwdHI7Cit9CisKK3ZvaWQgV2ViRnJh bWVQb2xpY3lMaXN0ZW5lclByb3h5OjpzZXROYXZpZ2F0aW9uKFJlZjxBUEk6Ok5hdmlnYXRpb24+ JiYgbmF2aWdhdGlvbikKK3sKKyAgICBtX25hdmlnYXRpb24gPSBXVEZNb3ZlKG5hdmlnYXRpb24p OworfQorICAgIAogdm9pZCBXZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHk6OnVzZShBUEk6Oldl YnNpdGVQb2xpY2llcyogcG9saWNpZXMsIFNob3VsZFByb2Nlc3NTd2FwSWZQb3NzaWJsZSBzd2Fw KQogewotICAgIG1fY29tcGxldGlvbkhhbmRsZXIoV2ViQ29yZTo6UG9saWN5QWN0aW9uOjpVc2Us IHBvbGljaWVzLCBzd2FwKTsKKyAgICBzdGQ6Om9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+ IGRhdGE7CisgICAgaWYgKHBvbGljaWVzKSB7CisgICAgICAgIGRhdGEgPSBwb2xpY2llcy0+ZGF0 YSgpOworICAgICAgICBpZiAobV9mcmFtZSAmJiBwb2xpY2llcy0+d2Vic2l0ZURhdGFTdG9yZSgp KQorICAgICAgICAgICAgbV9mcmFtZS0+Y2hhbmdlV2Vic2l0ZURhdGFTdG9yZShwb2xpY2llcy0+ d2Vic2l0ZURhdGFTdG9yZSgpLT53ZWJzaXRlRGF0YVN0b3JlKCkpOworICAgIH0KKworICAgIHJl Y2VpdmVkUG9saWN5RGVjaXNpb24oV2ViQ29yZTo6UG9saWN5QWN0aW9uOjpVc2UsIFdURk1vdmUo ZGF0YSksIHN3YXApOwogfQogCiB2b2lkIFdlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eTo6ZG93 bmxvYWQoKQogewotICAgIG1fY29tcGxldGlvbkhhbmRsZXIoV2ViQ29yZTo6UG9saWN5QWN0aW9u OjpEb3dubG9hZCwgbnVsbHB0ciwgU2hvdWxkUHJvY2Vzc1N3YXBJZlBvc3NpYmxlOjpObyk7Cisg ICAgcmVjZWl2ZWRQb2xpY3lEZWNpc2lvbihXZWJDb3JlOjpQb2xpY3lBY3Rpb246OkRvd25sb2Fk LCBzdGQ6Om51bGxvcHQsIFNob3VsZFByb2Nlc3NTd2FwSWZQb3NzaWJsZTo6Tm8pOwogfQogCiB2 b2lkIFdlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eTo6aWdub3JlKCkKIHsKLSAgICBtX2NvbXBs ZXRpb25IYW5kbGVyKFdlYkNvcmU6OlBvbGljeUFjdGlvbjo6SWdub3JlLCBudWxscHRyLCBTaG91 bGRQcm9jZXNzU3dhcElmUG9zc2libGU6Ok5vKTsKKyAgICByZWNlaXZlZFBvbGljeURlY2lzaW9u KFdlYkNvcmU6OlBvbGljeUFjdGlvbjo6SWdub3JlLCBzdGQ6Om51bGxvcHQsIFNob3VsZFByb2Nl c3NTd2FwSWZQb3NzaWJsZTo6Tm8pOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94 eS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5 LmgKaW5kZXggNGNlNWUxZGY1ZDAzMGE2OGM5YjU4NWFlY2I2NDUwZDM3ZjdmMmFlYy4uMzE5YThi ZTYyMzNiNTEyNWZlMGExZWYxZTIzODMwNzMyYjkwNWE5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5LmgKKysrIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5LmgKQEAgLTI2LDkg KzI2LDEzIEBACiAjcHJhZ21hIG9uY2UKIAogI2luY2x1ZGUgIkFQSU9iamVjdC5oIgotI2luY2x1 ZGUgPHd0Zi9Db21wbGV0aW9uSGFuZGxlci5oPgorCisjaWYgUExBVEZPUk0oQ09DT0EpCisjaW5j bHVkZSAiV0tGb3VuZGF0aW9uLmgiCisjZW5kaWYKIAogbmFtZXNwYWNlIEFQSSB7CitjbGFzcyBO YXZpZ2F0aW9uOwogY2xhc3MgV2Vic2l0ZVBvbGljaWVzOwogfQogCkBAIC0zOCwyNCArNDIsNDUg QEAgZW51bSBjbGFzcyBQb2xpY3lBY3Rpb247CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCitjbGFz cyBXZWJGcmFtZVByb3h5OworY2xhc3MgV2Vic2l0ZURhdGFTdG9yZTsKK3N0cnVjdCBXZWJzaXRl UG9saWNpZXNEYXRhOworCitlbnVtIGNsYXNzIFBvbGljeUxpc3RlbmVyVHlwZSB7CisgICAgTmF2 aWdhdGlvbkFjdGlvbiwKKyAgICBOZXdXaW5kb3dBY3Rpb24sCisgICAgUmVzcG9uc2UsCit9Owor CiBlbnVtIGNsYXNzIFNob3VsZFByb2Nlc3NTd2FwSWZQb3NzaWJsZSB7IE5vLCBZZXMgfTsKIAog Y2xhc3MgV2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5IDogcHVibGljIEFQSTo6T2JqZWN0SW1w bDxBUEk6Ok9iamVjdDo6VHlwZTo6RnJhbWVQb2xpY3lMaXN0ZW5lcj4gewogcHVibGljOgogCi0g ICAgc3RhdGljIFJlZjxXZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHk+IGNyZWF0ZShDb21wbGV0 aW9uSGFuZGxlcjx2b2lkKFdlYkNvcmU6OlBvbGljeUFjdGlvbiwgQVBJOjpXZWJzaXRlUG9saWNp ZXMqLCBTaG91bGRQcm9jZXNzU3dhcElmUG9zc2libGUpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQor ICAgIHN0YXRpYyBSZWY8V2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5PiBjcmVhdGUoV2ViRnJh bWVQcm94eSogZnJhbWUsIHVpbnQ2NF90IGxpc3RlbmVySUQsIFBvbGljeUxpc3RlbmVyVHlwZSBw b2xpY3lUeXBlKQogICAgIHsKLSAgICAgICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgV2ViRnJhbWVQ b2xpY3lMaXN0ZW5lclByb3h5KFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKSk7CisgICAgICAg IHJldHVybiBhZG9wdFJlZigqbmV3IFdlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eShmcmFtZSwg bGlzdGVuZXJJRCwgcG9saWN5VHlwZSkpOwogICAgIH0KIAogICAgIHZvaWQgdXNlKEFQSTo6V2Vi c2l0ZVBvbGljaWVzKiA9IG51bGxwdHIsIFNob3VsZFByb2Nlc3NTd2FwSWZQb3NzaWJsZSA9IFNo b3VsZFByb2Nlc3NTd2FwSWZQb3NzaWJsZTo6Tm8pOwogICAgIHZvaWQgZG93bmxvYWQoKTsKICAg ICB2b2lkIGlnbm9yZSgpOwogCisgICAgUG9saWN5TGlzdGVuZXJUeXBlIHBvbGljeUxpc3RlbmVy VHlwZSgpIGNvbnN0IHsgcmV0dXJuIG1fcG9saWN5VHlwZTsgfQorCisgICAgdWludDY0X3QgbGlz dGVuZXJJRCgpIGNvbnN0IHsgcmV0dXJuIG1fbGlzdGVuZXJJRDsgfQorICAgIAorICAgIHZvaWQg c2V0TmF2aWdhdGlvbihSZWY8QVBJOjpOYXZpZ2F0aW9uPiYmKTsKKwogcHJpdmF0ZToKLSAgICBX ZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHkoQ29tcGxldGlvbkhhbmRsZXI8dm9pZChXZWJDb3Jl OjpQb2xpY3lBY3Rpb24sIEFQSTo6V2Vic2l0ZVBvbGljaWVzKiwgU2hvdWxkUHJvY2Vzc1N3YXBJ ZlBvc3NpYmxlKT4mJik7CisgICAgV2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5KFdlYkZyYW1l UHJveHkqLCB1aW50NjRfdCBsaXN0ZW5lcklELCBQb2xpY3lMaXN0ZW5lclR5cGUpOworCisgICAg dm9pZCByZWNlaXZlZFBvbGljeURlY2lzaW9uKFdlYkNvcmU6OlBvbGljeUFjdGlvbiwgc3RkOjpv cHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmLCBTaG91bGRQcm9jZXNzU3dhcElmUG9zc2li bGUpOwogCi0gICAgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChXZWJDb3JlOjpQb2xpY3lBY3Rpb24s IEFQSTo6V2Vic2l0ZVBvbGljaWVzKiwgU2hvdWxkUHJvY2Vzc1N3YXBJZlBvc3NpYmxlKT4gbV9j b21wbGV0aW9uSGFuZGxlcjsKKyAgICBQb2xpY3lMaXN0ZW5lclR5cGUgbV9wb2xpY3lUeXBlOwor ICAgIFJlZlB0cjxXZWJGcmFtZVByb3h5PiBtX2ZyYW1lOworICAgIHVpbnQ2NF90IG1fbGlzdGVu ZXJJRCB7IDAgfTsKKyAgICBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBtX25hdmlnYXRpb247CiB9 OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYkZyYW1lUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRnJh bWVQcm94eS5jcHAKaW5kZXggNTk2YjRjYjkxNDU5ODdhMmFjZDdkZWEyNmM5YTI1OWU1OTUwNWJi Yi4uOWRjMDdjZjdhNWM1Mjc5NWZjOTczNThjYjkxYmEwMWJjYzM1OWM0YiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHAKKysrIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHAKQEAgLTE3OCwxNSArMTc4LDM1IEBAIHZv aWQgV2ViRnJhbWVQcm94eTo6ZGlkQ2hhbmdlVGl0bGUoY29uc3QgU3RyaW5nJiB0aXRsZSkKICAg ICBtX3RpdGxlID0gdGl0bGU7CiB9CiAKLVdlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eSYgV2Vi RnJhbWVQcm94eTo6c2V0VXBQb2xpY3lMaXN0ZW5lclByb3h5KENvbXBsZXRpb25IYW5kbGVyPHZv aWQoV2ViQ29yZTo6UG9saWN5QWN0aW9uLCBBUEk6OldlYnNpdGVQb2xpY2llcyosIFNob3VsZFBy b2Nlc3NTd2FwSWZQb3NzaWJsZSk+JiYgY29tcGxldGlvbkhhbmRsZXIpCit2b2lkIFdlYkZyYW1l UHJveHk6OnJlY2VpdmVkUG9saWN5RGVjaXNpb24oUG9saWN5QWN0aW9uIGFjdGlvbiwgdWludDY0 X3QgbGlzdGVuZXJJRCwgQVBJOjpOYXZpZ2F0aW9uKiBuYXZpZ2F0aW9uLCBzdGQ6Om9wdGlvbmFs PFdlYnNpdGVQb2xpY2llc0RhdGE+JiYgZGF0YSwgU2hvdWxkUHJvY2Vzc1N3YXBJZlBvc3NpYmxl IHN3YXApCit7CisgICAgaWYgKCFtX3BhZ2UpCisgICAgICAgIHJldHVybjsKKworICAgIEFTU0VS VChtX2FjdGl2ZUxpc3RlbmVyKTsKKyAgICBBU1NFUlQobV9hY3RpdmVMaXN0ZW5lci0+bGlzdGVu ZXJJRCgpID09IGxpc3RlbmVySUQpOworICAgIG1fcGFnZS0+cmVjZWl2ZWRQb2xpY3lEZWNpc2lv bihhY3Rpb24sICp0aGlzLCBsaXN0ZW5lcklELCBuYXZpZ2F0aW9uLCBXVEZNb3ZlKGRhdGEpLCBz d2FwKTsKK30KKworV2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5JiBXZWJGcmFtZVByb3h5Ojpz ZXRVcFBvbGljeUxpc3RlbmVyUHJveHkodWludDY0X3QgbGlzdGVuZXJJRCwgUG9saWN5TGlzdGVu ZXJUeXBlIHBvbGljeUxpc3RlbmVyVHlwZSkKIHsKICAgICBpZiAobV9hY3RpdmVMaXN0ZW5lcikK ICAgICAgICAgbV9hY3RpdmVMaXN0ZW5lci0+aWdub3JlKCk7Ci0gICAgbV9hY3RpdmVMaXN0ZW5l ciA9IFdlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eTo6Y3JlYXRlKFt0aGlzLCBwcm90ZWN0ZWRU aGlzID0gbWFrZVJlZigqdGhpcyksIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0 aW9uSGFuZGxlcildIChXZWJDb3JlOjpQb2xpY3lBY3Rpb24gYWN0aW9uLCBBUEk6OldlYnNpdGVQ b2xpY2llcyogcG9saWNpZXMsIFNob3VsZFByb2Nlc3NTd2FwSWZQb3NzaWJsZSBzd2FwKSB7Ci0g ICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKGFjdGlvbiwgcG9saWNpZXMsIHN3YXApOwotICAgICAg ICBtX2FjdGl2ZUxpc3RlbmVyID0gbnVsbHB0cjsKLSAgICB9KTsKLSAgICByZXR1cm4gKm1fYWN0 aXZlTGlzdGVuZXI7CisgICAgbV9hY3RpdmVMaXN0ZW5lciA9IFdlYkZyYW1lUG9saWN5TGlzdGVu ZXJQcm94eTo6Y3JlYXRlKHRoaXMsIGxpc3RlbmVySUQsIHBvbGljeUxpc3RlbmVyVHlwZSk7Cisg ICAgcmV0dXJuICpzdGF0aWNfY2FzdDxXZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHkqPihtX2Fj dGl2ZUxpc3RlbmVyLmdldCgpKTsKK30KKworV2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5KiBX ZWJGcmFtZVByb3h5OjphY3RpdmVQb2xpY3lMaXN0ZW5lclByb3h5KCkKK3sKKyAgICByZXR1cm4g bV9hY3RpdmVMaXN0ZW5lci5nZXQoKTsKK30KKwordm9pZCBXZWJGcmFtZVByb3h5OjpjaGFuZ2VX ZWJzaXRlRGF0YVN0b3JlKFdlYnNpdGVEYXRhU3RvcmUmIHdlYnNpdGVEYXRhU3RvcmUpCit7Cisg ICAgaWYgKCFtX3BhZ2UpCisgICAgICAgIHJldHVybjsKKworICAgIG1fcGFnZS0+Y2hhbmdlV2Vi c2l0ZURhdGFTdG9yZSh3ZWJzaXRlRGF0YVN0b3JlKTsKIH0KIAogdm9pZCBXZWJGcmFtZVByb3h5 OjpnZXRXZWJBcmNoaXZlKEZ1bmN0aW9uPHZvaWQgKEFQSTo6RGF0YSosIENhbGxiYWNrQmFzZTo6 RXJyb3IpPiYmIGNhbGxiYWNrRnVuY3Rpb24pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJGcmFtZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJGcmFt ZVByb3h5LmgKaW5kZXggMjYxODk2ZmQyNWExNGI5MmNhOWI1ZDVhMTgzNTI4YTBkOGMyYjc0ZC4u ZmI0NDIxMjMzYzA4Yjk0NmRlNGI2NmMwODZhMGRjZDA4ZmZlYjk0NiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYkZyYW1lUHJveHkuaApAQCAtNTMsNiArNTMsNyBAQCBjbGFzcyBXZWJGcmFt ZVBvbGljeUxpc3RlbmVyUHJveHk7CiBjbGFzcyBXZWJQYWdlUHJveHk7CiBjbGFzcyBXZWJzaXRl RGF0YVN0b3JlOwogZW51bSBjbGFzcyBTaG91bGRQcm9jZXNzU3dhcElmUG9zc2libGU7CitlbnVt IGNsYXNzIFBvbGljeUxpc3RlbmVyVHlwZTsKIHN0cnVjdCBXZWJzaXRlUG9saWNpZXNEYXRhOwog CiB0eXBlZGVmIEdlbmVyaWNDYWxsYmFjazxBUEk6OkRhdGEqPiBEYXRhQ2FsbGJhY2s7CkBAIC0x MTUsNyArMTE2LDEzIEBAIHB1YmxpYzoKICAgICB2b2lkIGRpZFNhbWVEb2N1bWVudE5hdmlnYXRp b24oY29uc3QgV2ViQ29yZTo6VVJMJik7IC8vIGVnLiBhbmNob3IgbmF2aWdhdGlvbiwgc2Vzc2lv biBzdGF0ZSBjaGFuZ2UuCiAgICAgdm9pZCBkaWRDaGFuZ2VUaXRsZShjb25zdCBTdHJpbmcmKTsK IAotICAgIFdlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eSYgc2V0VXBQb2xpY3lMaXN0ZW5lclBy b3h5KENvbXBsZXRpb25IYW5kbGVyPHZvaWQoV2ViQ29yZTo6UG9saWN5QWN0aW9uLCBBUEk6Oldl YnNpdGVQb2xpY2llcyosIFNob3VsZFByb2Nlc3NTd2FwSWZQb3NzaWJsZSk+JiYpOworICAgIC8v IFBvbGljeSBvcGVyYXRpb25zLgorICAgIHZvaWQgcmVjZWl2ZWRQb2xpY3lEZWNpc2lvbihXZWJD b3JlOjpQb2xpY3lBY3Rpb24sIHVpbnQ2NF90IGxpc3RlbmVySUQsIEFQSTo6TmF2aWdhdGlvbios IHN0ZDo6b3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiwgU2hvdWxkUHJvY2Vzc1N3YXBJ ZlBvc3NpYmxlKTsKKworICAgIFdlYkZyYW1lUG9saWN5TGlzdGVuZXJQcm94eSYgc2V0VXBQb2xp Y3lMaXN0ZW5lclByb3h5KHVpbnQ2NF90IGxpc3RlbmVySUQsIFBvbGljeUxpc3RlbmVyVHlwZSk7 CisgICAgV2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5KiBhY3RpdmVQb2xpY3lMaXN0ZW5lclBy b3h5KCk7CisKKyAgICB2b2lkIGNoYW5nZVdlYnNpdGVEYXRhU3RvcmUoV2Vic2l0ZURhdGFTdG9y ZSYpOwogCiAjaWYgRU5BQkxFKENPTlRFTlRfRklMVEVSSU5HKQogICAgIHZvaWQgY29udGVudEZp bHRlckRpZEJsb2NrTG9hZChXZWJDb3JlOjpDb250ZW50RmlsdGVyVW5ibG9ja0hhbmRsZXIgY29u dGVudEZpbHRlclVuYmxvY2tIYW5kbGVyKSB7IG1fY29udGVudEZpbHRlclVuYmxvY2tIYW5kbGVy ID0gV1RGTW92ZShjb250ZW50RmlsdGVyVW5ibG9ja0hhbmRsZXIpOyB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCBmN2Y4NzdjMjAwNTUwODc3YWUxMDZmNGY5 MTIwYzc3MDhmZjcyNmRmLi41ZGYzNzQ0N2Y1MzMzNDYyMjU4OTRhNTViMzNmMDBjMDczZTkxOGM2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTUxLDcgKzUx LDYgQEAKICNpbmNsdWRlICJBUElTZWN1cml0eU9yaWdpbi5oIgogI2luY2x1ZGUgIkFQSVVJQ2xp ZW50LmgiCiAjaW5jbHVkZSAiQVBJVVJMUmVxdWVzdC5oIgotI2luY2x1ZGUgIkFQSVdlYnNpdGVQ b2xpY2llcy5oIgogI2luY2x1ZGUgIkF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlUHJveHkuaCIKICNp bmNsdWRlICJBdXRoZW50aWNhdGlvbkRlY2lzaW9uTGlzdGVuZXIuaCIKICNpbmNsdWRlICJEYXRh UmVmZXJlbmNlLmgiCkBAIC0yNDA3LDcgKzI0MDYsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6Y2Vu dGVyU2VsZWN0aW9uSW5WaXNpYmxlQXJlYSgpCiAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2Vz OjpXZWJQYWdlOjpDZW50ZXJTZWxlY3Rpb25JblZpc2libGVBcmVhKCksIG1fcGFnZUlEKTsKIH0K IAotdm9pZCBXZWJQYWdlUHJveHk6OnJlY2VpdmVkUG9saWN5RGVjaXNpb24oUG9saWN5QWN0aW9u IGFjdGlvbiwgV2ViRnJhbWVQcm94eSYgZnJhbWUsIHVpbnQ2NF90IGxpc3RlbmVySUQsIEFQSTo6 TmF2aWdhdGlvbiogbmF2aWdhdGlvbiwgc3RkOjpvcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRh PiYmIHdlYnNpdGVQb2xpY2llcykKK3ZvaWQgV2ViUGFnZVByb3h5OjpyZWNlaXZlZFBvbGljeURl Y2lzaW9uKFBvbGljeUFjdGlvbiBhY3Rpb24sIFdlYkZyYW1lUHJveHkmIGZyYW1lLCB1aW50NjRf dCBsaXN0ZW5lcklELCBBUEk6Ok5hdmlnYXRpb24qIG5hdmlnYXRpb24sIHN0ZDo6b3B0aW9uYWw8 V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiB3ZWJzaXRlUG9saWNpZXMsIFNob3VsZFByb2Nlc3NTd2Fw SWZQb3NzaWJsZSBzaG91bGRQcm9jZXNzU3dhcElmUG9zc2libGUpCiB7CiAgICAgaWYgKCFpc1Zh bGlkKCkpCiAgICAgICAgIHJldHVybjsKQEAgLTI0MzQsNiArMjQzMywyMyBAQCB2b2lkIFdlYlBh Z2VQcm94eTo6cmVjZWl2ZWRQb2xpY3lEZWNpc2lvbihQb2xpY3lBY3Rpb24gYWN0aW9uLCBXZWJG cmFtZVByb3h5JiBmcgogICAgICAgICBtX2RlY2lkZVBvbGljeUZvclJlc3BvbnNlUmVxdWVzdCA9 IHsgfTsKICAgICB9CiAKKyAgICBhdXRvKiBhY3RpdmVQb2xpY3lMaXN0ZW5lciA9IGZyYW1lLmFj dGl2ZVBvbGljeUxpc3RlbmVyUHJveHkoKTsKKyAgICBpZiAoYWN0aXZlUG9saWN5TGlzdGVuZXIg JiYgYWN0aXZlUG9saWN5TGlzdGVuZXItPnBvbGljeUxpc3RlbmVyVHlwZSgpID09IFBvbGljeUxp c3RlbmVyVHlwZTo6TmF2aWdhdGlvbkFjdGlvbikgeworICAgICAgICBBU1NFUlQoYWN0aXZlUG9s aWN5TGlzdGVuZXItPmxpc3RlbmVySUQoKSA9PSBsaXN0ZW5lcklEKTsKKworICAgICAgICBpZiAo YWN0aW9uID09IFBvbGljeUFjdGlvbjo6VXNlICYmIG5hdmlnYXRpb24gJiYgZnJhbWUuaXNNYWlu RnJhbWUoKSkgeworICAgICAgICAgICAgYXV0byBwcm9wb3NlZFByb2Nlc3MgPSBwcm9jZXNzKCku cHJvY2Vzc1Bvb2woKS5wcm9jZXNzRm9yTmF2aWdhdGlvbigqdGhpcywgKm5hdmlnYXRpb24sIHNo b3VsZFByb2Nlc3NTd2FwSWZQb3NzaWJsZSwgYWN0aW9uKTsKKworICAgICAgICAgICAgaWYgKHBy b3Bvc2VkUHJvY2Vzcy5wdHIoKSAhPSAmcHJvY2VzcygpKSB7CisgICAgICAgICAgICAgICAgTE9H KFByb2Nlc3NTd2FwcGluZywgIihQcm9jZXNzU3dhcHBpbmcpIFN3aXRjaGluZyBmcm9tIHByb2Nl c3MgJWkgdG8gbmV3IHByb2Nlc3MgKCVpKSBmb3IgbmF2aWdhdGlvbiAlIiBQUkl1NjQgIiAnJXMn IiwgcHJvY2Vzc0lkZW50aWZpZXIoKSwgcHJvcG9zZWRQcm9jZXNzLT5wcm9jZXNzSWRlbnRpZmll cigpLCBuYXZpZ2F0aW9uLT5uYXZpZ2F0aW9uSUQoKSwgbmF2aWdhdGlvbi0+bG9nZ2luZ1N0cmlu ZygpKTsKKworICAgICAgICAgICAgICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbdGhpcywg cHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBuYXZpZ2F0aW9uID0gbWFrZVJlZigqbmF2 aWdhdGlvbiksIHByb3Bvc2VkUHJvY2VzcyA9IFdURk1vdmUocHJvcG9zZWRQcm9jZXNzKV0oKSBt dXRhYmxlIHsKKyAgICAgICAgICAgICAgICAgICAgY29udGludWVOYXZpZ2F0aW9uSW5OZXdQcm9j ZXNzKG5hdmlnYXRpb24uZ2V0KCksIFdURk1vdmUocHJvcG9zZWRQcm9jZXNzKSk7CisgICAgICAg ICAgICAgICAgfSk7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICB9CisKICAgICBpZiAo YXV0byBzeW5jTmF2aWdhdGlvbkFjdGlvblBvbGljeVJlcGx5ID0gV1RGTW92ZShtX3N5bmNOYXZp Z2F0aW9uQWN0aW9uUG9saWN5UmVwbHkpKSB7CiAgICAgICAgIHN5bmNOYXZpZ2F0aW9uQWN0aW9u UG9saWN5UmVwbHkobmF2aWdhdGlvbiA/IG5hdmlnYXRpb24tPm5hdmlnYXRpb25JRCgpIDogMCwg YWN0aW9uLCBkb3dubG9hZElELCBXVEZNb3ZlKHdlYnNpdGVQb2xpY2llcykpOwogICAgICAgICBy ZXR1cm47CkBAIC00MDA1LDM0ICs0MDIxLDE0IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkZWNpZGVQ b2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFNlY3VyCiAg ICAgbmF2aWdhdGlvbi0+c2V0SGFzT3BlbmVkRnJhbWVzKG5hdmlnYXRpb25BY3Rpb25EYXRhLmhh c09wZW5lZEZyYW1lcyk7CiAgICAgbmF2aWdhdGlvbi0+c2V0T3BlbmVyKG5hdmlnYXRpb25BY3Rp b25EYXRhLm9wZW5lcik7CiAKLSAgICBhdXRvIGxpc3RlbmVyID0gbWFrZVJlZihmcmFtZS0+c2V0 VXBQb2xpY3lMaXN0ZW5lclByb3h5KFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhp cyksIGZyYW1lID0gbWFrZVJlZigqZnJhbWUpLCBsaXN0ZW5lcklELCBuYXZpZ2F0aW9uXSAoV2Vi Q29yZTo6UG9saWN5QWN0aW9uIHBvbGljeUFjdGlvbiwgQVBJOjpXZWJzaXRlUG9saWNpZXMqIHBv bGljaWVzLCBTaG91bGRQcm9jZXNzU3dhcElmUG9zc2libGUgc3dhcCkgewotICAgICAgICBzdGQ6 Om9wdGlvbmFsPFdlYnNpdGVQb2xpY2llc0RhdGE+IGRhdGE7Ci0gICAgICAgIGlmIChwb2xpY2ll cykgewotICAgICAgICAgICAgZGF0YSA9IHBvbGljaWVzLT5kYXRhKCk7Ci0gICAgICAgICAgICBp ZiAocG9saWNpZXMtPndlYnNpdGVEYXRhU3RvcmUoKSkKLSAgICAgICAgICAgICAgICBjaGFuZ2VX ZWJzaXRlRGF0YVN0b3JlKHBvbGljaWVzLT53ZWJzaXRlRGF0YVN0b3JlKCktPndlYnNpdGVEYXRh U3RvcmUoKSk7Ci0gICAgICAgIH0KLQotICAgICAgICBpZiAocG9saWN5QWN0aW9uID09IFBvbGlj eUFjdGlvbjo6VXNlICYmIGZyYW1lLT5pc01haW5GcmFtZSgpKSB7Ci0gICAgICAgICAgICBhdXRv IHByb3Bvc2VkUHJvY2VzcyA9IHByb2Nlc3MoKS5wcm9jZXNzUG9vbCgpLnByb2Nlc3NGb3JOYXZp Z2F0aW9uKCp0aGlzLCAqbmF2aWdhdGlvbiwgc3dhcCwgcG9saWN5QWN0aW9uKTsKLSAgICAgICAg ICAgIAotICAgICAgICAgICAgaWYgKHByb3Bvc2VkUHJvY2Vzcy5wdHIoKSAhPSAmcHJvY2Vzcygp KSB7Ci0gICAgICAgICAgICAgICAgTE9HKFByb2Nlc3NTd2FwcGluZywgIihQcm9jZXNzU3dhcHBp bmcpIFN3aXRjaGluZyBmcm9tIHByb2Nlc3MgJWkgdG8gbmV3IHByb2Nlc3MgKCVpKSBmb3IgbmF2 aWdhdGlvbiAlIiBQUkl1NjQgIiAnJXMnIiwgcHJvY2Vzc0lkZW50aWZpZXIoKSwgcHJvcG9zZWRQ cm9jZXNzLT5wcm9jZXNzSWRlbnRpZmllcigpLCBuYXZpZ2F0aW9uLT5uYXZpZ2F0aW9uSUQoKSwg bmF2aWdhdGlvbi0+bG9nZ2luZ1N0cmluZygpKTsKLSAgICAgICAgICAgICAgICAKLSAgICAgICAg ICAgICAgICBSdW5Mb29wOjptYWluKCkuZGlzcGF0Y2goW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBt YWtlUmVmKCp0aGlzKSwgbmF2aWdhdGlvbiA9IG1ha2VSZWYoKm5hdmlnYXRpb24pLCBwcm9wb3Nl ZFByb2Nlc3MgPSBXVEZNb3ZlKHByb3Bvc2VkUHJvY2VzcyldKCkgbXV0YWJsZSB7Ci0gICAgICAg ICAgICAgICAgICAgIGNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2VzcyhuYXZpZ2F0aW9uLmdl dCgpLCBXVEZNb3ZlKHByb3Bvc2VkUHJvY2VzcykpOwotICAgICAgICAgICAgICAgIH0pOwotICAg ICAgICAgICAgfQotICAgICAgICB9Ci0KLSAgICAgICAgcmVjZWl2ZWRQb2xpY3lEZWNpc2lvbihw b2xpY3lBY3Rpb24sIGZyYW1lLmdldCgpLCBsaXN0ZW5lcklELCBuYXZpZ2F0aW9uLmdldCgpLCBX VEZNb3ZlKGRhdGEpKTsKLSAgICB9KSk7CisgICAgYXV0byBsaXN0ZW5lciA9IG1ha2VSZWYoZnJh bWUtPnNldFVwUG9saWN5TGlzdGVuZXJQcm94eShsaXN0ZW5lcklELCBQb2xpY3lMaXN0ZW5lclR5 cGU6Ok5hdmlnYXRpb25BY3Rpb24pKTsKIAogICAgIEFQSTo6TmF2aWdhdGlvbiogbWFpbkZyYW1l TmF2aWdhdGlvbiA9IGZyYW1lLT5pc01haW5GcmFtZSgpID8gbmF2aWdhdGlvbi5nZXQoKSA6IG51 bGxwdHI7CisgICAgbGlzdGVuZXItPnNldE5hdmlnYXRpb24obmF2aWdhdGlvbi5yZWxlYXNlTm9u TnVsbCgpKTsKIAogI2lmIEVOQUJMRShDT05URU5UX0ZJTFRFUklORykKICAgICBpZiAoZnJhbWUt PmRpZEhhbmRsZUNvbnRlbnRGaWx0ZXJVbmJsb2NrTmF2aWdhdGlvbihyZXF1ZXN0KSkKLSAgICAg ICAgcmV0dXJuIHJlY2VpdmVkUG9saWN5RGVjaXNpb24oUG9saWN5QWN0aW9uOjpJZ25vcmUsICpm cmFtZSwgbGlzdGVuZXJJRCwgJm1fbmF2aWdhdGlvblN0YXRlLT5uYXZpZ2F0aW9uKG5ld05hdmln YXRpb25JRCksIHN0ZDo6bnVsbG9wdCk7CisgICAgICAgIHJldHVybiByZWNlaXZlZFBvbGljeURl Y2lzaW9uKFBvbGljeUFjdGlvbjo6SWdub3JlLCAqZnJhbWUsIGxpc3RlbmVySUQsICZtX25hdmln YXRpb25TdGF0ZS0+bmF2aWdhdGlvbihuZXdOYXZpZ2F0aW9uSUQpLCBzdGQ6Om51bGxvcHQsIFNo b3VsZFByb2Nlc3NTd2FwSWZQb3NzaWJsZTo6Tm8pOwogI2Vsc2UKICAgICBVTlVTRURfUEFSQU0o bmV3TmF2aWdhdGlvbklEKTsKICNlbmRpZgpAQCAtNDA4MiwxMSArNDA3OCw3IEBAIHZvaWQgV2Vi UGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JOZXdXaW5kb3dBY3Rpb24odWludDY0X3QgZnJhbWVJ RCwgY29uc3QgU2VjdXJpCiAgICAgTUVTU0FHRV9DSEVDSyhmcmFtZSk7CiAgICAgTUVTU0FHRV9D SEVDS19VUkwocmVxdWVzdC51cmwoKSk7CiAKLSAgICBhdXRvIGxpc3RlbmVyID0gbWFrZVJlZihm cmFtZS0+c2V0VXBQb2xpY3lMaXN0ZW5lclByb3h5KFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFr ZVJlZigqdGhpcyksIGxpc3RlbmVySUQsIGZyYW1lID0gbWFrZVJlZigqZnJhbWUpXSAoV2ViQ29y ZTo6UG9saWN5QWN0aW9uIHBvbGljeUFjdGlvbiwgQVBJOjpXZWJzaXRlUG9saWNpZXMqIHBvbGlj aWVzLCBTaG91bGRQcm9jZXNzU3dhcElmUG9zc2libGUgc3dhcCkgewotICAgICAgICBBU1NFUlRf VU5VU0VEKHBvbGljaWVzLCAhcG9saWNpZXMpOwotICAgICAgICBBU1NFUlRfVU5VU0VEKHN3YXAs IHN3YXAgPT0gU2hvdWxkUHJvY2Vzc1N3YXBJZlBvc3NpYmxlOjpObyk7Ci0gICAgICAgIHJlY2Vp dmVkUG9saWN5RGVjaXNpb24ocG9saWN5QWN0aW9uLCBmcmFtZS5nZXQoKSwgbGlzdGVuZXJJRCwg bnVsbHB0ciwgc3RkOjpudWxsb3B0KTsKLSAgICB9KSk7CisgICAgUmVmPFdlYkZyYW1lUG9saWN5 TGlzdGVuZXJQcm94eT4gbGlzdGVuZXIgPSBmcmFtZS0+c2V0VXBQb2xpY3lMaXN0ZW5lclByb3h5 KGxpc3RlbmVySUQsIFBvbGljeUxpc3RlbmVyVHlwZTo6TmV3V2luZG93QWN0aW9uKTsKIAogICAg IGlmIChtX25hdmlnYXRpb25DbGllbnQpIHsKICAgICAgICAgUmVmUHRyPEFQSTo6RnJhbWVJbmZv PiBzb3VyY2VGcmFtZUluZm87CkBAIC00MTE0LDEyICs0MTA2LDExIEBAIHZvaWQgV2ViUGFnZVBy b3h5OjpkZWNpZGVQb2xpY3lGb3JSZXNwb25zZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBTZWN1 cml0eU9yaWdpCiAgICAgTUVTU0FHRV9DSEVDS19VUkwocmVxdWVzdC51cmwoKSk7CiAgICAgTUVT U0FHRV9DSEVDS19VUkwocmVzcG9uc2UudXJsKCkpOwogCi0gICAgUmVmUHRyPEFQSTo6TmF2aWdh dGlvbj4gbmF2aWdhdGlvbiA9IG5hdmlnYXRpb25JRCA/ICZtX25hdmlnYXRpb25TdGF0ZS0+bmF2 aWdhdGlvbihuYXZpZ2F0aW9uSUQpIDogbnVsbHB0cjsKLSAgICBhdXRvIGxpc3RlbmVyID0gbWFr ZVJlZihmcmFtZS0+c2V0VXBQb2xpY3lMaXN0ZW5lclByb3h5KFt0aGlzLCBwcm90ZWN0ZWRUaGlz ID0gbWFrZVJlZigqdGhpcyksIGZyYW1lID0gbWFrZVJlZigqZnJhbWUpLCBsaXN0ZW5lcklELCBu YXZpZ2F0aW9uID0gV1RGTW92ZShuYXZpZ2F0aW9uKV0gKFdlYkNvcmU6OlBvbGljeUFjdGlvbiBw b2xpY3lBY3Rpb24sIEFQSTo6V2Vic2l0ZVBvbGljaWVzKiBwb2xpY2llcywgU2hvdWxkUHJvY2Vz c1N3YXBJZlBvc3NpYmxlIHN3YXApIHsKLSAgICAgICAgQVNTRVJUX1VOVVNFRChwb2xpY2llcywg IXBvbGljaWVzKTsKLSAgICAgICAgQVNTRVJUX1VOVVNFRChzd2FwLCBzd2FwID09IFNob3VsZFBy b2Nlc3NTd2FwSWZQb3NzaWJsZTo6Tm8pOwotICAgICAgICByZWNlaXZlZFBvbGljeURlY2lzaW9u KHBvbGljeUFjdGlvbiwgZnJhbWUuZ2V0KCksIGxpc3RlbmVySUQsIG51bGxwdHIsIHN0ZDo6bnVs bG9wdCk7Ci0gICAgfSkpOworICAgIFJlZjxXZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHk+IGxp c3RlbmVyID0gZnJhbWUtPnNldFVwUG9saWN5TGlzdGVuZXJQcm94eShsaXN0ZW5lcklELCBQb2xp Y3lMaXN0ZW5lclR5cGU6OlJlc3BvbnNlKTsKKyAgICBpZiAobmF2aWdhdGlvbklEKSB7CisgICAg ICAgIGF1dG8mIG5hdmlnYXRpb24gPSBtX25hdmlnYXRpb25TdGF0ZS0+bmF2aWdhdGlvbihuYXZp Z2F0aW9uSUQpOworICAgICAgICBsaXN0ZW5lci0+c2V0TmF2aWdhdGlvbihuYXZpZ2F0aW9uKTsK KyAgICB9CiAKICAgICBpZiAobV9uYXZpZ2F0aW9uQ2xpZW50KSB7CiAgICAgICAgIGF1dG8gbmF2 aWdhdGlvblJlc3BvbnNlID0gQVBJOjpOYXZpZ2F0aW9uUmVzcG9uc2U6OmNyZWF0ZShBUEk6OkZy YW1lSW5mbzo6Y3JlYXRlKCpmcmFtZSwgZnJhbWVTZWN1cml0eU9yaWdpbi5zZWN1cml0eU9yaWdp bigpKS5nZXQoKSwgcmVxdWVzdCwgcmVzcG9uc2UsIGNhblNob3dNSU1FVHlwZSk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IDE4NjUyMmQyZjM5MTE0YjJmNzMwNGEx NTliNzNlZjk4ODkwZDc4MTMuLjY4YTJkMDk3MTlhZDk3YmU2ZmE1YjVjNzg0OTVmZDNhNmVlOTc1 ZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCisr KyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBAIC05MDgsNyArOTA4 LDcgQEAgcHVibGljOgogICAgIHZvaWQgcGVyZm9ybURpY3Rpb25hcnlMb29rdXBPZkN1cnJlbnRT ZWxlY3Rpb24oKTsKICNlbmRpZgogCi0gICAgdm9pZCByZWNlaXZlZFBvbGljeURlY2lzaW9uKFdl YkNvcmU6OlBvbGljeUFjdGlvbiwgV2ViRnJhbWVQcm94eSYsIHVpbnQ2NF90IGxpc3RlbmVySUQs IEFQSTo6TmF2aWdhdGlvbiosIHN0ZDo6b3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJik7 CisgICAgdm9pZCByZWNlaXZlZFBvbGljeURlY2lzaW9uKFdlYkNvcmU6OlBvbGljeUFjdGlvbiwg V2ViRnJhbWVQcm94eSYsIHVpbnQ2NF90IGxpc3RlbmVySUQsIEFQSTo6TmF2aWdhdGlvbiosIHN0 ZDo6b3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiwgU2hvdWxkUHJvY2Vzc1N3YXBJZlBv c3NpYmxlKTsKIAogICAgIHZvaWQgYmFja0ZvcndhcmRSZW1vdmVkSXRlbShjb25zdCBXZWJDb3Jl OjpCYWNrRm9yd2FyZEl0ZW1JZGVudGlmaWVyJik7CiAK