236090 2022-02-03 09:48:16 -0800 Teach VideoFullscreenInterface to keep track of its corresponding MediaPlayer's MediaPlayerIdentifier 2022-02-03 18:48:17 -0800 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 236094 1 wenson_hsieh wenson_hsieh bdakin eric.carlson ews-watchlist glenn jer.noble megan_gardner philipj sergio thorton webkit-bug-importer oldest_to_newest 1836986 0 wenson_hsieh 2022-02-03 09:48:16 -0800 . 1837005 1 450795 wenson_hsieh 2022-02-03 10:43:53 -0800 Created attachment 450795 For EWS 1837160 2 450795 wenson_hsieh 2022-02-03 16:21:10 -0800 Comment on attachment 450795 For EWS View in context: https://bugs.webkit.org/attachment.cgi?id=450795&action=review Thanks for the review! > Source/WebKit/WebProcess/cocoa/VideoFullscreenManager.mm:320 > + setPlayerIdentifier(contextId, player->identifier()); Ah, so after a bit more testing, I discovered is that this breaks fullscreen media in WebKit2 in the case where the GPUP: Media flag is off, since it tries to send an invalid (0) ObjectIdentifier across the process boundary :P I'll add a check for here to guard against this case. 1837173 3 450837 wenson_hsieh 2022-02-03 16:55:09 -0800 Created attachment 450837 For landing 1837215 4 ews-feeder 2022-02-03 18:46:59 -0800 Committed r289100 (246797@main): <https://commits.webkit.org/246797@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 450837. 1837216 5 webkit-bug-importer 2022-02-03 18:48:17 -0800 <rdar://problem/88468414> 450795 2022-02-03 10:43:53 -0800 2022-02-03 15:04:36 -0800 For EWS bug-236090-20220203104352.patch text/plain 19049 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5MDU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTM2Mjk5NjM4NDQyZjk3 OGU0ZmExMzRjNzk2YWNlZWQzZGQwYzMxNy4uNGI0Njk5NTZkNzY1MWM4N2VkOGRkYjNmYWVjMDNj OWExY2M1OTU0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDIyLTAyLTAzICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFRlYWNoIFZpZGVv RnVsbHNjcmVlbkludGVyZmFjZSB0byBrZWVwIHRyYWNrIG9mIGl0cyBjb3JyZXNwb25kaW5nIE1l ZGlhUGxheWVyJ3MgTWVkaWFQbGF5ZXJJZGVudGlmaWVyCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzYwOTAKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgcGx1bWJpbmcgZm9yIGFuIG9wdGlvbmFsIE1l ZGlhUGxheWVySWRlbnRpZmllciB0aHJvdWdoIHRoZSB2aWRlbyBmdWxsc2NyZWVuIG1vZGVsLiBU aGlzIGlkZW50aWZpZXIgaXMKKyAgICAgICAgaW52YWxpZGF0ZWQgdXBvbiBgbG9hZHN0YXJ0YCwg YW5kIHVwZGF0ZWQgb25jZSB3ZSBvYnNlcnZlIGBsb2FkZWRtZXRhZGF0YWAsIHdoaWNoIGVuc3Vy ZXMgdGhhdCBpZiB0aGUgbWVkaWEKKyAgICAgICAgZW5naW5lIChhbmQgbWVkaWEgcGxheWVyKSBj aGFuZ2VzIG91dCBmcm9tIHVuZGVybmVhdGggdGhlIHZpZGVvIGZ1bGxzY3JlZW4gbW9kZWwsIHdl IHN0aWxsIGtlZXAgdGhlIG5ldyBwbGF5ZXIKKyAgICAgICAgSUQgdXAgdG8gZGF0ZS4KKworICAg ICAgICBTZWUgV2ViS2l0L0NoYW5nZUxvZyBmb3IgbW9yZSBkZXRhaWxzLgorCisgICAgICAgICog cGxhdGZvcm0vY29jb2EvVmlkZW9GdWxsc2NyZWVuTW9kZWwuaDoKKyAgICAgICAgKFdlYkNvcmU6 OlZpZGVvRnVsbHNjcmVlbk1vZGVsQ2xpZW50OjpzZXRQbGF5ZXJJZGVudGlmaWVyKToKKyAgICAg ICAgKiBwbGF0Zm9ybS9jb2NvYS9WaWRlb0Z1bGxzY3JlZW5Nb2RlbFZpZGVvRWxlbWVudC5oOgor ICAgICAgICAqIHBsYXRmb3JtL2NvY29hL1ZpZGVvRnVsbHNjcmVlbk1vZGVsVmlkZW9FbGVtZW50 Lm1tOgorICAgICAgICAoV2ViQ29yZTo6VmlkZW9GdWxsc2NyZWVuTW9kZWxWaWRlb0VsZW1lbnQ6 OnVwZGF0ZUZvckV2ZW50TmFtZSk6CisgICAgICAgIChXZWJDb3JlOjpWaWRlb0Z1bGxzY3JlZW5N b2RlbFZpZGVvRWxlbWVudDo6b2JzZXJ2ZWRFdmVudE5hbWVzKToKKworICAgICAgICBBZGRpdGlv bmFsbHkgbGlzdGVuIGZvciBgbG9hZHN0YXJ0RXZlbnRgIGFuZCBgbG9hZGVkbWV0YWRhdGFFdmVu dGAgKHNlZSBhYm92ZSkuCisKKyAgICAgICAgKFdlYkNvcmU6OlZpZGVvRnVsbHNjcmVlbk1vZGVs VmlkZW9FbGVtZW50OjpzZXRQbGF5ZXJJZGVudGlmaWVyKToKKyAgICAgICAgKiBwbGF0Zm9ybS9p b3MvVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9t YWMvVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlTWFjLmg6CisgICAgICAgIChXZWJDb3JlOjpWaWRl b0Z1bGxzY3JlZW5JbnRlcmZhY2VNYWM6OnBsYXllcklkZW50aWZpZXIgY29uc3QpOgorCiAyMDIy LTAyLTAzICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBGbGFreSBz Y29wZS5hc3NlcnROb0V4Y2VwdGlvbigpIGFzc2VydGlvbiBpbiB+SlNFeGVjU3RhdGUgd2hlbiBy dW5uaW5nIHdvcmtlcnMgV1BUIHRlc3RzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDU3NzJjMGM2YTM0M2VmMjFjODgw YjhhNGU2YzViYWI1NGM4OGYxNzAuLjQ2NTk3NzY4NzRiNmE3OWFlOTZhMzdjY2Y4OTE3NTRlYjBi YWFjMTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMjItMDItMDMgIFdlbnNvbiBIc2ll aCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgVGVhY2ggVmlkZW9GdWxsc2Ny ZWVuSW50ZXJmYWNlIHRvIGtlZXAgdHJhY2sgb2YgaXRzIGNvcnJlc3BvbmRpbmcgTWVkaWFQbGF5 ZXIncyBNZWRpYVBsYXllcklkZW50aWZpZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIzNjA5MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEFkZCBhbiBJUEMgbWVzc2FnZSBiZXR3ZWVuIFZpZGVvRnVsbHNj cmVlbk1hbmFnZXIgYW5kIFZpZGVvRnVsbHNjcmVlbk1hbmFnZXJQcm94eSB0byB1cGRhdGUgdGhl IG1lZGlhIHBsYXllciBJRAorICAgICAgICBjb3JyZXNwb25kaW5nIHRvIGEgZ2l2ZW4gUGxheWJh Y2tTZXNzaW9uQ29udGV4dElkZW50aWZpZXIuIFRoaXMgaXMgc2VudCBpZiB0aGUgdW5kZXJseWlu ZyBtZWRpYSBwbGF5ZXIgY2hhbmdlcworICAgICAgICAoYW5kIHN1YnNlcXVlbnRseSBmaXJlcyBg bG9hZHN0YXJ0YCBhbmQgYGxvYWRlZG1ldGFkYXRhYCBldmVudHMpLCBhbmQgYWxzbyBzZW50IHVw b24gZW50ZXJpbmcgZnVsbHNjcmVlbiB2aWRlby4KKworICAgICAgICBJbiBhIGZ1dHVyZSBwYXRj aCwgdGhpcyBtZWNoYW5pc20gd2lsbCBiZSB1c2VkIHRvIHRlYWNoIFZpZGVvRnVsbHNjcmVlbk1h bmFnZXJQcm94eSB0byBncmFiIGFuIGltYWdlIGJpdG1hcCBmcm9tCisgICAgICAgIHRoZSBHUFUg cHJvY2VzcyBmb3IgYSBnaXZlbiBQbGF5YmFja1Nlc3Npb25Db250ZXh0SWRlbnRpZmllci4KKwor ICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9WaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyUHJveHkuaDoK KyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvVmlkZW9GdWxsc2NyZWVuTWFuYWdlclByb3h5Lm1l c3NhZ2VzLmluOgorICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9WaWRlb0Z1bGxzY3JlZW5NYW5h Z2VyUHJveHkubW06CisgICAgICAgIChXZWJLaXQ6OlZpZGVvRnVsbHNjcmVlbk1hbmFnZXJQcm94 eTo6c2V0UGxheWVySWRlbnRpZmllcik6CisgICAgICAgICogV2ViUHJvY2Vzcy9jb2NvYS9WaWRl b0Z1bGxzY3JlZW5NYW5hZ2VyLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9jb2NvYS9WaWRlb0Z1 bGxzY3JlZW5NYW5hZ2VyLm1tOgorICAgICAgICAoV2ViS2l0OjpWaWRlb0Z1bGxzY3JlZW5JbnRl cmZhY2VDb250ZXh0OjpzZXRQbGF5ZXJJZGVudGlmaWVyKToKKyAgICAgICAgKFdlYktpdDo6Vmlk ZW9GdWxsc2NyZWVuTWFuYWdlcjo6ZW50ZXJWaWRlb0Z1bGxzY3JlZW5Gb3JWaWRlb0VsZW1lbnQp OgorICAgICAgICAoV2ViS2l0OjpWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyOjpzZXRQbGF5ZXJJZGVu dGlmaWVyKToKKwogMjAyMi0wMi0wMyAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxl LmNvbT4KIAogICAgICAgICBBZGQgcGx1bWJpbmcgdG8gaW5mb3JtIFdlYlBhZ2VQcm94eSB3aGVu IHZpZGVvcyBwbGF5LCBwYXVzZSwgc2VlaywgYW5kIGVudGVyIG9yIGV4aXQgZnVsbHNjcmVlbgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY29jb2EvVmlkZW9GdWxsc2NyZWVu TW9kZWwuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL1ZpZGVvRnVsbHNjcmVlbk1v ZGVsLmgKaW5kZXggZjgxYzI4MTEyYjMxY2JlYTQ1ZTU4YTZhYWJlYjZkZmQ0ZDg4ZDdlNi4uNTQ0 N2ExMzdlY2QwMWY4NjE4YzE2MzFlNjFjNzM5NTFiODFiMTdmNCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vY29jb2EvVmlkZW9GdWxsc2NyZWVuTW9kZWwuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9WaWRlb0Z1bGxzY3JlZW5Nb2RlbC5oCkBAIC0zMiw2 ICszMiw3IEBACiAjaW5jbHVkZSAiRmxvYXRSZWN0LmgiCiAjaW5jbHVkZSAiSFRNTE1lZGlhRWxl bWVudEVudW1zLmgiCiAjaW5jbHVkZSAiTWVkaWFQbGF5ZXJFbnVtcy5oIgorI2luY2x1ZGUgIk1l ZGlhUGxheWVySWRlbnRpZmllci5oIgogI2luY2x1ZGUgIlBsYXliYWNrU2Vzc2lvbk1vZGVsLmgi CiAjaW5jbHVkZSA8d3RmL0NvbXBsZXRpb25IYW5kbGVyLmg+CiAjaW5jbHVkZSA8d3RmL1dlYWtQ dHIuaD4KQEAgLTg0LDYgKzg1LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCB3aWxsRXhp dFBpY3R1cmVJblBpY3R1cmUoKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgZGlkRXhpdFBpY3R1cmVJ blBpY3R1cmUoKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgbW9kZWxEZXN0cm95ZWQoKSB7IH0KKyAg ICB2aXJ0dWFsIHZvaWQgc2V0UGxheWVySWRlbnRpZmllcihzdGQ6Om9wdGlvbmFsPE1lZGlhUGxh eWVySWRlbnRpZmllcj4pIHsgfQogfTsKICAgICAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2NvY29hL1ZpZGVvRnVsbHNjcmVlbk1vZGVsVmlkZW9FbGVtZW50LmggYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9WaWRlb0Z1bGxzY3JlZW5Nb2RlbFZpZGVvRWxl bWVudC5oCmluZGV4IDc3ZDE1N2UzNjMyNzZlNmYxZmE5NTFlOGEyZTc0MGZhZjkyZTU3ODcuLjM1 OGVkOTlmMDJiNGJjOTBmNDJiOTBkNzU0MzA2NGQ1YjJkMWNlODYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL1ZpZGVvRnVsbHNjcmVlbk1vZGVsVmlkZW9FbGVtZW50 LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY29jb2EvVmlkZW9GdWxsc2NyZWVuTW9k ZWxWaWRlb0VsZW1lbnQuaApAQCAtMzIsNiArMzIsNyBAQAogI2luY2x1ZGUgIkZsb2F0UmVjdC5o IgogI2luY2x1ZGUgIkhUTUxNZWRpYUVsZW1lbnRFbnVtcy5oIgogI2luY2x1ZGUgIk1lZGlhUGxh eWVyRW51bXMuaCIKKyNpbmNsdWRlICJNZWRpYVBsYXllcklkZW50aWZpZXIuaCIKICNpbmNsdWRl ICJQbGF0Zm9ybUxheWVyLmgiCiAjaW5jbHVkZSAiVmlkZW9GdWxsc2NyZWVuTW9kZWwuaCIKICNp bmNsdWRlIDx3dGYvRnVuY3Rpb24uaD4KQEAgLTgxLDYgKzgyLDcgQEAgcHJvdGVjdGVkOgogcHJp dmF0ZToKICAgICB2b2lkIHNldEhhc1ZpZGVvKGJvb2wpOwogICAgIHZvaWQgc2V0VmlkZW9EaW1l bnNpb25zKGNvbnN0IEZsb2F0U2l6ZSYpOworICAgIHZvaWQgc2V0UGxheWVySWRlbnRpZmllcihz dGQ6Om9wdGlvbmFsPE1lZGlhUGxheWVySWRlbnRpZmllcj4pOwogCiAgICAgdm9pZCB3aWxsRW50 ZXJQaWN0dXJlSW5QaWN0dXJlKCkgb3ZlcnJpZGU7CiAgICAgdm9pZCBkaWRFbnRlclBpY3R1cmVJ blBpY3R1cmUoKSBvdmVycmlkZTsKQEAgLTEwMCw2ICsxMDIsNyBAQCBwcml2YXRlOgogICAgIEZs b2F0UmVjdCBtX3ZpZGVvRnJhbWU7CiAgICAgVmVjdG9yPFJlZlB0cjxUZXh0VHJhY2s+PiBtX2xl Z2libGVUcmFja3NGb3JNZW51OwogICAgIFZlY3RvcjxSZWZQdHI8QXVkaW9UcmFjaz4+IG1fYXVk aW9UcmFja3NGb3JNZW51OworICAgIHN0ZDo6b3B0aW9uYWw8TWVkaWFQbGF5ZXJJZGVudGlmaWVy PiBtX3BsYXllcklkZW50aWZpZXI7CiB9OwogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9jb2NvYS9WaWRlb0Z1bGxzY3JlZW5Nb2RlbFZpZGVvRWxlbWVudC5tbSBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL1ZpZGVvRnVsbHNjcmVlbk1vZGVsVmlkZW9FbGVt ZW50Lm1tCmluZGV4IDZiNWUxZGQzNTg3MmJhMDNiZjVhMWViMTg3NzVkMjA1OWIxNGU3ZTQuLjE5 NzQxZjYyZjZiNjZhMWJlMDc3N2RlZTZhM2FhMzlkYjAyODBlZGMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL1ZpZGVvRnVsbHNjcmVlbk1vZGVsVmlkZW9FbGVtZW50 Lm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL1ZpZGVvRnVsbHNjcmVlbk1v ZGVsVmlkZW9FbGVtZW50Lm1tCkBAIC0xMDMsNiArMTAzLDI2IEBAIHZvaWQgVmlkZW9GdWxsc2Ny ZWVuTW9kZWxWaWRlb0VsZW1lbnQ6OnVwZGF0ZUZvckV2ZW50TmFtZShjb25zdCBXVEY6OkF0b21T dHJpbmcmCiAgICAgICAgIHNldEhhc1ZpZGVvKG1fdmlkZW9FbGVtZW50KTsKICAgICAgICAgc2V0 VmlkZW9EaW1lbnNpb25zKG1fdmlkZW9FbGVtZW50ID8gRmxvYXRTaXplKG1fdmlkZW9FbGVtZW50 LT52aWRlb1dpZHRoKCksIG1fdmlkZW9FbGVtZW50LT52aWRlb0hlaWdodCgpKSA6IEZsb2F0U2l6 ZSgpKTsKICAgICB9CisKKyAgICBpZiAoYWxsCisgICAgICAgIHx8IGV2ZW50TmFtZSA9PSBldmVu dE5hbWVzKCkubG9hZGVkbWV0YWRhdGFFdmVudCB8fCBldmVudE5hbWUgPT0gZXZlbnROYW1lcygp LmxvYWRzdGFydEV2ZW50KSB7CisgICAgICAgIHNldFBsYXllcklkZW50aWZpZXIoWyZdKCkgLT4g c3RkOjpvcHRpb25hbDxNZWRpYVBsYXllcklkZW50aWZpZXI+IHsKKyAgICAgICAgICAgIGlmIChl dmVudE5hbWUgPT0gZXZlbnROYW1lcygpLmxvYWRzdGFydEV2ZW50KQorICAgICAgICAgICAgICAg IHJldHVybiBzdGQ6Om51bGxvcHQ7CisKKyAgICAgICAgICAgIGlmICghbV92aWRlb0VsZW1lbnQp CisgICAgICAgICAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKKworICAgICAgICAgICAgYXV0 byBwbGF5ZXIgPSBtX3ZpZGVvRWxlbWVudC0+cGxheWVyKCk7CisgICAgICAgICAgICBpZiAoIXBs YXllcikKKyAgICAgICAgICAgICAgICByZXR1cm4gc3RkOjpudWxsb3B0OworCisgICAgICAgICAg ICBpZiAoYXV0byBpZGVudGlmaWVyID0gcGxheWVyLT5pZGVudGlmaWVyKCkpCisgICAgICAgICAg ICAgICAgcmV0dXJuIGlkZW50aWZpZXI7CisKKyAgICAgICAgICAgIHJldHVybiBzdGQ6Om51bGxv cHQ7CisgICAgICAgIH0oKSk7CisgICAgfQogfQogCiB2b2lkIFZpZGVvRnVsbHNjcmVlbk1vZGVs VmlkZW9FbGVtZW50Ojp3aWxsRXhpdEZ1bGxzY3JlZW4oKQpAQCAtMTgwLDcgKzIwMCw3IEBAIHZv aWQgVmlkZW9GdWxsc2NyZWVuTW9kZWxWaWRlb0VsZW1lbnQ6OnNldFZpZGVvTGF5ZXJHcmF2aXR5 KE1lZGlhUGxheWVyOjpWaWRlb0dyCiAKIFNwYW48Y29uc3QgQXRvbVN0cmluZz4gVmlkZW9GdWxs c2NyZWVuTW9kZWxWaWRlb0VsZW1lbnQ6Om9ic2VydmVkRXZlbnROYW1lcygpCiB7Ci0gICAgc3Rh dGljIE5ldmVyRGVzdHJveWVkIG5hbWVzID0gc3RkOjphcnJheSB7IGV2ZW50TmFtZXMoKS5yZXNp emVFdmVudCB9OworICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZCBuYW1lcyA9IHN0ZDo6YXJyYXkg eyBldmVudE5hbWVzKCkucmVzaXplRXZlbnQsIGV2ZW50TmFtZXMoKS5sb2Fkc3RhcnRFdmVudCwg ZXZlbnROYW1lcygpLmxvYWRlZG1ldGFkYXRhRXZlbnQgfTsKICAgICByZXR1cm4gbmFtZXMuZ2V0 KCk7CiB9CiAKQEAgLTIzOCw2ICsyNTgsMTcgQEAgdm9pZCBWaWRlb0Z1bGxzY3JlZW5Nb2RlbFZp ZGVvRWxlbWVudDo6c2V0VmlkZW9EaW1lbnNpb25zKGNvbnN0IEZsb2F0U2l6ZSYgdmlkZW8KICAg ICAgICAgY2xpZW50LT52aWRlb0RpbWVuc2lvbnNDaGFuZ2VkKG1fdmlkZW9EaW1lbnNpb25zKTsK IH0KIAordm9pZCBWaWRlb0Z1bGxzY3JlZW5Nb2RlbFZpZGVvRWxlbWVudDo6c2V0UGxheWVySWRl bnRpZmllcihzdGQ6Om9wdGlvbmFsPE1lZGlhUGxheWVySWRlbnRpZmllcj4gaWRlbnRpZmllcikK K3sKKyAgICBpZiAobV9wbGF5ZXJJZGVudGlmaWVyID09IGlkZW50aWZpZXIpCisgICAgICAgIHJl dHVybjsKKworICAgIG1fcGxheWVySWRlbnRpZmllciA9IGlkZW50aWZpZXI7CisKKyAgICBmb3Ig KGF1dG8qIGNsaWVudCA6IGNvcHlUb1ZlY3RvcihtX2NsaWVudHMpKQorICAgICAgICBjbGllbnQt PnNldFBsYXllcklkZW50aWZpZXIoaWRlbnRpZmllcik7Cit9CisKIHZvaWQgVmlkZW9GdWxsc2Ny ZWVuTW9kZWxWaWRlb0VsZW1lbnQ6OndpbGxFbnRlclBpY3R1cmVJblBpY3R1cmUoKQogewogICAg IGZvciAoYXV0byYgY2xpZW50IDogY29weVRvVmVjdG9yKG1fY2xpZW50cykpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZL aXQuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9WaWRlb0Z1bGxzY3JlZW5JbnRlcmZh Y2VBVktpdC5oCmluZGV4IGNhMTRlN2FiMWZjZmY2ZjliYjFjNDFiYTk2MmQ1NDg5MWRjNTc3ZTAu LjhhMTZhN2Y3MWIxNWE5MmQ2M2E4YzgyZmEyZWJmNTQwNDk0MzYwODMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9WaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9WaWRlb0Z1bGxzY3JlZW5JbnRlcmZh Y2VBVktpdC5oCkBAIC0zMCw2ICszMCw3IEBACiAKICNpbmNsdWRlICJFdmVudExpc3RlbmVyLmgi CiAjaW5jbHVkZSAiSFRNTE1lZGlhRWxlbWVudEVudW1zLmgiCisjaW5jbHVkZSAiTWVkaWFQbGF5 ZXJJZGVudGlmaWVyLmgiCiAjaW5jbHVkZSAiUGxhdGZvcm1MYXllci5oIgogI2luY2x1ZGUgIlBs YXliYWNrU2Vzc2lvbkludGVyZmFjZUFWS2l0LmgiCiAjaW5jbHVkZSAiVmlkZW9GdWxsc2NyZWVu TW9kZWwuaCIKQEAgLTc2LDYgKzc3LDcgQEAgcHVibGljOgogICAgIFdFQkNPUkVfRVhQT1JUIHZv aWQgaGFzVmlkZW9DaGFuZ2VkKGJvb2wpIGZpbmFsOwogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQg dmlkZW9EaW1lbnNpb25zQ2hhbmdlZChjb25zdCBGbG9hdFNpemUmKSBmaW5hbDsKICAgICBXRUJD T1JFX0VYUE9SVCB2b2lkIG1vZGVsRGVzdHJveWVkKCkgZmluYWw7CisgICAgdm9pZCBzZXRQbGF5 ZXJJZGVudGlmaWVyKHN0ZDo6b3B0aW9uYWw8TWVkaWFQbGF5ZXJJZGVudGlmaWVyPiBpZGVudGlm aWVyKSBmaW5hbCB7IG1fcGxheWVySWRlbnRpZmllciA9IGlkZW50aWZpZXI7IH0KIAogICAgIC8v IFBsYXliYWNrU2Vzc2lvbk1vZGVsQ2xpZW50CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBleHRl cm5hbFBsYXliYWNrQ2hhbmdlZChib29sIGVuYWJsZWQsIFBsYXliYWNrU2Vzc2lvbk1vZGVsOjpF eHRlcm5hbFBsYXliYWNrVGFyZ2V0VHlwZSwgY29uc3QgU3RyaW5nJiBsb2NhbGl6ZWREZXZpY2VO YW1lKSBmaW5hbDsKQEAgLTE1OSw2ICsxNjEsOCBAQCBwdWJsaWM6CiAgICAgV2ViQVZQbGF5ZXJM YXllclZpZXcqIHBsYXllckxheWVyVmlldygpIGNvbnN0IHsgcmV0dXJuIG1fcGxheWVyTGF5ZXJW aWV3LmdldCgpOyB9CiAgICAgV0VCQ09SRV9FWFBPUlQgYm9vbCBwaWN0dXJlSW5QaWN0dXJlV2Fz U3RhcnRlZFdoZW5FbnRlcmluZ0JhY2tncm91bmQoKSBjb25zdDsKIAorICAgIHN0ZDo6b3B0aW9u YWw8TWVkaWFQbGF5ZXJJZGVudGlmaWVyPiBwbGF5ZXJJZGVudGlmaWVyKCkgY29uc3QgeyByZXR1 cm4gbV9wbGF5ZXJJZGVudGlmaWVyOyB9CisKIHByb3RlY3RlZDoKICAgICBXRUJDT1JFX0VYUE9S VCBWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdChQbGF5YmFja1Nlc3Npb25JbnRlcmZhY2VB VktpdCYpOwogCkBAIC0xNzEsNiArMTc1LDcgQEAgcHJvdGVjdGVkOgogICAgIFdlYkFWUGxheWVy Q29udHJvbGxlciAqcGxheWVyQ29udHJvbGxlcigpIGNvbnN0OwogCiAgICAgUmVmPFBsYXliYWNr U2Vzc2lvbkludGVyZmFjZUFWS2l0PiBtX3BsYXliYWNrU2Vzc2lvbkludGVyZmFjZTsKKyAgICBz dGQ6Om9wdGlvbmFsPE1lZGlhUGxheWVySWRlbnRpZmllcj4gbV9wbGF5ZXJJZGVudGlmaWVyOwog ICAgIFJldGFpblB0cjxXZWJBVlBsYXllclZpZXdDb250cm9sbGVyRGVsZWdhdGU+IG1fcGxheWVy Vmlld0NvbnRyb2xsZXJEZWxlZ2F0ZTsKICAgICBSZXRhaW5QdHI8V2ViQVZQbGF5ZXJWaWV3Q29u dHJvbGxlcj4gbV9wbGF5ZXJWaWV3Q29udHJvbGxlcjsKICAgICBWaWRlb0Z1bGxzY3JlZW5Nb2Rl bCogbV92aWRlb0Z1bGxzY3JlZW5Nb2RlbCB7IG51bGxwdHIgfTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9WaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VNYWMuaCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9WaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VNYWMuaApp bmRleCA4NmUwNGJiMjZhMTU0NDNiMzczMTBiNGQ5M2QyZDA0N2JhMGZhMDc4Li4wNzhmMjU1ZmJm M2Y0MjkyNTMzYmI5MzRkMzhiNjU0MzU2YTk2NWU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9tYWMvVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlTWFjLmgKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbWFjL1ZpZGVvRnVsbHNjcmVlbkludGVyZmFjZU1hYy5oCkBAIC0y OCw2ICsyOCw3IEBACiAjaWYgUExBVEZPUk0oTUFDKSAmJiBFTkFCTEUoVklERU9fUFJFU0VOVEFU SU9OX01PREUpCiAKICNpbmNsdWRlICJIVE1MTWVkaWFFbGVtZW50RW51bXMuaCIKKyNpbmNsdWRl ICJNZWRpYVBsYXllcklkZW50aWZpZXIuaCIKICNpbmNsdWRlICJQbGF5YmFja1Nlc3Npb25JbnRl cmZhY2VNYWMuaCIKICNpbmNsdWRlICJQbGF5YmFja1Nlc3Npb25Nb2RlbC5oIgogI2luY2x1ZGUg IlZpZGVvRnVsbHNjcmVlbk1vZGVsLmgiCkBAIC03MCw2ICs3MSw3IEBAIHB1YmxpYzoKICAgICAv LyBWaWRlb0Z1bGxzY3JlZW5Nb2RlbENsaWVudAogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgaGFz VmlkZW9DaGFuZ2VkKGJvb2wpIGZpbmFsOwogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgdmlkZW9E aW1lbnNpb25zQ2hhbmdlZChjb25zdCBGbG9hdFNpemUmKSBmaW5hbDsKKyAgICB2b2lkIHNldFBs YXllcklkZW50aWZpZXIoc3RkOjpvcHRpb25hbDxNZWRpYVBsYXllcklkZW50aWZpZXI+IGlkZW50 aWZpZXIpIGZpbmFsIHsgbV9wbGF5ZXJJZGVudGlmaWVyID0gaWRlbnRpZmllcjsgfQogCiAgICAg V0VCQ09SRV9FWFBPUlQgdm9pZCBzZXR1cEZ1bGxzY3JlZW4oTlNWaWV3JiBsYXllckhvc3RlZFZp ZXcsIGNvbnN0IEludFJlY3QmIGluaXRpYWxSZWN0LCBOU1dpbmRvdyAqcGFyZW50V2luZG93LCBI VE1MTWVkaWFFbGVtZW50RW51bXM6OlZpZGVvRnVsbHNjcmVlbk1vZGUsIGJvb2wgYWxsb3dzUGlj dHVyZUluUGljdHVyZVBsYXliYWNrKTsKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIGVudGVyRnVs bHNjcmVlbigpOwpAQCAtOTYsOSArOTgsMTIgQEAgcHVibGljOgogCiAgICAgV0VCQ09SRV9FWFBP UlQgdm9pZCByZXF1ZXN0SGlkZUFuZEV4aXRQaVAoKTsKIAorICAgIHN0ZDo6b3B0aW9uYWw8TWVk aWFQbGF5ZXJJZGVudGlmaWVyPiBwbGF5ZXJJZGVudGlmaWVyKCkgY29uc3QgeyByZXR1cm4gbV9w bGF5ZXJJZGVudGlmaWVyOyB9CisKIHByaXZhdGU6CiAgICAgV0VCQ09SRV9FWFBPUlQgVmlkZW9G dWxsc2NyZWVuSW50ZXJmYWNlTWFjKFBsYXliYWNrU2Vzc2lvbkludGVyZmFjZU1hYyYpOwogICAg IFJlZjxQbGF5YmFja1Nlc3Npb25JbnRlcmZhY2VNYWM+IG1fcGxheWJhY2tTZXNzaW9uSW50ZXJm YWNlOworICAgIHN0ZDo6b3B0aW9uYWw8TWVkaWFQbGF5ZXJJZGVudGlmaWVyPiBtX3BsYXllcklk ZW50aWZpZXI7CiAgICAgV2Vha1B0cjxWaWRlb0Z1bGxzY3JlZW5Nb2RlbD4gbV92aWRlb0Z1bGxz Y3JlZW5Nb2RlbDsKICAgICBXZWFrUHRyPFZpZGVvRnVsbHNjcmVlbkNoYW5nZU9ic2VydmVyPiBt X2Z1bGxzY3JlZW5DaGFuZ2VPYnNlcnZlcjsKICAgICBIVE1MTWVkaWFFbGVtZW50RW51bXM6OlZp ZGVvRnVsbHNjcmVlbk1vZGUgbV9tb2RlIHsgSFRNTE1lZGlhRWxlbWVudEVudW1zOjpWaWRlb0Z1 bGxzY3JlZW5Nb2RlTm9uZSB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv Q29jb2EvVmlkZW9GdWxsc2NyZWVuTWFuYWdlclByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9Db2NvYS9WaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyUHJveHkuaAppbmRleCA0ZDdkMmI5ZDI3 ZmE1MGNlNjQxNTIzZjJhYzY1MTBmMGQxYjA1MGIyLi45ZTViYWE5ZWNiYWVmMDYyNmNiYzU5MTIy NDI4MTQ0ZTljYzU0OWUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2Nv YS9WaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9Db2NvYS9WaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyUHJveHkuaApAQCAtMzIsNiArMzIsNyBA QAogI2luY2x1ZGUgIlBsYXliYWNrU2Vzc2lvbkNvbnRleHRJZGVudGlmaWVyLmgiCiAjaW5jbHVk ZSA8V2ViQ29yZS9BdWRpb1Nlc3Npb24uaD4KICNpbmNsdWRlIDxXZWJDb3JlL0dyYXBoaWNzTGF5 ZXIuaD4KKyNpbmNsdWRlIDxXZWJDb3JlL01lZGlhUGxheWVySWRlbnRpZmllci5oPgogI2luY2x1 ZGUgPFdlYkNvcmUvUGxhdGZvcm1WaWV3Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9WaWRlb0Z1bGxz Y3JlZW5DaGFuZ2VPYnNlcnZlci5oPgogI2luY2x1ZGUgPFdlYkNvcmUvVmlkZW9GdWxsc2NyZWVu TW9kZWwuaD4KQEAgLTE4MCw2ICsxODEsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgcHJlcGFyZWRU b1JldHVyblRvSW5saW5lKFBsYXliYWNrU2Vzc2lvbkNvbnRleHRJZGVudGlmaWVyLCBib29sIHZp c2libGUsIFdlYkNvcmU6OkZsb2F0UmVjdCBpbmxpbmVSZWN0KTsKICAgICB2b2lkIHByZXBhcmVk VG9FeGl0RnVsbHNjcmVlbihQbGF5YmFja1Nlc3Npb25Db250ZXh0SWRlbnRpZmllcik7CiAgICAg dm9pZCBleGl0RnVsbHNjcmVlbldpdGhvdXRBbmltYXRpb25Ub01vZGUoUGxheWJhY2tTZXNzaW9u Q29udGV4dElkZW50aWZpZXIsIFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnRFbnVtczo6VmlkZW9G dWxsc2NyZWVuTW9kZSk7CisgICAgdm9pZCBzZXRQbGF5ZXJJZGVudGlmaWVyKFBsYXliYWNrU2Vz c2lvbkNvbnRleHRJZGVudGlmaWVyLCBzdGQ6Om9wdGlvbmFsPFdlYkNvcmU6Ok1lZGlhUGxheWVy SWRlbnRpZmllcj4pOwogCiAgICAgLy8gTWVzc2FnZXMgdG8gVmlkZW9GdWxsc2NyZWVuTWFuYWdl cgogICAgIHZvaWQgcmVxdWVzdEZ1bGxzY3JlZW5Nb2RlKFBsYXliYWNrU2Vzc2lvbkNvbnRleHRJ ZGVudGlmaWVyLCBXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50RW51bXM6OlZpZGVvRnVsbHNjcmVl bk1vZGUsIGJvb2wgZmluaXNoZWRXaXRoTWVkaWEgPSBmYWxzZSk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9WaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyUHJveHkubWVz c2FnZXMuaW4gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9WaWRlb0Z1bGxzY3JlZW5N YW5hZ2VyUHJveHkubWVzc2FnZXMuaW4KaW5kZXggZGRmODUwNjQ0NjgzYmQyNmEyZmIxYjI1ZjFl NTExN2IyZTc1YWFjMi4uNGYxMzk2YmVjZjUzYjdkZGIxOTM5NGRkM2VmZDI0ZjI4NjgzNDE5YSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvVmlkZW9GdWxsc2NyZWVu TWFuYWdlclByb3h5Lm1lc3NhZ2VzLmluCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0Nv Y29hL1ZpZGVvRnVsbHNjcmVlbk1hbmFnZXJQcm94eS5tZXNzYWdlcy5pbgpAQCAtMjUsNiArMjUs NyBAQCBtZXNzYWdlcyAtPiBWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyUHJveHkgewogICAgIFNldEhh c1ZpZGVvKFdlYktpdDo6UGxheWJhY2tTZXNzaW9uQ29udGV4dElkZW50aWZpZXIgY29udGV4dElk LCBib29sIGhhc1ZpZGVvKQogICAgIFNldFZpZGVvRGltZW5zaW9ucyhXZWJLaXQ6OlBsYXliYWNr U2Vzc2lvbkNvbnRleHRJZGVudGlmaWVyIGNvbnRleHRJZCwgV2ViQ29yZTo6RmxvYXRTaXplIHZp ZGVvRGltZW5zaW9ucykKICAgICBTZXR1cEZ1bGxzY3JlZW5XaXRoSUQoV2ViS2l0OjpQbGF5YmFj a1Nlc3Npb25Db250ZXh0SWRlbnRpZmllciBjb250ZXh0SWQsIFdlYktpdDo6TGF5ZXJIb3N0aW5n Q29udGV4dElEIHZpZGVvTGF5ZXJJRCwgV2ViQ29yZTo6RmxvYXRSZWN0IGluaXRpYWxSZWN0LCBX ZWJDb3JlOjpGbG9hdFNpemUgdmlkZW9EaW1lbnNpb25zLCBmbG9hdCBob3N0aW5nU2NhbGVGYWN0 b3IsIFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnRFbnVtczo6VmlkZW9GdWxsc2NyZWVuTW9kZSB2 aWRlb0Z1bGxzY3JlZW5Nb2RlLCBib29sIGFsbG93c1BpY3R1cmVJblBpY3R1cmUsIGJvb2wgc3Rh bmRieSwgYm9vbCBibG9ja3NSZXR1cm5Ub0Z1bGxzY3JlZW5Gcm9tUGljdHVyZUluUGljdHVyZSkK KyAgICBTZXRQbGF5ZXJJZGVudGlmaWVyKFdlYktpdDo6UGxheWJhY2tTZXNzaW9uQ29udGV4dElk ZW50aWZpZXIgY29udGV4dElkLCBzdGQ6Om9wdGlvbmFsPFdlYkNvcmU6Ok1lZGlhUGxheWVySWRl bnRpZmllcj4gcGxheWVySWRlbnRpZmllcikKICNpZiAhUExBVEZPUk0oSU9TX0ZBTUlMWSkKICAg ICBFbnRlckZ1bGxzY3JlZW4oV2ViS2l0OjpQbGF5YmFja1Nlc3Npb25Db250ZXh0SWRlbnRpZmll ciBjb250ZXh0SWQpCiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0NvY29hL1ZpZGVvRnVsbHNjcmVlbk1hbmFnZXJQcm94eS5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0NvY29hL1ZpZGVvRnVsbHNjcmVlbk1hbmFnZXJQcm94eS5tbQppbmRleCBlYWIxMzc0 MjM2NjU2ODY0MDExYjgxZWU1YTFmYWNjNzQ0NDhmOGExLi41NGExYWIwZDg1ZGNlNThiNDRmZTNl NDEzYjMxMDQ5OGE0ZmVmNjg3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9D b2NvYS9WaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyUHJveHkubW0KKysrIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQ29jb2EvVmlkZW9GdWxsc2NyZWVuTWFuYWdlclByb3h5Lm1tCkBAIC01NzEsNiAr NTcxLDE1IEBAIHZvaWQgVmlkZW9GdWxsc2NyZWVuTWFuYWdlclByb3h5OjpzZXR1cEZ1bGxzY3Jl ZW5XaXRoSUQoUGxheWJhY2tTZXNzaW9uQ29udGV4dElkCiAjZW5kaWYKIH0KIAordm9pZCBWaWRl b0Z1bGxzY3JlZW5NYW5hZ2VyUHJveHk6OnNldFBsYXllcklkZW50aWZpZXIoUGxheWJhY2tTZXNz aW9uQ29udGV4dElkZW50aWZpZXIgY29udGV4dElkLCBzdGQ6Om9wdGlvbmFsPE1lZGlhUGxheWVy SWRlbnRpZmllcj4gcGxheWVySWRlbnRpZmllcikKK3sKKyAgICBpZiAobV9tb2NrVmlkZW9QcmVz ZW50YXRpb25Nb2RlRW5hYmxlZCkKKyAgICAgICAgcmV0dXJuOworCisgICAgaWYgKGF1dG8qIGlu dGVyZmFjZSA9IGZpbmRJbnRlcmZhY2UoY29udGV4dElkKSkKKyAgICAgICAgaW50ZXJmYWNlLT5z ZXRQbGF5ZXJJZGVudGlmaWVyKHBsYXllcklkZW50aWZpZXIpOworfQorCiB2b2lkIFZpZGVvRnVs bHNjcmVlbk1hbmFnZXJQcm94eTo6c2V0SGFzVmlkZW8oUGxheWJhY2tTZXNzaW9uQ29udGV4dElk ZW50aWZpZXIgY29udGV4dElkLCBib29sIGhhc1ZpZGVvKQogewogICAgIGlmIChtX21vY2tWaWRl b1ByZXNlbnRhdGlvbk1vZGVFbmFibGVkKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL2NvY29hL1ZpZGVvRnVsbHNjcmVlbk1hbmFnZXIuaCBiL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9jb2NvYS9WaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyLmgKaW5kZXggMDM4ZjNmOGIwNzc4 MDlmZmZiYjMwMzIyMWM0OGRmODNhYjIwZDY2OS4uZTM1MDJiYThkMDNkOGU4ZmIyMWViMDgxZDFl ZDk4NGY1YjcwNWYyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29h L1ZpZGVvRnVsbHNjcmVlbk1hbmFnZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv Y29jb2EvVmlkZW9GdWxsc2NyZWVuTWFuYWdlci5oCkBAIC05OCw2ICs5OCw3IEBAIHByaXZhdGU6 CiAgICAgLy8gVmlkZW9GdWxsc2NyZWVuTW9kZWxDbGllbnQKICAgICB2b2lkIGhhc1ZpZGVvQ2hh bmdlZChib29sKSBvdmVycmlkZTsKICAgICB2b2lkIHZpZGVvRGltZW5zaW9uc0NoYW5nZWQoY29u c3QgV2ViQ29yZTo6RmxvYXRTaXplJikgb3ZlcnJpZGU7CisgICAgdm9pZCBzZXRQbGF5ZXJJZGVu dGlmaWVyKHN0ZDo6b3B0aW9uYWw8V2ViQ29yZTo6TWVkaWFQbGF5ZXJJZGVudGlmaWVyPikgZmlu YWw7CiAKICAgICBWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VDb250ZXh0KFZpZGVvRnVsbHNjcmVl bk1hbmFnZXImLCBQbGF5YmFja1Nlc3Npb25Db250ZXh0SWRlbnRpZmllcik7CiAKQEAgLTE0Niw2 ICsxNDcsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgLy8gSW50ZXJmYWNlIHRvIFZpZGVvRnVsbHNjcmVl bkludGVyZmFjZUNvbnRleHQKICAgICB2b2lkIGhhc1ZpZGVvQ2hhbmdlZChQbGF5YmFja1Nlc3Np b25Db250ZXh0SWRlbnRpZmllciwgYm9vbCBoYXNWaWRlbyk7CiAgICAgdm9pZCB2aWRlb0RpbWVu c2lvbnNDaGFuZ2VkKFBsYXliYWNrU2Vzc2lvbkNvbnRleHRJZGVudGlmaWVyLCBjb25zdCBXZWJD b3JlOjpGbG9hdFNpemUmKTsKKyAgICB2b2lkIHNldFBsYXllcklkZW50aWZpZXIoUGxheWJhY2tT ZXNzaW9uQ29udGV4dElkZW50aWZpZXIsIHN0ZDo6b3B0aW9uYWw8V2ViQ29yZTo6TWVkaWFQbGF5 ZXJJZGVudGlmaWVyPik7CiAKICAgICAvLyBNZXNzYWdlcyBmcm9tIFZpZGVvRnVsbHNjcmVlbk1h bmFnZXJQcm94eQogICAgIHZvaWQgcmVxdWVzdEZ1bGxzY3JlZW5Nb2RlKFBsYXliYWNrU2Vzc2lv bkNvbnRleHRJZGVudGlmaWVyLCBXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50RW51bXM6OlZpZGVv RnVsbHNjcmVlbk1vZGUsIGJvb2wgZmluaXNoZWRXaXRoTWVkaWEpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1ZpZGVvRnVsbHNjcmVlbk1hbmFnZXIubW0gYi9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvVmlkZW9GdWxsc2NyZWVuTWFuYWdlci5tbQpp bmRleCA0MmJlOGNlYTUyNTBmYWZmZWI3OGUwMTFhNjdhNGVmYzBkYTU0YTc3Li5jMzk4Y2U3MTk5 NTNhY2Q0MDBmNTVjMGQzN2ZmZTRjYjcwNmE4Mjg4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvY29jb2EvVmlkZW9GdWxsc2NyZWVuTWFuYWdlci5tbQorKysgYi9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvVmlkZW9GdWxsc2NyZWVuTWFuYWdlci5tbQpAQCAtMTEw LDYgKzExMCwxMiBAQCB2b2lkIFZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUNvbnRleHQ6OnZpZGVv RGltZW5zaW9uc0NoYW5nZWQoY29uc3QgRmxvYXRTaXplJiB2aQogICAgICAgICBtX21hbmFnZXIt PnZpZGVvRGltZW5zaW9uc0NoYW5nZWQobV9jb250ZXh0SWQsIHZpZGVvRGltZW5zaW9ucyk7CiB9 CiAKK3ZvaWQgVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQ29udGV4dDo6c2V0UGxheWVySWRlbnRp ZmllcihzdGQ6Om9wdGlvbmFsPE1lZGlhUGxheWVySWRlbnRpZmllcj4gaWRlbnRpZmllcikKK3sK KyAgICBpZiAobV9tYW5hZ2VyKQorICAgICAgICBtX21hbmFnZXItPnNldFBsYXllcklkZW50aWZp ZXIobV9jb250ZXh0SWQsIGlkZW50aWZpZXIpOworfQorCiAjcHJhZ21hIG1hcmsgLSBWaWRlb0Z1 bGxzY3JlZW5NYW5hZ2VyCiAKIFJlZjxWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyPiBWaWRlb0Z1bGxz Y3JlZW5NYW5hZ2VyOjpjcmVhdGUoV2ViUGFnZSYgcGFnZSwgUGxheWJhY2tTZXNzaW9uTWFuYWdl ciYgcGxheWJhY2tTZXNzaW9uTWFuYWdlcikKQEAgLTMwOSw2ICszMTUsOSBAQCB2b2lkIFZpZGVv RnVsbHNjcmVlbk1hbmFnZXI6OmVudGVyVmlkZW9GdWxsc2NyZWVuRm9yVmlkZW9FbGVtZW50KEhU TUxWaWRlb0VsZW1lbgogICAgIH0KIAogICAgIG1fcGFnZS0+c2VuZChNZXNzYWdlczo6VmlkZW9G dWxsc2NyZWVuTWFuYWdlclByb3h5OjpTZXR1cEZ1bGxzY3JlZW5XaXRoSUQoY29udGV4dElkLCBp bnRlcmZhY2UtPmxheWVySG9zdGluZ0NvbnRleHQoKS0+Y29udGV4dElEKCksIHZpZGVvUmVjdCwg RmxvYXRTaXplKHZpZGVvRWxlbWVudC52aWRlb1dpZHRoKCksIHZpZGVvRWxlbWVudC52aWRlb0hl aWdodCgpKSwgbV9wYWdlLT5kZXZpY2VTY2FsZUZhY3RvcigpLCBpbnRlcmZhY2UtPmZ1bGxzY3Jl ZW5Nb2RlKCksIGFsbG93c1BpY3R1cmVJblBpY3R1cmUsIHN0YW5kYnksIHZpZGVvRWxlbWVudC5k b2N1bWVudCgpLnF1aXJrcygpLmJsb2Nrc1JldHVyblRvRnVsbHNjcmVlbkZyb21QaWN0dXJlSW5Q aWN0dXJlUXVpcmsoKSkpOworCisgICAgaWYgKGF1dG8gcGxheWVyID0gdmlkZW9FbGVtZW50LnBs YXllcigpKQorICAgICAgICBzZXRQbGF5ZXJJZGVudGlmaWVyKGNvbnRleHRJZCwgcGxheWVyLT5p ZGVudGlmaWVyKCkpOwogfQogCiB2b2lkIFZpZGVvRnVsbHNjcmVlbk1hbmFnZXI6OmV4aXRWaWRl b0Z1bGxzY3JlZW5Gb3JWaWRlb0VsZW1lbnQoSFRNTFZpZGVvRWxlbWVudCYgdmlkZW9FbGVtZW50 LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGJvb2wpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQpAQCAt Mzc3LDYgKzM4NiwxMiBAQCB2b2lkIFZpZGVvRnVsbHNjcmVlbk1hbmFnZXI6OnZpZGVvRGltZW5z aW9uc0NoYW5nZWQoUGxheWJhY2tTZXNzaW9uQ29udGV4dElkZW50aQogICAgICAgICBtX3BhZ2Ut PnNlbmQoTWVzc2FnZXM6OlZpZGVvRnVsbHNjcmVlbk1hbmFnZXJQcm94eTo6U2V0VmlkZW9EaW1l bnNpb25zKGNvbnRleHRJZCwgdmlkZW9EaW1lbnNpb25zKSk7CiB9CiAKK3ZvaWQgVmlkZW9GdWxs c2NyZWVuTWFuYWdlcjo6c2V0UGxheWVySWRlbnRpZmllcihQbGF5YmFja1Nlc3Npb25Db250ZXh0 SWRlbnRpZmllciBjb250ZXh0SWRlbnRpZmllciwgc3RkOjpvcHRpb25hbDxNZWRpYVBsYXllcklk ZW50aWZpZXI+IHBsYXllcklkZW50aWZpZXIpCit7CisgICAgaWYgKG1fcGFnZSkKKyAgICAgICAg bV9wYWdlLT5zZW5kKE1lc3NhZ2VzOjpWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyUHJveHk6OlNldFBs YXllcklkZW50aWZpZXIoY29udGV4dElkZW50aWZpZXIsIHBsYXllcklkZW50aWZpZXIpKTsKK30K KwogI3ByYWdtYSBtYXJrIE1lc3NhZ2VzIGZyb20gVmlkZW9GdWxsc2NyZWVuTWFuYWdlclByb3h5 OgogCiB2b2lkIFZpZGVvRnVsbHNjcmVlbk1hbmFnZXI6OnJlcXVlc3RGdWxsc2NyZWVuTW9kZShQ bGF5YmFja1Nlc3Npb25Db250ZXh0SWRlbnRpZmllciBjb250ZXh0SWQsIFdlYkNvcmU6OkhUTUxN ZWRpYUVsZW1lbnRFbnVtczo6VmlkZW9GdWxsc2NyZWVuTW9kZSBtb2RlLCBib29sIGZpbmlzaGVk V2l0aE1lZGlhKQo= 450837 2022-02-03 16:55:09 -0800 2022-02-03 18:47:01 -0800 For landing bug-236090-20220203165508.patch text/plain 19102 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5MDU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTM2Mjk5NjM4NDQyZjk3 OGU0ZmExMzRjNzk2YWNlZWQzZGQwYzMxNy4uZmMwNDMxMTI0MjBmY2VlZjA3NWJjYmU4ZGU1YmRl YTUyZDNkMGQ1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDIyLTAyLTAzICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFRlYWNoIFZpZGVv RnVsbHNjcmVlbkludGVyZmFjZSB0byBrZWVwIHRyYWNrIG9mIGl0cyBjb3JyZXNwb25kaW5nIE1l ZGlhUGxheWVyJ3MgTWVkaWFQbGF5ZXJJZGVudGlmaWVyCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzYwOTAKKworICAgICAgICBSZXZpZXdlZCBieSBF cmljIENhcmxzb24uCisKKyAgICAgICAgQWRkIHBsdW1iaW5nIGZvciBhbiBvcHRpb25hbCBNZWRp YVBsYXllcklkZW50aWZpZXIgdGhyb3VnaCB0aGUgdmlkZW8gZnVsbHNjcmVlbiBtb2RlbC4gVGhp cyBpZGVudGlmaWVyIGlzCisgICAgICAgIGludmFsaWRhdGVkIHVwb24gYGxvYWRzdGFydGAsIGFu ZCB1cGRhdGVkIG9uY2Ugd2Ugb2JzZXJ2ZSBgbG9hZGVkbWV0YWRhdGFgLCB3aGljaCBlbnN1cmVz IHRoYXQgaWYgdGhlIG1lZGlhCisgICAgICAgIGVuZ2luZSAoYW5kIG1lZGlhIHBsYXllcikgY2hh bmdlcyBvdXQgZnJvbSB1bmRlcm5lYXRoIHRoZSB2aWRlbyBmdWxsc2NyZWVuIG1vZGVsLCB3ZSBz dGlsbCBrZWVwIHRoZSBuZXcgcGxheWVyCisgICAgICAgIElEIHVwIHRvIGRhdGUuCisKKyAgICAg ICAgU2VlIFdlYktpdC9DaGFuZ2VMb2cgZm9yIG1vcmUgZGV0YWlscy4KKworICAgICAgICAqIHBs YXRmb3JtL2NvY29hL1ZpZGVvRnVsbHNjcmVlbk1vZGVsLmg6CisgICAgICAgIChXZWJDb3JlOjpW aWRlb0Z1bGxzY3JlZW5Nb2RlbENsaWVudDo6c2V0UGxheWVySWRlbnRpZmllcik6CisgICAgICAg ICogcGxhdGZvcm0vY29jb2EvVmlkZW9GdWxsc2NyZWVuTW9kZWxWaWRlb0VsZW1lbnQuaDoKKyAg ICAgICAgKiBwbGF0Zm9ybS9jb2NvYS9WaWRlb0Z1bGxzY3JlZW5Nb2RlbFZpZGVvRWxlbWVudC5t bToKKyAgICAgICAgKFdlYkNvcmU6OlZpZGVvRnVsbHNjcmVlbk1vZGVsVmlkZW9FbGVtZW50Ojp1 cGRhdGVGb3JFdmVudE5hbWUpOgorICAgICAgICAoV2ViQ29yZTo6VmlkZW9GdWxsc2NyZWVuTW9k ZWxWaWRlb0VsZW1lbnQ6Om9ic2VydmVkRXZlbnROYW1lcyk6CisKKyAgICAgICAgQWRkaXRpb25h bGx5IGxpc3RlbiBmb3IgYGxvYWRzdGFydEV2ZW50YCBhbmQgYGxvYWRlZG1ldGFkYXRhRXZlbnRg IChzZWUgYWJvdmUpLgorCisgICAgICAgIChXZWJDb3JlOjpWaWRlb0Z1bGxzY3JlZW5Nb2RlbFZp ZGVvRWxlbWVudDo6c2V0UGxheWVySWRlbnRpZmllcik6CisgICAgICAgICogcGxhdGZvcm0vaW9z L1ZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lmg6CisgICAgICAgICogcGxhdGZvcm0vbWFj L1ZpZGVvRnVsbHNjcmVlbkludGVyZmFjZU1hYy5oOgorICAgICAgICAoV2ViQ29yZTo6VmlkZW9G dWxsc2NyZWVuSW50ZXJmYWNlTWFjOjpwbGF5ZXJJZGVudGlmaWVyIGNvbnN0KToKKwogMjAyMi0w Mi0wMyAgTWFyayBMYW0gIDxtYXJrLmxhbUBhcHBsZS5jb20+CiAKICAgICAgICAgRmxha3kgc2Nv cGUuYXNzZXJ0Tm9FeGNlcHRpb24oKSBhc3NlcnRpb24gaW4gfkpTRXhlY1N0YXRlIHdoZW4gcnVu bmluZyB3b3JrZXJzIFdQVCB0ZXN0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCA1YmQyZTAzZTRmNzcyMzVkMmI3Nzkz MTUzMWY3ZTI3ZTNjMmQxZGE1Li4wYmI5YzE5NDE3ZTkyNzM1YmQwNzgzZWExYjY2ZjEwMTQ1NGY1 NGM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIyLTAyLTAzICBXZW5zb24gSHNpZWgg IDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFRlYWNoIFZpZGVvRnVsbHNjcmVl bkludGVyZmFjZSB0byBrZWVwIHRyYWNrIG9mIGl0cyBjb3JyZXNwb25kaW5nIE1lZGlhUGxheWVy J3MgTWVkaWFQbGF5ZXJJZGVudGlmaWVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMzYwOTAKKworICAgICAgICBSZXZpZXdlZCBieSBFcmljIENhcmxz b24uCisKKyAgICAgICAgQWRkIGFuIElQQyBtZXNzYWdlIGJldHdlZW4gVmlkZW9GdWxsc2NyZWVu TWFuYWdlciBhbmQgVmlkZW9GdWxsc2NyZWVuTWFuYWdlclByb3h5IHRvIHVwZGF0ZSB0aGUgbWVk aWEgcGxheWVyIElECisgICAgICAgIGNvcnJlc3BvbmRpbmcgdG8gYSBnaXZlbiBQbGF5YmFja1Nl c3Npb25Db250ZXh0SWRlbnRpZmllci4gVGhpcyBpcyBzZW50IGlmIHRoZSB1bmRlcmx5aW5nIG1l ZGlhIHBsYXllciBjaGFuZ2VzCisgICAgICAgIChhbmQgc3Vic2VxdWVudGx5IGZpcmVzIGBsb2Fk c3RhcnRgIGFuZCBgbG9hZGVkbWV0YWRhdGFgIGV2ZW50cyksIGFuZCBhbHNvIHNlbnQgdXBvbiBl bnRlcmluZyBmdWxsc2NyZWVuIHZpZGVvLgorCisgICAgICAgIEluIGEgZnV0dXJlIHBhdGNoLCB0 aGlzIG1lY2hhbmlzbSB3aWxsIGJlIHVzZWQgdG8gdGVhY2ggVmlkZW9GdWxsc2NyZWVuTWFuYWdl clByb3h5IHRvIGdyYWIgYW4gaW1hZ2UgYml0bWFwIGZyb20KKyAgICAgICAgdGhlIEdQVSBwcm9j ZXNzIGZvciBhIGdpdmVuIFBsYXliYWNrU2Vzc2lvbkNvbnRleHRJZGVudGlmaWVyLgorCisgICAg ICAgICogVUlQcm9jZXNzL0NvY29hL1ZpZGVvRnVsbHNjcmVlbk1hbmFnZXJQcm94eS5oOgorICAg ICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9WaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyUHJveHkubWVzc2Fn ZXMuaW46CisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL1ZpZGVvRnVsbHNjcmVlbk1hbmFnZXJQ cm94eS5tbToKKyAgICAgICAgKFdlYktpdDo6VmlkZW9GdWxsc2NyZWVuTWFuYWdlclByb3h5Ojpz ZXRQbGF5ZXJJZGVudGlmaWVyKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL2NvY29hL1ZpZGVvRnVs bHNjcmVlbk1hbmFnZXIuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL2NvY29hL1ZpZGVvRnVsbHNj cmVlbk1hbmFnZXIubW06CisgICAgICAgIChXZWJLaXQ6OlZpZGVvRnVsbHNjcmVlbkludGVyZmFj ZUNvbnRleHQ6OnNldFBsYXllcklkZW50aWZpZXIpOgorICAgICAgICAoV2ViS2l0OjpWaWRlb0Z1 bGxzY3JlZW5NYW5hZ2VyOjplbnRlclZpZGVvRnVsbHNjcmVlbkZvclZpZGVvRWxlbWVudCk6Cisg ICAgICAgIChXZWJLaXQ6OlZpZGVvRnVsbHNjcmVlbk1hbmFnZXI6OnNldFBsYXllcklkZW50aWZp ZXIpOgorCiAyMDIyLTAyLTAzICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29t PgogCiAgICAgICAgIEFkZCBwbHVtYmluZyB0byBpbmZvcm0gV2ViUGFnZVByb3h5IHdoZW4gdmlk ZW9zIHBsYXksIHBhdXNlLCBzZWVrLCBhbmQgZW50ZXIgb3IgZXhpdCBmdWxsc2NyZWVuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9WaWRlb0Z1bGxzY3JlZW5Nb2Rl bC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY29jb2EvVmlkZW9GdWxsc2NyZWVuTW9kZWwu aAppbmRleCBmODFjMjgxMTJiMzFjYmVhNDVlNThhNmFhYmViNmRmZDRkODhkN2U2Li41NDQ3YTEz N2VjZDAxZjg2MThjMTYzMWU2MWM3Mzk1MWI4MWIxN2Y0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9jb2NvYS9WaWRlb0Z1bGxzY3JlZW5Nb2RlbC5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2NvY29hL1ZpZGVvRnVsbHNjcmVlbk1vZGVsLmgKQEAgLTMyLDYgKzMy LDcgQEAKICNpbmNsdWRlICJGbG9hdFJlY3QuaCIKICNpbmNsdWRlICJIVE1MTWVkaWFFbGVtZW50 RW51bXMuaCIKICNpbmNsdWRlICJNZWRpYVBsYXllckVudW1zLmgiCisjaW5jbHVkZSAiTWVkaWFQ bGF5ZXJJZGVudGlmaWVyLmgiCiAjaW5jbHVkZSAiUGxheWJhY2tTZXNzaW9uTW9kZWwuaCIKICNp bmNsdWRlIDx3dGYvQ29tcGxldGlvbkhhbmRsZXIuaD4KICNpbmNsdWRlIDx3dGYvV2Vha1B0ci5o PgpAQCAtODQsNiArODUsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHdpbGxFeGl0UGlj dHVyZUluUGljdHVyZSgpIHsgfQogICAgIHZpcnR1YWwgdm9pZCBkaWRFeGl0UGljdHVyZUluUGlj dHVyZSgpIHsgfQogICAgIHZpcnR1YWwgdm9pZCBtb2RlbERlc3Ryb3llZCgpIHsgfQorICAgIHZp cnR1YWwgdm9pZCBzZXRQbGF5ZXJJZGVudGlmaWVyKHN0ZDo6b3B0aW9uYWw8TWVkaWFQbGF5ZXJJ ZGVudGlmaWVyPikgeyB9CiB9OwogICAgIAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vY29jb2EvVmlkZW9GdWxsc2NyZWVuTW9kZWxWaWRlb0VsZW1lbnQuaCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL1ZpZGVvRnVsbHNjcmVlbk1vZGVsVmlkZW9FbGVtZW50 LmgKaW5kZXggNzdkMTU3ZTM2MzI3NmU2ZjFmYTk1MWU4YTJlNzQwZmFmOTJlNTc4Ny4uMzU4ZWQ5 OWYwMmI0YmM5MGY0MmI5MGQ3NTQzMDY0ZDViMmQxY2U4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vY29jb2EvVmlkZW9GdWxsc2NyZWVuTW9kZWxWaWRlb0VsZW1lbnQuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9WaWRlb0Z1bGxzY3JlZW5Nb2RlbFZp ZGVvRWxlbWVudC5oCkBAIC0zMiw2ICszMiw3IEBACiAjaW5jbHVkZSAiRmxvYXRSZWN0LmgiCiAj aW5jbHVkZSAiSFRNTE1lZGlhRWxlbWVudEVudW1zLmgiCiAjaW5jbHVkZSAiTWVkaWFQbGF5ZXJF bnVtcy5oIgorI2luY2x1ZGUgIk1lZGlhUGxheWVySWRlbnRpZmllci5oIgogI2luY2x1ZGUgIlBs YXRmb3JtTGF5ZXIuaCIKICNpbmNsdWRlICJWaWRlb0Z1bGxzY3JlZW5Nb2RlbC5oIgogI2luY2x1 ZGUgPHd0Zi9GdW5jdGlvbi5oPgpAQCAtODEsNiArODIsNyBAQCBwcm90ZWN0ZWQ6CiBwcml2YXRl OgogICAgIHZvaWQgc2V0SGFzVmlkZW8oYm9vbCk7CiAgICAgdm9pZCBzZXRWaWRlb0RpbWVuc2lv bnMoY29uc3QgRmxvYXRTaXplJik7CisgICAgdm9pZCBzZXRQbGF5ZXJJZGVudGlmaWVyKHN0ZDo6 b3B0aW9uYWw8TWVkaWFQbGF5ZXJJZGVudGlmaWVyPik7CiAKICAgICB2b2lkIHdpbGxFbnRlclBp Y3R1cmVJblBpY3R1cmUoKSBvdmVycmlkZTsKICAgICB2b2lkIGRpZEVudGVyUGljdHVyZUluUGlj dHVyZSgpIG92ZXJyaWRlOwpAQCAtMTAwLDYgKzEwMiw3IEBAIHByaXZhdGU6CiAgICAgRmxvYXRS ZWN0IG1fdmlkZW9GcmFtZTsKICAgICBWZWN0b3I8UmVmUHRyPFRleHRUcmFjaz4+IG1fbGVnaWJs ZVRyYWNrc0Zvck1lbnU7CiAgICAgVmVjdG9yPFJlZlB0cjxBdWRpb1RyYWNrPj4gbV9hdWRpb1Ry YWNrc0Zvck1lbnU7CisgICAgc3RkOjpvcHRpb25hbDxNZWRpYVBsYXllcklkZW50aWZpZXI+IG1f cGxheWVySWRlbnRpZmllcjsKIH07CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2NvY29hL1ZpZGVvRnVsbHNjcmVlbk1vZGVsVmlkZW9FbGVtZW50Lm1tIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vY29jb2EvVmlkZW9GdWxsc2NyZWVuTW9kZWxWaWRlb0VsZW1lbnQu bW0KaW5kZXggNmI1ZTFkZDM1ODcyYmEwM2JmNWExZWIxODc3NWQyMDU5YjE0ZTdlNC4uMTk3NDFm NjJmNmI2NmExYmUwNzc3ZGVlNmEzYWEzOWRiMDI4MGVkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vY29jb2EvVmlkZW9GdWxsc2NyZWVuTW9kZWxWaWRlb0VsZW1lbnQubW0K KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY29jb2EvVmlkZW9GdWxsc2NyZWVuTW9kZWxW aWRlb0VsZW1lbnQubW0KQEAgLTEwMyw2ICsxMDMsMjYgQEAgdm9pZCBWaWRlb0Z1bGxzY3JlZW5N b2RlbFZpZGVvRWxlbWVudDo6dXBkYXRlRm9yRXZlbnROYW1lKGNvbnN0IFdURjo6QXRvbVN0cmlu ZyYKICAgICAgICAgc2V0SGFzVmlkZW8obV92aWRlb0VsZW1lbnQpOwogICAgICAgICBzZXRWaWRl b0RpbWVuc2lvbnMobV92aWRlb0VsZW1lbnQgPyBGbG9hdFNpemUobV92aWRlb0VsZW1lbnQtPnZp ZGVvV2lkdGgoKSwgbV92aWRlb0VsZW1lbnQtPnZpZGVvSGVpZ2h0KCkpIDogRmxvYXRTaXplKCkp OwogICAgIH0KKworICAgIGlmIChhbGwKKyAgICAgICAgfHwgZXZlbnROYW1lID09IGV2ZW50TmFt ZXMoKS5sb2FkZWRtZXRhZGF0YUV2ZW50IHx8IGV2ZW50TmFtZSA9PSBldmVudE5hbWVzKCkubG9h ZHN0YXJ0RXZlbnQpIHsKKyAgICAgICAgc2V0UGxheWVySWRlbnRpZmllcihbJl0oKSAtPiBzdGQ6 Om9wdGlvbmFsPE1lZGlhUGxheWVySWRlbnRpZmllcj4geworICAgICAgICAgICAgaWYgKGV2ZW50 TmFtZSA9PSBldmVudE5hbWVzKCkubG9hZHN0YXJ0RXZlbnQpCisgICAgICAgICAgICAgICAgcmV0 dXJuIHN0ZDo6bnVsbG9wdDsKKworICAgICAgICAgICAgaWYgKCFtX3ZpZGVvRWxlbWVudCkKKyAg ICAgICAgICAgICAgICByZXR1cm4gc3RkOjpudWxsb3B0OworCisgICAgICAgICAgICBhdXRvIHBs YXllciA9IG1fdmlkZW9FbGVtZW50LT5wbGF5ZXIoKTsKKyAgICAgICAgICAgIGlmICghcGxheWVy KQorICAgICAgICAgICAgICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7CisKKyAgICAgICAgICAgIGlm IChhdXRvIGlkZW50aWZpZXIgPSBwbGF5ZXItPmlkZW50aWZpZXIoKSkKKyAgICAgICAgICAgICAg ICByZXR1cm4gaWRlbnRpZmllcjsKKworICAgICAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsK KyAgICAgICAgfSgpKTsKKyAgICB9CiB9CiAKIHZvaWQgVmlkZW9GdWxsc2NyZWVuTW9kZWxWaWRl b0VsZW1lbnQ6OndpbGxFeGl0RnVsbHNjcmVlbigpCkBAIC0xODAsNyArMjAwLDcgQEAgdm9pZCBW aWRlb0Z1bGxzY3JlZW5Nb2RlbFZpZGVvRWxlbWVudDo6c2V0VmlkZW9MYXllckdyYXZpdHkoTWVk aWFQbGF5ZXI6OlZpZGVvR3IKIAogU3Bhbjxjb25zdCBBdG9tU3RyaW5nPiBWaWRlb0Z1bGxzY3Jl ZW5Nb2RlbFZpZGVvRWxlbWVudDo6b2JzZXJ2ZWRFdmVudE5hbWVzKCkKIHsKLSAgICBzdGF0aWMg TmV2ZXJEZXN0cm95ZWQgbmFtZXMgPSBzdGQ6OmFycmF5IHsgZXZlbnROYW1lcygpLnJlc2l6ZUV2 ZW50IH07CisgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkIG5hbWVzID0gc3RkOjphcnJheSB7IGV2 ZW50TmFtZXMoKS5yZXNpemVFdmVudCwgZXZlbnROYW1lcygpLmxvYWRzdGFydEV2ZW50LCBldmVu dE5hbWVzKCkubG9hZGVkbWV0YWRhdGFFdmVudCB9OwogICAgIHJldHVybiBuYW1lcy5nZXQoKTsK IH0KIApAQCAtMjM4LDYgKzI1OCwxNyBAQCB2b2lkIFZpZGVvRnVsbHNjcmVlbk1vZGVsVmlkZW9F bGVtZW50OjpzZXRWaWRlb0RpbWVuc2lvbnMoY29uc3QgRmxvYXRTaXplJiB2aWRlbwogICAgICAg ICBjbGllbnQtPnZpZGVvRGltZW5zaW9uc0NoYW5nZWQobV92aWRlb0RpbWVuc2lvbnMpOwogfQog Cit2b2lkIFZpZGVvRnVsbHNjcmVlbk1vZGVsVmlkZW9FbGVtZW50OjpzZXRQbGF5ZXJJZGVudGlm aWVyKHN0ZDo6b3B0aW9uYWw8TWVkaWFQbGF5ZXJJZGVudGlmaWVyPiBpZGVudGlmaWVyKQorewor ICAgIGlmIChtX3BsYXllcklkZW50aWZpZXIgPT0gaWRlbnRpZmllcikKKyAgICAgICAgcmV0dXJu OworCisgICAgbV9wbGF5ZXJJZGVudGlmaWVyID0gaWRlbnRpZmllcjsKKworICAgIGZvciAoYXV0 byogY2xpZW50IDogY29weVRvVmVjdG9yKG1fY2xpZW50cykpCisgICAgICAgIGNsaWVudC0+c2V0 UGxheWVySWRlbnRpZmllcihpZGVudGlmaWVyKTsKK30KKwogdm9pZCBWaWRlb0Z1bGxzY3JlZW5N b2RlbFZpZGVvRWxlbWVudDo6d2lsbEVudGVyUGljdHVyZUluUGljdHVyZSgpCiB7CiAgICAgZm9y IChhdXRvJiBjbGllbnQgOiBjb3B5VG9WZWN0b3IobV9jbGllbnRzKSkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9WaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5o IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1ZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFW S2l0LmgKaW5kZXggY2ExNGU3YWIxZmNmZjZmOWJiMWM0MWJhOTYyZDU0ODkxZGM1NzdlMC4uOGEx NmE3ZjcxYjE1YTkyZDYzYThjODJmYTJlYmY1NDA0OTQzNjA4MyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vaW9zL1ZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0LmgKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1ZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUFW S2l0LmgKQEAgLTMwLDYgKzMwLDcgQEAKIAogI2luY2x1ZGUgIkV2ZW50TGlzdGVuZXIuaCIKICNp bmNsdWRlICJIVE1MTWVkaWFFbGVtZW50RW51bXMuaCIKKyNpbmNsdWRlICJNZWRpYVBsYXllcklk ZW50aWZpZXIuaCIKICNpbmNsdWRlICJQbGF0Zm9ybUxheWVyLmgiCiAjaW5jbHVkZSAiUGxheWJh Y2tTZXNzaW9uSW50ZXJmYWNlQVZLaXQuaCIKICNpbmNsdWRlICJWaWRlb0Z1bGxzY3JlZW5Nb2Rl bC5oIgpAQCAtNzYsNiArNzcsNyBAQCBwdWJsaWM6CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBo YXNWaWRlb0NoYW5nZWQoYm9vbCkgZmluYWw7CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCB2aWRl b0RpbWVuc2lvbnNDaGFuZ2VkKGNvbnN0IEZsb2F0U2l6ZSYpIGZpbmFsOwogICAgIFdFQkNPUkVf RVhQT1JUIHZvaWQgbW9kZWxEZXN0cm95ZWQoKSBmaW5hbDsKKyAgICB2b2lkIHNldFBsYXllcklk ZW50aWZpZXIoc3RkOjpvcHRpb25hbDxNZWRpYVBsYXllcklkZW50aWZpZXI+IGlkZW50aWZpZXIp IGZpbmFsIHsgbV9wbGF5ZXJJZGVudGlmaWVyID0gaWRlbnRpZmllcjsgfQogCiAgICAgLy8gUGxh eWJhY2tTZXNzaW9uTW9kZWxDbGllbnQKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIGV4dGVybmFs UGxheWJhY2tDaGFuZ2VkKGJvb2wgZW5hYmxlZCwgUGxheWJhY2tTZXNzaW9uTW9kZWw6OkV4dGVy bmFsUGxheWJhY2tUYXJnZXRUeXBlLCBjb25zdCBTdHJpbmcmIGxvY2FsaXplZERldmljZU5hbWUp IGZpbmFsOwpAQCAtMTU5LDYgKzE2MSw4IEBAIHB1YmxpYzoKICAgICBXZWJBVlBsYXllckxheWVy VmlldyogcGxheWVyTGF5ZXJWaWV3KCkgY29uc3QgeyByZXR1cm4gbV9wbGF5ZXJMYXllclZpZXcu Z2V0KCk7IH0KICAgICBXRUJDT1JFX0VYUE9SVCBib29sIHBpY3R1cmVJblBpY3R1cmVXYXNTdGFy dGVkV2hlbkVudGVyaW5nQmFja2dyb3VuZCgpIGNvbnN0OwogCisgICAgc3RkOjpvcHRpb25hbDxN ZWRpYVBsYXllcklkZW50aWZpZXI+IHBsYXllcklkZW50aWZpZXIoKSBjb25zdCB7IHJldHVybiBt X3BsYXllcklkZW50aWZpZXI7IH0KKwogcHJvdGVjdGVkOgogICAgIFdFQkNPUkVfRVhQT1JUIFZp ZGVvRnVsbHNjcmVlbkludGVyZmFjZUFWS2l0KFBsYXliYWNrU2Vzc2lvbkludGVyZmFjZUFWS2l0 Jik7CiAKQEAgLTE3MSw2ICsxNzUsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgV2ViQVZQbGF5ZXJDb250 cm9sbGVyICpwbGF5ZXJDb250cm9sbGVyKCkgY29uc3Q7CiAKICAgICBSZWY8UGxheWJhY2tTZXNz aW9uSW50ZXJmYWNlQVZLaXQ+IG1fcGxheWJhY2tTZXNzaW9uSW50ZXJmYWNlOworICAgIHN0ZDo6 b3B0aW9uYWw8TWVkaWFQbGF5ZXJJZGVudGlmaWVyPiBtX3BsYXllcklkZW50aWZpZXI7CiAgICAg UmV0YWluUHRyPFdlYkFWUGxheWVyVmlld0NvbnRyb2xsZXJEZWxlZ2F0ZT4gbV9wbGF5ZXJWaWV3 Q29udHJvbGxlckRlbGVnYXRlOwogICAgIFJldGFpblB0cjxXZWJBVlBsYXllclZpZXdDb250cm9s bGVyPiBtX3BsYXllclZpZXdDb250cm9sbGVyOwogICAgIFZpZGVvRnVsbHNjcmVlbk1vZGVsKiBt X3ZpZGVvRnVsbHNjcmVlbk1vZGVsIHsgbnVsbHB0ciB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbWFjL1ZpZGVvRnVsbHNjcmVlbkludGVyZmFjZU1hYy5oIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbWFjL1ZpZGVvRnVsbHNjcmVlbkludGVyZmFjZU1hYy5oCmluZGV4 IDg2ZTA0YmIyNmExNTQ0M2IzNzMxMGI0ZDkzZDJkMDQ3YmEwZmEwNzguLjA3OGYyNTVmYmYzZjQy OTI1MzNiYjkzNGQzOGI2NTQzNTZhOTY1ZTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL21hYy9WaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VNYWMuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9tYWMvVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlTWFjLmgKQEAgLTI4LDYg KzI4LDcgQEAKICNpZiBQTEFURk9STShNQUMpICYmIEVOQUJMRShWSURFT19QUkVTRU5UQVRJT05f TU9ERSkKIAogI2luY2x1ZGUgIkhUTUxNZWRpYUVsZW1lbnRFbnVtcy5oIgorI2luY2x1ZGUgIk1l ZGlhUGxheWVySWRlbnRpZmllci5oIgogI2luY2x1ZGUgIlBsYXliYWNrU2Vzc2lvbkludGVyZmFj ZU1hYy5oIgogI2luY2x1ZGUgIlBsYXliYWNrU2Vzc2lvbk1vZGVsLmgiCiAjaW5jbHVkZSAiVmlk ZW9GdWxsc2NyZWVuTW9kZWwuaCIKQEAgLTcwLDYgKzcxLDcgQEAgcHVibGljOgogICAgIC8vIFZp ZGVvRnVsbHNjcmVlbk1vZGVsQ2xpZW50CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBoYXNWaWRl b0NoYW5nZWQoYm9vbCkgZmluYWw7CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCB2aWRlb0RpbWVu c2lvbnNDaGFuZ2VkKGNvbnN0IEZsb2F0U2l6ZSYpIGZpbmFsOworICAgIHZvaWQgc2V0UGxheWVy SWRlbnRpZmllcihzdGQ6Om9wdGlvbmFsPE1lZGlhUGxheWVySWRlbnRpZmllcj4gaWRlbnRpZmll cikgZmluYWwgeyBtX3BsYXllcklkZW50aWZpZXIgPSBpZGVudGlmaWVyOyB9CiAKICAgICBXRUJD T1JFX0VYUE9SVCB2b2lkIHNldHVwRnVsbHNjcmVlbihOU1ZpZXcmIGxheWVySG9zdGVkVmlldywg Y29uc3QgSW50UmVjdCYgaW5pdGlhbFJlY3QsIE5TV2luZG93ICpwYXJlbnRXaW5kb3csIEhUTUxN ZWRpYUVsZW1lbnRFbnVtczo6VmlkZW9GdWxsc2NyZWVuTW9kZSwgYm9vbCBhbGxvd3NQaWN0dXJl SW5QaWN0dXJlUGxheWJhY2spOwogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgZW50ZXJGdWxsc2Ny ZWVuKCk7CkBAIC05Niw5ICs5OCwxMiBAQCBwdWJsaWM6CiAKICAgICBXRUJDT1JFX0VYUE9SVCB2 b2lkIHJlcXVlc3RIaWRlQW5kRXhpdFBpUCgpOwogCisgICAgc3RkOjpvcHRpb25hbDxNZWRpYVBs YXllcklkZW50aWZpZXI+IHBsYXllcklkZW50aWZpZXIoKSBjb25zdCB7IHJldHVybiBtX3BsYXll cklkZW50aWZpZXI7IH0KKwogcHJpdmF0ZToKICAgICBXRUJDT1JFX0VYUE9SVCBWaWRlb0Z1bGxz Y3JlZW5JbnRlcmZhY2VNYWMoUGxheWJhY2tTZXNzaW9uSW50ZXJmYWNlTWFjJik7CiAgICAgUmVm PFBsYXliYWNrU2Vzc2lvbkludGVyZmFjZU1hYz4gbV9wbGF5YmFja1Nlc3Npb25JbnRlcmZhY2U7 CisgICAgc3RkOjpvcHRpb25hbDxNZWRpYVBsYXllcklkZW50aWZpZXI+IG1fcGxheWVySWRlbnRp ZmllcjsKICAgICBXZWFrUHRyPFZpZGVvRnVsbHNjcmVlbk1vZGVsPiBtX3ZpZGVvRnVsbHNjcmVl bk1vZGVsOwogICAgIFdlYWtQdHI8VmlkZW9GdWxsc2NyZWVuQ2hhbmdlT2JzZXJ2ZXI+IG1fZnVs bHNjcmVlbkNoYW5nZU9ic2VydmVyOwogICAgIEhUTUxNZWRpYUVsZW1lbnRFbnVtczo6VmlkZW9G dWxsc2NyZWVuTW9kZSBtX21vZGUgeyBIVE1MTWVkaWFFbGVtZW50RW51bXM6OlZpZGVvRnVsbHNj cmVlbk1vZGVOb25lIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2Nv YS9WaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0NvY29hL1ZpZGVvRnVsbHNjcmVlbk1hbmFnZXJQcm94eS5oCmluZGV4IDRkN2QyYjlkMjdmYTUw Y2U2NDE1MjNmMmFjNjUxMGYwZDFiMDUwYjIuLjllNWJhYTllY2JhZWYwNjI2Y2JjNTkxMjI0Mjgx NDRlOWNjNTQ5ZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1Zp ZGVvRnVsbHNjcmVlbk1hbmFnZXJQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0NvY29hL1ZpZGVvRnVsbHNjcmVlbk1hbmFnZXJQcm94eS5oCkBAIC0zMiw2ICszMiw3IEBACiAj aW5jbHVkZSAiUGxheWJhY2tTZXNzaW9uQ29udGV4dElkZW50aWZpZXIuaCIKICNpbmNsdWRlIDxX ZWJDb3JlL0F1ZGlvU2Vzc2lvbi5oPgogI2luY2x1ZGUgPFdlYkNvcmUvR3JhcGhpY3NMYXllci5o PgorI2luY2x1ZGUgPFdlYkNvcmUvTWVkaWFQbGF5ZXJJZGVudGlmaWVyLmg+CiAjaW5jbHVkZSA8 V2ViQ29yZS9QbGF0Zm9ybVZpZXcuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1ZpZGVvRnVsbHNjcmVl bkNoYW5nZU9ic2VydmVyLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9WaWRlb0Z1bGxzY3JlZW5Nb2Rl bC5oPgpAQCAtMTgwLDYgKzE4MSw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBwcmVwYXJlZFRvUmV0 dXJuVG9JbmxpbmUoUGxheWJhY2tTZXNzaW9uQ29udGV4dElkZW50aWZpZXIsIGJvb2wgdmlzaWJs ZSwgV2ViQ29yZTo6RmxvYXRSZWN0IGlubGluZVJlY3QpOwogICAgIHZvaWQgcHJlcGFyZWRUb0V4 aXRGdWxsc2NyZWVuKFBsYXliYWNrU2Vzc2lvbkNvbnRleHRJZGVudGlmaWVyKTsKICAgICB2b2lk IGV4aXRGdWxsc2NyZWVuV2l0aG91dEFuaW1hdGlvblRvTW9kZShQbGF5YmFja1Nlc3Npb25Db250 ZXh0SWRlbnRpZmllciwgV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudEVudW1zOjpWaWRlb0Z1bGxz Y3JlZW5Nb2RlKTsKKyAgICB2b2lkIHNldFBsYXllcklkZW50aWZpZXIoUGxheWJhY2tTZXNzaW9u Q29udGV4dElkZW50aWZpZXIsIHN0ZDo6b3B0aW9uYWw8V2ViQ29yZTo6TWVkaWFQbGF5ZXJJZGVu dGlmaWVyPik7CiAKICAgICAvLyBNZXNzYWdlcyB0byBWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyCiAg ICAgdm9pZCByZXF1ZXN0RnVsbHNjcmVlbk1vZGUoUGxheWJhY2tTZXNzaW9uQ29udGV4dElkZW50 aWZpZXIsIFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnRFbnVtczo6VmlkZW9GdWxsc2NyZWVuTW9k ZSwgYm9vbCBmaW5pc2hlZFdpdGhNZWRpYSA9IGZhbHNlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0NvY29hL1ZpZGVvRnVsbHNjcmVlbk1hbmFnZXJQcm94eS5tZXNzYWdl cy5pbiBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1ZpZGVvRnVsbHNjcmVlbk1hbmFn ZXJQcm94eS5tZXNzYWdlcy5pbgppbmRleCBkZGY4NTA2NDQ2ODNiZDI2YTJmYjFiMjVmMWU1MTE3 YjJlNzVhYWMyLi40ZjEzOTZiZWNmNTNiN2RkYjE5Mzk0ZGQzZWZkMjRmMjg2ODM0MTlhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9WaWRlb0Z1bGxzY3JlZW5NYW5h Z2VyUHJveHkubWVzc2FnZXMuaW4KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2Ev VmlkZW9GdWxsc2NyZWVuTWFuYWdlclByb3h5Lm1lc3NhZ2VzLmluCkBAIC0yNSw2ICsyNSw3IEBA IG1lc3NhZ2VzIC0+IFZpZGVvRnVsbHNjcmVlbk1hbmFnZXJQcm94eSB7CiAgICAgU2V0SGFzVmlk ZW8oV2ViS2l0OjpQbGF5YmFja1Nlc3Npb25Db250ZXh0SWRlbnRpZmllciBjb250ZXh0SWQsIGJv b2wgaGFzVmlkZW8pCiAgICAgU2V0VmlkZW9EaW1lbnNpb25zKFdlYktpdDo6UGxheWJhY2tTZXNz aW9uQ29udGV4dElkZW50aWZpZXIgY29udGV4dElkLCBXZWJDb3JlOjpGbG9hdFNpemUgdmlkZW9E aW1lbnNpb25zKQogICAgIFNldHVwRnVsbHNjcmVlbldpdGhJRChXZWJLaXQ6OlBsYXliYWNrU2Vz c2lvbkNvbnRleHRJZGVudGlmaWVyIGNvbnRleHRJZCwgV2ViS2l0OjpMYXllckhvc3RpbmdDb250 ZXh0SUQgdmlkZW9MYXllcklELCBXZWJDb3JlOjpGbG9hdFJlY3QgaW5pdGlhbFJlY3QsIFdlYkNv cmU6OkZsb2F0U2l6ZSB2aWRlb0RpbWVuc2lvbnMsIGZsb2F0IGhvc3RpbmdTY2FsZUZhY3Rvciwg V2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudEVudW1zOjpWaWRlb0Z1bGxzY3JlZW5Nb2RlIHZpZGVv RnVsbHNjcmVlbk1vZGUsIGJvb2wgYWxsb3dzUGljdHVyZUluUGljdHVyZSwgYm9vbCBzdGFuZGJ5 LCBib29sIGJsb2Nrc1JldHVyblRvRnVsbHNjcmVlbkZyb21QaWN0dXJlSW5QaWN0dXJlKQorICAg IFNldFBsYXllcklkZW50aWZpZXIoV2ViS2l0OjpQbGF5YmFja1Nlc3Npb25Db250ZXh0SWRlbnRp ZmllciBjb250ZXh0SWQsIHN0ZDo6b3B0aW9uYWw8V2ViQ29yZTo6TWVkaWFQbGF5ZXJJZGVudGlm aWVyPiBwbGF5ZXJJZGVudGlmaWVyKQogI2lmICFQTEFURk9STShJT1NfRkFNSUxZKQogICAgIEVu dGVyRnVsbHNjcmVlbihXZWJLaXQ6OlBsYXliYWNrU2Vzc2lvbkNvbnRleHRJZGVudGlmaWVyIGNv bnRleHRJZCkKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29j b2EvVmlkZW9GdWxsc2NyZWVuTWFuYWdlclByb3h5Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQ29jb2EvVmlkZW9GdWxsc2NyZWVuTWFuYWdlclByb3h5Lm1tCmluZGV4IGVhYjEzNzQyMzY2 NTY4NjQwMTFiODFlZTVhMWZhY2M3NDQ0OGY4YTEuLjU0YTFhYjBkODVkY2U1OGI0NGZlM2U0MTNi MzEwNDk4YTRmZWY2ODcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29h L1ZpZGVvRnVsbHNjcmVlbk1hbmFnZXJQcm94eS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9Db2NvYS9WaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyUHJveHkubW0KQEAgLTU3MSw2ICs1NzEs MTUgQEAgdm9pZCBWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyUHJveHk6OnNldHVwRnVsbHNjcmVlbldp dGhJRChQbGF5YmFja1Nlc3Npb25Db250ZXh0SWQKICNlbmRpZgogfQogCit2b2lkIFZpZGVvRnVs bHNjcmVlbk1hbmFnZXJQcm94eTo6c2V0UGxheWVySWRlbnRpZmllcihQbGF5YmFja1Nlc3Npb25D b250ZXh0SWRlbnRpZmllciBjb250ZXh0SWQsIHN0ZDo6b3B0aW9uYWw8TWVkaWFQbGF5ZXJJZGVu dGlmaWVyPiBwbGF5ZXJJZGVudGlmaWVyKQoreworICAgIGlmIChtX21vY2tWaWRlb1ByZXNlbnRh dGlvbk1vZGVFbmFibGVkKQorICAgICAgICByZXR1cm47CisKKyAgICBpZiAoYXV0byogaW50ZXJm YWNlID0gZmluZEludGVyZmFjZShjb250ZXh0SWQpKQorICAgICAgICBpbnRlcmZhY2UtPnNldFBs YXllcklkZW50aWZpZXIocGxheWVySWRlbnRpZmllcik7Cit9CisKIHZvaWQgVmlkZW9GdWxsc2Ny ZWVuTWFuYWdlclByb3h5OjpzZXRIYXNWaWRlbyhQbGF5YmFja1Nlc3Npb25Db250ZXh0SWRlbnRp ZmllciBjb250ZXh0SWQsIGJvb2wgaGFzVmlkZW8pCiB7CiAgICAgaWYgKG1fbW9ja1ZpZGVvUHJl c2VudGF0aW9uTW9kZUVuYWJsZWQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvY29jb2EvVmlkZW9GdWxsc2NyZWVuTWFuYWdlci5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL2NvY29hL1ZpZGVvRnVsbHNjcmVlbk1hbmFnZXIuaAppbmRleCAwMzhmM2Y4YjA3NzgwOWZm ZmJiMzAzMjIxYzQ4ZGY4M2FiMjBkNjY5Li5lMzUwMmJhOGQwM2Q4ZThmYjIxZWIwODFkMWVkOTg0 ZjViNzA1ZjJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvVmlk ZW9GdWxsc2NyZWVuTWFuYWdlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2Nv YS9WaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyLmgKQEAgLTk4LDYgKzk4LDcgQEAgcHJpdmF0ZToKICAg ICAvLyBWaWRlb0Z1bGxzY3JlZW5Nb2RlbENsaWVudAogICAgIHZvaWQgaGFzVmlkZW9DaGFuZ2Vk KGJvb2wpIG92ZXJyaWRlOwogICAgIHZvaWQgdmlkZW9EaW1lbnNpb25zQ2hhbmdlZChjb25zdCBX ZWJDb3JlOjpGbG9hdFNpemUmKSBvdmVycmlkZTsKKyAgICB2b2lkIHNldFBsYXllcklkZW50aWZp ZXIoc3RkOjpvcHRpb25hbDxXZWJDb3JlOjpNZWRpYVBsYXllcklkZW50aWZpZXI+KSBmaW5hbDsK IAogICAgIFZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUNvbnRleHQoVmlkZW9GdWxsc2NyZWVuTWFu YWdlciYsIFBsYXliYWNrU2Vzc2lvbkNvbnRleHRJZGVudGlmaWVyKTsKIApAQCAtMTQ2LDYgKzE0 Nyw3IEBAIHByb3RlY3RlZDoKICAgICAvLyBJbnRlcmZhY2UgdG8gVmlkZW9GdWxsc2NyZWVuSW50 ZXJmYWNlQ29udGV4dAogICAgIHZvaWQgaGFzVmlkZW9DaGFuZ2VkKFBsYXliYWNrU2Vzc2lvbkNv bnRleHRJZGVudGlmaWVyLCBib29sIGhhc1ZpZGVvKTsKICAgICB2b2lkIHZpZGVvRGltZW5zaW9u c0NoYW5nZWQoUGxheWJhY2tTZXNzaW9uQ29udGV4dElkZW50aWZpZXIsIGNvbnN0IFdlYkNvcmU6 OkZsb2F0U2l6ZSYpOworICAgIHZvaWQgc2V0UGxheWVySWRlbnRpZmllcihQbGF5YmFja1Nlc3Np b25Db250ZXh0SWRlbnRpZmllciwgc3RkOjpvcHRpb25hbDxXZWJDb3JlOjpNZWRpYVBsYXllcklk ZW50aWZpZXI+KTsKIAogICAgIC8vIE1lc3NhZ2VzIGZyb20gVmlkZW9GdWxsc2NyZWVuTWFuYWdl clByb3h5CiAgICAgdm9pZCByZXF1ZXN0RnVsbHNjcmVlbk1vZGUoUGxheWJhY2tTZXNzaW9uQ29u dGV4dElkZW50aWZpZXIsIFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnRFbnVtczo6VmlkZW9GdWxs c2NyZWVuTW9kZSwgYm9vbCBmaW5pc2hlZFdpdGhNZWRpYSk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvVmlkZW9GdWxsc2NyZWVuTWFuYWdlci5tbSBiL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9WaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyLm1tCmluZGV4 IDQyYmU4Y2VhNTI1MGZhZmZlYjc4ZTAxMWE2N2E0ZWZjMGRhNTRhNzcuLjBhYTA1YjBmMjllMzEz NDdhODhkNDQ4NTAzMzhjNGRiNzYxZGNjZTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9jb2NvYS9WaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyLm1tCisrKyBiL1NvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9jb2NvYS9WaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyLm1tCkBAIC0xMTAsNiAr MTEwLDEyIEBAIHZvaWQgVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQ29udGV4dDo6dmlkZW9EaW1l bnNpb25zQ2hhbmdlZChjb25zdCBGbG9hdFNpemUmIHZpCiAgICAgICAgIG1fbWFuYWdlci0+dmlk ZW9EaW1lbnNpb25zQ2hhbmdlZChtX2NvbnRleHRJZCwgdmlkZW9EaW1lbnNpb25zKTsKIH0KIAor dm9pZCBWaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VDb250ZXh0OjpzZXRQbGF5ZXJJZGVudGlmaWVy KHN0ZDo6b3B0aW9uYWw8TWVkaWFQbGF5ZXJJZGVudGlmaWVyPiBpZGVudGlmaWVyKQoreworICAg IGlmIChtX21hbmFnZXIpCisgICAgICAgIG1fbWFuYWdlci0+c2V0UGxheWVySWRlbnRpZmllciht X2NvbnRleHRJZCwgaWRlbnRpZmllcik7Cit9CisKICNwcmFnbWEgbWFyayAtIFZpZGVvRnVsbHNj cmVlbk1hbmFnZXIKIAogUmVmPFZpZGVvRnVsbHNjcmVlbk1hbmFnZXI+IFZpZGVvRnVsbHNjcmVl bk1hbmFnZXI6OmNyZWF0ZShXZWJQYWdlJiBwYWdlLCBQbGF5YmFja1Nlc3Npb25NYW5hZ2VyJiBw bGF5YmFja1Nlc3Npb25NYW5hZ2VyKQpAQCAtMzA5LDYgKzMxNSwxMSBAQCB2b2lkIFZpZGVvRnVs bHNjcmVlbk1hbmFnZXI6OmVudGVyVmlkZW9GdWxsc2NyZWVuRm9yVmlkZW9FbGVtZW50KEhUTUxW aWRlb0VsZW1lbgogICAgIH0KIAogICAgIG1fcGFnZS0+c2VuZChNZXNzYWdlczo6VmlkZW9GdWxs c2NyZWVuTWFuYWdlclByb3h5OjpTZXR1cEZ1bGxzY3JlZW5XaXRoSUQoY29udGV4dElkLCBpbnRl cmZhY2UtPmxheWVySG9zdGluZ0NvbnRleHQoKS0+Y29udGV4dElEKCksIHZpZGVvUmVjdCwgRmxv YXRTaXplKHZpZGVvRWxlbWVudC52aWRlb1dpZHRoKCksIHZpZGVvRWxlbWVudC52aWRlb0hlaWdo dCgpKSwgbV9wYWdlLT5kZXZpY2VTY2FsZUZhY3RvcigpLCBpbnRlcmZhY2UtPmZ1bGxzY3JlZW5N b2RlKCksIGFsbG93c1BpY3R1cmVJblBpY3R1cmUsIHN0YW5kYnksIHZpZGVvRWxlbWVudC5kb2N1 bWVudCgpLnF1aXJrcygpLmJsb2Nrc1JldHVyblRvRnVsbHNjcmVlbkZyb21QaWN0dXJlSW5QaWN0 dXJlUXVpcmsoKSkpOworCisgICAgaWYgKGF1dG8gcGxheWVyID0gdmlkZW9FbGVtZW50LnBsYXll cigpKSB7CisgICAgICAgIGlmIChhdXRvIGlkZW50aWZpZXIgPSBwbGF5ZXItPmlkZW50aWZpZXIo KSkKKyAgICAgICAgICAgIHNldFBsYXllcklkZW50aWZpZXIoY29udGV4dElkLCBpZGVudGlmaWVy KTsKKyAgICB9CiB9CiAKIHZvaWQgVmlkZW9GdWxsc2NyZWVuTWFuYWdlcjo6ZXhpdFZpZGVvRnVs bHNjcmVlbkZvclZpZGVvRWxlbWVudChIVE1MVmlkZW9FbGVtZW50JiB2aWRlb0VsZW1lbnQsIENv bXBsZXRpb25IYW5kbGVyPHZvaWQoYm9vbCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCkBAIC0zNzcs NiArMzg4LDEyIEBAIHZvaWQgVmlkZW9GdWxsc2NyZWVuTWFuYWdlcjo6dmlkZW9EaW1lbnNpb25z Q2hhbmdlZChQbGF5YmFja1Nlc3Npb25Db250ZXh0SWRlbnRpCiAgICAgICAgIG1fcGFnZS0+c2Vu ZChNZXNzYWdlczo6VmlkZW9GdWxsc2NyZWVuTWFuYWdlclByb3h5OjpTZXRWaWRlb0RpbWVuc2lv bnMoY29udGV4dElkLCB2aWRlb0RpbWVuc2lvbnMpKTsKIH0KIAordm9pZCBWaWRlb0Z1bGxzY3Jl ZW5NYW5hZ2VyOjpzZXRQbGF5ZXJJZGVudGlmaWVyKFBsYXliYWNrU2Vzc2lvbkNvbnRleHRJZGVu dGlmaWVyIGNvbnRleHRJZGVudGlmaWVyLCBzdGQ6Om9wdGlvbmFsPE1lZGlhUGxheWVySWRlbnRp Zmllcj4gcGxheWVySWRlbnRpZmllcikKK3sKKyAgICBpZiAobV9wYWdlKQorICAgICAgICBtX3Bh Z2UtPnNlbmQoTWVzc2FnZXM6OlZpZGVvRnVsbHNjcmVlbk1hbmFnZXJQcm94eTo6U2V0UGxheWVy SWRlbnRpZmllcihjb250ZXh0SWRlbnRpZmllciwgcGxheWVySWRlbnRpZmllcikpOworfQorCiAj cHJhZ21hIG1hcmsgTWVzc2FnZXMgZnJvbSBWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyUHJveHk6CiAK IHZvaWQgVmlkZW9GdWxsc2NyZWVuTWFuYWdlcjo6cmVxdWVzdEZ1bGxzY3JlZW5Nb2RlKFBsYXli YWNrU2Vzc2lvbkNvbnRleHRJZGVudGlmaWVyIGNvbnRleHRJZCwgV2ViQ29yZTo6SFRNTE1lZGlh RWxlbWVudEVudW1zOjpWaWRlb0Z1bGxzY3JlZW5Nb2RlIG1vZGUsIGJvb2wgZmluaXNoZWRXaXRo TWVkaWEpCg==