246139 2022-10-06 02:13:02 -0700 REGRESSION(254755@main): Release assert in LayoutIntegration::BoxTree::rendererForLayoutBox with <fieldset> 2022-10-06 16:09:47 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto koivisto bfulgham simon.fraser zalan oldest_to_newest 1903692 0 koivisto 2022-10-06 02:13:02 -0700 <style> fieldset { display: inline } span { float: left } </style> <span> <fieldset> AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA 1903693 1 koivisto 2022-10-06 02:13:20 -0700 rdar://100493284 1903707 2 462831 koivisto 2022-10-06 02:58:44 -0700 Created attachment 462831 Patch 1903713 3 462832 koivisto 2022-10-06 03:09:19 -0700 Created attachment 462832 Patch 1903884 4 ews-feeder 2022-10-06 14:19:13 -0700 Committed 255240@main (ca4898717f9e): <https://commits.webkit.org/255240@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 462832. 462831 2022-10-06 02:58:44 -0700 2022-10-06 03:09:14 -0700 Patch bug-246139-20221006125842.patch text/plain 15281 koivisto RnJvbSA5MTM0NTkxOTFhNTFkZGZlOThiYmY2NDgzOTVkMWRkODUyMjNmNWY1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnR0aSBLb2l2aXN0byA8YW50dGlAYXBwbGUuY29tPgpEYXRl OiBUaHUsIDYgT2N0IDIwMjIgMTI6MjQ6NTMgKzAzMDAKU3ViamVjdDogW1BBVENIXSBSRUdSRVNT SU9OKDI1NDc1NUBtYWluKTogUmVsZWFzZSBhc3NlcnQgaW4KIExheW91dEludGVncmF0aW9uOjpC b3hUcmVlOjpyZW5kZXJlckZvckxheW91dEJveAogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTI0NjEzOSByZGFyOi8vMTAwNDkzMjg0CgpSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KCjxmaWVsZHNldCBzdHlsZT0iZGlzcGxheTppbmxpbmUiPiBjcmVhdGVzIGEgUmVu ZGVyQmxvY2tGbG93IHdpdGggZGlzcGxheTppbmxpbmUuIFdlIG5lZWQgdG8gdHJlYXQgaXQgYXMg aW5saW5lLWJsb2NrCnRvIGF2b2lkIGJyZWFraW5nIGFzc3VtcHRpb25zLgoKKiBTb3VyY2UvTGF5 b3V0VGVzdHMvZmFzdC9pbmxpbmUvZmllbGRzZXQtaW5saW5lLWNyYXNoLWV4cGVjdGVkLnR4dDog QWRkZWQuCiogU291cmNlL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL2ZpZWxkc2V0LWlubGluZS1j cmFzaC5odG1sOiBBZGRlZC4KKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5 b3V0SW50ZWdyYXRpb25Cb3hUcmVlLmNwcDoKKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpC b3hUcmVlOjpCb3hUcmVlKToKKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpCb3hUcmVlOjph ZGp1c3RTdHlsZUlmTmVlZGVkKToKKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpCb3hUcmVl OjpjcmVhdGVMYXlvdXRCb3gpOgoKRml4IGJ5IHJlZmFjdG9yaW5nIGxheW91dCBib3ggY29uc3Ry dWN0aW9uIGludG8gYSBmdW5jdGlvbiBhbmQgdXNpbmcgaXQgY29uc2lzdGVudGx5IGFsc28gZm9y IHRoZSBmb3JtYXR0aW5nIGNvbnRleHQgcm9vdCBib3guCgooV2ViQ29yZTo6TGF5b3V0SW50ZWdy YXRpb246OkJveFRyZWU6OmJ1aWxkVHJlZUZvcklubGluZUNvbnRlbnQpOgooV2ViQ29yZTo6TGF5 b3V0SW50ZWdyYXRpb246OkJveFRyZWU6OnVwZGF0ZVN0eWxlKToKKFdlYkNvcmU6OkxheW91dElu dGVncmF0aW9uOjpyb290Qm94U3R5bGUpOiBEZWxldGVkLgooV2ViQ29yZTo6TGF5b3V0SW50ZWdy YXRpb246OmFkanVzdFN0eWxlSWZOZWVkZWQpOiBEZWxldGVkLgoqIFNvdXJjZS9XZWJDb3JlL2xh eW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkJveFRyZWUuaDoKLS0tCiAuLi4vaW50 ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Cb3hUcmVlLmNwcCAgfCAxMzMgKysrKysrKystLS0t LS0tLS0tCiAuLi4vaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Cb3hUcmVlLmggICAgfCAg IDMgKwogLi4uL2lubGluZS9maWVsZHNldC1pbmxpbmUtY3Jhc2gtZXhwZWN0ZWQudHh0IHwgICAx ICsKIC4uLi9mYXN0L2lubGluZS9maWVsZHNldC1pbmxpbmUtY3Jhc2guaHRtbCAgICB8ICAxMSAr KwogNCBmaWxlcyBjaGFuZ2VkLCA3MyBpbnNlcnRpb25zKCspLCA3NSBkZWxldGlvbnMoLSkKIGNy ZWF0ZSBtb2RlIDEwMDY0NCBMYXlvdXRUZXN0cy9mYXN0L2lubGluZS9maWVsZHNldC1pbmxpbmUt Y3Jhc2gtZXhwZWN0ZWQudHh0CiBjcmVhdGUgbW9kZSAxMDA2NDQgTGF5b3V0VGVzdHMvZmFzdC9p bmxpbmUvZmllbGRzZXQtaW5saW5lLWNyYXNoLmh0bWwKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Cb3hUcmVlLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkJveFRyZWUu Y3BwCmluZGV4IGYxYjNkY2EzNGE0Zi4uYjcwZmJhYTUzYmRhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Cb3hUcmVlLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25C b3hUcmVlLmNwcApAQCAtNTIsMjAgKzUyLDYgQEAgbmFtZXNwYWNlIExheW91dEludGVncmF0aW9u IHsKIAogc3RhdGljIGNvbnN0ZXhwciBzaXplX3Qgc21hbGxUcmVlVGhyZXNob2xkID0gODsKIAot c3RhdGljIFJlbmRlclN0eWxlIHJvb3RCb3hTdHlsZShjb25zdCBSZW5kZXJCbG9jayYgcm9vdFJl bmRlcmVyKQotewotICAgIGF1dG8gY2xvbmVkU3R5bGUgPSBSZW5kZXJTdHlsZTo6Y2xvbmUocm9v dFJlbmRlcmVyLnN0eWxlKCkpOwotICAgIGlmIChyb290UmVuZGVyZXIuaXNBbm9ueW1vdXNCbG9j aygpKSB7Ci0gICAgICAgIGF1dG8mIGFub25CbG9ja1BhcmVudFN0eWxlID0gcm9vdFJlbmRlcmVy LnBhcmVudCgpLT5zdHlsZSgpOwotICAgICAgICAvLyBvdmVyZmxvdyBhbmQgdGV4dC1vdmVyZmxv dyBwcm9wZXJ0eSB2YWx1ZXMgZG9uJ3QgZ2V0IGZvcndhcmRlZCB0byBhbm9ueW1vdXMgYmxvY2sg Ym94ZXMuCi0gICAgICAgIC8vIGUuZy4gPGRpdiBzdHlsZT0ib3ZlcmZsb3c6IGhpZGRlbjsgdGV4 dC1vdmVyZmxvdzogZWxsaXBzaXM7IHdpZHRoOiAxMDBweDsgd2hpdGUtc3BhY2U6IHByZTsiPnRo aXMgdGV4dCBzaG91bGQgaGF2ZSBlbGxpcHNpczxkaXY+PC9kaXY+PC9kaXY+Ci0gICAgICAgIGNs b25lZFN0eWxlLnNldFRleHRPdmVyZmxvdyhhbm9uQmxvY2tQYXJlbnRTdHlsZS50ZXh0T3ZlcmZs b3coKSk7Ci0gICAgICAgIGNsb25lZFN0eWxlLnNldE92ZXJmbG93WChhbm9uQmxvY2tQYXJlbnRT dHlsZS5vdmVyZmxvd1goKSk7Ci0gICAgICAgIGNsb25lZFN0eWxlLnNldE92ZXJmbG93WShhbm9u QmxvY2tQYXJlbnRTdHlsZS5vdmVyZmxvd1koKSk7Ci0gICAgfQotICAgIHJldHVybiBjbG9uZWRT dHlsZTsKLX0KLQogc3RhdGljIHN0ZDo6dW5pcXVlX3B0cjxSZW5kZXJTdHlsZT4gZmlyc3RMaW5l U3R5bGVGb3IoY29uc3QgUmVuZGVyT2JqZWN0JiByZW5kZXJlcikKIHsKICAgICBhdXRvJiBmaXJz dExpbmVTdHlsZSA9IHJlbmRlcmVyLmZpcnN0TGluZVN0eWxlKCk7CkBAIC03OSw4ICs2NSwxOCBA QCBzdGF0aWMgTGF5b3V0OjpCb3g6OklzQW5vbnltb3VzIGlzQW5vbnltb3VzKGNvbnN0IFJlbmRl ck9iamVjdCYgcmVuZGVyZXIpCiAgICAgcmV0dXJuIHJlbmRlcmVyLmlzQW5vbnltb3VzKCkgPyBM YXlvdXQ6OkJveDo6SXNBbm9ueW1vdXM6OlllcyA6IExheW91dDo6Qm94OjpJc0Fub255bW91czo6 Tm87CiB9CiAKLXN0YXRpYyBMYXlvdXQ6OkJveDo6RWxlbWVudEF0dHJpYnV0ZXMgZWxlbWVudEF0 dHJpYnV0ZXMoY29uc3QgUmVuZGVyT2JqZWN0JiByZW5kZXJlciwgTGF5b3V0OjpCb3g6Ok5vZGVU eXBlIG5vZGVUeXBlID0gTGF5b3V0OjpCb3g6Ok5vZGVUeXBlOjpHZW5lcmljRWxlbWVudCkKK3N0 YXRpYyBMYXlvdXQ6OkJveDo6RWxlbWVudEF0dHJpYnV0ZXMgZWxlbWVudEF0dHJpYnV0ZXMoY29u c3QgUmVuZGVyRWxlbWVudCYgcmVuZGVyZXIpCiB7CisgICAgYXV0byBub2RlVHlwZSA9IFsmXSB7 CisgICAgICAgIGlmIChpczxSZW5kZXJMaXN0TWFya2VyPihyZW5kZXJlcikpCisgICAgICAgICAg ICByZXR1cm4gTGF5b3V0OjpCb3g6Ok5vZGVUeXBlOjpMaXN0TWFya2VyOworICAgICAgICBpZiAo aXM8UmVuZGVyUmVwbGFjZWQ+KHJlbmRlcmVyKSkKKyAgICAgICAgICAgIHJldHVybiBpczxSZW5k ZXJJbWFnZT4ocmVuZGVyZXIpID8gTGF5b3V0OjpCb3g6Ok5vZGVUeXBlOjpJbWFnZSA6IExheW91 dDo6Qm94OjpOb2RlVHlwZTo6UmVwbGFjZWRFbGVtZW50OworICAgICAgICBpZiAoaXM8UmVuZGVy TGluZUJyZWFrPihyZW5kZXJlcikpCisgICAgICAgICAgICByZXR1cm4gZG93bmNhc3Q8UmVuZGVy TGluZUJyZWFrPihyZW5kZXJlcikuaXNXQlIoKSA/IExheW91dDo6Qm94OjpOb2RlVHlwZTo6V29y ZEJyZWFrT3Bwb3J0dW5pdHkgOiBMYXlvdXQ6OkJveDo6Tm9kZVR5cGU6OkxpbmVCcmVhazsKKyAg ICAgICAgcmV0dXJuIExheW91dDo6Qm94OjpOb2RlVHlwZTo6R2VuZXJpY0VsZW1lbnQ7CisgICAg fSgpOworCiAgICAgcmV0dXJuIHsgbm9kZVR5cGUsIGlzQW5vbnltb3VzKHJlbmRlcmVyKSB9Owog fQogCkBAIC04OSw4ICs4NSw4IEBAIEJveFRyZWU6OkJveFRyZWUoUmVuZGVyQmxvY2smIHJvb3RS ZW5kZXJlcikKIHsKICAgICBhdXRvKiByb290Qm94ID0gbV9yb290UmVuZGVyZXIubGF5b3V0Qm94 KCk7CiAgICAgaWYgKCFyb290Qm94KSB7Ci0gICAgICAgIGF1dG8gbmV3Um9vdEJveCA9IG1ha2VV bmlxdWVSZWY8TGF5b3V0OjpFbGVtZW50Qm94PihlbGVtZW50QXR0cmlidXRlcyhyb290UmVuZGVy ZXIpLCByb290Qm94U3R5bGUocm9vdFJlbmRlcmVyKSwgZmlyc3RMaW5lU3R5bGVGb3Iocm9vdFJl bmRlcmVyKSk7Ci0gICAgICAgIHJvb3RCb3ggPSBuZXdSb290Qm94LnB0cigpOworICAgICAgICBh dXRvIG5ld1Jvb3RCb3ggPSBjcmVhdGVMYXlvdXRCb3gocm9vdFJlbmRlcmVyKTsKKyAgICAgICAg cm9vdEJveCA9IGRvd25jYXN0PExheW91dDo6RWxlbWVudEJveD4obmV3Um9vdEJveC5wdHIoKSk7 CiAgICAgICAgIG1fcm9vdFJlbmRlcmVyLnNldExheW91dEJveCgqcm9vdEJveCk7CiAgICAgICAg IGluaXRpYWxDb250YWluaW5nQmxvY2soKS5hcHBlbmRDaGlsZChXVEZNb3ZlKG5ld1Jvb3RCb3gp KTsKICAgICB9CkBAIC0xMjksMTIgKzEyNSwyMCBAQCBCb3hUcmVlOjp+Qm94VHJlZSgpCiAgICAg ICAgIHJvb3RMYXlvdXRCb3goKS5kZXN0cm95Q2hpbGRyZW4oKTsKIH0KIAotc3RhdGljIHZvaWQg YWRqdXN0U3R5bGVJZk5lZWRlZChjb25zdCBSZW5kZXJPYmplY3QmIHJlbmRlcmVyLCBSZW5kZXJT dHlsZSYgc3R5bGUsIFJlbmRlclN0eWxlKiBmaXJzdExpbmVTdHlsZSkKK3ZvaWQgQm94VHJlZTo6 YWRqdXN0U3R5bGVJZk5lZWRlZChjb25zdCBSZW5kZXJPYmplY3QmIHJlbmRlcmVyLCBSZW5kZXJT dHlsZSYgc3R5bGUsIFJlbmRlclN0eWxlKiBmaXJzdExpbmVTdHlsZSkKIHsKICAgICBhdXRvIGFk anVzdFN0eWxlID0gWyZdIChhdXRvJiBzdHlsZVRvQWRqdXN0KSB7CiAgICAgICAgIGlmIChpczxS ZW5kZXJCbG9jaz4ocmVuZGVyZXIpKSB7CiAgICAgICAgICAgICBpZiAoc3R5bGVUb0FkanVzdC5k aXNwbGF5KCkgPT0gRGlzcGxheVR5cGU6OklubGluZSkKICAgICAgICAgICAgICAgICBzdHlsZVRv QWRqdXN0LnNldERpc3BsYXkoRGlzcGxheVR5cGU6OklubGluZUJsb2NrKTsKKyAgICAgICAgICAg IGlmIChyZW5kZXJlci5pc0Fub255bW91c0Jsb2NrKCkpIHsKKyAgICAgICAgICAgICAgICBhdXRv JiBhbm9uQmxvY2tQYXJlbnRTdHlsZSA9IHJlbmRlcmVyLnBhcmVudCgpLT5zdHlsZSgpOworICAg ICAgICAgICAgICAgIC8vIG92ZXJmbG93IGFuZCB0ZXh0LW92ZXJmbG93IHByb3BlcnR5IHZhbHVl cyBkb24ndCBnZXQgZm9yd2FyZGVkIHRvIGFub255bW91cyBibG9jayBib3hlcy4KKyAgICAgICAg ICAgICAgICAvLyBlLmcuIDxkaXYgc3R5bGU9Im92ZXJmbG93OiBoaWRkZW47IHRleHQtb3ZlcmZs b3c6IGVsbGlwc2lzOyB3aWR0aDogMTAwcHg7IHdoaXRlLXNwYWNlOiBwcmU7Ij50aGlzIHRleHQg c2hvdWxkIGhhdmUgZWxsaXBzaXM8ZGl2PjwvZGl2PjwvZGl2PgorICAgICAgICAgICAgICAgIHN0 eWxlVG9BZGp1c3Quc2V0VGV4dE92ZXJmbG93KGFub25CbG9ja1BhcmVudFN0eWxlLnRleHRPdmVy ZmxvdygpKTsKKyAgICAgICAgICAgICAgICBzdHlsZVRvQWRqdXN0LnNldE92ZXJmbG93WChhbm9u QmxvY2tQYXJlbnRTdHlsZS5vdmVyZmxvd1goKSk7CisgICAgICAgICAgICAgICAgc3R5bGVUb0Fk anVzdC5zZXRPdmVyZmxvd1koYW5vbkJsb2NrUGFyZW50U3R5bGUub3ZlcmZsb3dZKCkpOworICAg ICAgICAgICAgfQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgICAgIGlmIChp czxSZW5kZXJJbmxpbmU+KHJlbmRlcmVyKSkgewpAQCAtMTcxLDY4ICsxNzUsNTEgQEAgc3RhdGlj IHZvaWQgYWRqdXN0U3R5bGVJZk5lZWRlZChjb25zdCBSZW5kZXJPYmplY3QmIHJlbmRlcmVyLCBS ZW5kZXJTdHlsZSYgc3R5bGUKICAgICAgICAgYWRqdXN0U3R5bGUoKmZpcnN0TGluZVN0eWxlKTsK IH0KIAotdm9pZCBCb3hUcmVlOjpidWlsZFRyZWVGb3JJbmxpbmVDb250ZW50KCkKK1VuaXF1ZVJl ZjxMYXlvdXQ6OkJveD4gQm94VHJlZTo6Y3JlYXRlTGF5b3V0Qm94KFJlbmRlck9iamVjdCYgcmVu ZGVyZXIpCiB7Ci0gICAgYXV0byBjcmVhdGVDaGlsZEJveCA9IFsmXShSZW5kZXJPYmplY3QmIGNo aWxkUmVuZGVyZXIpIC0+IHN0ZDo6dW5pcXVlX3B0cjxMYXlvdXQ6OkJveD4gewotICAgICAgICBz dGQ6OnVuaXF1ZV9wdHI8UmVuZGVyU3R5bGU+IGZpcnN0TGluZVN0eWxlID0gZmlyc3RMaW5lU3R5 bGVGb3IoY2hpbGRSZW5kZXJlcik7Ci0KLSAgICAgICAgaWYgKGlzPFJlbmRlckNvdW50ZXI+KGNo aWxkUmVuZGVyZXIpKSB7Ci0gICAgICAgICAgICAvLyBUaGlzIGVuc3VyZXMgdGhhdCBJbmxpbmVU ZXh0Qm94IChzZWUgYmVsb3cpIGFsd2F5cyBoYXMgdXB0b2RhdGUgY291bnRlciB0ZXh0IChub3Rl IHRoYXQgUmVuZGVyQ291bnRlciBpcyBhIHR5cGUgb2YgUmVuZGVyVGV4dCkuCi0gICAgICAgICAg ICBpZiAoY2hpbGRSZW5kZXJlci5wcmVmZXJyZWRMb2dpY2FsV2lkdGhzRGlydHkoKSkgewotICAg ICAgICAgICAgICAgIC8vIENvdW50ZXIgY29udGVudCBpcyB1cGRhdGVkIHRocm91Z2ggcHJlZmVy cmVkIHdpZHRoIGNvbXB1dGF0aW9uLgotICAgICAgICAgICAgICAgIGRvd25jYXN0PFJlbmRlckNv dW50ZXI+KGNoaWxkUmVuZGVyZXIpLnVwZGF0ZUNvdW50ZXIoKTsKLSAgICAgICAgICAgIH0KLSAg ICAgICAgfQotICAgICAgICBpZiAoaXM8UmVuZGVyVGV4dD4oY2hpbGRSZW5kZXJlcikpIHsKLSAg ICAgICAgICAgIGF1dG8mIHRleHRSZW5kZXJlciA9IGRvd25jYXN0PFJlbmRlclRleHQ+KGNoaWxk UmVuZGVyZXIpOwotICAgICAgICAgICAgYXV0byBzdHlsZSA9IFJlbmRlclN0eWxlOjpjcmVhdGVB bm9ueW1vdXNTdHlsZVdpdGhEaXNwbGF5KHRleHRSZW5kZXJlci5zdHlsZSgpLCBEaXNwbGF5VHlw ZTo6SW5saW5lKTsKLSAgICAgICAgICAgIGF1dG8gdGV4dCA9IHN0eWxlLnRleHRTZWN1cml0eSgp ID09IFRleHRTZWN1cml0eTo6Tm9uZSA/IHRleHRSZW5kZXJlci50ZXh0KCkgOiBSZW5kZXJCbG9j azo6dXBkYXRlU2VjdXJpdHlEaXNjQ2hhcmFjdGVycyhzdHlsZSwgdGV4dFJlbmRlcmVyLnRleHQo KSk7Ci0gICAgICAgICAgICByZXR1cm4gbWFrZVVuaXF1ZTxMYXlvdXQ6OklubGluZVRleHRCb3g+ KHRleHQsIHRleHRSZW5kZXJlci5jYW5Vc2VTaW1wbGlmaWVkVGV4dE1lYXN1cmluZygpLCB0ZXh0 UmVuZGVyZXIuY2FuVXNlU2ltcGxlRm9udENvZGVQYXRoKCksIFdURk1vdmUoc3R5bGUpLCBXVEZN b3ZlKGZpcnN0TGluZVN0eWxlKSk7CisgICAgaWYgKGlzPFJlbmRlckNvdW50ZXI+KHJlbmRlcmVy KSkgeworICAgICAgICAvLyBUaGlzIGVuc3VyZXMgdGhhdCBJbmxpbmVUZXh0Qm94IChzZWUgYmVs b3cpIGFsd2F5cyBoYXMgdXB0b2RhdGUgY291bnRlciB0ZXh0IChub3RlIHRoYXQgUmVuZGVyQ291 bnRlciBpcyBhIHR5cGUgb2YgUmVuZGVyVGV4dCkuCisgICAgICAgIGlmIChyZW5kZXJlci5wcmVm ZXJyZWRMb2dpY2FsV2lkdGhzRGlydHkoKSkgeworICAgICAgICAgICAgLy8gQ291bnRlciBjb250 ZW50IGlzIHVwZGF0ZWQgdGhyb3VnaCBwcmVmZXJyZWQgd2lkdGggY29tcHV0YXRpb24uCisgICAg ICAgICAgICBkb3duY2FzdDxSZW5kZXJDb3VudGVyPihyZW5kZXJlcikudXBkYXRlQ291bnRlcigp OwogICAgICAgICB9CisgICAgfQogCi0gICAgICAgIGF1dG8gc3R5bGUgPSBSZW5kZXJTdHlsZTo6 Y2xvbmUoY2hpbGRSZW5kZXJlci5zdHlsZSgpKTsKLSAgICAgICAgaWYgKGNoaWxkUmVuZGVyZXIu aXNMaW5lQnJlYWsoKSkgewotICAgICAgICAgICAgYWRqdXN0U3R5bGVJZk5lZWRlZChjaGlsZFJl bmRlcmVyLCBzdHlsZSwgZmlyc3RMaW5lU3R5bGUuZ2V0KCkpOwotICAgICAgICAgICAgYXV0byBh dHRyaWJ1dGVzID0gZWxlbWVudEF0dHJpYnV0ZXMoY2hpbGRSZW5kZXJlciwgZG93bmNhc3Q8UmVu ZGVyTGluZUJyZWFrPihjaGlsZFJlbmRlcmVyKS5pc1dCUigpID8gTGF5b3V0OjpCb3g6Ok5vZGVU eXBlOjpXb3JkQnJlYWtPcHBvcnR1bml0eSA6IExheW91dDo6Qm94OjpOb2RlVHlwZTo6TGluZUJy ZWFrKTsKLSAgICAgICAgICAgIHJldHVybiBtYWtlVW5pcXVlPExheW91dDo6RWxlbWVudEJveD4o V1RGTW92ZShhdHRyaWJ1dGVzKSwgV1RGTW92ZShzdHlsZSksIFdURk1vdmUoZmlyc3RMaW5lU3R5 bGUpKTsKLSAgICAgICAgfQorICAgIHN0ZDo6dW5pcXVlX3B0cjxSZW5kZXJTdHlsZT4gZmlyc3RM aW5lU3R5bGUgPSBmaXJzdExpbmVTdHlsZUZvcihyZW5kZXJlcik7CiAKLSAgICAgICAgaWYgKGlz PFJlbmRlckxpc3RNYXJrZXI+KGNoaWxkUmVuZGVyZXIpKSB7Ci0gICAgICAgICAgICBhdXRvJiBs aXN0TWFya2VyUmVuZGVyZXIgPSBkb3duY2FzdDxSZW5kZXJMaXN0TWFya2VyPihjaGlsZFJlbmRl cmVyKTsKLSAgICAgICAgICAgIE9wdGlvblNldDxMYXlvdXQ6OkVsZW1lbnRCb3g6Okxpc3RNYXJr ZXJBdHRyaWJ1dGU+IGxpc3RNYXJrZXJBdHRyaWJ1dGVzOwotICAgICAgICAgICAgaWYgKGxpc3RN YXJrZXJSZW5kZXJlci5pc0ltYWdlKCkpCi0gICAgICAgICAgICAgICAgbGlzdE1hcmtlckF0dHJp YnV0ZXMuYWRkKExheW91dDo6RWxlbWVudEJveDo6TGlzdE1hcmtlckF0dHJpYnV0ZTo6SW1hZ2Up OwotICAgICAgICAgICAgaWYgKCFsaXN0TWFya2VyUmVuZGVyZXIuaXNJbnNpZGUoKSkKLSAgICAg ICAgICAgICAgICBsaXN0TWFya2VyQXR0cmlidXRlcy5hZGQoTGF5b3V0OjpFbGVtZW50Qm94OjpM aXN0TWFya2VyQXR0cmlidXRlOjpPdXRzaWRlKTsKLSAgICAgICAgICAgIHJldHVybiBtYWtlVW5p cXVlPExheW91dDo6RWxlbWVudEJveD4oZWxlbWVudEF0dHJpYnV0ZXMoY2hpbGRSZW5kZXJlciwg TGF5b3V0OjpCb3g6Ok5vZGVUeXBlOjpMaXN0TWFya2VyKSwgbGlzdE1hcmtlckF0dHJpYnV0ZXMs IFdURk1vdmUoc3R5bGUpLCBXVEZNb3ZlKGZpcnN0TGluZVN0eWxlKSk7Ci0gICAgICAgIH0KKyAg ICBpZiAoaXM8UmVuZGVyVGV4dD4ocmVuZGVyZXIpKSB7CisgICAgICAgIGF1dG8mIHRleHRSZW5k ZXJlciA9IGRvd25jYXN0PFJlbmRlclRleHQ+KHJlbmRlcmVyKTsKKyAgICAgICAgYXV0byBzdHls ZSA9IFJlbmRlclN0eWxlOjpjcmVhdGVBbm9ueW1vdXNTdHlsZVdpdGhEaXNwbGF5KHRleHRSZW5k ZXJlci5zdHlsZSgpLCBEaXNwbGF5VHlwZTo6SW5saW5lKTsKKyAgICAgICAgYXV0byB0ZXh0ID0g c3R5bGUudGV4dFNlY3VyaXR5KCkgPT0gVGV4dFNlY3VyaXR5OjpOb25lID8gdGV4dFJlbmRlcmVy LnRleHQoKSA6IFJlbmRlckJsb2NrOjp1cGRhdGVTZWN1cml0eURpc2NDaGFyYWN0ZXJzKHN0eWxl LCB0ZXh0UmVuZGVyZXIudGV4dCgpKTsKKyAgICAgICAgcmV0dXJuIG1ha2VVbmlxdWVSZWY8TGF5 b3V0OjpJbmxpbmVUZXh0Qm94Pih0ZXh0LCB0ZXh0UmVuZGVyZXIuY2FuVXNlU2ltcGxpZmllZFRl eHRNZWFzdXJpbmcoKSwgdGV4dFJlbmRlcmVyLmNhblVzZVNpbXBsZUZvbnRDb2RlUGF0aCgpLCBX VEZNb3ZlKHN0eWxlKSwgV1RGTW92ZShmaXJzdExpbmVTdHlsZSkpOworICAgIH0KIAotICAgICAg ICBpZiAoaXM8UmVuZGVyUmVwbGFjZWQ+KGNoaWxkUmVuZGVyZXIpKSB7Ci0gICAgICAgICAgICBh dXRvIGF0dHJpYnV0ZXMgPSBlbGVtZW50QXR0cmlidXRlcyhjaGlsZFJlbmRlcmVyLCBpczxSZW5k ZXJJbWFnZT4oY2hpbGRSZW5kZXJlcikgPyBMYXlvdXQ6OkJveDo6Tm9kZVR5cGU6OkltYWdlIDog TGF5b3V0OjpCb3g6Ok5vZGVUeXBlOjpSZXBsYWNlZEVsZW1lbnQpOwotICAgICAgICAgICAgcmV0 dXJuIG1ha2VVbmlxdWU8TGF5b3V0OjpFbGVtZW50Qm94PihXVEZNb3ZlKGF0dHJpYnV0ZXMpLCBX VEZNb3ZlKHN0eWxlKSwgV1RGTW92ZShmaXJzdExpbmVTdHlsZSkpOwotICAgICAgICB9CisgICAg YXV0byYgcmVuZGVyRWxlbWVudCA9IGRvd25jYXN0PFJlbmRlckVsZW1lbnQ+KHJlbmRlcmVyKTsK IAotICAgICAgICBpZiAoaXM8UmVuZGVyQmxvY2s+KGNoaWxkUmVuZGVyZXIpKSB7Ci0gICAgICAg ICAgICBhZGp1c3RTdHlsZUlmTmVlZGVkKGNoaWxkUmVuZGVyZXIsIHN0eWxlLCBmaXJzdExpbmVT dHlsZS5nZXQoKSk7Ci0gICAgICAgICAgICBhdXRvIGF0dHJpYnV0ZXMgPSBlbGVtZW50QXR0cmli dXRlcyhjaGlsZFJlbmRlcmVyKTsKLSAgICAgICAgICAgIHJldHVybiBtYWtlVW5pcXVlPExheW91 dDo6RWxlbWVudEJveD4oV1RGTW92ZShhdHRyaWJ1dGVzKSwgV1RGTW92ZShzdHlsZSksIFdURk1v dmUoZmlyc3RMaW5lU3R5bGUpKTsKLSAgICAgICAgfQorICAgIGF1dG8gc3R5bGUgPSBSZW5kZXJT dHlsZTo6Y2xvbmUocmVuZGVyZXIuc3R5bGUoKSk7CisgICAgYWRqdXN0U3R5bGVJZk5lZWRlZChy ZW5kZXJlciwgc3R5bGUsIGZpcnN0TGluZVN0eWxlLmdldCgpKTsKIAotICAgICAgICBpZiAoaXM8 UmVuZGVySW5saW5lPihjaGlsZFJlbmRlcmVyKSkgewotICAgICAgICAgICAgYWRqdXN0U3R5bGVJ Zk5lZWRlZChjaGlsZFJlbmRlcmVyLCBzdHlsZSwgZmlyc3RMaW5lU3R5bGUuZ2V0KCkpOwotICAg ICAgICAgICAgcmV0dXJuIG1ha2VVbmlxdWU8TGF5b3V0OjpFbGVtZW50Qm94PihlbGVtZW50QXR0 cmlidXRlcyhjaGlsZFJlbmRlcmVyKSwgV1RGTW92ZShzdHlsZSksIFdURk1vdmUoZmlyc3RMaW5l U3R5bGUpKTsKLSAgICAgICAgfQorICAgIGlmIChpczxSZW5kZXJMaXN0TWFya2VyPihyZW5kZXJF bGVtZW50KSkgeworICAgICAgICBhdXRvJiBsaXN0TWFya2VyUmVuZGVyZXIgPSBkb3duY2FzdDxS ZW5kZXJMaXN0TWFya2VyPihyZW5kZXJFbGVtZW50KTsKKyAgICAgICAgT3B0aW9uU2V0PExheW91 dDo6RWxlbWVudEJveDo6TGlzdE1hcmtlckF0dHJpYnV0ZT4gbGlzdE1hcmtlckF0dHJpYnV0ZXM7 CisgICAgICAgIGlmIChsaXN0TWFya2VyUmVuZGVyZXIuaXNJbWFnZSgpKQorICAgICAgICAgICAg bGlzdE1hcmtlckF0dHJpYnV0ZXMuYWRkKExheW91dDo6RWxlbWVudEJveDo6TGlzdE1hcmtlckF0 dHJpYnV0ZTo6SW1hZ2UpOworICAgICAgICBpZiAoIWxpc3RNYXJrZXJSZW5kZXJlci5pc0luc2lk ZSgpKQorICAgICAgICAgICAgbGlzdE1hcmtlckF0dHJpYnV0ZXMuYWRkKExheW91dDo6RWxlbWVu dEJveDo6TGlzdE1hcmtlckF0dHJpYnV0ZTo6T3V0c2lkZSk7CisgICAgICAgIHJldHVybiBtYWtl VW5pcXVlUmVmPExheW91dDo6RWxlbWVudEJveD4oZWxlbWVudEF0dHJpYnV0ZXMocmVuZGVyRWxl bWVudCksIGxpc3RNYXJrZXJBdHRyaWJ1dGVzLCBXVEZNb3ZlKHN0eWxlKSwgV1RGTW92ZShmaXJz dExpbmVTdHlsZSkpOworICAgIH0KIAotICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAg ICAgICAgcmV0dXJuIG51bGxwdHI7Ci0gICAgfTsKKyAgICByZXR1cm4gbWFrZVVuaXF1ZVJlZjxM YXlvdXQ6OkVsZW1lbnRCb3g+KGVsZW1lbnRBdHRyaWJ1dGVzKHJlbmRlckVsZW1lbnQpLCBXVEZN b3ZlKHN0eWxlKSwgV1RGTW92ZShmaXJzdExpbmVTdHlsZSkpOworfTsKIAordm9pZCBCb3hUcmVl OjpidWlsZFRyZWVGb3JJbmxpbmVDb250ZW50KCkKK3sKICAgICBmb3IgKGF1dG8gd2Fsa2VyID0g SW5saW5lV2Fsa2VyKGRvd25jYXN0PFJlbmRlckJsb2NrRmxvdz4obV9yb290UmVuZGVyZXIpKTsg IXdhbGtlci5hdEVuZCgpOyB3YWxrZXIuYWR2YW5jZSgpKSB7CiAgICAgICAgIGF1dG8mIGNoaWxk UmVuZGVyZXIgPSAqd2Fsa2VyLmN1cnJlbnQoKTsKICAgICAgICAgYXV0byBjaGlsZExheW91dEJv eCA9IFsmXSB7CiAgICAgICAgICAgICBpZiAoYXV0byBleGlzdGluZ0NoaWxkQm94ID0gY2hpbGRS ZW5kZXJlci5sYXlvdXRCb3goKSkKICAgICAgICAgICAgICAgICByZXR1cm4gZXhpc3RpbmdDaGls ZEJveC0+cmVtb3ZlRnJvbVBhcmVudCgpOwotICAgICAgICAgICAgcmV0dXJuIG1ha2VVbmlxdWVS ZWZGcm9tTm9uTnVsbFVuaXF1ZVB0cihjcmVhdGVDaGlsZEJveChjaGlsZFJlbmRlcmVyKSk7Cisg ICAgICAgICAgICByZXR1cm4gY3JlYXRlTGF5b3V0Qm94KGNoaWxkUmVuZGVyZXIpOwogICAgICAg ICB9OwogICAgICAgICBhcHBlbmRDaGlsZChjaGlsZExheW91dEJveCgpLCBjaGlsZFJlbmRlcmVy KTsKICAgICB9CkBAIC0yNDAsNyArMjI3LDcgQEAgdm9pZCBCb3hUcmVlOjpidWlsZFRyZWVGb3JJ bmxpbmVDb250ZW50KCkKIAogdm9pZCBCb3hUcmVlOjpidWlsZFRyZWVGb3JGbGV4Q29udGVudCgp CiB7Ci0gICAgZm9yIChhdXRvJiBmbGV4SXRlbVJlbmRlcmVyIDogY2hpbGRyZW5PZlR5cGU8UmVu ZGVyT2JqZWN0PihtX3Jvb3RSZW5kZXJlcikpIHsKKyAgICBmb3IgKGF1dG8mIGZsZXhJdGVtUmVu ZGVyZXIgOiBjaGlsZHJlbk9mVHlwZTxSZW5kZXJFbGVtZW50PihtX3Jvb3RSZW5kZXJlcikpIHsK ICAgICAgICAgYXV0byBzdHlsZSA9IFJlbmRlclN0eWxlOjpjbG9uZShmbGV4SXRlbVJlbmRlcmVy LnN0eWxlKCkpOwogICAgICAgICBhdXRvIGZsZXhJdGVtID0gbWFrZVVuaXF1ZTxMYXlvdXQ6OkVs ZW1lbnRCb3g+KGVsZW1lbnRBdHRyaWJ1dGVzKGZsZXhJdGVtUmVuZGVyZXIpLCBXVEZNb3ZlKHN0 eWxlKSk7CiAgICAgICAgIGFwcGVuZENoaWxkKG1ha2VVbmlxdWVSZWZGcm9tTm9uTnVsbFVuaXF1 ZVB0cihXVEZNb3ZlKGZsZXhJdGVtKSksIGZsZXhJdGVtUmVuZGVyZXIpOwpAQCAtMjYyLDE0ICsy NDksMTAgQEAgdm9pZCBCb3hUcmVlOjp1cGRhdGVTdHlsZShjb25zdCBSZW5kZXJCb3hNb2RlbE9i amVjdCYgcmVuZGVyZXIpCiAgICAgYXV0byYgbGF5b3V0Qm94ID0gbGF5b3V0Qm94Rm9yUmVuZGVy ZXIocmVuZGVyZXIpOwogICAgIGF1dG8mIHJlbmRlcmVyU3R5bGUgPSByZW5kZXJlci5zdHlsZSgp OwogCi0gICAgaWYgKCZsYXlvdXRCb3ggPT0gJnJvb3RMYXlvdXRCb3goKSkKLSAgICAgICAgbGF5 b3V0Qm94LnVwZGF0ZVN0eWxlKHJvb3RCb3hTdHlsZShkb3duY2FzdDxSZW5kZXJCbG9jaz4ocmVu ZGVyZXIpKSwgZmlyc3RMaW5lU3R5bGVGb3IocmVuZGVyZXIpKTsKLSAgICBlbHNlIHsKLSAgICAg ICAgYXV0byBmaXJzdExpbmVOZXdTdHlsZSA9IGZpcnN0TGluZVN0eWxlRm9yKHJlbmRlcmVyKTsK LSAgICAgICAgYXV0byBuZXdTdHlsZSA9IFJlbmRlclN0eWxlOjpjbG9uZShyZW5kZXJlclN0eWxl KTsKLSAgICAgICAgYWRqdXN0U3R5bGVJZk5lZWRlZChyZW5kZXJlciwgbmV3U3R5bGUsIGZpcnN0 TGluZU5ld1N0eWxlLmdldCgpKTsKLSAgICAgICAgbGF5b3V0Qm94LnVwZGF0ZVN0eWxlKFdURk1v dmUobmV3U3R5bGUpLCBXVEZNb3ZlKGZpcnN0TGluZU5ld1N0eWxlKSk7Ci0gICAgfQorICAgIGF1 dG8gZmlyc3RMaW5lTmV3U3R5bGUgPSBmaXJzdExpbmVTdHlsZUZvcihyZW5kZXJlcik7CisgICAg YXV0byBuZXdTdHlsZSA9IFJlbmRlclN0eWxlOjpjbG9uZShyZW5kZXJlclN0eWxlKTsKKyAgICBh ZGp1c3RTdHlsZUlmTmVlZGVkKHJlbmRlcmVyLCBuZXdTdHlsZSwgZmlyc3RMaW5lTmV3U3R5bGUu Z2V0KCkpOworICAgIGxheW91dEJveC51cGRhdGVTdHlsZShXVEZNb3ZlKG5ld1N0eWxlKSwgV1RG TW92ZShmaXJzdExpbmVOZXdTdHlsZSkpOwogCiAgICAgZm9yIChhdXRvKiBjaGlsZCA9IGxheW91 dEJveC5maXJzdENoaWxkKCk7IGNoaWxkOyBjaGlsZCA9IGNoaWxkLT5uZXh0U2libGluZygpKSB7 CiAgICAgICAgIGlmIChjaGlsZC0+aXNJbmxpbmVUZXh0Qm94KCkpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Cb3hUcmVlLmgg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Cb3hU cmVlLmgKaW5kZXggODFmNGMwN2ZmMGY5Li45ODJjNzU0ZGZiN2UgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkJveFRyZWUuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25C b3hUcmVlLmgKQEAgLTcxLDYgKzcxLDkgQEAgcHVibGljOgogcHJpdmF0ZToKICAgICBMYXlvdXQ6 OkluaXRpYWxDb250YWluaW5nQmxvY2smIGluaXRpYWxDb250YWluaW5nQmxvY2soKTsKIAorICAg IHN0YXRpYyBVbmlxdWVSZWY8TGF5b3V0OjpCb3g+IGNyZWF0ZUxheW91dEJveChSZW5kZXJPYmpl Y3QmKTsKKyAgICBzdGF0aWMgdm9pZCBhZGp1c3RTdHlsZUlmTmVlZGVkKGNvbnN0IFJlbmRlck9i amVjdCYsIFJlbmRlclN0eWxlJiwgUmVuZGVyU3R5bGUqIGZpcnN0TGluZVN0eWxlKTsKKwogICAg IHZvaWQgYnVpbGRUcmVlRm9ySW5saW5lQ29udGVudCgpOwogICAgIHZvaWQgYnVpbGRUcmVlRm9y RmxleENvbnRlbnQoKTsKICAgICB2b2lkIGFwcGVuZENoaWxkKFVuaXF1ZVJlZjxMYXlvdXQ6OkJv eD4sIFJlbmRlck9iamVjdCYpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUv ZmllbGRzZXQtaW5saW5lLWNyYXNoLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvaW5s aW5lL2ZpZWxkc2V0LWlubGluZS1jcmFzaC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMDAwMDAwLi43MzBlYmY2NmEwZGEKLS0tIC9kZXYvbnVsbAorKysgYi9M YXlvdXRUZXN0cy9mYXN0L2lubGluZS9maWVsZHNldC1pbmxpbmUtY3Jhc2gtZXhwZWN0ZWQudHh0 CkBAIC0wLDAgKzEgQEAKK1RoaXMgdGVzdCBwYXNzZXMgaWYgaXQgZG9lc24ndCBjcmFzaC4KZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL2ZpZWxkc2V0LWlubGluZS1jcmFzaC5o dG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvZmllbGRzZXQtaW5saW5lLWNyYXNoLmh0bWwK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwLi41OTY4OWUwMjM3NDIKLS0t IC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2lubGluZS9maWVsZHNldC1pbmxpbmUt Y3Jhc2guaHRtbApAQCAtMCwwICsxLDExIEBACis8c2NyaXB0PgoraWYgKHdpbmRvdy50ZXN0UnVu bmVyKQorICAgIHRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOworPC9zY3JpcHQ+Cis8c3R5bGU+Citm aWVsZHNldCB7IGRpc3BsYXk6IGlubGluZSB9CitzcGFuIHsgZmxvYXQ6IGxlZnQgfQorPC9zdHls ZT4KKzxzcGFuPgorPGZpZWxkc2V0PgorVGhpcyB0ZXN0IHBhc3NlcyBpZiBpdCBkb2Vzbid0IGNy YXNoLgo= 462832 2022-10-06 03:09:19 -0700 2022-10-06 16:09:47 -0700 Patch bug-246139-20221006130917.patch text/plain 15432 koivisto RnJvbSAyMjkxOWY5OTI1OTQ5ZTVjZmUxZTk5NDQyMGYxMjc2ODcxOWYwZDgzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnR0aSBLb2l2aXN0byA8YW50dGlAYXBwbGUuY29tPgpEYXRl OiBUaHUsIDYgT2N0IDIwMjIgMTI6MjQ6NTMgKzAzMDAKU3ViamVjdDogW1BBVENIXSBSRUdSRVNT SU9OKDI1NDc1NUBtYWluKTogUmVsZWFzZSBhc3NlcnQgaW4KIExheW91dEludGVncmF0aW9uOjpC b3hUcmVlOjpyZW5kZXJlckZvckxheW91dEJveCB3aXRoIDxmaWVsZHNldD4KIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNDYxMzkgcmRhcjovLzEwMDQ5MzI4NAoKUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgo8ZmllbGRzZXQgc3R5bGU9ImRpc3BsYXk6aW5saW5l Ij4gY3JlYXRlcyBhIFJlbmRlckJsb2NrRmxvdyB3aXRoIGRpc3BsYXk6aW5saW5lLiBXZSBuZWVk IHRvIHRyZWF0IGl0IGFzIGlubGluZS1ibG9jawp0byBhdm9pZCBicmVha2luZyBhc3N1bXB0aW9u cy4KCiogU291cmNlL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL2ZpZWxkc2V0LWlubGluZS1jcmFz aC1leHBlY3RlZC50eHQ6IEFkZGVkLgoqIFNvdXJjZS9MYXlvdXRUZXN0cy9mYXN0L2lubGluZS9m aWVsZHNldC1pbmxpbmUtY3Jhc2guaHRtbDogQWRkZWQuCiogU291cmNlL1dlYkNvcmUvbGF5b3V0 L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uQm94VHJlZS5jcHA6CihXZWJDb3JlOjpMYXlv dXRJbnRlZ3JhdGlvbjo6Qm94VHJlZTo6Qm94VHJlZSk6CihXZWJDb3JlOjpMYXlvdXRJbnRlZ3Jh dGlvbjo6Qm94VHJlZTo6YWRqdXN0U3R5bGVJZk5lZWRlZCk6CihXZWJDb3JlOjpMYXlvdXRJbnRl Z3JhdGlvbjo6Qm94VHJlZTo6Y3JlYXRlTGF5b3V0Qm94KToKCkZpeCBieSByZWZhY3RvcmluZyBs YXlvdXQgYm94IGNvbnN0cnVjdGlvbiBpbnRvIGEgZnVuY3Rpb24gYW5kIHVzaW5nIGl0IGNvbnNp c3RlbnRseSBhbHNvIGZvciB0aGUgZm9ybWF0dGluZyBjb250ZXh0IHJvb3QgYm94LgoKKFdlYkNv cmU6OkxheW91dEludGVncmF0aW9uOjpCb3hUcmVlOjpidWlsZFRyZWVGb3JJbmxpbmVDb250ZW50 KToKKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpCb3hUcmVlOjp1cGRhdGVTdHlsZSk6CihX ZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6cm9vdEJveFN0eWxlKTogRGVsZXRlZC4KKFdlYkNv cmU6OkxheW91dEludGVncmF0aW9uOjphZGp1c3RTdHlsZUlmTmVlZGVkKTogRGVsZXRlZC4KKiBT b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Cb3hUcmVl Lmg6Ci0tLQogLi4uL2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uQm94VHJlZS5jcHAgIHwg MTM2ICsrKysrKysrLS0tLS0tLS0tLQogLi4uL2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9u Qm94VHJlZS5oICAgIHwgICAzICsKIC4uLi9pbmxpbmUvZmllbGRzZXQtaW5saW5lLWNyYXNoLWV4 cGVjdGVkLnR4dCB8ICAgMSArCiAuLi4vZmFzdC9pbmxpbmUvZmllbGRzZXQtaW5saW5lLWNyYXNo Lmh0bWwgICAgfCAgMTEgKysKIDQgZmlsZXMgY2hhbmdlZCwgNzQgaW5zZXJ0aW9ucygrKSwgNzcg ZGVsZXRpb25zKC0pCiBjcmVhdGUgbW9kZSAxMDA2NDQgTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUv ZmllbGRzZXQtaW5saW5lLWNyYXNoLWV4cGVjdGVkLnR4dAogY3JlYXRlIG1vZGUgMTAwNjQ0IExh eW91dFRlc3RzL2Zhc3QvaW5saW5lL2ZpZWxkc2V0LWlubGluZS1jcmFzaC5odG1sCgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9u Qm94VHJlZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50 ZWdyYXRpb25Cb3hUcmVlLmNwcAppbmRleCBmMWIzZGNhMzRhNGYuLjU4MzMzODEwZDI5MiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0 aW9uQm94VHJlZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xh eW91dEludGVncmF0aW9uQm94VHJlZS5jcHAKQEAgLTUyLDIwICs1Miw2IEBAIG5hbWVzcGFjZSBM YXlvdXRJbnRlZ3JhdGlvbiB7CiAKIHN0YXRpYyBjb25zdGV4cHIgc2l6ZV90IHNtYWxsVHJlZVRo cmVzaG9sZCA9IDg7CiAKLXN0YXRpYyBSZW5kZXJTdHlsZSByb290Qm94U3R5bGUoY29uc3QgUmVu ZGVyQmxvY2smIHJvb3RSZW5kZXJlcikKLXsKLSAgICBhdXRvIGNsb25lZFN0eWxlID0gUmVuZGVy U3R5bGU6OmNsb25lKHJvb3RSZW5kZXJlci5zdHlsZSgpKTsKLSAgICBpZiAocm9vdFJlbmRlcmVy LmlzQW5vbnltb3VzQmxvY2soKSkgewotICAgICAgICBhdXRvJiBhbm9uQmxvY2tQYXJlbnRTdHls ZSA9IHJvb3RSZW5kZXJlci5wYXJlbnQoKS0+c3R5bGUoKTsKLSAgICAgICAgLy8gb3ZlcmZsb3cg YW5kIHRleHQtb3ZlcmZsb3cgcHJvcGVydHkgdmFsdWVzIGRvbid0IGdldCBmb3J3YXJkZWQgdG8g YW5vbnltb3VzIGJsb2NrIGJveGVzLgotICAgICAgICAvLyBlLmcuIDxkaXYgc3R5bGU9Im92ZXJm bG93OiBoaWRkZW47IHRleHQtb3ZlcmZsb3c6IGVsbGlwc2lzOyB3aWR0aDogMTAwcHg7IHdoaXRl LXNwYWNlOiBwcmU7Ij50aGlzIHRleHQgc2hvdWxkIGhhdmUgZWxsaXBzaXM8ZGl2PjwvZGl2Pjwv ZGl2PgotICAgICAgICBjbG9uZWRTdHlsZS5zZXRUZXh0T3ZlcmZsb3coYW5vbkJsb2NrUGFyZW50 U3R5bGUudGV4dE92ZXJmbG93KCkpOwotICAgICAgICBjbG9uZWRTdHlsZS5zZXRPdmVyZmxvd1go YW5vbkJsb2NrUGFyZW50U3R5bGUub3ZlcmZsb3dYKCkpOwotICAgICAgICBjbG9uZWRTdHlsZS5z ZXRPdmVyZmxvd1koYW5vbkJsb2NrUGFyZW50U3R5bGUub3ZlcmZsb3dZKCkpOwotICAgIH0KLSAg ICByZXR1cm4gY2xvbmVkU3R5bGU7Ci19Ci0KIHN0YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8UmVuZGVy U3R5bGU+IGZpcnN0TGluZVN0eWxlRm9yKGNvbnN0IFJlbmRlck9iamVjdCYgcmVuZGVyZXIpCiB7 CiAgICAgYXV0byYgZmlyc3RMaW5lU3R5bGUgPSByZW5kZXJlci5maXJzdExpbmVTdHlsZSgpOwpA QCAtNzksOCArNjUsMTggQEAgc3RhdGljIExheW91dDo6Qm94OjpJc0Fub255bW91cyBpc0Fub255 bW91cyhjb25zdCBSZW5kZXJPYmplY3QmIHJlbmRlcmVyKQogICAgIHJldHVybiByZW5kZXJlci5p c0Fub255bW91cygpID8gTGF5b3V0OjpCb3g6OklzQW5vbnltb3VzOjpZZXMgOiBMYXlvdXQ6OkJv eDo6SXNBbm9ueW1vdXM6Ok5vOwogfQogCi1zdGF0aWMgTGF5b3V0OjpCb3g6OkVsZW1lbnRBdHRy aWJ1dGVzIGVsZW1lbnRBdHRyaWJ1dGVzKGNvbnN0IFJlbmRlck9iamVjdCYgcmVuZGVyZXIsIExh eW91dDo6Qm94OjpOb2RlVHlwZSBub2RlVHlwZSA9IExheW91dDo6Qm94OjpOb2RlVHlwZTo6R2Vu ZXJpY0VsZW1lbnQpCitzdGF0aWMgTGF5b3V0OjpCb3g6OkVsZW1lbnRBdHRyaWJ1dGVzIGVsZW1l bnRBdHRyaWJ1dGVzKGNvbnN0IFJlbmRlckVsZW1lbnQmIHJlbmRlcmVyKQogeworICAgIGF1dG8g bm9kZVR5cGUgPSBbJl0geworICAgICAgICBpZiAoaXM8UmVuZGVyTGlzdE1hcmtlcj4ocmVuZGVy ZXIpKQorICAgICAgICAgICAgcmV0dXJuIExheW91dDo6Qm94OjpOb2RlVHlwZTo6TGlzdE1hcmtl cjsKKyAgICAgICAgaWYgKGlzPFJlbmRlclJlcGxhY2VkPihyZW5kZXJlcikpCisgICAgICAgICAg ICByZXR1cm4gaXM8UmVuZGVySW1hZ2U+KHJlbmRlcmVyKSA/IExheW91dDo6Qm94OjpOb2RlVHlw ZTo6SW1hZ2UgOiBMYXlvdXQ6OkJveDo6Tm9kZVR5cGU6OlJlcGxhY2VkRWxlbWVudDsKKyAgICAg ICAgaWYgKGlzPFJlbmRlckxpbmVCcmVhaz4ocmVuZGVyZXIpKQorICAgICAgICAgICAgcmV0dXJu IGRvd25jYXN0PFJlbmRlckxpbmVCcmVhaz4ocmVuZGVyZXIpLmlzV0JSKCkgPyBMYXlvdXQ6OkJv eDo6Tm9kZVR5cGU6OldvcmRCcmVha09wcG9ydHVuaXR5IDogTGF5b3V0OjpCb3g6Ok5vZGVUeXBl OjpMaW5lQnJlYWs7CisgICAgICAgIHJldHVybiBMYXlvdXQ6OkJveDo6Tm9kZVR5cGU6OkdlbmVy aWNFbGVtZW50OworICAgIH0oKTsKKwogICAgIHJldHVybiB7IG5vZGVUeXBlLCBpc0Fub255bW91 cyhyZW5kZXJlcikgfTsKIH0KIApAQCAtODksOCArODUsOCBAQCBCb3hUcmVlOjpCb3hUcmVlKFJl bmRlckJsb2NrJiByb290UmVuZGVyZXIpCiB7CiAgICAgYXV0byogcm9vdEJveCA9IG1fcm9vdFJl bmRlcmVyLmxheW91dEJveCgpOwogICAgIGlmICghcm9vdEJveCkgewotICAgICAgICBhdXRvIG5l d1Jvb3RCb3ggPSBtYWtlVW5pcXVlUmVmPExheW91dDo6RWxlbWVudEJveD4oZWxlbWVudEF0dHJp YnV0ZXMocm9vdFJlbmRlcmVyKSwgcm9vdEJveFN0eWxlKHJvb3RSZW5kZXJlciksIGZpcnN0TGlu ZVN0eWxlRm9yKHJvb3RSZW5kZXJlcikpOwotICAgICAgICByb290Qm94ID0gbmV3Um9vdEJveC5w dHIoKTsKKyAgICAgICAgYXV0byBuZXdSb290Qm94ID0gY3JlYXRlTGF5b3V0Qm94KHJvb3RSZW5k ZXJlcik7CisgICAgICAgIHJvb3RCb3ggPSBkb3duY2FzdDxMYXlvdXQ6OkVsZW1lbnRCb3g+KG5l d1Jvb3RCb3gucHRyKCkpOwogICAgICAgICBtX3Jvb3RSZW5kZXJlci5zZXRMYXlvdXRCb3goKnJv b3RCb3gpOwogICAgICAgICBpbml0aWFsQ29udGFpbmluZ0Jsb2NrKCkuYXBwZW5kQ2hpbGQoV1RG TW92ZShuZXdSb290Qm94KSk7CiAgICAgfQpAQCAtMTI5LDEyICsxMjUsMjAgQEAgQm94VHJlZTo6 fkJveFRyZWUoKQogICAgICAgICByb290TGF5b3V0Qm94KCkuZGVzdHJveUNoaWxkcmVuKCk7CiB9 CiAKLXN0YXRpYyB2b2lkIGFkanVzdFN0eWxlSWZOZWVkZWQoY29uc3QgUmVuZGVyT2JqZWN0JiBy ZW5kZXJlciwgUmVuZGVyU3R5bGUmIHN0eWxlLCBSZW5kZXJTdHlsZSogZmlyc3RMaW5lU3R5bGUp Cit2b2lkIEJveFRyZWU6OmFkanVzdFN0eWxlSWZOZWVkZWQoY29uc3QgUmVuZGVyRWxlbWVudCYg cmVuZGVyZXIsIFJlbmRlclN0eWxlJiBzdHlsZSwgUmVuZGVyU3R5bGUqIGZpcnN0TGluZVN0eWxl KQogewogICAgIGF1dG8gYWRqdXN0U3R5bGUgPSBbJl0gKGF1dG8mIHN0eWxlVG9BZGp1c3QpIHsK ICAgICAgICAgaWYgKGlzPFJlbmRlckJsb2NrPihyZW5kZXJlcikpIHsKICAgICAgICAgICAgIGlm IChzdHlsZVRvQWRqdXN0LmRpc3BsYXkoKSA9PSBEaXNwbGF5VHlwZTo6SW5saW5lKQogICAgICAg ICAgICAgICAgIHN0eWxlVG9BZGp1c3Quc2V0RGlzcGxheShEaXNwbGF5VHlwZTo6SW5saW5lQmxv Y2spOworICAgICAgICAgICAgaWYgKHJlbmRlcmVyLmlzQW5vbnltb3VzQmxvY2soKSkgeworICAg ICAgICAgICAgICAgIGF1dG8mIGFub25CbG9ja1BhcmVudFN0eWxlID0gcmVuZGVyZXIucGFyZW50 KCktPnN0eWxlKCk7CisgICAgICAgICAgICAgICAgLy8gb3ZlcmZsb3cgYW5kIHRleHQtb3ZlcmZs b3cgcHJvcGVydHkgdmFsdWVzIGRvbid0IGdldCBmb3J3YXJkZWQgdG8gYW5vbnltb3VzIGJsb2Nr IGJveGVzLgorICAgICAgICAgICAgICAgIC8vIGUuZy4gPGRpdiBzdHlsZT0ib3ZlcmZsb3c6IGhp ZGRlbjsgdGV4dC1vdmVyZmxvdzogZWxsaXBzaXM7IHdpZHRoOiAxMDBweDsgd2hpdGUtc3BhY2U6 IHByZTsiPnRoaXMgdGV4dCBzaG91bGQgaGF2ZSBlbGxpcHNpczxkaXY+PC9kaXY+PC9kaXY+Cisg ICAgICAgICAgICAgICAgc3R5bGVUb0FkanVzdC5zZXRUZXh0T3ZlcmZsb3coYW5vbkJsb2NrUGFy ZW50U3R5bGUudGV4dE92ZXJmbG93KCkpOworICAgICAgICAgICAgICAgIHN0eWxlVG9BZGp1c3Qu c2V0T3ZlcmZsb3dYKGFub25CbG9ja1BhcmVudFN0eWxlLm92ZXJmbG93WCgpKTsKKyAgICAgICAg ICAgICAgICBzdHlsZVRvQWRqdXN0LnNldE92ZXJmbG93WShhbm9uQmxvY2tQYXJlbnRTdHlsZS5v dmVyZmxvd1koKSk7CisgICAgICAgICAgICB9CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAg IH0KICAgICAgICAgaWYgKGlzPFJlbmRlcklubGluZT4ocmVuZGVyZXIpKSB7CkBAIC0xNzEsNjgg KzE3NSw1MCBAQCBzdGF0aWMgdm9pZCBhZGp1c3RTdHlsZUlmTmVlZGVkKGNvbnN0IFJlbmRlck9i amVjdCYgcmVuZGVyZXIsIFJlbmRlclN0eWxlJiBzdHlsZQogICAgICAgICBhZGp1c3RTdHlsZSgq Zmlyc3RMaW5lU3R5bGUpOwogfQogCi12b2lkIEJveFRyZWU6OmJ1aWxkVHJlZUZvcklubGluZUNv bnRlbnQoKQorVW5pcXVlUmVmPExheW91dDo6Qm94PiBCb3hUcmVlOjpjcmVhdGVMYXlvdXRCb3go UmVuZGVyT2JqZWN0JiByZW5kZXJlcikKIHsKLSAgICBhdXRvIGNyZWF0ZUNoaWxkQm94ID0gWyZd KFJlbmRlck9iamVjdCYgY2hpbGRSZW5kZXJlcikgLT4gc3RkOjp1bmlxdWVfcHRyPExheW91dDo6 Qm94PiB7Ci0gICAgICAgIHN0ZDo6dW5pcXVlX3B0cjxSZW5kZXJTdHlsZT4gZmlyc3RMaW5lU3R5 bGUgPSBmaXJzdExpbmVTdHlsZUZvcihjaGlsZFJlbmRlcmVyKTsKLQotICAgICAgICBpZiAoaXM8 UmVuZGVyQ291bnRlcj4oY2hpbGRSZW5kZXJlcikpIHsKLSAgICAgICAgICAgIC8vIFRoaXMgZW5z dXJlcyB0aGF0IElubGluZVRleHRCb3ggKHNlZSBiZWxvdykgYWx3YXlzIGhhcyB1cHRvZGF0ZSBj b3VudGVyIHRleHQgKG5vdGUgdGhhdCBSZW5kZXJDb3VudGVyIGlzIGEgdHlwZSBvZiBSZW5kZXJU ZXh0KS4KLSAgICAgICAgICAgIGlmIChjaGlsZFJlbmRlcmVyLnByZWZlcnJlZExvZ2ljYWxXaWR0 aHNEaXJ0eSgpKSB7Ci0gICAgICAgICAgICAgICAgLy8gQ291bnRlciBjb250ZW50IGlzIHVwZGF0 ZWQgdGhyb3VnaCBwcmVmZXJyZWQgd2lkdGggY29tcHV0YXRpb24uCi0gICAgICAgICAgICAgICAg ZG93bmNhc3Q8UmVuZGVyQ291bnRlcj4oY2hpbGRSZW5kZXJlcikudXBkYXRlQ291bnRlcigpOwot ICAgICAgICAgICAgfQotICAgICAgICB9Ci0gICAgICAgIGlmIChpczxSZW5kZXJUZXh0PihjaGls ZFJlbmRlcmVyKSkgewotICAgICAgICAgICAgYXV0byYgdGV4dFJlbmRlcmVyID0gZG93bmNhc3Q8 UmVuZGVyVGV4dD4oY2hpbGRSZW5kZXJlcik7Ci0gICAgICAgICAgICBhdXRvIHN0eWxlID0gUmVu ZGVyU3R5bGU6OmNyZWF0ZUFub255bW91c1N0eWxlV2l0aERpc3BsYXkodGV4dFJlbmRlcmVyLnN0 eWxlKCksIERpc3BsYXlUeXBlOjpJbmxpbmUpOwotICAgICAgICAgICAgYXV0byB0ZXh0ID0gc3R5 bGUudGV4dFNlY3VyaXR5KCkgPT0gVGV4dFNlY3VyaXR5OjpOb25lID8gdGV4dFJlbmRlcmVyLnRl eHQoKSA6IFJlbmRlckJsb2NrOjp1cGRhdGVTZWN1cml0eURpc2NDaGFyYWN0ZXJzKHN0eWxlLCB0 ZXh0UmVuZGVyZXIudGV4dCgpKTsKLSAgICAgICAgICAgIHJldHVybiBtYWtlVW5pcXVlPExheW91 dDo6SW5saW5lVGV4dEJveD4odGV4dCwgdGV4dFJlbmRlcmVyLmNhblVzZVNpbXBsaWZpZWRUZXh0 TWVhc3VyaW5nKCksIHRleHRSZW5kZXJlci5jYW5Vc2VTaW1wbGVGb250Q29kZVBhdGgoKSwgV1RG TW92ZShzdHlsZSksIFdURk1vdmUoZmlyc3RMaW5lU3R5bGUpKTsKLSAgICAgICAgfQorICAgIHN0 ZDo6dW5pcXVlX3B0cjxSZW5kZXJTdHlsZT4gZmlyc3RMaW5lU3R5bGUgPSBmaXJzdExpbmVTdHls ZUZvcihyZW5kZXJlcik7CiAKLSAgICAgICAgYXV0byBzdHlsZSA9IFJlbmRlclN0eWxlOjpjbG9u ZShjaGlsZFJlbmRlcmVyLnN0eWxlKCkpOwotICAgICAgICBpZiAoY2hpbGRSZW5kZXJlci5pc0xp bmVCcmVhaygpKSB7Ci0gICAgICAgICAgICBhZGp1c3RTdHlsZUlmTmVlZGVkKGNoaWxkUmVuZGVy ZXIsIHN0eWxlLCBmaXJzdExpbmVTdHlsZS5nZXQoKSk7Ci0gICAgICAgICAgICBhdXRvIGF0dHJp YnV0ZXMgPSBlbGVtZW50QXR0cmlidXRlcyhjaGlsZFJlbmRlcmVyLCBkb3duY2FzdDxSZW5kZXJM aW5lQnJlYWs+KGNoaWxkUmVuZGVyZXIpLmlzV0JSKCkgPyBMYXlvdXQ6OkJveDo6Tm9kZVR5cGU6 OldvcmRCcmVha09wcG9ydHVuaXR5IDogTGF5b3V0OjpCb3g6Ok5vZGVUeXBlOjpMaW5lQnJlYWsp OwotICAgICAgICAgICAgcmV0dXJuIG1ha2VVbmlxdWU8TGF5b3V0OjpFbGVtZW50Qm94PihXVEZN b3ZlKGF0dHJpYnV0ZXMpLCBXVEZNb3ZlKHN0eWxlKSwgV1RGTW92ZShmaXJzdExpbmVTdHlsZSkp OwotICAgICAgICB9CisgICAgaWYgKGlzPFJlbmRlclRleHQ+KHJlbmRlcmVyKSkgeworICAgICAg ICBhdXRvJiB0ZXh0UmVuZGVyZXIgPSBkb3duY2FzdDxSZW5kZXJUZXh0PihyZW5kZXJlcik7CiAK LSAgICAgICAgaWYgKGlzPFJlbmRlckxpc3RNYXJrZXI+KGNoaWxkUmVuZGVyZXIpKSB7Ci0gICAg ICAgICAgICBhdXRvJiBsaXN0TWFya2VyUmVuZGVyZXIgPSBkb3duY2FzdDxSZW5kZXJMaXN0TWFy a2VyPihjaGlsZFJlbmRlcmVyKTsKLSAgICAgICAgICAgIE9wdGlvblNldDxMYXlvdXQ6OkVsZW1l bnRCb3g6Okxpc3RNYXJrZXJBdHRyaWJ1dGU+IGxpc3RNYXJrZXJBdHRyaWJ1dGVzOwotICAgICAg ICAgICAgaWYgKGxpc3RNYXJrZXJSZW5kZXJlci5pc0ltYWdlKCkpCi0gICAgICAgICAgICAgICAg bGlzdE1hcmtlckF0dHJpYnV0ZXMuYWRkKExheW91dDo6RWxlbWVudEJveDo6TGlzdE1hcmtlckF0 dHJpYnV0ZTo6SW1hZ2UpOwotICAgICAgICAgICAgaWYgKCFsaXN0TWFya2VyUmVuZGVyZXIuaXNJ bnNpZGUoKSkKLSAgICAgICAgICAgICAgICBsaXN0TWFya2VyQXR0cmlidXRlcy5hZGQoTGF5b3V0 OjpFbGVtZW50Qm94OjpMaXN0TWFya2VyQXR0cmlidXRlOjpPdXRzaWRlKTsKLSAgICAgICAgICAg IHJldHVybiBtYWtlVW5pcXVlPExheW91dDo6RWxlbWVudEJveD4oZWxlbWVudEF0dHJpYnV0ZXMo Y2hpbGRSZW5kZXJlciwgTGF5b3V0OjpCb3g6Ok5vZGVUeXBlOjpMaXN0TWFya2VyKSwgbGlzdE1h cmtlckF0dHJpYnV0ZXMsIFdURk1vdmUoc3R5bGUpLCBXVEZNb3ZlKGZpcnN0TGluZVN0eWxlKSk7 CisgICAgICAgIGlmIChpczxSZW5kZXJDb3VudGVyPih0ZXh0UmVuZGVyZXIpICYmIHRleHRSZW5k ZXJlci5wcmVmZXJyZWRMb2dpY2FsV2lkdGhzRGlydHkoKSkgeworICAgICAgICAgICAgLy8gVGhp cyBlbnN1cmVzIHRoYXQgSW5saW5lVGV4dEJveCBhbHdheXMgaGFzIHVwLXRvLWRhdGUgY291bnRl ciB0ZXh0LgorICAgICAgICAgICAgLy8gQ291bnRlciBjb250ZW50IGlzIHVwZGF0ZWQgdGhyb3Vn aCBwcmVmZXJyZWQgd2lkdGggY29tcHV0YXRpb24uCisgICAgICAgICAgICBkb3duY2FzdDxSZW5k ZXJDb3VudGVyPih0ZXh0UmVuZGVyZXIpLnVwZGF0ZUNvdW50ZXIoKTsKICAgICAgICAgfQogCi0g ICAgICAgIGlmIChpczxSZW5kZXJSZXBsYWNlZD4oY2hpbGRSZW5kZXJlcikpIHsKLSAgICAgICAg ICAgIGF1dG8gYXR0cmlidXRlcyA9IGVsZW1lbnRBdHRyaWJ1dGVzKGNoaWxkUmVuZGVyZXIsIGlz PFJlbmRlckltYWdlPihjaGlsZFJlbmRlcmVyKSA/IExheW91dDo6Qm94OjpOb2RlVHlwZTo6SW1h Z2UgOiBMYXlvdXQ6OkJveDo6Tm9kZVR5cGU6OlJlcGxhY2VkRWxlbWVudCk7Ci0gICAgICAgICAg ICByZXR1cm4gbWFrZVVuaXF1ZTxMYXlvdXQ6OkVsZW1lbnRCb3g+KFdURk1vdmUoYXR0cmlidXRl cyksIFdURk1vdmUoc3R5bGUpLCBXVEZNb3ZlKGZpcnN0TGluZVN0eWxlKSk7Ci0gICAgICAgIH0K KyAgICAgICAgYXV0byBzdHlsZSA9IFJlbmRlclN0eWxlOjpjcmVhdGVBbm9ueW1vdXNTdHlsZVdp dGhEaXNwbGF5KHRleHRSZW5kZXJlci5zdHlsZSgpLCBEaXNwbGF5VHlwZTo6SW5saW5lKTsKKyAg ICAgICAgYXV0byB0ZXh0ID0gc3R5bGUudGV4dFNlY3VyaXR5KCkgPT0gVGV4dFNlY3VyaXR5OjpO b25lID8gdGV4dFJlbmRlcmVyLnRleHQoKSA6IFJlbmRlckJsb2NrOjp1cGRhdGVTZWN1cml0eURp c2NDaGFyYWN0ZXJzKHN0eWxlLCB0ZXh0UmVuZGVyZXIudGV4dCgpKTsKKyAgICAgICAgcmV0dXJu IG1ha2VVbmlxdWVSZWY8TGF5b3V0OjpJbmxpbmVUZXh0Qm94Pih0ZXh0LCB0ZXh0UmVuZGVyZXIu Y2FuVXNlU2ltcGxpZmllZFRleHRNZWFzdXJpbmcoKSwgdGV4dFJlbmRlcmVyLmNhblVzZVNpbXBs ZUZvbnRDb2RlUGF0aCgpLCBXVEZNb3ZlKHN0eWxlKSwgV1RGTW92ZShmaXJzdExpbmVTdHlsZSkp OworICAgIH0KIAotICAgICAgICBpZiAoaXM8UmVuZGVyQmxvY2s+KGNoaWxkUmVuZGVyZXIpKSB7 Ci0gICAgICAgICAgICBhZGp1c3RTdHlsZUlmTmVlZGVkKGNoaWxkUmVuZGVyZXIsIHN0eWxlLCBm aXJzdExpbmVTdHlsZS5nZXQoKSk7Ci0gICAgICAgICAgICBhdXRvIGF0dHJpYnV0ZXMgPSBlbGVt ZW50QXR0cmlidXRlcyhjaGlsZFJlbmRlcmVyKTsKLSAgICAgICAgICAgIHJldHVybiBtYWtlVW5p cXVlPExheW91dDo6RWxlbWVudEJveD4oV1RGTW92ZShhdHRyaWJ1dGVzKSwgV1RGTW92ZShzdHls ZSksIFdURk1vdmUoZmlyc3RMaW5lU3R5bGUpKTsKLSAgICAgICAgfQorICAgIGF1dG8mIHJlbmRl ckVsZW1lbnQgPSBkb3duY2FzdDxSZW5kZXJFbGVtZW50PihyZW5kZXJlcik7CiAKLSAgICAgICAg aWYgKGlzPFJlbmRlcklubGluZT4oY2hpbGRSZW5kZXJlcikpIHsKLSAgICAgICAgICAgIGFkanVz dFN0eWxlSWZOZWVkZWQoY2hpbGRSZW5kZXJlciwgc3R5bGUsIGZpcnN0TGluZVN0eWxlLmdldCgp KTsKLSAgICAgICAgICAgIHJldHVybiBtYWtlVW5pcXVlPExheW91dDo6RWxlbWVudEJveD4oZWxl bWVudEF0dHJpYnV0ZXMoY2hpbGRSZW5kZXJlciksIFdURk1vdmUoc3R5bGUpLCBXVEZNb3ZlKGZp cnN0TGluZVN0eWxlKSk7Ci0gICAgICAgIH0KKyAgICBhdXRvIHN0eWxlID0gUmVuZGVyU3R5bGU6 OmNsb25lKHJlbmRlcmVyLnN0eWxlKCkpOworICAgIGFkanVzdFN0eWxlSWZOZWVkZWQocmVuZGVy RWxlbWVudCwgc3R5bGUsIGZpcnN0TGluZVN0eWxlLmdldCgpKTsKIAotICAgICAgICBBU1NFUlRf Tk9UX1JFQUNIRUQoKTsKLSAgICAgICAgcmV0dXJuIG51bGxwdHI7Ci0gICAgfTsKKyAgICBpZiAo aXM8UmVuZGVyTGlzdE1hcmtlcj4ocmVuZGVyRWxlbWVudCkpIHsKKyAgICAgICAgYXV0byYgbGlz dE1hcmtlclJlbmRlcmVyID0gZG93bmNhc3Q8UmVuZGVyTGlzdE1hcmtlcj4ocmVuZGVyRWxlbWVu dCk7CisgICAgICAgIE9wdGlvblNldDxMYXlvdXQ6OkVsZW1lbnRCb3g6Okxpc3RNYXJrZXJBdHRy aWJ1dGU+IGxpc3RNYXJrZXJBdHRyaWJ1dGVzOworICAgICAgICBpZiAobGlzdE1hcmtlclJlbmRl cmVyLmlzSW1hZ2UoKSkKKyAgICAgICAgICAgIGxpc3RNYXJrZXJBdHRyaWJ1dGVzLmFkZChMYXlv dXQ6OkVsZW1lbnRCb3g6Okxpc3RNYXJrZXJBdHRyaWJ1dGU6OkltYWdlKTsKKyAgICAgICAgaWYg KCFsaXN0TWFya2VyUmVuZGVyZXIuaXNJbnNpZGUoKSkKKyAgICAgICAgICAgIGxpc3RNYXJrZXJB dHRyaWJ1dGVzLmFkZChMYXlvdXQ6OkVsZW1lbnRCb3g6Okxpc3RNYXJrZXJBdHRyaWJ1dGU6Ok91 dHNpZGUpOworICAgICAgICByZXR1cm4gbWFrZVVuaXF1ZVJlZjxMYXlvdXQ6OkVsZW1lbnRCb3g+ KGVsZW1lbnRBdHRyaWJ1dGVzKHJlbmRlckVsZW1lbnQpLCBsaXN0TWFya2VyQXR0cmlidXRlcywg V1RGTW92ZShzdHlsZSksIFdURk1vdmUoZmlyc3RMaW5lU3R5bGUpKTsKKyAgICB9CisKKyAgICBy ZXR1cm4gbWFrZVVuaXF1ZVJlZjxMYXlvdXQ6OkVsZW1lbnRCb3g+KGVsZW1lbnRBdHRyaWJ1dGVz KHJlbmRlckVsZW1lbnQpLCBXVEZNb3ZlKHN0eWxlKSwgV1RGTW92ZShmaXJzdExpbmVTdHlsZSkp OworfTsKIAordm9pZCBCb3hUcmVlOjpidWlsZFRyZWVGb3JJbmxpbmVDb250ZW50KCkKK3sKICAg ICBmb3IgKGF1dG8gd2Fsa2VyID0gSW5saW5lV2Fsa2VyKGRvd25jYXN0PFJlbmRlckJsb2NrRmxv dz4obV9yb290UmVuZGVyZXIpKTsgIXdhbGtlci5hdEVuZCgpOyB3YWxrZXIuYWR2YW5jZSgpKSB7 CiAgICAgICAgIGF1dG8mIGNoaWxkUmVuZGVyZXIgPSAqd2Fsa2VyLmN1cnJlbnQoKTsKICAgICAg ICAgYXV0byBjaGlsZExheW91dEJveCA9IFsmXSB7CiAgICAgICAgICAgICBpZiAoYXV0byBleGlz dGluZ0NoaWxkQm94ID0gY2hpbGRSZW5kZXJlci5sYXlvdXRCb3goKSkKICAgICAgICAgICAgICAg ICByZXR1cm4gZXhpc3RpbmdDaGlsZEJveC0+cmVtb3ZlRnJvbVBhcmVudCgpOwotICAgICAgICAg ICAgcmV0dXJuIG1ha2VVbmlxdWVSZWZGcm9tTm9uTnVsbFVuaXF1ZVB0cihjcmVhdGVDaGlsZEJv eChjaGlsZFJlbmRlcmVyKSk7CisgICAgICAgICAgICByZXR1cm4gY3JlYXRlTGF5b3V0Qm94KGNo aWxkUmVuZGVyZXIpOwogICAgICAgICB9OwogICAgICAgICBhcHBlbmRDaGlsZChjaGlsZExheW91 dEJveCgpLCBjaGlsZFJlbmRlcmVyKTsKICAgICB9CkBAIC0yNDAsMTAgKzIyNiwxMCBAQCB2b2lk IEJveFRyZWU6OmJ1aWxkVHJlZUZvcklubGluZUNvbnRlbnQoKQogCiB2b2lkIEJveFRyZWU6OmJ1 aWxkVHJlZUZvckZsZXhDb250ZW50KCkKIHsKLSAgICBmb3IgKGF1dG8mIGZsZXhJdGVtUmVuZGVy ZXIgOiBjaGlsZHJlbk9mVHlwZTxSZW5kZXJPYmplY3Q+KG1fcm9vdFJlbmRlcmVyKSkgeworICAg IGZvciAoYXV0byYgZmxleEl0ZW1SZW5kZXJlciA6IGNoaWxkcmVuT2ZUeXBlPFJlbmRlckVsZW1l bnQ+KG1fcm9vdFJlbmRlcmVyKSkgewogICAgICAgICBhdXRvIHN0eWxlID0gUmVuZGVyU3R5bGU6 OmNsb25lKGZsZXhJdGVtUmVuZGVyZXIuc3R5bGUoKSk7Ci0gICAgICAgIGF1dG8gZmxleEl0ZW0g PSBtYWtlVW5pcXVlPExheW91dDo6RWxlbWVudEJveD4oZWxlbWVudEF0dHJpYnV0ZXMoZmxleEl0 ZW1SZW5kZXJlciksIFdURk1vdmUoc3R5bGUpKTsKLSAgICAgICAgYXBwZW5kQ2hpbGQobWFrZVVu aXF1ZVJlZkZyb21Ob25OdWxsVW5pcXVlUHRyKFdURk1vdmUoZmxleEl0ZW0pKSwgZmxleEl0ZW1S ZW5kZXJlcik7CisgICAgICAgIGF1dG8gZmxleEl0ZW0gPSBtYWtlVW5pcXVlUmVmPExheW91dDo6 RWxlbWVudEJveD4oZWxlbWVudEF0dHJpYnV0ZXMoZmxleEl0ZW1SZW5kZXJlciksIFdURk1vdmUo c3R5bGUpKTsKKyAgICAgICAgYXBwZW5kQ2hpbGQoV1RGTW92ZShmbGV4SXRlbSksIGZsZXhJdGVt UmVuZGVyZXIpOwogICAgIH0KIH0KIApAQCAtMjYyLDE0ICsyNDgsMTAgQEAgdm9pZCBCb3hUcmVl Ojp1cGRhdGVTdHlsZShjb25zdCBSZW5kZXJCb3hNb2RlbE9iamVjdCYgcmVuZGVyZXIpCiAgICAg YXV0byYgbGF5b3V0Qm94ID0gbGF5b3V0Qm94Rm9yUmVuZGVyZXIocmVuZGVyZXIpOwogICAgIGF1 dG8mIHJlbmRlcmVyU3R5bGUgPSByZW5kZXJlci5zdHlsZSgpOwogCi0gICAgaWYgKCZsYXlvdXRC b3ggPT0gJnJvb3RMYXlvdXRCb3goKSkKLSAgICAgICAgbGF5b3V0Qm94LnVwZGF0ZVN0eWxlKHJv b3RCb3hTdHlsZShkb3duY2FzdDxSZW5kZXJCbG9jaz4ocmVuZGVyZXIpKSwgZmlyc3RMaW5lU3R5 bGVGb3IocmVuZGVyZXIpKTsKLSAgICBlbHNlIHsKLSAgICAgICAgYXV0byBmaXJzdExpbmVOZXdT dHlsZSA9IGZpcnN0TGluZVN0eWxlRm9yKHJlbmRlcmVyKTsKLSAgICAgICAgYXV0byBuZXdTdHls ZSA9IFJlbmRlclN0eWxlOjpjbG9uZShyZW5kZXJlclN0eWxlKTsKLSAgICAgICAgYWRqdXN0U3R5 bGVJZk5lZWRlZChyZW5kZXJlciwgbmV3U3R5bGUsIGZpcnN0TGluZU5ld1N0eWxlLmdldCgpKTsK LSAgICAgICAgbGF5b3V0Qm94LnVwZGF0ZVN0eWxlKFdURk1vdmUobmV3U3R5bGUpLCBXVEZNb3Zl KGZpcnN0TGluZU5ld1N0eWxlKSk7Ci0gICAgfQorICAgIGF1dG8gZmlyc3RMaW5lTmV3U3R5bGUg PSBmaXJzdExpbmVTdHlsZUZvcihyZW5kZXJlcik7CisgICAgYXV0byBuZXdTdHlsZSA9IFJlbmRl clN0eWxlOjpjbG9uZShyZW5kZXJlclN0eWxlKTsKKyAgICBhZGp1c3RTdHlsZUlmTmVlZGVkKHJl bmRlcmVyLCBuZXdTdHlsZSwgZmlyc3RMaW5lTmV3U3R5bGUuZ2V0KCkpOworICAgIGxheW91dEJv eC51cGRhdGVTdHlsZShXVEZNb3ZlKG5ld1N0eWxlKSwgV1RGTW92ZShmaXJzdExpbmVOZXdTdHls ZSkpOwogCiAgICAgZm9yIChhdXRvKiBjaGlsZCA9IGxheW91dEJveC5maXJzdENoaWxkKCk7IGNo aWxkOyBjaGlsZCA9IGNoaWxkLT5uZXh0U2libGluZygpKSB7CiAgICAgICAgIGlmIChjaGlsZC0+ aXNJbmxpbmVUZXh0Qm94KCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50 ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Cb3hUcmVlLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Cb3hUcmVlLmgKaW5kZXggODFmNGMwN2Zm MGY5Li43NjIyM2QxMDdmYjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRl Z3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkJveFRyZWUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Cb3hUcmVlLmgKQEAgLTcxLDYgKzcx LDkgQEAgcHVibGljOgogcHJpdmF0ZToKICAgICBMYXlvdXQ6OkluaXRpYWxDb250YWluaW5nQmxv Y2smIGluaXRpYWxDb250YWluaW5nQmxvY2soKTsKIAorICAgIHN0YXRpYyBVbmlxdWVSZWY8TGF5 b3V0OjpCb3g+IGNyZWF0ZUxheW91dEJveChSZW5kZXJPYmplY3QmKTsKKyAgICBzdGF0aWMgdm9p ZCBhZGp1c3RTdHlsZUlmTmVlZGVkKGNvbnN0IFJlbmRlckVsZW1lbnQmLCBSZW5kZXJTdHlsZSYs IFJlbmRlclN0eWxlKiBmaXJzdExpbmVTdHlsZSk7CisKICAgICB2b2lkIGJ1aWxkVHJlZUZvcklu bGluZUNvbnRlbnQoKTsKICAgICB2b2lkIGJ1aWxkVHJlZUZvckZsZXhDb250ZW50KCk7CiAgICAg dm9pZCBhcHBlbmRDaGlsZChVbmlxdWVSZWY8TGF5b3V0OjpCb3g+LCBSZW5kZXJPYmplY3QmKTsK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL2ZpZWxkc2V0LWlubGluZS1jcmFz aC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2lubGluZS9maWVsZHNldC1pbmxpbmUt Y3Jhc2gtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAw MC4uNzMwZWJmNjZhMGRhCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9pbmxp bmUvZmllbGRzZXQtaW5saW5lLWNyYXNoLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxIEBACitUaGlz IHRlc3QgcGFzc2VzIGlmIGl0IGRvZXNuJ3QgY3Jhc2guCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9mYXN0L2lubGluZS9maWVsZHNldC1pbmxpbmUtY3Jhc2guaHRtbCBiL0xheW91dFRlc3RzL2Zh c3QvaW5saW5lL2ZpZWxkc2V0LWlubGluZS1jcmFzaC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAwMDAwMC4uNTk2ODllMDIzNzQyCi0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvZmFzdC9pbmxpbmUvZmllbGRzZXQtaW5saW5lLWNyYXNoLmh0bWwKQEAgLTAsMCAr MSwxMSBAQAorPHNjcmlwdD4KK2lmICh3aW5kb3cudGVzdFJ1bm5lcikKKyAgICB0ZXN0UnVubmVy LmR1bXBBc1RleHQoKTsKKzwvc2NyaXB0PgorPHN0eWxlPgorZmllbGRzZXQgeyBkaXNwbGF5OiBp bmxpbmUgfQorc3BhbiB7IGZsb2F0OiBsZWZ0IH0KKzwvc3R5bGU+Cis8c3Bhbj4KKzxmaWVsZHNl dD4KK1RoaXMgdGVzdCBwYXNzZXMgaWYgaXQgZG9lc24ndCBjcmFzaC4K