166035 2016-12-19 14:04:28 -0800 Do not position detached list item marker. 2016-12-20 07:48:41 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan achristensen commit-queue esprehn+autocc glenn kondapallykalyan ossy pvollan ryanhaddad simon.fraser ysuzuki oldest_to_newest 1261200 0 zalan 2016-12-19 14:04:28 -0800 rdar://problem/29175235 1261203 1 297476 zalan 2016-12-19 14:12:51 -0800 Created attachment 297476 Patch 1261240 2 297476 commit-queue 2016-12-19 15:42:26 -0800 Comment on attachment 297476 Patch Clearing flags on attachment: 297476 Committed r210001: <http://trac.webkit.org/changeset/210001> 1261241 3 commit-queue 2016-12-19 15:42:30 -0800 All reviewed patches have been landed. Closing bug. 1261340 4 ossy 2016-12-19 23:50:12 -0800 (In reply to comment #2) > Comment on attachment 297476 [details] > Patch > > Clearing flags on attachment: 297476 > > Committed r210001: <http://trac.webkit.org/changeset/210001> It broke the Apple Windows debug build, see build.webkit.org for details. 1261356 5 ysuzuki 2016-12-20 02:51:08 -0800 Committed r210018: <http://trac.webkit.org/changeset/210018> 1261359 6 ysuzuki 2016-12-20 03:43:06 -0800 Committed r210020: <http://trac.webkit.org/changeset/210020> 1261383 7 zalan 2016-12-20 07:48:41 -0800 Thanks Yusuke! 297476 2016-12-19 14:12:51 -0800 2016-12-19 15:42:26 -0800 Patch bug-166035-20161219141152.patch text/plain 17577 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjA5OTAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGNkZmY2Njc0YjhiODNh OTQzNzNmMzdlMDAxYzMyNmU3YTM4NWFlYy4uZmIwZDI2ZjkzN2M4MDAyMmIzNTg0NmFlMzhhYzZk NWE4ZDQzMzAxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE2LTEyLTE5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgRG8gbm90IHBvc2l0aW9uIGRl dGFjaGVkIGxpc3QgaXRlbSBtYXJrZXIuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNjYwMzUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI5MTc1MjM1 PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIGNl cnRhaW4gKG5vbi1yZXByb2R1Y2libGUpIGNhc2VzLCB0aGUgbGlzdCBpdGVtIG1hcmtlciBjYW4g Z2V0IGRldGFjaGVkIGZyb20gdGhlIHRyZWUKKyAgICAgICAgZHVyaW5nIGxheW91dCBhbmQgd2hl biBpbiBSZW5kZXJMaXN0SXRlbTo6cG9zaXRpb25MaXN0TWFya2VyKCkgd2UgZGVyZWZlcmVuY2Ug dGhlIG1hcmtlcidzIHBhcmVudCwgd2UgY3Jhc2guCisgICAgICAgIEluIGFkZGl0aW9uIHRvIHRo ZSBudWxsIGNoZWNrLCB0aGlzIHBhdGNoIGFkZHMgYW4gQVNTRVJUSU9OIHRvIGNhdGNoIHN1Y2gg Y2FzZXMgZWFybHkgb24uCisKKyAgICAgICAgVW5hYmxlIHRvIHJlcHJvZHVjZS4KKworICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJCb3hNb2RlbE9iamVjdDo6bW92ZUNoaWxkVG8pOgorICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckVsZW1lbnQ6OnJl bW92ZUNoaWxkSW50ZXJuYWwpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJFbGVtZW50Lmg6 CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxpc3RJdGVtLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlckxpc3RJdGVtOjpsYXlvdXQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGlz dEl0ZW06OnBvc2l0aW9uTGlzdE1hcmtlcik6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxp c3RJdGVtLmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxpc3RNYXJrZXIuaDoKKwogMjAx Ni0xMi0xNSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIE1ha2Ug c3VyZSBIVE1MIHZhbGlkYXRpb24gYnViYmxlJ3Mgc3RhdGUgaXMgdXBkYXRlZCBhZnRlciBsYXlv dXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9i amVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3Qu Y3BwCmluZGV4IGVjZDdiMjE4ODRlOTQxYmY1ZWJkMGRlZDc4NjZmYWNjNGRkODEzNTguLjVjNjU5 YjcyY2E5ZDA3N2ZiNjcyYTY3MjI1YTNjNTIzZGUxYTAxNjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcApAQCAtNTcsNiArNTcsOSBA QAogI2luY2x1ZGUgIlNldHRpbmdzLmgiCiAjaW5jbHVkZSAiVHJhbnNmb3JtU3RhdGUuaCIKICNp bmNsdWRlIDx3dGYvTmV2ZXJEZXN0cm95ZWQuaD4KKyNpZiAhQVNTRVJUX0RJU0FCTEVECisjaW5j bHVkZSA8d3RmL1NldEZvclNjb3BlLmg+CisjZW5kaWYKIAogbmFtZXNwYWNlIFdlYkNvcmUgewog CkBAIC0yNDk1LDYgKzI0OTgsOSBAQCB2b2lkIFJlbmRlckJveE1vZGVsT2JqZWN0OjptYXBBYnNv bHV0ZVRvTG9jYWxQb2ludChNYXBDb29yZGluYXRlc0ZsYWdzIG1vZGUsIFRyYQogCiB2b2lkIFJl bmRlckJveE1vZGVsT2JqZWN0Ojptb3ZlQ2hpbGRUbyhSZW5kZXJCb3hNb2RlbE9iamVjdCogdG9C b3hNb2RlbE9iamVjdCwgUmVuZGVyT2JqZWN0KiBjaGlsZCwgUmVuZGVyT2JqZWN0KiBiZWZvcmVD aGlsZCwgYm9vbCBmdWxsUmVtb3ZlSW5zZXJ0KQogeworI2lmICFBU1NFUlRfRElTQUJMRUQKKyAg ICBTZXRGb3JTY29wZTxib29sPiByZXBhcmVudGluZ0NoaWxkKG1fcmVwYXJlbnRpbmdDaGlsZCwg dHJ1ZSk7CisjZW5kaWYKICAgICAvLyBXZSBhc3N1bWUgdGhhdCBjYWxsZXJzIGhhdmUgY2xlYXJl ZCB0aGVpciBwb3NpdGlvbmVkIG9iamVjdHMgbGlzdCBmb3IgY2hpbGQgbW92ZXMgKCFmdWxsUmVt b3ZlSW5zZXJ0KSBzbyB0aGUKICAgICAvLyBwb3NpdGlvbmVkIHJlbmRlcmVyIG1hcHMgZG9uJ3Qg YmVjb21lIHN0YWxlLiBJdCB3b3VsZCBiZSB0b28gc2xvdyB0byBkbyB0aGUgbWFwIGxvb2t1cCBv biBlYWNoIGNhbGwuCiAgICAgQVNTRVJUKCFmdWxsUmVtb3ZlSW5zZXJ0IHx8ICFpczxSZW5kZXJC bG9jaz4oKnRoaXMpIHx8ICFkb3duY2FzdDxSZW5kZXJCbG9jaz4oKnRoaXMpLmhhc1Bvc2l0aW9u ZWRPYmplY3RzKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuY3Bw CmluZGV4IDA5OWUzOTYyMDY4YzQ2YzljMDhhZGUzZWY0ODI1ZDAxZTI5ZjU2Y2QuLmU1NmRhNWYz ZTkxMzI3YTY4MDE0ZWJjZjYyYWY4OGQxODI4MTUwNmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAKQEAgLTU2LDYgKzU2LDkgQEAKICNpbmNsdWRlICJSZW5k ZXJMYXllckNvbXBvc2l0b3IuaCIKICNpbmNsdWRlICJSZW5kZXJMaW5lQnJlYWsuaCIKICNpbmNs dWRlICJSZW5kZXJMaXN0SXRlbS5oIgorI2lmICFBU1NFUlRfRElTQUJMRUQKKyNpbmNsdWRlICJS ZW5kZXJMaXN0TWFya2VyLmgiCisjZW5kaWYKICNpbmNsdWRlICJSZW5kZXJOYW1lZEZsb3dUaHJl YWQuaCIKICNpbmNsdWRlICJSZW5kZXJSZWdpb24uaCIKICNpbmNsdWRlICJSZW5kZXJUYWJsZUNh cHRpb24uaCIKQEAgLTY0MSw2ICs2NDQsMTEgQEAgdm9pZCBSZW5kZXJFbGVtZW50OjpyZW1vdmVD aGlsZEludGVybmFsKFJlbmRlck9iamVjdCYgb2xkQ2hpbGQsIE5vdGlmeUNoaWxkcmVuVHkKIAog ICAgIGlmIChBWE9iamVjdENhY2hlKiBjYWNoZSA9IGRvY3VtZW50KCkuZXhpc3RpbmdBWE9iamVj dENhY2hlKCkpCiAgICAgICAgIGNhY2hlLT5jaGlsZHJlbkNoYW5nZWQodGhpcyk7CisjaWYgIUFT U0VSVF9ESVNBQkxFRAorICAgIC8vIENoZWNrIGlmIHRoZSBtYXJrZXIgZ2V0cyBkZXRhY2hlZCB3 aGlsZSBsYXlpbmcgb3V0IHRoZSBsaXN0IGl0ZW0uCisgICAgaWYgKGlzPFJlbmRlckxpc3RNYXJr ZXI+KG9sZENoaWxkKSkKKyAgICAgICAgQVNTRVJUKG1fcmVwYXJlbnRpbmdDaGlsZCB8fCAhZG93 bmNhc3Q8UmVuZGVyTGlzdE1hcmtlcj4ob2xkQ2hpbGQpLmxpc3RJdGVtKCkuaW5MYXlvdXQoKSk7 CisjZW5kaWYKIH0KIAogUmVuZGVyQmxvY2sqIFJlbmRlckVsZW1lbnQ6OmNvbnRhaW5pbmdCbG9j a0ZvckZpeGVkUG9zaXRpb24oKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckVsZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJF bGVtZW50LmgKaW5kZXggN2NmZGE0M2Q5MDI0ZjgwN2RlYTUzNTk2YWU3NGZmNGZkOTRiMGU5ZC4u MjE1YzFmNGQ3ZWZjN2NlNzU1MzMzOTJkZWFmNTM2MmFmNjMyNTEyMSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5oCkBAIC0yNzMsNiArMjczLDkgQEAgcHJvdGVjdGVk OgogCiAgICAgdm9pZCByZW1vdmVGcm9tUmVuZGVyRmxvd1RocmVhZEluY2x1ZGluZ0Rlc2NlbmRh bnRzKGJvb2wgc2hvdWxkVXBkYXRlU3RhdGUpOwogICAgIHZvaWQgYWRqdXN0Rmxvd1RocmVhZFN0 YXRlT25Db250YWluaW5nQmxvY2tDaGFuZ2VJZk5lZWRlZCgpOworI2lmICFBU1NFUlRfRElTQUJM RUQKKyAgICBib29sIG1fcmVwYXJlbnRpbmdDaGlsZCB7IGZhbHNlIH07CisjZW5kaWYKIAogcHJp dmF0ZToKICAgICBSZW5kZXJFbGVtZW50KENvbnRhaW5lck5vZGUmLCBSZW5kZXJTdHlsZSYmLCBC YXNlVHlwZUZsYWdzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMaXN0SXRlbS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEl0ZW0u Y3BwCmluZGV4IDQ0MGJkMmQyMmQwNjJkZGIyYzI5OTYwY2Q3YzY1YmEwYjUyNzAwNzcuLmRjYTcz NDZmODdiODEzYTU0YzU0YmI5ZjFlYmFjYjliYTVhN2M1ZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0SXRlbS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxpc3RJdGVtLmNwcApAQCAtMzgsNiArMzgsOSBAQAogI2luY2x1ZGUg IlJlbmRlclRhYmxlLmgiCiAjaW5jbHVkZSAiUmVuZGVyVmlldy5oIgogI2luY2x1ZGUgIlN0eWxl SW5oZXJpdGVkRGF0YS5oIgorI2lmICFBU1NFUlRfRElTQUJMRUQKKyNpbmNsdWRlIDx3dGYvU2V0 Rm9yU2NvcGUuaD4KKyNlbmRpZgogI2luY2x1ZGUgPHd0Zi9TdGFja1N0YXRzLmg+CiAjaW5jbHVk ZSA8d3RmL1N0ZExpYkV4dHJhcy5oPgogCkBAIC0zMTcsNiArMzIwLDkgQEAgdm9pZCBSZW5kZXJM aXN0SXRlbTo6bGF5b3V0KCkKICAgICBBU1NFUlQobmVlZHNMYXlvdXQoKSk7IAogCiAgICAgaW5z ZXJ0T3JNb3ZlTWFya2VyUmVuZGVyZXJJZk5lZWRlZCgpOworI2lmICFBU1NFUlRfRElTQUJMRUQK KyAgICBTZXRGb3JTY29wZTxib29sPiBpbkxpc3RJdGVtTGF5b3V0KG1faW5MYXlvdXQsIHRydWUp OworI2VuZGlmCiAgICAgUmVuZGVyQmxvY2tGbG93OjpsYXlvdXQoKTsKIH0KIApAQCAtMzQxLDk2 ICszNDcsMTAwIEBAIHZvaWQgUmVuZGVyTGlzdEl0ZW06OmNvbXB1dGVQcmVmZXJyZWRMb2dpY2Fs V2lkdGhzKCkKIAogdm9pZCBSZW5kZXJMaXN0SXRlbTo6cG9zaXRpb25MaXN0TWFya2VyKCkKIHsK LSAgICBpZiAobV9tYXJrZXIgJiYgbV9tYXJrZXItPnBhcmVudCgpLT5pc0JveCgpICYmICFtX21h cmtlci0+aXNJbnNpZGUoKSAmJiBtX21hcmtlci0+aW5saW5lQm94V3JhcHBlcigpKSB7Ci0gICAg ICAgIExheW91dFVuaXQgbWFya2VyT2xkTG9naWNhbExlZnQgPSBtX21hcmtlci0+bG9naWNhbExl ZnQoKTsKLSAgICAgICAgTGF5b3V0VW5pdCBibG9ja09mZnNldCA9IDA7Ci0gICAgICAgIExheW91 dFVuaXQgbGluZU9mZnNldCA9IDA7Ci0gICAgICAgIGZvciAoUmVuZGVyQm94KiBvID0gbV9tYXJr ZXItPnBhcmVudEJveCgpOyBvICE9IHRoaXM7IG8gPSBvLT5wYXJlbnRCb3goKSkgewotICAgICAg ICAgICAgYmxvY2tPZmZzZXQgKz0gby0+bG9naWNhbFRvcCgpOwotICAgICAgICAgICAgbGluZU9m ZnNldCArPSBvLT5sb2dpY2FsTGVmdCgpOwotICAgICAgICB9CisgICAgaWYgKCFtX21hcmtlciB8 fCAhbV9tYXJrZXItPnBhcmVudCgpIHx8ICFtX21hcmtlci0+cGFyZW50KCktPmlzQm94KCkpCisg ICAgICAgIHJldHVybjsKIAotICAgICAgICBib29sIGFkanVzdE92ZXJmbG93ID0gZmFsc2U7Ci0g ICAgICAgIExheW91dFVuaXQgbWFya2VyTG9naWNhbExlZnQ7Ci0gICAgICAgIGJvb2wgaGl0U2Vs ZlBhaW50aW5nTGF5ZXIgPSBmYWxzZTsKLSAgICAgICAgCi0gICAgICAgIGNvbnN0IFJvb3RJbmxp bmVCb3gmIHJvb3RCb3ggPSBtX21hcmtlci0+aW5saW5lQm94V3JhcHBlcigpLT5yb290KCk7Ci0g ICAgICAgIExheW91dFVuaXQgbGluZVRvcCA9IHJvb3RCb3gubGluZVRvcCgpOwotICAgICAgICBM YXlvdXRVbml0IGxpbmVCb3R0b20gPSByb290Qm94LmxpbmVCb3R0b20oKTsKLQotICAgICAgICAv LyBGSVhNRTogTmVlZCB0byBhY2NvdW50IGZvciByZWxhdGl2ZSBwb3NpdGlvbmluZyBpbiB0aGUg bGF5b3V0IG92ZXJmbG93LgotICAgICAgICBpZiAoc3R5bGUoKS5pc0xlZnRUb1JpZ2h0RGlyZWN0 aW9uKCkpIHsKLSAgICAgICAgICAgIExheW91dFVuaXQgbGVmdExpbmVPZmZzZXQgPSBsb2dpY2Fs TGVmdE9mZnNldEZvckxpbmUoYmxvY2tPZmZzZXQsIGxvZ2ljYWxMZWZ0T2Zmc2V0Rm9yTGluZShi bG9ja09mZnNldCwgRG9Ob3RJbmRlbnRUZXh0KSwgZmFsc2UpOwotICAgICAgICAgICAgbWFya2Vy TG9naWNhbExlZnQgPSBsZWZ0TGluZU9mZnNldCAtIGxpbmVPZmZzZXQgLSBwYWRkaW5nU3RhcnQo KSAtIGJvcmRlclN0YXJ0KCkgKyBtX21hcmtlci0+bWFyZ2luU3RhcnQoKTsKLSAgICAgICAgICAg IG1fbWFya2VyLT5pbmxpbmVCb3hXcmFwcGVyKCktPmFkanVzdExpbmVEaXJlY3Rpb25Qb3NpdGlv bihtYXJrZXJMb2dpY2FsTGVmdCAtIG1hcmtlck9sZExvZ2ljYWxMZWZ0KTsKLSAgICAgICAgICAg IGZvciAoSW5saW5lRmxvd0JveCogYm94ID0gbV9tYXJrZXItPmlubGluZUJveFdyYXBwZXIoKS0+ cGFyZW50KCk7IGJveDsgYm94ID0gYm94LT5wYXJlbnQoKSkgewotICAgICAgICAgICAgICAgIExh eW91dFJlY3QgbmV3TG9naWNhbFZpc3VhbE92ZXJmbG93UmVjdCA9IGJveC0+bG9naWNhbFZpc3Vh bE92ZXJmbG93UmVjdChsaW5lVG9wLCBsaW5lQm90dG9tKTsKLSAgICAgICAgICAgICAgICBMYXlv dXRSZWN0IG5ld0xvZ2ljYWxMYXlvdXRPdmVyZmxvd1JlY3QgPSBib3gtPmxvZ2ljYWxMYXlvdXRP dmVyZmxvd1JlY3QobGluZVRvcCwgbGluZUJvdHRvbSk7Ci0gICAgICAgICAgICAgICAgaWYgKG1h cmtlckxvZ2ljYWxMZWZ0IDwgbmV3TG9naWNhbFZpc3VhbE92ZXJmbG93UmVjdC54KCkgJiYgIWhp dFNlbGZQYWludGluZ0xheWVyKSB7Ci0gICAgICAgICAgICAgICAgICAgIG5ld0xvZ2ljYWxWaXN1 YWxPdmVyZmxvd1JlY3Quc2V0V2lkdGgobmV3TG9naWNhbFZpc3VhbE92ZXJmbG93UmVjdC5tYXhY KCkgLSBtYXJrZXJMb2dpY2FsTGVmdCk7Ci0gICAgICAgICAgICAgICAgICAgIG5ld0xvZ2ljYWxW aXN1YWxPdmVyZmxvd1JlY3Quc2V0WChtYXJrZXJMb2dpY2FsTGVmdCk7Ci0gICAgICAgICAgICAg ICAgICAgIGlmIChib3ggPT0gJnJvb3RCb3gpCi0gICAgICAgICAgICAgICAgICAgICAgICBhZGp1 c3RPdmVyZmxvdyA9IHRydWU7Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgIGlm IChtYXJrZXJMb2dpY2FsTGVmdCA8IG5ld0xvZ2ljYWxMYXlvdXRPdmVyZmxvd1JlY3QueCgpKSB7 Ci0gICAgICAgICAgICAgICAgICAgIG5ld0xvZ2ljYWxMYXlvdXRPdmVyZmxvd1JlY3Quc2V0V2lk dGgobmV3TG9naWNhbExheW91dE92ZXJmbG93UmVjdC5tYXhYKCkgLSBtYXJrZXJMb2dpY2FsTGVm dCk7Ci0gICAgICAgICAgICAgICAgICAgIG5ld0xvZ2ljYWxMYXlvdXRPdmVyZmxvd1JlY3Quc2V0 WChtYXJrZXJMb2dpY2FsTGVmdCk7Ci0gICAgICAgICAgICAgICAgICAgIGlmIChib3ggPT0gJnJv b3RCb3gpCi0gICAgICAgICAgICAgICAgICAgICAgICBhZGp1c3RPdmVyZmxvdyA9IHRydWU7Ci0g ICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgIGJveC0+c2V0T3ZlcmZsb3dGcm9tTG9n aWNhbFJlY3RzKG5ld0xvZ2ljYWxMYXlvdXRPdmVyZmxvd1JlY3QsIG5ld0xvZ2ljYWxWaXN1YWxP dmVyZmxvd1JlY3QsIGxpbmVUb3AsIGxpbmVCb3R0b20pOwotICAgICAgICAgICAgICAgIGlmIChi b3gtPnJlbmRlcmVyKCkuaGFzU2VsZlBhaW50aW5nTGF5ZXIoKSkKLSAgICAgICAgICAgICAgICAg ICAgaGl0U2VsZlBhaW50aW5nTGF5ZXIgPSB0cnVlOworICAgIGlmIChtX21hcmtlci0+aXNJbnNp ZGUoKSB8fCAhbV9tYXJrZXItPmlubGluZUJveFdyYXBwZXIoKSkKKyAgICAgICAgcmV0dXJuOwor CisgICAgTGF5b3V0VW5pdCBtYXJrZXJPbGRMb2dpY2FsTGVmdCA9IG1fbWFya2VyLT5sb2dpY2Fs TGVmdCgpOworICAgIExheW91dFVuaXQgYmxvY2tPZmZzZXQgPSAwOworICAgIExheW91dFVuaXQg bGluZU9mZnNldCA9IDA7CisgICAgZm9yIChSZW5kZXJCb3gqIG8gPSBtX21hcmtlci0+cGFyZW50 Qm94KCk7IG8gIT0gdGhpczsgbyA9IG8tPnBhcmVudEJveCgpKSB7CisgICAgICAgIGJsb2NrT2Zm c2V0ICs9IG8tPmxvZ2ljYWxUb3AoKTsKKyAgICAgICAgbGluZU9mZnNldCArPSBvLT5sb2dpY2Fs TGVmdCgpOworICAgIH0KKworICAgIGJvb2wgYWRqdXN0T3ZlcmZsb3cgPSBmYWxzZTsKKyAgICBM YXlvdXRVbml0IG1hcmtlckxvZ2ljYWxMZWZ0OworICAgIGJvb2wgaGl0U2VsZlBhaW50aW5nTGF5 ZXIgPSBmYWxzZTsKKworICAgIGNvbnN0IFJvb3RJbmxpbmVCb3gmIHJvb3RCb3ggPSBtX21hcmtl ci0+aW5saW5lQm94V3JhcHBlcigpLT5yb290KCk7CisgICAgTGF5b3V0VW5pdCBsaW5lVG9wID0g cm9vdEJveC5saW5lVG9wKCk7CisgICAgTGF5b3V0VW5pdCBsaW5lQm90dG9tID0gcm9vdEJveC5s aW5lQm90dG9tKCk7CisKKyAgICAvLyBGSVhNRTogTmVlZCB0byBhY2NvdW50IGZvciByZWxhdGl2 ZSBwb3NpdGlvbmluZyBpbiB0aGUgbGF5b3V0IG92ZXJmbG93LgorICAgIGlmIChzdHlsZSgpLmlz TGVmdFRvUmlnaHREaXJlY3Rpb24oKSkgeworICAgICAgICBMYXlvdXRVbml0IGxlZnRMaW5lT2Zm c2V0ID0gbG9naWNhbExlZnRPZmZzZXRGb3JMaW5lKGJsb2NrT2Zmc2V0LCBsb2dpY2FsTGVmdE9m ZnNldEZvckxpbmUoYmxvY2tPZmZzZXQsIERvTm90SW5kZW50VGV4dCksIGZhbHNlKTsKKyAgICAg ICAgbWFya2VyTG9naWNhbExlZnQgPSBsZWZ0TGluZU9mZnNldCAtIGxpbmVPZmZzZXQgLSBwYWRk aW5nU3RhcnQoKSAtIGJvcmRlclN0YXJ0KCkgKyBtX21hcmtlci0+bWFyZ2luU3RhcnQoKTsKKyAg ICAgICAgbV9tYXJrZXItPmlubGluZUJveFdyYXBwZXIoKS0+YWRqdXN0TGluZURpcmVjdGlvblBv c2l0aW9uKG1hcmtlckxvZ2ljYWxMZWZ0IC0gbWFya2VyT2xkTG9naWNhbExlZnQpOworICAgICAg ICBmb3IgKElubGluZUZsb3dCb3gqIGJveCA9IG1fbWFya2VyLT5pbmxpbmVCb3hXcmFwcGVyKCkt PnBhcmVudCgpOyBib3g7IGJveCA9IGJveC0+cGFyZW50KCkpIHsKKyAgICAgICAgICAgIExheW91 dFJlY3QgbmV3TG9naWNhbFZpc3VhbE92ZXJmbG93UmVjdCA9IGJveC0+bG9naWNhbFZpc3VhbE92 ZXJmbG93UmVjdChsaW5lVG9wLCBsaW5lQm90dG9tKTsKKyAgICAgICAgICAgIExheW91dFJlY3Qg bmV3TG9naWNhbExheW91dE92ZXJmbG93UmVjdCA9IGJveC0+bG9naWNhbExheW91dE92ZXJmbG93 UmVjdChsaW5lVG9wLCBsaW5lQm90dG9tKTsKKyAgICAgICAgICAgIGlmIChtYXJrZXJMb2dpY2Fs TGVmdCA8IG5ld0xvZ2ljYWxWaXN1YWxPdmVyZmxvd1JlY3QueCgpICYmICFoaXRTZWxmUGFpbnRp bmdMYXllcikgeworICAgICAgICAgICAgICAgIG5ld0xvZ2ljYWxWaXN1YWxPdmVyZmxvd1JlY3Qu c2V0V2lkdGgobmV3TG9naWNhbFZpc3VhbE92ZXJmbG93UmVjdC5tYXhYKCkgLSBtYXJrZXJMb2dp Y2FsTGVmdCk7CisgICAgICAgICAgICAgICAgbmV3TG9naWNhbFZpc3VhbE92ZXJmbG93UmVjdC5z ZXRYKG1hcmtlckxvZ2ljYWxMZWZ0KTsKKyAgICAgICAgICAgICAgICBpZiAoYm94ID09ICZyb290 Qm94KQorICAgICAgICAgICAgICAgICAgICBhZGp1c3RPdmVyZmxvdyA9IHRydWU7CiAgICAgICAg ICAgICB9Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBMYXlvdXRVbml0IHJpZ2h0TGlu ZU9mZnNldCA9IGxvZ2ljYWxSaWdodE9mZnNldEZvckxpbmUoYmxvY2tPZmZzZXQsIGxvZ2ljYWxS aWdodE9mZnNldEZvckxpbmUoYmxvY2tPZmZzZXQsIERvTm90SW5kZW50VGV4dCksIGZhbHNlKTsK LSAgICAgICAgICAgIG1hcmtlckxvZ2ljYWxMZWZ0ID0gcmlnaHRMaW5lT2Zmc2V0IC0gbGluZU9m ZnNldCArIHBhZGRpbmdTdGFydCgpICsgYm9yZGVyU3RhcnQoKSArIG1fbWFya2VyLT5tYXJnaW5F bmQoKTsKLSAgICAgICAgICAgIG1fbWFya2VyLT5pbmxpbmVCb3hXcmFwcGVyKCktPmFkanVzdExp bmVEaXJlY3Rpb25Qb3NpdGlvbihtYXJrZXJMb2dpY2FsTGVmdCAtIG1hcmtlck9sZExvZ2ljYWxM ZWZ0KTsKLSAgICAgICAgICAgIGZvciAoSW5saW5lRmxvd0JveCogYm94ID0gbV9tYXJrZXItPmlu bGluZUJveFdyYXBwZXIoKS0+cGFyZW50KCk7IGJveDsgYm94ID0gYm94LT5wYXJlbnQoKSkgewot ICAgICAgICAgICAgICAgIExheW91dFJlY3QgbmV3TG9naWNhbFZpc3VhbE92ZXJmbG93UmVjdCA9 IGJveC0+bG9naWNhbFZpc3VhbE92ZXJmbG93UmVjdChsaW5lVG9wLCBsaW5lQm90dG9tKTsKLSAg ICAgICAgICAgICAgICBMYXlvdXRSZWN0IG5ld0xvZ2ljYWxMYXlvdXRPdmVyZmxvd1JlY3QgPSBi b3gtPmxvZ2ljYWxMYXlvdXRPdmVyZmxvd1JlY3QobGluZVRvcCwgbGluZUJvdHRvbSk7Ci0gICAg ICAgICAgICAgICAgaWYgKG1hcmtlckxvZ2ljYWxMZWZ0ICsgbV9tYXJrZXItPmxvZ2ljYWxXaWR0 aCgpID4gbmV3TG9naWNhbFZpc3VhbE92ZXJmbG93UmVjdC5tYXhYKCkgJiYgIWhpdFNlbGZQYWlu dGluZ0xheWVyKSB7Ci0gICAgICAgICAgICAgICAgICAgIG5ld0xvZ2ljYWxWaXN1YWxPdmVyZmxv d1JlY3Quc2V0V2lkdGgobWFya2VyTG9naWNhbExlZnQgKyBtX21hcmtlci0+bG9naWNhbFdpZHRo KCkgLSBuZXdMb2dpY2FsVmlzdWFsT3ZlcmZsb3dSZWN0LngoKSk7Ci0gICAgICAgICAgICAgICAg ICAgIGlmIChib3ggPT0gJnJvb3RCb3gpCi0gICAgICAgICAgICAgICAgICAgICAgICBhZGp1c3RP dmVyZmxvdyA9IHRydWU7Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgIGlmICht YXJrZXJMb2dpY2FsTGVmdCArIG1fbWFya2VyLT5sb2dpY2FsV2lkdGgoKSA+IG5ld0xvZ2ljYWxM YXlvdXRPdmVyZmxvd1JlY3QubWF4WCgpKSB7Ci0gICAgICAgICAgICAgICAgICAgIG5ld0xvZ2lj YWxMYXlvdXRPdmVyZmxvd1JlY3Quc2V0V2lkdGgobWFya2VyTG9naWNhbExlZnQgKyBtX21hcmtl ci0+bG9naWNhbFdpZHRoKCkgLSBuZXdMb2dpY2FsTGF5b3V0T3ZlcmZsb3dSZWN0LngoKSk7Ci0g ICAgICAgICAgICAgICAgICAgIGlmIChib3ggPT0gJnJvb3RCb3gpCi0gICAgICAgICAgICAgICAg ICAgICAgICBhZGp1c3RPdmVyZmxvdyA9IHRydWU7Ci0gICAgICAgICAgICAgICAgfQotICAgICAg ICAgICAgICAgIGJveC0+c2V0T3ZlcmZsb3dGcm9tTG9naWNhbFJlY3RzKG5ld0xvZ2ljYWxMYXlv dXRPdmVyZmxvd1JlY3QsIG5ld0xvZ2ljYWxWaXN1YWxPdmVyZmxvd1JlY3QsIGxpbmVUb3AsIGxp bmVCb3R0b20pOwotICAgICAgICAgICAgICAgIAotICAgICAgICAgICAgICAgIGlmIChib3gtPnJl bmRlcmVyKCkuaGFzU2VsZlBhaW50aW5nTGF5ZXIoKSkKLSAgICAgICAgICAgICAgICAgICAgaGl0 U2VsZlBhaW50aW5nTGF5ZXIgPSB0cnVlOworICAgICAgICAgICAgaWYgKG1hcmtlckxvZ2ljYWxM ZWZ0IDwgbmV3TG9naWNhbExheW91dE92ZXJmbG93UmVjdC54KCkpIHsKKyAgICAgICAgICAgICAg ICBuZXdMb2dpY2FsTGF5b3V0T3ZlcmZsb3dSZWN0LnNldFdpZHRoKG5ld0xvZ2ljYWxMYXlvdXRP dmVyZmxvd1JlY3QubWF4WCgpIC0gbWFya2VyTG9naWNhbExlZnQpOworICAgICAgICAgICAgICAg IG5ld0xvZ2ljYWxMYXlvdXRPdmVyZmxvd1JlY3Quc2V0WChtYXJrZXJMb2dpY2FsTGVmdCk7Cisg ICAgICAgICAgICAgICAgaWYgKGJveCA9PSAmcm9vdEJveCkKKyAgICAgICAgICAgICAgICAgICAg YWRqdXN0T3ZlcmZsb3cgPSB0cnVlOwogICAgICAgICAgICAgfQorICAgICAgICAgICAgYm94LT5z ZXRPdmVyZmxvd0Zyb21Mb2dpY2FsUmVjdHMobmV3TG9naWNhbExheW91dE92ZXJmbG93UmVjdCwg bmV3TG9naWNhbFZpc3VhbE92ZXJmbG93UmVjdCwgbGluZVRvcCwgbGluZUJvdHRvbSk7CisgICAg ICAgICAgICBpZiAoYm94LT5yZW5kZXJlcigpLmhhc1NlbGZQYWludGluZ0xheWVyKCkpCisgICAg ICAgICAgICAgICAgaGl0U2VsZlBhaW50aW5nTGF5ZXIgPSB0cnVlOwogICAgICAgICB9Ci0KLSAg ICAgICAgaWYgKGFkanVzdE92ZXJmbG93KSB7Ci0gICAgICAgICAgICBMYXlvdXRSZWN0IG1hcmtl clJlY3QobWFya2VyTG9naWNhbExlZnQgKyBsaW5lT2Zmc2V0LCBibG9ja09mZnNldCwgbV9tYXJr ZXItPndpZHRoKCksIG1fbWFya2VyLT5oZWlnaHQoKSk7Ci0gICAgICAgICAgICBpZiAoIXN0eWxl KCkuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSkKLSAgICAgICAgICAgICAgICBtYXJrZXJSZWN0 ID0gbWFya2VyUmVjdC50cmFuc3Bvc2VkUmVjdCgpOwotICAgICAgICAgICAgUmVuZGVyQm94KiBv ID0gbV9tYXJrZXI7Ci0gICAgICAgICAgICBib29sIHByb3BhZ2F0ZVZpc3VhbE92ZXJmbG93ID0g dHJ1ZTsKLSAgICAgICAgICAgIGJvb2wgcHJvcGFnYXRlTGF5b3V0T3ZlcmZsb3cgPSB0cnVlOwot ICAgICAgICAgICAgZG8gewotICAgICAgICAgICAgICAgIG8gPSBvLT5wYXJlbnRCb3goKTsKLSAg ICAgICAgICAgICAgICBpZiAoby0+aGFzT3ZlcmZsb3dDbGlwKCkpCi0gICAgICAgICAgICAgICAg ICAgIHByb3BhZ2F0ZVZpc3VhbE92ZXJmbG93ID0gZmFsc2U7Ci0gICAgICAgICAgICAgICAgaWYg KGlzPFJlbmRlckJsb2NrPigqbykpIHsKLSAgICAgICAgICAgICAgICAgICAgaWYgKHByb3BhZ2F0 ZVZpc3VhbE92ZXJmbG93KQotICAgICAgICAgICAgICAgICAgICAgICAgZG93bmNhc3Q8UmVuZGVy QmxvY2s+KCpvKS5hZGRWaXN1YWxPdmVyZmxvdyhtYXJrZXJSZWN0KTsKLSAgICAgICAgICAgICAg ICAgICAgaWYgKHByb3BhZ2F0ZUxheW91dE92ZXJmbG93KQotICAgICAgICAgICAgICAgICAgICAg ICAgZG93bmNhc3Q8UmVuZGVyQmxvY2s+KCpvKS5hZGRMYXlvdXRPdmVyZmxvdyhtYXJrZXJSZWN0 KTsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgaWYgKG8tPmhhc092ZXJmbG93 Q2xpcCgpKQotICAgICAgICAgICAgICAgICAgICBwcm9wYWdhdGVMYXlvdXRPdmVyZmxvdyA9IGZh bHNlOwotICAgICAgICAgICAgICAgIGlmIChvLT5oYXNTZWxmUGFpbnRpbmdMYXllcigpKQotICAg ICAgICAgICAgICAgICAgICBwcm9wYWdhdGVWaXN1YWxPdmVyZmxvdyA9IGZhbHNlOwotICAgICAg ICAgICAgICAgIG1hcmtlclJlY3QubW92ZUJ5KC1vLT5sb2NhdGlvbigpKTsKLSAgICAgICAgICAg IH0gd2hpbGUgKG8gIT0gdGhpcyAmJiBwcm9wYWdhdGVWaXN1YWxPdmVyZmxvdyAmJiBwcm9wYWdh dGVMYXlvdXRPdmVyZmxvdyk7CisgICAgfSBlbHNlIHsKKyAgICAgICAgTGF5b3V0VW5pdCByaWdo dExpbmVPZmZzZXQgPSBsb2dpY2FsUmlnaHRPZmZzZXRGb3JMaW5lKGJsb2NrT2Zmc2V0LCBsb2dp Y2FsUmlnaHRPZmZzZXRGb3JMaW5lKGJsb2NrT2Zmc2V0LCBEb05vdEluZGVudFRleHQpLCBmYWxz ZSk7CisgICAgICAgIG1hcmtlckxvZ2ljYWxMZWZ0ID0gcmlnaHRMaW5lT2Zmc2V0IC0gbGluZU9m ZnNldCArIHBhZGRpbmdTdGFydCgpICsgYm9yZGVyU3RhcnQoKSArIG1fbWFya2VyLT5tYXJnaW5F bmQoKTsKKyAgICAgICAgbV9tYXJrZXItPmlubGluZUJveFdyYXBwZXIoKS0+YWRqdXN0TGluZURp cmVjdGlvblBvc2l0aW9uKG1hcmtlckxvZ2ljYWxMZWZ0IC0gbWFya2VyT2xkTG9naWNhbExlZnQp OworICAgICAgICBmb3IgKElubGluZUZsb3dCb3gqIGJveCA9IG1fbWFya2VyLT5pbmxpbmVCb3hX cmFwcGVyKCktPnBhcmVudCgpOyBib3g7IGJveCA9IGJveC0+cGFyZW50KCkpIHsKKyAgICAgICAg ICAgIExheW91dFJlY3QgbmV3TG9naWNhbFZpc3VhbE92ZXJmbG93UmVjdCA9IGJveC0+bG9naWNh bFZpc3VhbE92ZXJmbG93UmVjdChsaW5lVG9wLCBsaW5lQm90dG9tKTsKKyAgICAgICAgICAgIExh eW91dFJlY3QgbmV3TG9naWNhbExheW91dE92ZXJmbG93UmVjdCA9IGJveC0+bG9naWNhbExheW91 dE92ZXJmbG93UmVjdChsaW5lVG9wLCBsaW5lQm90dG9tKTsKKyAgICAgICAgICAgIGlmIChtYXJr ZXJMb2dpY2FsTGVmdCArIG1fbWFya2VyLT5sb2dpY2FsV2lkdGgoKSA+IG5ld0xvZ2ljYWxWaXN1 YWxPdmVyZmxvd1JlY3QubWF4WCgpICYmICFoaXRTZWxmUGFpbnRpbmdMYXllcikgeworICAgICAg ICAgICAgICAgIG5ld0xvZ2ljYWxWaXN1YWxPdmVyZmxvd1JlY3Quc2V0V2lkdGgobWFya2VyTG9n aWNhbExlZnQgKyBtX21hcmtlci0+bG9naWNhbFdpZHRoKCkgLSBuZXdMb2dpY2FsVmlzdWFsT3Zl cmZsb3dSZWN0LngoKSk7CisgICAgICAgICAgICAgICAgaWYgKGJveCA9PSAmcm9vdEJveCkKKyAg ICAgICAgICAgICAgICAgICAgYWRqdXN0T3ZlcmZsb3cgPSB0cnVlOworICAgICAgICAgICAgfQor ICAgICAgICAgICAgaWYgKG1hcmtlckxvZ2ljYWxMZWZ0ICsgbV9tYXJrZXItPmxvZ2ljYWxXaWR0 aCgpID4gbmV3TG9naWNhbExheW91dE92ZXJmbG93UmVjdC5tYXhYKCkpIHsKKyAgICAgICAgICAg ICAgICBuZXdMb2dpY2FsTGF5b3V0T3ZlcmZsb3dSZWN0LnNldFdpZHRoKG1hcmtlckxvZ2ljYWxM ZWZ0ICsgbV9tYXJrZXItPmxvZ2ljYWxXaWR0aCgpIC0gbmV3TG9naWNhbExheW91dE92ZXJmbG93 UmVjdC54KCkpOworICAgICAgICAgICAgICAgIGlmIChib3ggPT0gJnJvb3RCb3gpCisgICAgICAg ICAgICAgICAgICAgIGFkanVzdE92ZXJmbG93ID0gdHJ1ZTsKKyAgICAgICAgICAgIH0KKyAgICAg ICAgICAgIGJveC0+c2V0T3ZlcmZsb3dGcm9tTG9naWNhbFJlY3RzKG5ld0xvZ2ljYWxMYXlvdXRP dmVyZmxvd1JlY3QsIG5ld0xvZ2ljYWxWaXN1YWxPdmVyZmxvd1JlY3QsIGxpbmVUb3AsIGxpbmVC b3R0b20pOworICAgICAgICAgICAgICAgIAorICAgICAgICAgICAgaWYgKGJveC0+cmVuZGVyZXIo KS5oYXNTZWxmUGFpbnRpbmdMYXllcigpKQorICAgICAgICAgICAgICAgIGhpdFNlbGZQYWludGlu Z0xheWVyID0gdHJ1ZTsKICAgICAgICAgfQogICAgIH0KKworICAgIGlmIChhZGp1c3RPdmVyZmxv dykgeworICAgICAgICBMYXlvdXRSZWN0IG1hcmtlclJlY3QobWFya2VyTG9naWNhbExlZnQgKyBs aW5lT2Zmc2V0LCBibG9ja09mZnNldCwgbV9tYXJrZXItPndpZHRoKCksIG1fbWFya2VyLT5oZWln aHQoKSk7CisgICAgICAgIGlmICghc3R5bGUoKS5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpKQor ICAgICAgICAgICAgbWFya2VyUmVjdCA9IG1hcmtlclJlY3QudHJhbnNwb3NlZFJlY3QoKTsKKyAg ICAgICAgUmVuZGVyQm94KiBvID0gbV9tYXJrZXI7CisgICAgICAgIGJvb2wgcHJvcGFnYXRlVmlz dWFsT3ZlcmZsb3cgPSB0cnVlOworICAgICAgICBib29sIHByb3BhZ2F0ZUxheW91dE92ZXJmbG93 ID0gdHJ1ZTsKKyAgICAgICAgZG8geworICAgICAgICAgICAgbyA9IG8tPnBhcmVudEJveCgpOwor ICAgICAgICAgICAgaWYgKG8tPmhhc092ZXJmbG93Q2xpcCgpKQorICAgICAgICAgICAgICAgIHBy b3BhZ2F0ZVZpc3VhbE92ZXJmbG93ID0gZmFsc2U7CisgICAgICAgICAgICBpZiAoaXM8UmVuZGVy QmxvY2s+KCpvKSkgeworICAgICAgICAgICAgICAgIGlmIChwcm9wYWdhdGVWaXN1YWxPdmVyZmxv dykKKyAgICAgICAgICAgICAgICAgICAgZG93bmNhc3Q8UmVuZGVyQmxvY2s+KCpvKS5hZGRWaXN1 YWxPdmVyZmxvdyhtYXJrZXJSZWN0KTsKKyAgICAgICAgICAgICAgICBpZiAocHJvcGFnYXRlTGF5 b3V0T3ZlcmZsb3cpCisgICAgICAgICAgICAgICAgICAgIGRvd25jYXN0PFJlbmRlckJsb2NrPigq bykuYWRkTGF5b3V0T3ZlcmZsb3cobWFya2VyUmVjdCk7CisgICAgICAgICAgICB9CisgICAgICAg ICAgICBpZiAoby0+aGFzT3ZlcmZsb3dDbGlwKCkpCisgICAgICAgICAgICAgICAgcHJvcGFnYXRl TGF5b3V0T3ZlcmZsb3cgPSBmYWxzZTsKKyAgICAgICAgICAgIGlmIChvLT5oYXNTZWxmUGFpbnRp bmdMYXllcigpKQorICAgICAgICAgICAgICAgIHByb3BhZ2F0ZVZpc3VhbE92ZXJmbG93ID0gZmFs c2U7CisgICAgICAgICAgICBtYXJrZXJSZWN0Lm1vdmVCeSgtby0+bG9jYXRpb24oKSk7CisgICAg ICAgIH0gd2hpbGUgKG8gIT0gdGhpcyAmJiBwcm9wYWdhdGVWaXN1YWxPdmVyZmxvdyAmJiBwcm9w YWdhdGVMYXlvdXRPdmVyZmxvdyk7CisgICAgfQogfQogCiB2b2lkIFJlbmRlckxpc3RJdGVtOjpw YWludChQYWludEluZm8mIHBhaW50SW5mbywgY29uc3QgTGF5b3V0UG9pbnQmIHBhaW50T2Zmc2V0 KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RJdGVtLmgg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEl0ZW0uaAppbmRleCAyYWMyZGNl Mjc3NzMwZGUwYzUzOWQ4NGViMDJhYmIxMDg2OTI4NWFhLi5lNjE2NDllMDExYTM5NmMxM2VkMzlh NTRlMTdiOTEzZDUwOWNlZmM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTGlzdEl0ZW0uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlz dEl0ZW0uaApAQCAtNTcsNiArNTcsOSBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGRpZERlc3Ryb3lM aXN0TWFya2VyKCkgeyBtX21hcmtlciA9IG51bGxwdHI7IH0KIAorI2lmICFBU1NFUlRfRElTQUJM RUQKKyAgICBib29sIGluTGF5b3V0KCkgY29uc3QgeyByZXR1cm4gbV9pbkxheW91dDsgfQorI2Vu ZGlmCiBwcml2YXRlOgogICAgIGNvbnN0IGNoYXIqIHJlbmRlck5hbWUoKSBjb25zdCBvdmVycmlk ZSB7IHJldHVybiAiUmVuZGVyTGlzdEl0ZW0iOyB9CiAKQEAgLTg2LDcgKzg5LDkgQEAgcHJpdmF0 ZToKICAgICBpbnQgbV9leHBsaWNpdFZhbHVlOwogICAgIFJlbmRlckxpc3RNYXJrZXIqIG1fbWFy a2VyOwogICAgIG11dGFibGUgaW50IG1fdmFsdWU7Ci0KKyNpZiAhQVNTRVJUX0RJU0FCTEVECisg ICAgYm9vbCBtX2luTGF5b3V0IHsgZmFsc2UgfTsKKyNlbmRpZgogICAgIGJvb2wgbV9oYXNFeHBs aWNpdFZhbHVlIDogMTsKICAgICBtdXRhYmxlIGJvb2wgbV9pc1ZhbHVlVXBUb0RhdGUgOiAxOwog ICAgIGJvb2wgbV9ub3RJbkxpc3QgOiAxOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckxpc3RNYXJrZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMaXN0TWFya2VyLmgKaW5kZXggMTM3MjM1NGNiMDM1MzA0MjI0YjBkZTg4N2VmMzQ1YTFlNmU5 OWMxMC4uNWExNmZlNTBlNWZjNDUwMWE2ODMxNzBmYjk3OWNkYWQ4OWRhZjBkOSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RNYXJrZXIuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdE1hcmtlci5oCkBAIC00NCw2ICs0NCwxMCBA QCBwdWJsaWM6CiAKICAgICB2b2lkIHVwZGF0ZU1hcmdpbnNBbmRDb250ZW50KCk7CiAKKyNpZiAh QVNTRVJUX0RJU0FCTEVECisgICAgUmVuZGVyTGlzdEl0ZW0mIGxpc3RJdGVtKCkgY29uc3QgeyBy ZXR1cm4gbV9saXN0SXRlbTsgfQorI2VuZGlmCisKIHByaXZhdGU6CiAgICAgdm9pZCBlbGVtZW50 KCkgY29uc3QgPSBkZWxldGU7CiAK