235247 2022-01-14 13:05:35 -0800 Clarify / Optimize <select> logic given that deeply nested <option> or <optgroup> are not supported 2022-01-14 14:48:26 -0800 1 1 1 Unclassified WebKit Forms WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 235237 1 cdumez cdumez cdumez changseok esprehn+autocc ews-watchlist ggaren gyuyoung.kim mifenton webkit-bug-importer wenson_hsieh oldest_to_newest 1831041 0 cdumez 2022-01-14 13:05:35 -0800 Clarify / Optimize <select> logic given that deeply nested <option> or <optgroup> are not supported, as per specification. An <option> is only associated with a <select> element if it is either a child of the <select> or a child of an <optgroup> that is itself a child of the <select>: - https://html.spec.whatwg.org/multipage/form-elements.html#concept-select-option-list As a result, an <optgroup> is only associated with a <select> element if it is a child of that <select>. 1831042 1 449210 cdumez 2022-01-14 13:08:13 -0800 Created attachment 449210 Patch 1831050 2 449210 ggaren 2022-01-14 13:13:39 -0800 Comment on attachment 449210 Patch r=me 1831100 3 ews-feeder 2022-01-14 14:47:53 -0800 Committed r288033 (246059@main): <https://commits.webkit.org/246059@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 449210. 1831101 4 webkit-bug-importer 2022-01-14 14:48:26 -0800 <rdar://problem/87619558> 449210 2022-01-14 13:08:13 -0800 2022-01-14 14:47:55 -0800 Patch bug-235247-20220114130813.patch text/plain 12592 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3OTk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjJlMmFjMWUxZmVhYmVm Yzc4MDEzNzFlZTQ0OWEyYmIwNTFmMjM5Zi4uYzAzNmE5YzhlNDNjZmFjZmE2NGUyYTIxYWE3OTk1 OGU0NjQ1M2U4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDIyLTAxLTE0ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgQ2xhcmlmeSAvIE9wdGltaXpl IDxzZWxlY3Q+IGxvZ2ljIGdpdmVuIHRoYXQgZGVlcGx5IG5lc3RlZCA8b3B0aW9uPiBvciA8b3B0 Z3JvdXA+IGFyZSBub3Qgc3VwcG9ydGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMzUyNDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBDbGFyaWZ5IC8gT3B0aW1pemUgPHNlbGVjdD4gbG9naWMgZ2l2ZW4g dGhhdCBkZWVwbHkgbmVzdGVkIDxvcHRpb24+IG9yIDxvcHRncm91cD4gYXJlIG5vdCBzdXBwb3J0 ZWQsIGFzIHBlciB0aGUKKyAgICAgICAgc3BlY2lmaWNhdGlvbi4KKworICAgICAgICBBbiA8b3B0 aW9uPiBpcyBvbmx5IGFzc29jaWF0ZWQgd2l0aCBhIDxzZWxlY3Q+IGVsZW1lbnQgaWYgaXQgaXMg ZWl0aGVyIGEgY2hpbGQgb2YgdGhlIDxzZWxlY3Q+IG9yIGEgY2hpbGQgb2YgYW4KKyAgICAgICAg PG9wdGdyb3VwPiB0aGF0IGlzIGl0c2VsZiBhIGNoaWxkIG9mIHRoZSA8c2VsZWN0PjoKKyAgICAg ICAgLSBodHRwczovL2h0bWwuc3BlYy53aGF0d2cub3JnL211bHRpcGFnZS9mb3JtLWVsZW1lbnRz Lmh0bWwjY29uY2VwdC1zZWxlY3Qtb3B0aW9uLWxpc3QKKworICAgICAgICBBcyBhIHJlc3VsdCwg YW4gPG9wdGdyb3VwPiBpcyBvbmx5IGFzc29jaWF0ZWQgd2l0aCBhIDxzZWxlY3Q+IGVsZW1lbnQg aWYgaXQgaXMgYSBjaGlsZCBvZiB0aGF0IDxzZWxlY3Q+LgorCisgICAgICAgIE5vIG5ldyB0ZXN0 cywgbm8gV2ViLWZhY2luZyBiZWhhdmlvciBjaGFuZ2UuCisKKyAgICAgICAgKiBodG1sL0hUTUxP cHRHcm91cEVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE9wdEdyb3VwRWxlbWVu dDo6cmVjYWxjU2VsZWN0T3B0aW9ucyk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MT3B0R3JvdXBF bGVtZW50Ojpvd25lclNlbGVjdEVsZW1lbnQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6SFRN TE9wdEdyb3VwRWxlbWVudDo6YWNjZXNzS2V5QWN0aW9uKToKKyAgICAgICAgKiBodG1sL0hUTUxP cHRpb25FbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxPcHRpb25FbGVtZW50Ojpz ZXRUZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxPcHRpb25FbGVtZW50OjphY2Nlc3NLZXlB Y3Rpb24pOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE9wdGlvbkVsZW1lbnQ6OmluZGV4IGNvbnN0 KToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxPcHRpb25FbGVtZW50OjpzZWxlY3RlZCBjb25zdCk6 CisgICAgICAgIChXZWJDb3JlOjpIVE1MT3B0aW9uRWxlbWVudDo6c2V0U2VsZWN0ZWQpOgorICAg ICAgICAoV2ViQ29yZTo6SFRNTE9wdGlvbkVsZW1lbnQ6OmNoaWxkcmVuQ2hhbmdlZCk6CisgICAg ICAgIChXZWJDb3JlOjpIVE1MT3B0aW9uRWxlbWVudDo6b3duZXJTZWxlY3RFbGVtZW50IGNvbnN0 KToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxPcHRpb25FbGVtZW50Ojp0ZXh0SW5kZW50ZWRUb1Jl c3BlY3RHcm91cExhYmVsIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxPcHRpb25FbGVt ZW50OjppbnNlcnRlZEludG9BbmNlc3Rvcik6CisgICAgICAgIChXZWJDb3JlOjpIVE1MT3B0aW9u RWxlbWVudDo6Y29sbGVjdE9wdGlvbklubmVyVGV4dCBjb25zdCk6CisgICAgICAgICogaHRtbC9I VE1MU2VsZWN0RWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MU2VsZWN0RWxlbWVu dDo6cmVjYWxjTGlzdEl0ZW1zIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxTZWxlY3RF bGVtZW50OjpsaXN0Qm94RGVmYXVsdEV2ZW50SGFuZGxlcik6CisKIDIwMjItMDEtMTMgIEFkcmlh biBQZXJleiBkZSBDYXN0cm8gIDxhcGVyZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBOb24tdW5p ZmllZCBidWlsZCBmaXhlcywgbWlkIEphbnVhcnkgMjAyMiBlZGl0aW9uCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9odG1sL0hUTUxPcHRHcm91cEVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNv cmUvaHRtbC9IVE1MT3B0R3JvdXBFbGVtZW50LmNwcAppbmRleCA5MDIxZmRmYjkzY2M2YmZkMTdk MGI2OTM2ZGViYzM4MTNjZGE3YjhiLi44Yzc0OWM2YWEyZjIwNmNlZjUyN2FmM2U2NThiODhiNjE1 ODk4YWY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxPcHRHcm91cEVsZW1l bnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE9wdEdyb3VwRWxlbWVudC5jcHAK QEAgLTEwMiw3ICsxMDIsNyBAQCB2b2lkIEhUTUxPcHRHcm91cEVsZW1lbnQ6OnBhcnNlQXR0cmli dXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmIG5hbWUsIGNvbnN0IEF0b21TdAogCiB2b2lkIEhUTUxP cHRHcm91cEVsZW1lbnQ6OnJlY2FsY1NlbGVjdE9wdGlvbnMoKQogewotICAgIGlmIChSZWZQdHIg c2VsZWN0RWxlbWVudCA9IGFuY2VzdG9yc09mVHlwZTxIVE1MU2VsZWN0RWxlbWVudD4oKnRoaXMp LmZpcnN0KCkpIHsKKyAgICBpZiAoUmVmUHRyIHNlbGVjdEVsZW1lbnQgPSBvd25lclNlbGVjdEVs ZW1lbnQoKSkgewogICAgICAgICBzZWxlY3RFbGVtZW50LT5zZXRSZWNhbGNMaXN0SXRlbXMoKTsK ICAgICAgICAgc2VsZWN0RWxlbWVudC0+dXBkYXRlVmFsaWRpdHkoKTsKICAgICB9CkBAIC0xMjIs MTIgKzEyMiwxMyBAQCBTdHJpbmcgSFRNTE9wdEdyb3VwRWxlbWVudDo6Z3JvdXBMYWJlbFRleHQo KSBjb25zdAogICAgIAogSFRNTFNlbGVjdEVsZW1lbnQqIEhUTUxPcHRHcm91cEVsZW1lbnQ6Om93 bmVyU2VsZWN0RWxlbWVudCgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIGNvbnN0X2Nhc3Q8SFRNTFNl bGVjdEVsZW1lbnQqPihhbmNlc3RvcnNPZlR5cGU8SFRNTFNlbGVjdEVsZW1lbnQ+KCp0aGlzKS5m aXJzdCgpKTsKKyAgICBhdXRvKiBwYXJlbnQgPSBwYXJlbnROb2RlKCk7CisgICAgcmV0dXJuIGlz PEhUTUxTZWxlY3RFbGVtZW50PihwYXJlbnQpID8gZG93bmNhc3Q8SFRNTFNlbGVjdEVsZW1lbnQ+ KHBhcmVudCkgOiBudWxscHRyOwogfQogCiBib29sIEhUTUxPcHRHcm91cEVsZW1lbnQ6OmFjY2Vz c0tleUFjdGlvbihib29sKQogewotICAgIFJlZlB0cjxIVE1MU2VsZWN0RWxlbWVudD4gc2VsZWN0 ID0gb3duZXJTZWxlY3RFbGVtZW50KCk7CisgICAgUmVmUHRyIHNlbGVjdCA9IG93bmVyU2VsZWN0 RWxlbWVudCgpOwogICAgIC8vIHNlbmQgdG8gdGhlIHBhcmVudCB0byBicmluZyBmb2N1cyB0byB0 aGUgbGlzdCBib3gKICAgICBpZiAoc2VsZWN0ICYmICFzZWxlY3QtPmZvY3VzZWQoKSkKICAgICAg ICAgcmV0dXJuIHNlbGVjdC0+YWNjZXNzS2V5QWN0aW9uKGZhbHNlKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2h0bWwvSFRNTE9wdGlvbkVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUv aHRtbC9IVE1MT3B0aW9uRWxlbWVudC5jcHAKaW5kZXggYzU5YWJmY2YzYzI5NGZlZmUwNDAxYmE0 YTFlODAwMTg5OThlYTQ0Yi4uMWEyY2I4MjQ4NzdlZGUzZjc0ZjkxNGIyMTBmODVmOGE3NWI0MDc1 ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MT3B0aW9uRWxlbWVudC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MT3B0aW9uRWxlbWVudC5jcHAKQEAgLTExNCwx NyArMTE0LDE3IEBAIFN0cmluZyBIVE1MT3B0aW9uRWxlbWVudDo6dGV4dCgpIGNvbnN0CiAKIHZv aWQgSFRNTE9wdGlvbkVsZW1lbnQ6OnNldFRleHQoY29uc3QgU3RyaW5nICZ0ZXh0KQogewotICAg IFJlZjxIVE1MT3B0aW9uRWxlbWVudD4gcHJvdGVjdGVkVGhpcygqdGhpcyk7CisgICAgUmVmIHBy b3RlY3RlZFRoaXMgeyAqdGhpcyB9OwogCiAgICAgLy8gQ2hhbmdpbmcgdGhlIHRleHQgY2F1c2Vz IGEgcmVjYWxjIG9mIGEgc2VsZWN0J3MgaXRlbXMsIHdoaWNoIHdpbGwgcmVzZXQgdGhlIHNlbGVj dGVkCiAgICAgLy8gaW5kZXggdG8gdGhlIGZpcnN0IGl0ZW0gaWYgdGhlIHNlbGVjdCBpcyBzaW5n bGUgc2VsZWN0aW9uIHdpdGggYSBtZW51IGxpc3QuIFdlIGF0dGVtcHQgdG8KICAgICAvLyBwcmVz ZXJ2ZSB0aGUgc2VsZWN0ZWQgaXRlbS4KLSAgICBSZWZQdHI8SFRNTFNlbGVjdEVsZW1lbnQ+IHNl bGVjdCA9IG93bmVyU2VsZWN0RWxlbWVudCgpOworICAgIFJlZlB0ciBzZWxlY3QgPSBvd25lclNl bGVjdEVsZW1lbnQoKTsKICAgICBib29sIHNlbGVjdElzTWVudUxpc3QgPSBzZWxlY3QgJiYgc2Vs ZWN0LT51c2VzTWVudUxpc3QoKTsKICAgICBpbnQgb2xkU2VsZWN0ZWRJbmRleCA9IHNlbGVjdElz TWVudUxpc3QgPyBzZWxlY3QtPnNlbGVjdGVkSW5kZXgoKSA6IC0xOwogCiAgICAgLy8gSGFuZGxl IHRoZSBjb21tb24gc3BlY2lhbCBjYXNlIHdoZXJlIHRoZXJlJ3MgZXhhY3RseSAxIGNoaWxkIG5v ZGUsIGFuZCBpdCdzIGEgdGV4dCBub2RlLgotICAgIFJlZlB0cjxOb2RlPiBjaGlsZCA9IGZpcnN0 Q2hpbGQoKTsKKyAgICBSZWZQdHIgY2hpbGQgPSBmaXJzdENoaWxkKCk7CiAgICAgaWYgKGlzPFRl eHQ+KGNoaWxkKSAmJiAhY2hpbGQtPm5leHRTaWJsaW5nKCkpCiAgICAgICAgIGRvd25jYXN0PFRl eHQ+KCpjaGlsZCkuc2V0RGF0YSh0ZXh0KTsKICAgICBlbHNlIHsKQEAgLTEzOCw3ICsxMzgsNyBA QCB2b2lkIEhUTUxPcHRpb25FbGVtZW50OjpzZXRUZXh0KGNvbnN0IFN0cmluZyAmdGV4dCkKIAog Ym9vbCBIVE1MT3B0aW9uRWxlbWVudDo6YWNjZXNzS2V5QWN0aW9uKGJvb2wpCiB7Ci0gICAgUmVm UHRyPEhUTUxTZWxlY3RFbGVtZW50PiBzZWxlY3QgPSBvd25lclNlbGVjdEVsZW1lbnQoKTsKKyAg ICBSZWZQdHIgc2VsZWN0ID0gb3duZXJTZWxlY3RFbGVtZW50KCk7CiAgICAgaWYgKHNlbGVjdCkg ewogICAgICAgICBzZWxlY3QtPmFjY2Vzc0tleVNldFNlbGVjdGVkSW5kZXgoaW5kZXgoKSk7CiAg ICAgICAgIHJldHVybiB0cnVlOwpAQCAtMTUwLDcgKzE1MCw3IEBAIGludCBIVE1MT3B0aW9uRWxl bWVudDo6aW5kZXgoKSBjb25zdAogewogICAgIC8vIEl0IHdvdWxkIGJlIGZhc3RlciB0byBjYWNo ZSB0aGUgaW5kZXgsIGJ1dCBoYXJkZXIgdG8gZ2V0IGl0IHJpZ2h0IGluIGFsbCBjYXNlcy4KIAot ICAgIFJlZlB0cjxIVE1MU2VsZWN0RWxlbWVudD4gc2VsZWN0RWxlbWVudCA9IG93bmVyU2VsZWN0 RWxlbWVudCgpOworICAgIFJlZlB0ciBzZWxlY3RFbGVtZW50ID0gb3duZXJTZWxlY3RFbGVtZW50 KCk7CiAgICAgaWYgKCFzZWxlY3RFbGVtZW50KQogICAgICAgICByZXR1cm4gMDsKIApAQCAtMjEy LDcgKzIxMiw3IEBAIHZvaWQgSFRNTE9wdGlvbkVsZW1lbnQ6OnNldFZhbHVlKGNvbnN0IFN0cmlu ZyYgdmFsdWUpCiAKIGJvb2wgSFRNTE9wdGlvbkVsZW1lbnQ6OnNlbGVjdGVkKCkgY29uc3QKIHsK LSAgICBpZiAoUmVmUHRyPEhUTUxTZWxlY3RFbGVtZW50PiBzZWxlY3QgPSBvd25lclNlbGVjdEVs ZW1lbnQoKSkKKyAgICBpZiAoUmVmUHRyIHNlbGVjdCA9IG93bmVyU2VsZWN0RWxlbWVudCgpKQog ICAgICAgICBzZWxlY3QtPnVwZGF0ZUxpc3RJdGVtU2VsZWN0ZWRTdGF0ZXMoKTsKICAgICByZXR1 cm4gbV9pc1NlbGVjdGVkOwogfQpAQCAtMjI0LDcgKzIyNCw3IEBAIHZvaWQgSFRNTE9wdGlvbkVs ZW1lbnQ6OnNldFNlbGVjdGVkKGJvb2wgc2VsZWN0ZWQpCiAKICAgICBzZXRTZWxlY3RlZFN0YXRl KHNlbGVjdGVkKTsKIAotICAgIGlmIChSZWZQdHI8SFRNTFNlbGVjdEVsZW1lbnQ+IHNlbGVjdCA9 IG93bmVyU2VsZWN0RWxlbWVudCgpKQorICAgIGlmIChSZWZQdHIgc2VsZWN0ID0gb3duZXJTZWxl Y3RFbGVtZW50KCkpCiAgICAgICAgIHNlbGVjdC0+b3B0aW9uU2VsZWN0aW9uU3RhdGVDaGFuZ2Vk KCp0aGlzLCBzZWxlY3RlZCk7CiB9CiAKQEAgLTI0OSwxNCArMjQ5LDIwIEBAIHZvaWQgSFRNTE9w dGlvbkVsZW1lbnQ6OmNoaWxkcmVuQ2hhbmdlZChjb25zdCBDaGlsZENoYW5nZSYgY2hhbmdlKQog ICAgIGZvciAoYXV0byYgZGF0YUxpc3QgOiBhbmNlc3RvcnNPZlR5cGU8SFRNTERhdGFMaXN0RWxl bWVudD4oKnRoaXMpKQogICAgICAgICBkYXRhTGlzdC5vcHRpb25FbGVtZW50Q2hpbGRyZW5DaGFu Z2VkKCk7CiAjZW5kaWYKLSAgICBpZiAoUmVmUHRyPEhUTUxTZWxlY3RFbGVtZW50PiBzZWxlY3Qg PSBvd25lclNlbGVjdEVsZW1lbnQoKSkKKyAgICBpZiAoUmVmUHRyIHNlbGVjdCA9IG93bmVyU2Vs ZWN0RWxlbWVudCgpKQogICAgICAgICBzZWxlY3QtPm9wdGlvbkVsZW1lbnRDaGlsZHJlbkNoYW5n ZWQoKTsKICAgICBIVE1MRWxlbWVudDo6Y2hpbGRyZW5DaGFuZ2VkKGNoYW5nZSk7CiB9CiAKIEhU TUxTZWxlY3RFbGVtZW50KiBIVE1MT3B0aW9uRWxlbWVudDo6b3duZXJTZWxlY3RFbGVtZW50KCkg Y29uc3QKIHsKLSAgICByZXR1cm4gY29uc3RfY2FzdDxIVE1MU2VsZWN0RWxlbWVudCo+KGFuY2Vz dG9yc09mVHlwZTxIVE1MU2VsZWN0RWxlbWVudD4oKnRoaXMpLmZpcnN0KCkpOworICAgIGlmIChh dXRvKiBwYXJlbnQgPSBwYXJlbnRFbGVtZW50KCkpIHsKKyAgICAgICAgaWYgKGlzPEhUTUxTZWxl Y3RFbGVtZW50PigqcGFyZW50KSkKKyAgICAgICAgICAgIHJldHVybiBkb3duY2FzdDxIVE1MU2Vs ZWN0RWxlbWVudD4ocGFyZW50KTsKKyAgICAgICAgaWYgKGlzPEhUTUxPcHRHcm91cEVsZW1lbnQ+ KCpwYXJlbnQpKQorICAgICAgICAgICAgcmV0dXJuIGRvd25jYXN0PEhUTUxPcHRHcm91cEVsZW1l bnQ+KCpwYXJlbnQpLm93bmVyU2VsZWN0RWxlbWVudCgpOworICAgIH0KKyAgICByZXR1cm4gbnVs bHB0cjsKIH0KIAogU3RyaW5nIEhUTUxPcHRpb25FbGVtZW50OjpsYWJlbCgpIGNvbnN0CkBAIC0y OTIsNyArMjk4LDcgQEAgdm9pZCBIVE1MT3B0aW9uRWxlbWVudDo6d2lsbFJlc2V0Q29tcHV0ZWRT dHlsZSgpCiAKIFN0cmluZyBIVE1MT3B0aW9uRWxlbWVudDo6dGV4dEluZGVudGVkVG9SZXNwZWN0 R3JvdXBMYWJlbCgpIGNvbnN0CiB7Ci0gICAgUmVmUHRyPENvbnRhaW5lck5vZGU+IHBhcmVudCA9 IHBhcmVudE5vZGUoKTsKKyAgICBSZWZQdHIgcGFyZW50ID0gcGFyZW50Tm9kZSgpOwogICAgIGlm IChpczxIVE1MT3B0R3JvdXBFbGVtZW50PihwYXJlbnQpKQogICAgICAgICByZXR1cm4gIiAgICAi ICsgZGlzcGxheUxhYmVsKCk7CiAgICAgcmV0dXJuIGRpc3BsYXlMYWJlbCgpOwpAQCAtMzExLDcg KzMxNyw3IEBAIGJvb2wgSFRNTE9wdGlvbkVsZW1lbnQ6OmlzRGlzYWJsZWRGb3JtQ29udHJvbCgp IGNvbnN0CiAKIE5vZGU6Okluc2VydGVkSW50b0FuY2VzdG9yUmVzdWx0IEhUTUxPcHRpb25FbGVt ZW50OjppbnNlcnRlZEludG9BbmNlc3RvcihJbnNlcnRpb25UeXBlIGluc2VydGlvblR5cGUsIENv bnRhaW5lck5vZGUmIHBhcmVudE9mSW5zZXJ0ZWRUcmVlKQogewotICAgIGlmIChSZWZQdHI8SFRN TFNlbGVjdEVsZW1lbnQ+IHNlbGVjdCA9IG93bmVyU2VsZWN0RWxlbWVudCgpKSB7CisgICAgaWYg KFJlZlB0ciBzZWxlY3QgPSBvd25lclNlbGVjdEVsZW1lbnQoKSkgewogICAgICAgICBzZWxlY3Qt PnNldFJlY2FsY0xpc3RJdGVtcygpOwogICAgICAgICBzZWxlY3QtPnVwZGF0ZVZhbGlkaXR5KCk7 CiAgICAgICAgIC8vIERvIG5vdCBjYWxsIHNlbGVjdGVkKCkgc2luY2UgY2FsbGluZyB1cGRhdGVM aXN0SXRlbVNlbGVjdGVkU3RhdGVzKCkKQEAgLTMyOSw3ICszMzUsNyBAQCBOb2RlOjpJbnNlcnRl ZEludG9BbmNlc3RvclJlc3VsdCBIVE1MT3B0aW9uRWxlbWVudDo6aW5zZXJ0ZWRJbnRvQW5jZXN0 b3IoSW5zZXJ0aQogU3RyaW5nIEhUTUxPcHRpb25FbGVtZW50Ojpjb2xsZWN0T3B0aW9uSW5uZXJU ZXh0KCkgY29uc3QKIHsKICAgICBTdHJpbmdCdWlsZGVyIHRleHQ7Ci0gICAgZm9yIChSZWZQdHI8 Tm9kZT4gbm9kZSA9IGZpcnN0Q2hpbGQoKTsgbm9kZTsgKSB7CisgICAgZm9yIChSZWZQdHIgbm9k ZSA9IGZpcnN0Q2hpbGQoKTsgbm9kZTsgKSB7CiAgICAgICAgIGlmIChpczxUZXh0Pigqbm9kZSkp CiAgICAgICAgICAgICB0ZXh0LmFwcGVuZChub2RlLT5ub2RlVmFsdWUoKSk7CiAgICAgICAgIC8v IFRleHQgbm9kZXMgaW5zaWRlIHNjcmlwdCBlbGVtZW50cyBhcmUgbm90IHBhcnQgb2YgdGhlIG9w dGlvbiB0ZXh0LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MU2VsZWN0RWxl bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTZWxlY3RFbGVtZW50LmNwcAppbmRl eCBjMjkyZDA3NDgwZWIzNDhiNDdmY2RhNDA5NDBkYjVmMzYyZWQ2YThhLi44MjE2ZGJjZGRhMDM4 YzZjZTI2YmEwZTBhZmU2OTdlYTk5MzkxOGYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9o dG1sL0hUTUxTZWxlY3RFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxT ZWxlY3RFbGVtZW50LmNwcApAQCAtNzcwLDUwICs3NzAsMzEgQEAgdm9pZCBIVE1MU2VsZWN0RWxl bWVudDo6cmVjYWxjTGlzdEl0ZW1zKGJvb2wgdXBkYXRlU2VsZWN0ZWRTdGF0ZXMpIGNvbnN0CiAK ICAgICBSZWZQdHI8SFRNTE9wdGlvbkVsZW1lbnQ+IGZvdW5kU2VsZWN0ZWQ7CiAgICAgUmVmUHRy PEhUTUxPcHRpb25FbGVtZW50PiBmaXJzdE9wdGlvbjsKLSAgICBmb3IgKFJlZlB0cjxFbGVtZW50 PiBjdXJyZW50RWxlbWVudCA9IEVsZW1lbnRUcmF2ZXJzYWw6OmZpcnN0V2l0aGluKCp0aGlzKTsg Y3VycmVudEVsZW1lbnQ7ICkgewotICAgICAgICBpZiAoIWlzPEhUTUxFbGVtZW50PigqY3VycmVu dEVsZW1lbnQpKSB7Ci0gICAgICAgICAgICBjdXJyZW50RWxlbWVudCA9IEVsZW1lbnRUcmF2ZXJz YWw6Om5leHRTa2lwcGluZ0NoaWxkcmVuKCpjdXJyZW50RWxlbWVudCwgdGhpcyk7Ci0gICAgICAg ICAgICBjb250aW51ZTsKLSAgICAgICAgfQotICAgICAgICBIVE1MRWxlbWVudCYgY3VycmVudCA9 IGRvd25jYXN0PEhUTUxFbGVtZW50PigqY3VycmVudEVsZW1lbnQpOwotCi0gICAgICAgIC8vIE9u bHkgY29uc2lkZXIgb3B0Z3JvdXAgZWxlbWVudHMgdGhhdCBhcmUgZGlyZWN0IGNoaWxkcmVuIG9m IHRoZSBzZWxlY3QgZWxlbWVudC4KLSAgICAgICAgaWYgKGlzPEhUTUxPcHRHcm91cEVsZW1lbnQ+ KGN1cnJlbnQpICYmIGN1cnJlbnQucGFyZW50Tm9kZSgpID09IHRoaXMpIHsKLSAgICAgICAgICAg IG1fbGlzdEl0ZW1zLmFwcGVuZCgmY3VycmVudCk7Ci0gICAgICAgICAgICBpZiAoUmVmUHRyPEVs ZW1lbnQ+IG5leHRFbGVtZW50ID0gRWxlbWVudFRyYXZlcnNhbDo6Zmlyc3RXaXRoaW4oY3VycmVu dCkpIHsKLSAgICAgICAgICAgICAgICBjdXJyZW50RWxlbWVudCA9IG5leHRFbGVtZW50OwotICAg ICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgfQotICAgICAgICB9Ci0KLSAgICAg ICAgaWYgKGlzPEhUTUxPcHRpb25FbGVtZW50PihjdXJyZW50KSkgewotICAgICAgICAgICAgbV9s aXN0SXRlbXMuYXBwZW5kKCZjdXJyZW50KTsKLQotICAgICAgICAgICAgaWYgKHVwZGF0ZVNlbGVj dGVkU3RhdGVzICYmICFtX211bHRpcGxlKSB7Ci0gICAgICAgICAgICAgICAgSFRNTE9wdGlvbkVs ZW1lbnQmIG9wdGlvbiA9IGRvd25jYXN0PEhUTUxPcHRpb25FbGVtZW50PihjdXJyZW50KTsKLSAg ICAgICAgICAgICAgICBpZiAoIWZpcnN0T3B0aW9uKQotICAgICAgICAgICAgICAgICAgICBmaXJz dE9wdGlvbiA9ICZvcHRpb247Ci0gICAgICAgICAgICAgICAgaWYgKG9wdGlvbi5zZWxlY3RlZCgp KSB7Ci0gICAgICAgICAgICAgICAgICAgIGlmIChmb3VuZFNlbGVjdGVkKQotICAgICAgICAgICAg ICAgICAgICAgICAgZm91bmRTZWxlY3RlZC0+c2V0U2VsZWN0ZWRTdGF0ZShmYWxzZSk7Ci0gICAg ICAgICAgICAgICAgICAgIGZvdW5kU2VsZWN0ZWQgPSAmb3B0aW9uOwotICAgICAgICAgICAgICAg IH0gZWxzZSBpZiAobV9zaXplIDw9IDEgJiYgIWZvdW5kU2VsZWN0ZWQgJiYgIW9wdGlvbi5pc0Rp c2FibGVkRm9ybUNvbnRyb2woKSkgewotICAgICAgICAgICAgICAgICAgICBmb3VuZFNlbGVjdGVk ID0gJm9wdGlvbjsKLSAgICAgICAgICAgICAgICAgICAgZm91bmRTZWxlY3RlZC0+c2V0U2VsZWN0 ZWRTdGF0ZSh0cnVlKTsKLSAgICAgICAgICAgICAgICB9CisgICAgYXV0byBoYW5kbGVPcHRpb25F bGVtZW50ID0gWyZdKEhUTUxPcHRpb25FbGVtZW50JiBvcHRpb24pIHsKKyAgICAgICAgbV9saXN0 SXRlbXMuYXBwZW5kKCZvcHRpb24pOworICAgICAgICBpZiAodXBkYXRlU2VsZWN0ZWRTdGF0ZXMg JiYgIW1fbXVsdGlwbGUpIHsKKyAgICAgICAgICAgIGlmICghZmlyc3RPcHRpb24pCisgICAgICAg ICAgICAgICAgZmlyc3RPcHRpb24gPSAmb3B0aW9uOworICAgICAgICAgICAgaWYgKG9wdGlvbi5z ZWxlY3RlZCgpKSB7CisgICAgICAgICAgICAgICAgaWYgKGZvdW5kU2VsZWN0ZWQpCisgICAgICAg ICAgICAgICAgICAgIGZvdW5kU2VsZWN0ZWQtPnNldFNlbGVjdGVkU3RhdGUoZmFsc2UpOworICAg ICAgICAgICAgICAgIGZvdW5kU2VsZWN0ZWQgPSAmb3B0aW9uOworICAgICAgICAgICAgfSBlbHNl IGlmIChtX3NpemUgPD0gMSAmJiAhZm91bmRTZWxlY3RlZCAmJiAhb3B0aW9uLmlzRGlzYWJsZWRG b3JtQ29udHJvbCgpKSB7CisgICAgICAgICAgICAgICAgZm91bmRTZWxlY3RlZCA9ICZvcHRpb247 CisgICAgICAgICAgICAgICAgZm91bmRTZWxlY3RlZC0+c2V0U2VsZWN0ZWRTdGF0ZSh0cnVlKTsK ICAgICAgICAgICAgIH0KICAgICAgICAgfQotCi0gICAgICAgIGlmIChjdXJyZW50Lmhhc1RhZ05h bWUoaHJUYWcpKQotICAgICAgICAgICAgbV9saXN0SXRlbXMuYXBwZW5kKCZjdXJyZW50KTsKLQot ICAgICAgICAvLyBJbiBjb25mb3JtaW5nIEhUTUwgY29kZSwgb25seSA8b3B0Z3JvdXA+IGFuZCA8 b3B0aW9uPiB3aWxsIGJlIGZvdW5kCi0gICAgICAgIC8vIHdpdGhpbiBhIDxzZWxlY3Q+LiBXZSBj YWxsIE5vZGVUcmF2ZXJzYWw6Om5leHRTa2lwcGluZ0NoaWxkcmVuIHNvIHRoYXQgd2Ugb25seSBz dGVwCi0gICAgICAgIC8vIGludG8gdGhvc2UgdGFncyB0aGF0IHdlIGNob29zZSB0by4gRm9yIHdl Yi1jb21wYXQsIHdlIHNob3VsZCBjb3BlCi0gICAgICAgIC8vIHdpdGggdGhlIGNhc2Ugd2hlcmUg b2RkIHRhZ3MgbGlrZSBhIDxkaXY+IGhhdmUgYmVlbiBhZGRlZCBidXQgd2UKLSAgICAgICAgLy8g aGFuZGxlIHRoaXMgYmVjYXVzZSBzdWNoIHRhZ3MgaGF2ZSBhbHJlYWR5IGJlZW4gcmVtb3ZlZCBm cm9tIHRoZQotICAgICAgICAvLyA8c2VsZWN0PidzIHN1YnRyZWUgYXQgdGhpcyBwb2ludC4KLSAg ICAgICAgY3VycmVudEVsZW1lbnQgPSBFbGVtZW50VHJhdmVyc2FsOjpuZXh0U2tpcHBpbmdDaGls ZHJlbigqY3VycmVudEVsZW1lbnQsIHRoaXMpOworICAgIH07CisKKyAgICBmb3IgKGF1dG8mIGNo aWxkIDogY2hpbGRyZW5PZlR5cGU8SFRNTEVsZW1lbnQ+KCpjb25zdF9jYXN0PEhUTUxTZWxlY3RF bGVtZW50Kj4odGhpcykpKSB7CisgICAgICAgIGlmIChpczxIVE1MT3B0R3JvdXBFbGVtZW50Pihj aGlsZCkpIHsKKyAgICAgICAgICAgIG1fbGlzdEl0ZW1zLmFwcGVuZCgmY2hpbGQpOworICAgICAg ICAgICAgZm9yIChhdXRvJiBvcHRpb24gOiBjaGlsZHJlbk9mVHlwZTxIVE1MT3B0aW9uRWxlbWVu dD4oY2hpbGQpKQorICAgICAgICAgICAgICAgIGhhbmRsZU9wdGlvbkVsZW1lbnQob3B0aW9uKTsK KyAgICAgICAgfSBlbHNlIGlmIChpczxIVE1MT3B0aW9uRWxlbWVudD4oY2hpbGQpKSB7CisgICAg ICAgICAgICBoYW5kbGVPcHRpb25FbGVtZW50KGRvd25jYXN0PEhUTUxPcHRpb25FbGVtZW50Pihj aGlsZCkpOworICAgICAgICB9IGVsc2UgaWYgKGlzPEhUTUxIUkVsZW1lbnQ+KGNoaWxkKSkKKyAg ICAgICAgICAgIG1fbGlzdEl0ZW1zLmFwcGVuZCgmY2hpbGQpOwogICAgIH0KIAogICAgIGlmICgh Zm91bmRTZWxlY3RlZCAmJiBtX3NpemUgPD0gMSAmJiBmaXJzdE9wdGlvbiAmJiAhZmlyc3RPcHRp b24tPnNlbGVjdGVkKCkpCkBAIC0xMzQ5LDcgKzEzMzAsNyBAQCB2b2lkIEhUTUxTZWxlY3RFbGVt ZW50OjpsaXN0Qm94RGVmYXVsdEV2ZW50SGFuZGxlcihFdmVudCYgZXZlbnQpCiAgICAgICAgICAg ICAgICAgdXBkYXRlU2VsZWN0ZWRTdGF0ZShsaXN0SW5kZXgsIG1vdXNlRXZlbnQuY3RybEtleSgp LCBtb3VzZUV2ZW50LnNoaWZ0S2V5KCkpOwogI2VuZGlmCiAgICAgICAgICAgICB9Ci0gICAgICAg ICAgICBpZiAoUmVmUHRyPEZyYW1lPiBmcmFtZSA9IGRvY3VtZW50KCkuZnJhbWUoKSkKKyAgICAg ICAgICAgIGlmIChSZWZQdHIgZnJhbWUgPSBkb2N1bWVudCgpLmZyYW1lKCkpCiAgICAgICAgICAg ICAgICAgZnJhbWUtPmV2ZW50SGFuZGxlcigpLnNldE1vdXNlRG93bk1heVN0YXJ0QXV0b3Njcm9s bCgpOwogCiAgICAgICAgICAgICBtb3VzZUV2ZW50LnNldERlZmF1bHRIYW5kbGVkKCk7Cg==