302574 2025-11-15 10:54:37 -0800 [blocks-in-inline] Fix simple margin collapsing before/after between blocks 2025-11-16 05:27:13 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan koivisto webkit-bug-importer oldest_to_newest 2159013 0 zalan 2025-11-15 10:54:37 -0800 ssia 2159015 1 477406 zalan 2025-11-15 10:59:00 -0800 Created attachment 477406 Patch 2159016 2 477406 koivisto 2025-11-15 11:03:40 -0800 Comment on attachment 477406 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=477406&action=review > Source/WebCore/rendering/RenderBlockFlow.cpp:944 > +RenderBlockFlow::BlockPositionAndMargin RenderBlockFlow::layoutBlockChildFromIFC(RenderBox& child, LayoutUnit contentHeight, MarginInfo marginInfo) or layoutBlockChildFromInlineLayout? 2159039 3 477407 zalan 2025-11-15 14:13:08 -0800 Created attachment 477407 Patch 2159054 4 477409 zalan 2025-11-15 18:15:25 -0800 Created attachment 477409 Patch 2159055 5 477410 zalan 2025-11-15 18:22:46 -0800 Created attachment 477410 [fast-cq]Patch 2159082 6 ews-feeder 2025-11-16 05:26:47 -0800 Committed 303090@main (902b5a3b1992): <https://commits.webkit.org/303090@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 477410. 2159083 7 webkit-bug-importer 2025-11-16 05:27:13 -0800 <rdar://problem/164827506> 477406 2025-11-15 10:59:00 -0800 2025-11-15 14:13:06 -0800 Patch bug-302574-20251115105859.patch text/plain 11440 zalan RnJvbSAyZWVlNDdhNjc2MmExNTZlZDU2MTRmYTA4ZWIxM2E3MGMyOWIwYmU4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFNhdCwgMTUgTm92IDIwMjUgMTA6NTQ6NDggLTA4MDAKU3ViamVjdDogW1BBVENIXSBbYmxvY2tz LWluLWlubGluZV0gRml4IHNpbXBsZSBtYXJnaW4gY29sbGFwc2luZyBiZWZvcmUvYWZ0ZXIKIGJl dHdlZW4gYmxvY2tzIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDI1 NzQKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKMS4gQmVmb3JlIHJ1bm5pbmcgcmVuZGVy IHRyZWUgbGF5b3V0IGNvdmVydCBNYXJnaW5TdGF0ZSAtPiBNYXJnaW5JbmZvCjIuIENhbGwgZGVk aWNhdGVkIFJlbmRlckJsb2NrRmxvdzo6bGF5b3V0QmxvY2tDaGlsZEZyb21JRkMgdG8gbGF5b3V0 IGJsb2NrKHMpIGluIGlubGluZQozLiBBZnRlciBsYXlvdXQgY292ZXJ0IE1hcmdpbkluZm8gLT4g TWFyZ2luU3RhdGUKClRlc3Q6IGZhc3QvaW5saW5lL2Jsb2Nrcy1pbi1pbmxpbmUtbGF5b3V0LXdp dGgtbWFyZ2lucy5odG1sCgoqIExheW91dFRlc3RzL2Zhc3QvaW5saW5lL2Jsb2Nrcy1pbi1pbmxp bmUtbGF5b3V0LXdpdGgtbWFyZ2lucy1leHBlY3RlZC5odG1sOiBBZGRlZC4KKiBMYXlvdXRUZXN0 cy9mYXN0L2lubGluZS9ibG9ja3MtaW4taW5saW5lLWxheW91dC13aXRoLW1hcmdpbnMuaHRtbDog QWRkZWQuCiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0 aW9uRm9ybWF0dGluZ0NvbnRleHRMYXlvdXQuY3BwOgooV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRp b246OmxheW91dFdpdGhGb3JtYXR0aW5nQ29udGV4dEZvckJsb2NrSW5JbmxpbmUpOgoqIFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwOgooV2ViQ29yZTo6UmVuZGVy QmxvY2tGbG93OjpNYXJnaW5JbmZvOjpNYXJnaW5JbmZvKToKKFdlYkNvcmU6OlJlbmRlckJsb2Nr Rmxvdzo6bGF5b3V0QmxvY2tDaGlsZEZyb21JRkMpOgoqIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCbG9ja0Zsb3cuaDoKLS0tCiAuLi55b3V0SW50ZWdyYXRpb25Gb3JtYXR0aW5nQ29u dGV4dExheW91dC5jcHAgfCAyMyArKysrKy0tLS0tCiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyQmxvY2tGbG93LmNwcCAgfCAyNiArKysrKysrKysrKwogU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5oICAgIHwgIDcgKysrCiAuLi5uLWlubGluZS1sYXlvdXQt d2l0aC1tYXJnaW5zLWV4cGVjdGVkLmh0bWwgfCA0MyArKysrKysrKysrKysrKysrKysKIC4uLi9i bG9ja3MtaW4taW5saW5lLWxheW91dC13aXRoLW1hcmdpbnMuaHRtbCB8IDQ0ICsrKysrKysrKysr KysrKysrKysKIDUgZmlsZXMgY2hhbmdlZCwgMTMzIGluc2VydGlvbnMoKyksIDEwIGRlbGV0aW9u cygtKQogY3JlYXRlIG1vZGUgMTAwNjQ0IExheW91dFRlc3RzL2Zhc3QvaW5saW5lL2Jsb2Nrcy1p bi1pbmxpbmUtbGF5b3V0LXdpdGgtbWFyZ2lucy1leHBlY3RlZC5odG1sCiBjcmVhdGUgbW9kZSAx MDA2NDQgTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvYmxvY2tzLWluLWlubGluZS1sYXlvdXQtd2l0 aC1tYXJnaW5zLmh0bWwKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdy YXRpb24vTGF5b3V0SW50ZWdyYXRpb25Gb3JtYXR0aW5nQ29udGV4dExheW91dC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Gb3JtYXR0aW5n Q29udGV4dExheW91dC5jcHAKaW5kZXggZmRlMDNkYThlMTI5Li44YzVmMGQ1YzIyMDQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlv bkZvcm1hdHRpbmdDb250ZXh0TGF5b3V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Gb3JtYXR0aW5nQ29udGV4dExheW91dC5jcHAK QEAgLTk2LDI0ICs5NiwyNyBAQCB2b2lkIGxheW91dFdpdGhGb3JtYXR0aW5nQ29udGV4dEZvckJs b2NrSW5JbmxpbmUoY29uc3QgTGF5b3V0OjpFbGVtZW50Qm94JiBibG9jawogICAgIH07CiAgICAg cG9wdWxhdGVSb290UmVuZGVyZXJXaXRoRmxvYXRzRnJvbUlGQygpOwogCi0gICAgLy8gUmVuZGVy IHRyZWUgdXNlcyBibG9jayBoZWlnaHQgdG8gdHJhY2sgdGhlIGNoaWxkIGJsb2NrIGxheW91dCBw b3NpdGlvbi4gU2V0IGl0IHRvIHRoZSBjdXJyZW50IHBvc2l0aW9uIGJlZm9yZSBjYWxsaW5nIGxh eW91dEJsb2NrQ2hpbGQuCi0gICAgcm9vdEJsb2NrQ29udGFpbmVyLnNldExvZ2ljYWxIZWlnaHQo YmxvY2tMb2dpY2FsVG9wTGVmdC55KCkgLSByb290QmxvY2tDb250YWluZXIubWFyZ2luQmVmb3Jl KCkpOworICAgIGF1dG8gbWFyZ2luSW5mb0ZvckJsb2NrID0gWyZdIHsKKyAgICAgICAgYXV0byYg bWFyZ2luU3RhdGUgPSBwYXJlbnRCbG9ja0xheW91dFN0YXRlLm1hcmdpblN0YXRlKCk7CisgICAg ICAgIHJldHVybiBSZW5kZXJCbG9ja0Zsb3c6Ok1hcmdpbkluZm8geyBtYXJnaW5TdGF0ZS5jYW5D b2xsYXBzZVdpdGhDaGlsZHJlbiwgbWFyZ2luU3RhdGUuY2FuQ29sbGFwc2VNYXJnaW5CZWZvcmVX aXRoQ2hpbGRyZW4sIG1hcmdpblN0YXRlLmNhbkNvbGxhcHNlTWFyZ2luQWZ0ZXJXaXRoQ2hpbGRy ZW4sIG1hcmdpblN0YXRlLnF1aXJrQ29udGFpbmVyLCBtYXJnaW5TdGF0ZS5hdEJlZm9yZVNpZGVP ZkJsb2NrLCBtYXJnaW5TdGF0ZS5hdEFmdGVyU2lkZU9mQmxvY2ssIG1hcmdpblN0YXRlLmhhc01h cmdpbkJlZm9yZVF1aXJrLCBtYXJnaW5TdGF0ZS5oYXNNYXJnaW5BZnRlclF1aXJrLCBtYXJnaW5T dGF0ZS5kZXRlcm1pbmVkTWFyZ2luQmVmb3JlUXVpcmssIG1hcmdpblN0YXRlLnBvc2l0aXZlTWFy Z2luLCBtYXJnaW5TdGF0ZS5uZWdhdGl2ZU1hcmdpbiB9OworICAgIH07CiAKLSAgICBhdXRvIG1h cmdpbkluZm8gPSBSZW5kZXJCbG9ja0Zsb3c6Ok1hcmdpbkluZm8geyByb290QmxvY2tDb250YWlu ZXIgfTsKLSAgICAvLyBGSVhNRTogVGhlc2UgYXJlIHByb2JhYmx5IG5lZWRlZCB0byBtYWtlIHRo ZSBjb250YWluZXIgbWFyZ2luIGNvbGxhcHNpbmcgd29yay4KLSAgICBtYXJnaW5JbmZvLnNldEF0 QmVmb3JlU2lkZU9mQmxvY2soZmFsc2UpOwotICAgIG1hcmdpbkluZm8uc2V0QXRBZnRlclNpZGVP ZkJsb2NrKGZhbHNlKTsKKyAgICBhdXRvIHBvc2l0aW9uQW5kTWFyZ2luID0gcm9vdEJsb2NrQ29u dGFpbmVyLmxheW91dEJsb2NrQ2hpbGRGcm9tSUZDKGJsb2NrUmVuZGVyZXIsIGJsb2NrTG9naWNh bFRvcExlZnQueSgpLCBtYXJnaW5JbmZvRm9yQmxvY2soKSk7CiAKLSAgICBMYXlvdXRVbml0IHBy ZXZpb3VzRmxvYXRMb2dpY2FsQm90dG9tOwotICAgIExheW91dFVuaXQgbWF4RmxvYXRMb2dpY2Fs Qm90dG9tOwotICAgIHJvb3RCbG9ja0NvbnRhaW5lci5sYXlvdXRCbG9ja0NoaWxkKGJsb2NrUmVu ZGVyZXIsIG1hcmdpbkluZm8sIHByZXZpb3VzRmxvYXRMb2dpY2FsQm90dG9tLCBtYXhGbG9hdExv Z2ljYWxCb3R0b20pOworICAgIGF1dG8gdXBkYXRlTWFyZ2luU3RhdGUgPSBbJl0geworICAgICAg ICBhdXRvJiBtYXJnaW5JbmZvID0gcG9zaXRpb25BbmRNYXJnaW4ubWFyZ2luSW5mbzsKKyAgICAg ICAgcGFyZW50QmxvY2tMYXlvdXRTdGF0ZS5tYXJnaW5TdGF0ZSgpID0geyBtYXJnaW5JbmZvLmNh bkNvbGxhcHNlV2l0aENoaWxkcmVuKCksIG1hcmdpbkluZm8uY2FuQ29sbGFwc2VNYXJnaW5CZWZv cmVXaXRoQ2hpbGRyZW4oKSwgbWFyZ2luSW5mby5jYW5Db2xsYXBzZU1hcmdpbkFmdGVyV2l0aENo aWxkcmVuKCksIG1hcmdpbkluZm8ucXVpcmtDb250YWluZXIoKSwgbWFyZ2luSW5mby5hdEJlZm9y ZVNpZGVPZkJsb2NrKCksIG1hcmdpbkluZm8uYXRBZnRlclNpZGVPZkJsb2NrKCksIG1hcmdpbklu Zm8uaGFzTWFyZ2luQmVmb3JlUXVpcmsoKSwgbWFyZ2luSW5mby5oYXNNYXJnaW5BZnRlclF1aXJr KCksIG1hcmdpbkluZm8uZGV0ZXJtaW5lZE1hcmdpbkJlZm9yZVF1aXJrKCksIG1hcmdpbkluZm8u cG9zaXRpdmVNYXJnaW4oKSwgbWFyZ2luSW5mby5uZWdhdGl2ZU1hcmdpbigpIH07CisgICAgfTsK KyAgICB1cGRhdGVNYXJnaW5TdGF0ZSgpOwogCiAgICAgYXV0byB1cGRhdGVyID0gQm94R2VvbWV0 cnlVcGRhdGVyIHsgbGF5b3V0U3RhdGUsIHJvb3RMYXlvdXRCb3goYmxvY2spIH07CiAgICAgdXBk YXRlci51cGRhdGVCb3hHZW9tZXRyeUFmdGVySW50ZWdyYXRpb25MYXlvdXQoYmxvY2ssIHJvb3RC bG9ja0NvbnRhaW5lci5jb250ZW50Qm94TG9naWNhbFdpZHRoKCkpOwogCiAgICAgQVNTRVJUKCFi bG9ja1JlbmRlcmVyLm5lZWRzTGF5b3V0KCkpOwogICAgIGF1dG8mIGJsb2NrR2VvbWV0cnkgPSBs YXlvdXRTdGF0ZS5lbnN1cmVHZW9tZXRyeUZvckJveChibG9jayk7Ci0gICAgYmxvY2tHZW9tZXRy eS5zZXRUb3BMZWZ0KExheW91dFBvaW50IHsgYmxvY2tHZW9tZXRyeS5tYXJnaW5TdGFydCgpLCBi bG9ja0dlb21ldHJ5Lm1hcmdpbkJlZm9yZSgpIH0pOworICAgIGJsb2NrR2VvbWV0cnkuc2V0VG9w TGVmdChMYXlvdXRQb2ludCB7IGJsb2NrR2VvbWV0cnkubWFyZ2luU3RhcnQoKSwgcG9zaXRpb25B bmRNYXJnaW4ubG9naWNhbFRvcCB9KTsKKyAgICAvLyBGSVhNRTogVGhpcyBpcyBvbmx5IHZhbGlk IHVuZGVyIHRoZSBhc3N1bXB0aW9uIHRoYXQgdGhlIGJsb2NrIGlzIGltbWVkaWF0ZWx5IGZvbGxv d2VkIGJ5IGFuIGlubGluZSAoaS5lLiBubyBtYXJnaW4gY29sbGFwc2luZykuCisgICAgYmxvY2tH ZW9tZXRyeS5zZXRWZXJ0aWNhbE1hcmdpbih7IHBvc2l0aW9uQW5kTWFyZ2luLmxvZ2ljYWxUb3As IHBvc2l0aW9uQW5kTWFyZ2luLm1hcmdpbkluZm8ucG9zaXRpdmVNYXJnaW4oKSAtIHBvc2l0aW9u QW5kTWFyZ2luLm1hcmdpbkluZm8ubmVnYXRpdmVNYXJnaW4oKSB9KTsKIAogICAgIGF1dG8gcG9w dWxhdGVJRkNXaXRoTmV3bHlQbGFjZWRGbG9hdHMgPSBbJl0gewogICAgICAgICBhdXRvKiByZW5k ZXJCbG9ja0Zsb3cgPSBkeW5hbWljRG93bmNhc3Q8UmVuZGVyQmxvY2tGbG93PihibG9ja1JlbmRl cmVyKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zs b3cuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKaW5k ZXggOTllYTkxNjRkOGU0Li4xNTM2Yjc2NDc0MWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCkBAIC0xMzksNiArMTM5LDIxIEBAIFJlbmRlckJsb2Nr Rmxvdzo6TWFyZ2luSW5mbzo6TWFyZ2luSW5mbyhjb25zdCBSZW5kZXJCbG9ja0Zsb3cmIGJsb2Nr LCBJZ25vcmVTY3JvCiAgICAgbV9uZWdhdGl2ZU1hcmdpbiA9IG1fY2FuQ29sbGFwc2VNYXJnaW5C ZWZvcmVXaXRoQ2hpbGRyZW4gPyBibG9jay5tYXhOZWdhdGl2ZU1hcmdpbkJlZm9yZSgpIDogMF9s dTsKIH0KIAorUmVuZGVyQmxvY2tGbG93OjpNYXJnaW5JbmZvOjpNYXJnaW5JbmZvKGJvb2wgY2Fu Q29sbGFwc2VXaXRoQ2hpbGRyZW4sIGJvb2wgY2FuQ29sbGFwc2VNYXJnaW5CZWZvcmVXaXRoQ2hp bGRyZW4sIGJvb2wgY2FuQ29sbGFwc2VNYXJnaW5BZnRlcldpdGhDaGlsZHJlbiwgYm9vbCBxdWly a0NvbnRhaW5lciwgYm9vbCBhdEJlZm9yZVNpZGVPZkJsb2NrLCBib29sIGF0QWZ0ZXJTaWRlT2ZC bG9jaywgIGJvb2wgaGFzTWFyZ2luQmVmb3JlUXVpcmssIGJvb2wgaGFzTWFyZ2luQWZ0ZXJRdWly aywgYm9vbCBkZXRlcm1pbmVkTWFyZ2luQmVmb3JlUXVpcmssIExheW91dFVuaXQgcG9zaXRpdmVN YXJnaW4sIExheW91dFVuaXQgbmVnYXRpdmVNYXJnaW4pCisgICAgOiBtX2NhbkNvbGxhcHNlV2l0 aENoaWxkcmVuKGNhbkNvbGxhcHNlV2l0aENoaWxkcmVuKQorICAgICwgbV9jYW5Db2xsYXBzZU1h cmdpbkJlZm9yZVdpdGhDaGlsZHJlbihjYW5Db2xsYXBzZU1hcmdpbkJlZm9yZVdpdGhDaGlsZHJl bikKKyAgICAsIG1fY2FuQ29sbGFwc2VNYXJnaW5BZnRlcldpdGhDaGlsZHJlbihjYW5Db2xsYXBz ZU1hcmdpbkFmdGVyV2l0aENoaWxkcmVuKQorICAgICwgbV9xdWlya0NvbnRhaW5lcihxdWlya0Nv bnRhaW5lcikKKyAgICAsIG1fYXRCZWZvcmVTaWRlT2ZCbG9jayhhdEJlZm9yZVNpZGVPZkJsb2Nr KQorICAgICwgbV9hdEFmdGVyU2lkZU9mQmxvY2soYXRBZnRlclNpZGVPZkJsb2NrKQorICAgICwg bV9oYXNNYXJnaW5CZWZvcmVRdWlyayhoYXNNYXJnaW5CZWZvcmVRdWlyaykKKyAgICAsIG1faGFz TWFyZ2luQWZ0ZXJRdWlyayhoYXNNYXJnaW5BZnRlclF1aXJrKQorICAgICwgbV9kZXRlcm1pbmVk TWFyZ2luQmVmb3JlUXVpcmsoZGV0ZXJtaW5lZE1hcmdpbkJlZm9yZVF1aXJrKQorICAgICwgbV9w b3NpdGl2ZU1hcmdpbihwb3NpdGl2ZU1hcmdpbikKKyAgICAsIG1fbmVnYXRpdmVNYXJnaW4obmVn YXRpdmVNYXJnaW4pCit7Cit9CisKIFJlbmRlckJsb2NrRmxvdzo6UmVuZGVyQmxvY2tGbG93KFR5 cGUgdHlwZSwgRWxlbWVudCYgZWxlbWVudCwgUmVuZGVyU3R5bGUmJiBzdHlsZSwgT3B0aW9uU2V0 PEJsb2NrRmxvd0ZsYWc+IGZsYWdzKQogICAgIDogUmVuZGVyQmxvY2sodHlwZSwgZWxlbWVudCwg V1RGTW92ZShzdHlsZSksIHsgfSwgZmxhZ3MpCiAjaWYgRU5BQkxFKFRFWFRfQVVUT1NJWklORykK QEAgLTkyNiw2ICs5NDEsMTcgQEAgdm9pZCBSZW5kZXJCbG9ja0Zsb3c6OmxheW91dEJsb2NrQ2hp bGRyZW4oUmVsYXlvdXRDaGlsZHJlbiByZWxheW91dENoaWxkcmVuLCBMYXkKICAgICBoYW5kbGVB ZnRlclNpZGVPZkJsb2NrKG1hcmdpbkluZm8pOwogfQogCitSZW5kZXJCbG9ja0Zsb3c6OkJsb2Nr UG9zaXRpb25BbmRNYXJnaW4gUmVuZGVyQmxvY2tGbG93OjpsYXlvdXRCbG9ja0NoaWxkRnJvbUlG QyhSZW5kZXJCb3gmIGNoaWxkLCBMYXlvdXRVbml0IGNvbnRlbnRIZWlnaHQsIE1hcmdpbkluZm8g bWFyZ2luSW5mbykKK3sKKyAgICAvLyBSZW5kZXIgdHJlZSB1c2VzIGJsb2NrIGhlaWdodCB0byB0 cmFjayB0aGUgY2hpbGQgYmxvY2sgbGF5b3V0IHBvc2l0aW9uLiBTZXQgaXQgdG8gdGhlIGN1cnJl bnQgcG9zaXRpb24gYmVmb3JlIGNhbGxpbmcgbGF5b3V0QmxvY2tDaGlsZC4KKyAgICBzZXRMb2dp Y2FsSGVpZ2h0KGNvbnRlbnRIZWlnaHQpOworCisgICAgYXV0byBwcmV2aW91c0Zsb2F0TG9naWNh bEJvdHRvbSA9IExheW91dFVuaXQgeyB9OworICAgIGF1dG8gbWF4RmxvYXRMb2dpY2FsQm90dG9t ID0gTGF5b3V0VW5pdCB7IH07CisgICAgbGF5b3V0QmxvY2tDaGlsZChjaGlsZCwgbWFyZ2luSW5m bywgcHJldmlvdXNGbG9hdExvZ2ljYWxCb3R0b20sIG1heEZsb2F0TG9naWNhbEJvdHRvbSk7Cisg ICAgcmV0dXJuIHsgY2hpbGQubG9naWNhbFRvcCgpIC0gY29udGVudEhlaWdodCwgbWFyZ2luSW5m byB9OworfQorCiB2b2lkIFJlbmRlckJsb2NrRmxvdzo6dHJpbUJsb2NrRW5kQ2hpbGRyZW5NYXJn aW5zKCkKIHsKICAgICBhdXRvIHRyaW1TZWxmQ29sbGFwc2luZ0NoaWxkRGVzY2VuZGFudHNNYXJn aW5zID0gWyZdKFJlbmRlckJveCYgY2hpbGQpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCbG9ja0Zsb3cuaAppbmRleCBjODMzMTdlZWYwMTIuLjZmMzFiYzQwYWZiOCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuaApAQCAtMTcxLDYgKzE3MSw3 IEBAIHB1YmxpYzoKICAgICBwdWJsaWM6CiAgICAgICAgIGVudW0gY2xhc3MgSWdub3JlU2Nyb2xs YmFyRm9yQWZ0ZXJNYXJnaW4gOiBib29sIHsgTm8sIFllcyB9OwogICAgICAgICBNYXJnaW5JbmZv KGNvbnN0IFJlbmRlckJsb2NrRmxvdyYsIElnbm9yZVNjcm9sbGJhckZvckFmdGVyTWFyZ2luID0g SWdub3JlU2Nyb2xsYmFyRm9yQWZ0ZXJNYXJnaW46Olllcyk7CisgICAgICAgIE1hcmdpbkluZm8o Ym9vbCBjYW5Db2xsYXBzZVdpdGhDaGlsZHJlbiwgYm9vbCBjYW5Db2xsYXBzZU1hcmdpbkJlZm9y ZVdpdGhDaGlsZHJlbiwgYm9vbCBjYW5Db2xsYXBzZU1hcmdpbkFmdGVyV2l0aENoaWxkcmVuLCBi b29sIHF1aXJrQ29udGFpbmVyLCBib29sIGF0QmVmb3JlU2lkZU9mQmxvY2ssIGJvb2wgYXRBZnRl clNpZGVPZkJsb2NrLCAgYm9vbCBoYXNNYXJnaW5CZWZvcmVRdWlyaywgYm9vbCBoYXNNYXJnaW5B ZnRlclF1aXJrLCBib29sIGRldGVybWluZWRNYXJnaW5CZWZvcmVRdWlyaywgTGF5b3V0VW5pdCBw b3NpdGl2ZU1hcmdpbiwgTGF5b3V0VW5pdCBuZWdhdGl2ZU1hcmdpbik7CiAKICAgICAgICAgdm9p ZCBzZXRBdEJlZm9yZVNpZGVPZkJsb2NrKGJvb2wgYXRCZWZvcmVTaWRlT2ZCbG9jaykgeyBtX2F0 QmVmb3JlU2lkZU9mQmxvY2sgPSBhdEJlZm9yZVNpZGVPZkJsb2NrOyB9CiAgICAgICAgIHZvaWQg c2V0QXRBZnRlclNpZGVPZkJsb2NrKGJvb2wgYXRBZnRlclNpZGVPZkJsb2NrKSB7IG1fYXRBZnRl clNpZGVPZkJsb2NrID0gYXRBZnRlclNpZGVPZkJsb2NrOyB9CkBAIC0yNDMsNiArMjQ0LDEyIEBA IHB1YmxpYzoKICAgICB2b2lkIHBlcmZvcm1CbG9ja1N0ZXBTaXppbmcoUmVuZGVyQm94JiBjaGls ZCwgTGF5b3V0VW5pdCBibG9ja1N0ZXBTaXplRm9yQ2hpbGQpIGNvbnN0OwogCiAgICAgdm9pZCBs YXlvdXRCbG9ja0NoaWxkKFJlbmRlckJveCYgY2hpbGQsIE1hcmdpbkluZm8mLCBMYXlvdXRVbml0 JiBwcmV2aW91c0Zsb2F0TG9naWNhbEJvdHRvbSwgTGF5b3V0VW5pdCYgbWF4RmxvYXRMb2dpY2Fs Qm90dG9tKTsKKyAgICBzdHJ1Y3QgQmxvY2tQb3NpdGlvbkFuZE1hcmdpbiB7CisgICAgICAgIExh eW91dFVuaXQgbG9naWNhbFRvcDsKKyAgICAgICAgTWFyZ2luSW5mbyBtYXJnaW5JbmZvOworICAg IH07CisgICAgQmxvY2tQb3NpdGlvbkFuZE1hcmdpbiBsYXlvdXRCbG9ja0NoaWxkRnJvbUlGQyhS ZW5kZXJCb3gmIGNoaWxkLCBMYXlvdXRVbml0IGJsb2NrTG9naWNhbFRvcCwgTWFyZ2luSW5mbyk7 IC8vIENhbGxlZCBmcm9tIElGQyB3aGVuIGxheWluZyBvdXQgYmxvY2sgaW4gaW5saW5lLgorCiAg ICAgdm9pZCBhZGp1c3RPdXRPZkZsb3dCbG9jayhSZW5kZXJCb3gmIGNoaWxkLCBjb25zdCBNYXJn aW5JbmZvJik7CiAgICAgdm9pZCBhZGp1c3RGbG9hdGluZ0Jsb2NrKGNvbnN0IE1hcmdpbkluZm8m KTsKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvYmxvY2tzLWluLWlubGlu ZS1sYXlvdXQtd2l0aC1tYXJnaW5zLWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2lu bGluZS9ibG9ja3MtaW4taW5saW5lLWxheW91dC13aXRoLW1hcmdpbnMtZXhwZWN0ZWQuaHRtbApu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAuLjJiMDc2ZDNkMzAzYgotLS0g L2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL2Jsb2Nrcy1pbi1pbmxpbmUt bGF5b3V0LXdpdGgtbWFyZ2lucy1leHBlY3RlZC5odG1sCkBAIC0wLDAgKzEsNDMgQEAKKzxzdHls ZT4KKy5jb250YWluZXIgeworICB3aWR0aDogMTAwcHg7CisgIGhlaWdodDogMTAwcHg7CisgIG91 dGxpbmU6IDFweCBzb2xpZCBibGFjazsKK30KKy5taWRkbGUtYmxvY2sgeyAKKyAgYmFja2dyb3Vu ZC1jb2xvcjogYmx1ZTsKKyAgaGVpZ2h0OiAyMHB4OworICBtYXJnaW4tdG9wOiA1cHg7CisgIG1h cmdpbi1ib3R0b206IDEwcHg7Cit9Cis8L3N0eWxlPgorPGRpdiBjbGFzcz1jb250YWluZXI+Cisg IDxzcGFuPgorICAgIHNwYW4gc3RhcnQKKyAgICA8ZGl2IGNsYXNzPW1pZGRsZS1ibG9jaz48L2Rp dj4KKyAgICBzcGFuIGVuZAorICA8L3NwYW4+Cis8L2Rpdj4KKworPGRpdiBjbGFzcz1jb250YWlu ZXI+CisgIDxzcGFuPgorICAgIDxkaXYgY2xhc3M9bWlkZGxlLWJsb2NrPjwvZGl2PgorICAgIHNw YW4gZW5kCisgIDwvc3Bhbj4KKzwvZGl2PgorCis8ZGl2IGNsYXNzPWNvbnRhaW5lcj4KKyAgPHNw YW4+CisgICAgc3BhbiBzdGFydAorICAgIDxkaXYgY2xhc3M9bWlkZGxlLWJsb2NrPjwvZGl2Pgor ICA8L3NwYW4+Cis8L2Rpdj4KKworPGRpdiBjbGFzcz1jb250YWluZXI+CisgIDxzcGFuPgorICAg IHNwYW4gc3RhcnQKKyAgICA8ZGl2IGNsYXNzPW1pZGRsZS1ibG9jaz48L2Rpdj4KKyAgICA8ZGl2 IGNsYXNzPW1pZGRsZS1ibG9jaz48L2Rpdj4KKyAgICBzcGFuIGVuZAorICA8L3NwYW4+Cis8L2Rp dj4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL2Jsb2Nrcy1pbi1pbmxpbmUt bGF5b3V0LXdpdGgtbWFyZ2lucy5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvYmxvY2tz LWluLWlubGluZS1sYXlvdXQtd2l0aC1tYXJnaW5zLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMDAwMDAwLi41MTRkY2I2M2Y0NWEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv dXRUZXN0cy9mYXN0L2lubGluZS9ibG9ja3MtaW4taW5saW5lLWxheW91dC13aXRoLW1hcmdpbnMu aHRtbApAQCAtMCwwICsxLDQ0IEBACis8IS0tIHdlYmtpdC10ZXN0LXJ1bm5lciBbIEJsb2Nrc0lu SW5saW5lTGF5b3V0RW5hYmxlZD10cnVlIF0gLS0+Cis8c3R5bGU+CisuY29udGFpbmVyIHsKKyAg d2lkdGg6IDEwMHB4OworICBoZWlnaHQ6IDEwMHB4OworICBvdXRsaW5lOiAxcHggc29saWQgYmxh Y2s7Cit9CisubWlkZGxlLWJsb2NrIHsgCisgIGJhY2tncm91bmQtY29sb3I6IGJsdWU7CisgIGhl aWdodDogMjBweDsKKyAgbWFyZ2luLXRvcDogNXB4OworICBtYXJnaW4tYm90dG9tOiAxMHB4Owor fQorPC9zdHlsZT4KKzxkaXYgY2xhc3M9Y29udGFpbmVyPgorICA8c3Bhbj4KKyAgICBzcGFuIHN0 YXJ0CisgICAgPGRpdiBjbGFzcz1taWRkbGUtYmxvY2s+PC9kaXY+CisgICAgc3BhbiBlbmQKKyAg PC9zcGFuPgorPC9kaXY+CisKKzxkaXYgY2xhc3M9Y29udGFpbmVyPgorICA8c3Bhbj4KKyAgICA8 ZGl2IGNsYXNzPW1pZGRsZS1ibG9jaz48L2Rpdj4KKyAgICBzcGFuIGVuZAorICA8L3NwYW4+Cis8 L2Rpdj4KKworPGRpdiBjbGFzcz1jb250YWluZXI+CisgIDxzcGFuPgorICAgIHNwYW4gc3RhcnQK KyAgICA8ZGl2IGNsYXNzPW1pZGRsZS1ibG9jaz48L2Rpdj4KKyAgPC9zcGFuPgorPC9kaXY+CisK KzxkaXYgY2xhc3M9Y29udGFpbmVyPgorICA8c3Bhbj4KKyAgICBzcGFuIHN0YXJ0CisgICAgPGRp diBjbGFzcz1taWRkbGUtYmxvY2s+PC9kaXY+CisgICAgPGRpdiBjbGFzcz1taWRkbGUtYmxvY2s+ PC9kaXY+CisgICAgc3BhbiBlbmQKKyAgPC9zcGFuPgorPC9kaXY+Cg== 477407 2025-11-15 14:13:08 -0800 2025-11-15 18:15:22 -0800 Patch bug-302574-20251115141307.patch text/plain 11440 zalan RnJvbSBjNzk0YWYxNzg1MjYyYTUzOWI3MmJlMzk1NGU2YzAxM2E2ZGZlOWQ4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFNhdCwgMTUgTm92IDIwMjUgMTA6NTQ6NDggLTA4MDAKU3ViamVjdDogW1BBVENIXSBbYmxvY2tz LWluLWlubGluZV0gRml4IHNpbXBsZSBtYXJnaW4gY29sbGFwc2luZyBiZWZvcmUvYWZ0ZXIKIGJl dHdlZW4gYmxvY2tzIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDI1 NzQKClJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgoKMS4gQmVmb3JlIHJ1bm5pbmcgcmVuZGVy IHRyZWUgbGF5b3V0IGNvdmVydCBNYXJnaW5TdGF0ZSAtPiBNYXJnaW5JbmZvCjIuIENhbGwgZGVk aWNhdGVkIFJlbmRlckJsb2NrRmxvdzo6bGF5b3V0QmxvY2tDaGlsZEZyb21JRkMgdG8gbGF5b3V0 IGJsb2NrKHMpIGluIGlubGluZQozLiBBZnRlciBsYXlvdXQgY292ZXJ0IE1hcmdpbkluZm8gLT4g TWFyZ2luU3RhdGUKClRlc3Q6IGZhc3QvaW5saW5lL2Jsb2Nrcy1pbi1pbmxpbmUtbGF5b3V0LXdp dGgtbWFyZ2lucy5odG1sCgoqIExheW91dFRlc3RzL2Zhc3QvaW5saW5lL2Jsb2Nrcy1pbi1pbmxp bmUtbGF5b3V0LXdpdGgtbWFyZ2lucy1leHBlY3RlZC5odG1sOiBBZGRlZC4KKiBMYXlvdXRUZXN0 cy9mYXN0L2lubGluZS9ibG9ja3MtaW4taW5saW5lLWxheW91dC13aXRoLW1hcmdpbnMuaHRtbDog QWRkZWQuCiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0 aW9uRm9ybWF0dGluZ0NvbnRleHRMYXlvdXQuY3BwOgooV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRp b246OmxheW91dFdpdGhGb3JtYXR0aW5nQ29udGV4dEZvckJsb2NrSW5JbmxpbmUpOgoqIFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwOgooV2ViQ29yZTo6UmVuZGVy QmxvY2tGbG93OjpNYXJnaW5JbmZvOjpNYXJnaW5JbmZvKToKKFdlYkNvcmU6OlJlbmRlckJsb2Nr Rmxvdzo6bGF5b3V0QmxvY2tDaGlsZEZyb21JRkMpOgoqIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCbG9ja0Zsb3cuaDoKLS0tCiAuLi55b3V0SW50ZWdyYXRpb25Gb3JtYXR0aW5nQ29u dGV4dExheW91dC5jcHAgfCAyMyArKysrKy0tLS0tCiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyQmxvY2tGbG93LmNwcCAgfCAyNiArKysrKysrKysrKwogU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5oICAgIHwgIDcgKysrCiAuLi5uLWlubGluZS1sYXlvdXQt d2l0aC1tYXJnaW5zLWV4cGVjdGVkLmh0bWwgfCA0MyArKysrKysrKysrKysrKysrKysKIC4uLi9i bG9ja3MtaW4taW5saW5lLWxheW91dC13aXRoLW1hcmdpbnMuaHRtbCB8IDQ0ICsrKysrKysrKysr KysrKysrKysKIDUgZmlsZXMgY2hhbmdlZCwgMTMzIGluc2VydGlvbnMoKyksIDEwIGRlbGV0aW9u cygtKQogY3JlYXRlIG1vZGUgMTAwNjQ0IExheW91dFRlc3RzL2Zhc3QvaW5saW5lL2Jsb2Nrcy1p bi1pbmxpbmUtbGF5b3V0LXdpdGgtbWFyZ2lucy1leHBlY3RlZC5odG1sCiBjcmVhdGUgbW9kZSAx MDA2NDQgTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvYmxvY2tzLWluLWlubGluZS1sYXlvdXQtd2l0 aC1tYXJnaW5zLmh0bWwKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdy YXRpb24vTGF5b3V0SW50ZWdyYXRpb25Gb3JtYXR0aW5nQ29udGV4dExheW91dC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Gb3JtYXR0aW5n Q29udGV4dExheW91dC5jcHAKaW5kZXggZmRlMDNkYThlMTI5Li44YzVmMGQ1YzIyMDQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlv bkZvcm1hdHRpbmdDb250ZXh0TGF5b3V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Gb3JtYXR0aW5nQ29udGV4dExheW91dC5jcHAK QEAgLTk2LDI0ICs5NiwyNyBAQCB2b2lkIGxheW91dFdpdGhGb3JtYXR0aW5nQ29udGV4dEZvckJs b2NrSW5JbmxpbmUoY29uc3QgTGF5b3V0OjpFbGVtZW50Qm94JiBibG9jawogICAgIH07CiAgICAg cG9wdWxhdGVSb290UmVuZGVyZXJXaXRoRmxvYXRzRnJvbUlGQygpOwogCi0gICAgLy8gUmVuZGVy IHRyZWUgdXNlcyBibG9jayBoZWlnaHQgdG8gdHJhY2sgdGhlIGNoaWxkIGJsb2NrIGxheW91dCBw b3NpdGlvbi4gU2V0IGl0IHRvIHRoZSBjdXJyZW50IHBvc2l0aW9uIGJlZm9yZSBjYWxsaW5nIGxh eW91dEJsb2NrQ2hpbGQuCi0gICAgcm9vdEJsb2NrQ29udGFpbmVyLnNldExvZ2ljYWxIZWlnaHQo YmxvY2tMb2dpY2FsVG9wTGVmdC55KCkgLSByb290QmxvY2tDb250YWluZXIubWFyZ2luQmVmb3Jl KCkpOworICAgIGF1dG8gbWFyZ2luSW5mb0ZvckJsb2NrID0gWyZdIHsKKyAgICAgICAgYXV0byYg bWFyZ2luU3RhdGUgPSBwYXJlbnRCbG9ja0xheW91dFN0YXRlLm1hcmdpblN0YXRlKCk7CisgICAg ICAgIHJldHVybiBSZW5kZXJCbG9ja0Zsb3c6Ok1hcmdpbkluZm8geyBtYXJnaW5TdGF0ZS5jYW5D b2xsYXBzZVdpdGhDaGlsZHJlbiwgbWFyZ2luU3RhdGUuY2FuQ29sbGFwc2VNYXJnaW5CZWZvcmVX aXRoQ2hpbGRyZW4sIG1hcmdpblN0YXRlLmNhbkNvbGxhcHNlTWFyZ2luQWZ0ZXJXaXRoQ2hpbGRy ZW4sIG1hcmdpblN0YXRlLnF1aXJrQ29udGFpbmVyLCBtYXJnaW5TdGF0ZS5hdEJlZm9yZVNpZGVP ZkJsb2NrLCBtYXJnaW5TdGF0ZS5hdEFmdGVyU2lkZU9mQmxvY2ssIG1hcmdpblN0YXRlLmhhc01h cmdpbkJlZm9yZVF1aXJrLCBtYXJnaW5TdGF0ZS5oYXNNYXJnaW5BZnRlclF1aXJrLCBtYXJnaW5T dGF0ZS5kZXRlcm1pbmVkTWFyZ2luQmVmb3JlUXVpcmssIG1hcmdpblN0YXRlLnBvc2l0aXZlTWFy Z2luLCBtYXJnaW5TdGF0ZS5uZWdhdGl2ZU1hcmdpbiB9OworICAgIH07CiAKLSAgICBhdXRvIG1h cmdpbkluZm8gPSBSZW5kZXJCbG9ja0Zsb3c6Ok1hcmdpbkluZm8geyByb290QmxvY2tDb250YWlu ZXIgfTsKLSAgICAvLyBGSVhNRTogVGhlc2UgYXJlIHByb2JhYmx5IG5lZWRlZCB0byBtYWtlIHRo ZSBjb250YWluZXIgbWFyZ2luIGNvbGxhcHNpbmcgd29yay4KLSAgICBtYXJnaW5JbmZvLnNldEF0 QmVmb3JlU2lkZU9mQmxvY2soZmFsc2UpOwotICAgIG1hcmdpbkluZm8uc2V0QXRBZnRlclNpZGVP ZkJsb2NrKGZhbHNlKTsKKyAgICBhdXRvIHBvc2l0aW9uQW5kTWFyZ2luID0gcm9vdEJsb2NrQ29u dGFpbmVyLmxheW91dEJsb2NrQ2hpbGRGcm9tSUZDKGJsb2NrUmVuZGVyZXIsIGJsb2NrTG9naWNh bFRvcExlZnQueSgpLCBtYXJnaW5JbmZvRm9yQmxvY2soKSk7CiAKLSAgICBMYXlvdXRVbml0IHBy ZXZpb3VzRmxvYXRMb2dpY2FsQm90dG9tOwotICAgIExheW91dFVuaXQgbWF4RmxvYXRMb2dpY2Fs Qm90dG9tOwotICAgIHJvb3RCbG9ja0NvbnRhaW5lci5sYXlvdXRCbG9ja0NoaWxkKGJsb2NrUmVu ZGVyZXIsIG1hcmdpbkluZm8sIHByZXZpb3VzRmxvYXRMb2dpY2FsQm90dG9tLCBtYXhGbG9hdExv Z2ljYWxCb3R0b20pOworICAgIGF1dG8gdXBkYXRlTWFyZ2luU3RhdGUgPSBbJl0geworICAgICAg ICBhdXRvJiBtYXJnaW5JbmZvID0gcG9zaXRpb25BbmRNYXJnaW4ubWFyZ2luSW5mbzsKKyAgICAg ICAgcGFyZW50QmxvY2tMYXlvdXRTdGF0ZS5tYXJnaW5TdGF0ZSgpID0geyBtYXJnaW5JbmZvLmNh bkNvbGxhcHNlV2l0aENoaWxkcmVuKCksIG1hcmdpbkluZm8uY2FuQ29sbGFwc2VNYXJnaW5CZWZv cmVXaXRoQ2hpbGRyZW4oKSwgbWFyZ2luSW5mby5jYW5Db2xsYXBzZU1hcmdpbkFmdGVyV2l0aENo aWxkcmVuKCksIG1hcmdpbkluZm8ucXVpcmtDb250YWluZXIoKSwgbWFyZ2luSW5mby5hdEJlZm9y ZVNpZGVPZkJsb2NrKCksIG1hcmdpbkluZm8uYXRBZnRlclNpZGVPZkJsb2NrKCksIG1hcmdpbklu Zm8uaGFzTWFyZ2luQmVmb3JlUXVpcmsoKSwgbWFyZ2luSW5mby5oYXNNYXJnaW5BZnRlclF1aXJr KCksIG1hcmdpbkluZm8uZGV0ZXJtaW5lZE1hcmdpbkJlZm9yZVF1aXJrKCksIG1hcmdpbkluZm8u cG9zaXRpdmVNYXJnaW4oKSwgbWFyZ2luSW5mby5uZWdhdGl2ZU1hcmdpbigpIH07CisgICAgfTsK KyAgICB1cGRhdGVNYXJnaW5TdGF0ZSgpOwogCiAgICAgYXV0byB1cGRhdGVyID0gQm94R2VvbWV0 cnlVcGRhdGVyIHsgbGF5b3V0U3RhdGUsIHJvb3RMYXlvdXRCb3goYmxvY2spIH07CiAgICAgdXBk YXRlci51cGRhdGVCb3hHZW9tZXRyeUFmdGVySW50ZWdyYXRpb25MYXlvdXQoYmxvY2ssIHJvb3RC bG9ja0NvbnRhaW5lci5jb250ZW50Qm94TG9naWNhbFdpZHRoKCkpOwogCiAgICAgQVNTRVJUKCFi bG9ja1JlbmRlcmVyLm5lZWRzTGF5b3V0KCkpOwogICAgIGF1dG8mIGJsb2NrR2VvbWV0cnkgPSBs YXlvdXRTdGF0ZS5lbnN1cmVHZW9tZXRyeUZvckJveChibG9jayk7Ci0gICAgYmxvY2tHZW9tZXRy eS5zZXRUb3BMZWZ0KExheW91dFBvaW50IHsgYmxvY2tHZW9tZXRyeS5tYXJnaW5TdGFydCgpLCBi bG9ja0dlb21ldHJ5Lm1hcmdpbkJlZm9yZSgpIH0pOworICAgIGJsb2NrR2VvbWV0cnkuc2V0VG9w TGVmdChMYXlvdXRQb2ludCB7IGJsb2NrR2VvbWV0cnkubWFyZ2luU3RhcnQoKSwgcG9zaXRpb25B bmRNYXJnaW4ubG9naWNhbFRvcCB9KTsKKyAgICAvLyBGSVhNRTogVGhpcyBpcyBvbmx5IHZhbGlk IHVuZGVyIHRoZSBhc3N1bXB0aW9uIHRoYXQgdGhlIGJsb2NrIGlzIGltbWVkaWF0ZWx5IGZvbGxv d2VkIGJ5IGFuIGlubGluZSAoaS5lLiBubyBtYXJnaW4gY29sbGFwc2luZykuCisgICAgYmxvY2tH ZW9tZXRyeS5zZXRWZXJ0aWNhbE1hcmdpbih7IHBvc2l0aW9uQW5kTWFyZ2luLmxvZ2ljYWxUb3As IHBvc2l0aW9uQW5kTWFyZ2luLm1hcmdpbkluZm8ucG9zaXRpdmVNYXJnaW4oKSAtIHBvc2l0aW9u QW5kTWFyZ2luLm1hcmdpbkluZm8ubmVnYXRpdmVNYXJnaW4oKSB9KTsKIAogICAgIGF1dG8gcG9w dWxhdGVJRkNXaXRoTmV3bHlQbGFjZWRGbG9hdHMgPSBbJl0gewogICAgICAgICBhdXRvKiByZW5k ZXJCbG9ja0Zsb3cgPSBkeW5hbWljRG93bmNhc3Q8UmVuZGVyQmxvY2tGbG93PihibG9ja1JlbmRl cmVyKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zs b3cuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKaW5k ZXggOTllYTkxNjRkOGU0Li4xNTM2Yjc2NDc0MWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCkBAIC0xMzksNiArMTM5LDIxIEBAIFJlbmRlckJsb2Nr Rmxvdzo6TWFyZ2luSW5mbzo6TWFyZ2luSW5mbyhjb25zdCBSZW5kZXJCbG9ja0Zsb3cmIGJsb2Nr LCBJZ25vcmVTY3JvCiAgICAgbV9uZWdhdGl2ZU1hcmdpbiA9IG1fY2FuQ29sbGFwc2VNYXJnaW5C ZWZvcmVXaXRoQ2hpbGRyZW4gPyBibG9jay5tYXhOZWdhdGl2ZU1hcmdpbkJlZm9yZSgpIDogMF9s dTsKIH0KIAorUmVuZGVyQmxvY2tGbG93OjpNYXJnaW5JbmZvOjpNYXJnaW5JbmZvKGJvb2wgY2Fu Q29sbGFwc2VXaXRoQ2hpbGRyZW4sIGJvb2wgY2FuQ29sbGFwc2VNYXJnaW5CZWZvcmVXaXRoQ2hp bGRyZW4sIGJvb2wgY2FuQ29sbGFwc2VNYXJnaW5BZnRlcldpdGhDaGlsZHJlbiwgYm9vbCBxdWly a0NvbnRhaW5lciwgYm9vbCBhdEJlZm9yZVNpZGVPZkJsb2NrLCBib29sIGF0QWZ0ZXJTaWRlT2ZC bG9jaywgIGJvb2wgaGFzTWFyZ2luQmVmb3JlUXVpcmssIGJvb2wgaGFzTWFyZ2luQWZ0ZXJRdWly aywgYm9vbCBkZXRlcm1pbmVkTWFyZ2luQmVmb3JlUXVpcmssIExheW91dFVuaXQgcG9zaXRpdmVN YXJnaW4sIExheW91dFVuaXQgbmVnYXRpdmVNYXJnaW4pCisgICAgOiBtX2NhbkNvbGxhcHNlV2l0 aENoaWxkcmVuKGNhbkNvbGxhcHNlV2l0aENoaWxkcmVuKQorICAgICwgbV9jYW5Db2xsYXBzZU1h cmdpbkJlZm9yZVdpdGhDaGlsZHJlbihjYW5Db2xsYXBzZU1hcmdpbkJlZm9yZVdpdGhDaGlsZHJl bikKKyAgICAsIG1fY2FuQ29sbGFwc2VNYXJnaW5BZnRlcldpdGhDaGlsZHJlbihjYW5Db2xsYXBz ZU1hcmdpbkFmdGVyV2l0aENoaWxkcmVuKQorICAgICwgbV9xdWlya0NvbnRhaW5lcihxdWlya0Nv bnRhaW5lcikKKyAgICAsIG1fYXRCZWZvcmVTaWRlT2ZCbG9jayhhdEJlZm9yZVNpZGVPZkJsb2Nr KQorICAgICwgbV9hdEFmdGVyU2lkZU9mQmxvY2soYXRBZnRlclNpZGVPZkJsb2NrKQorICAgICwg bV9oYXNNYXJnaW5CZWZvcmVRdWlyayhoYXNNYXJnaW5CZWZvcmVRdWlyaykKKyAgICAsIG1faGFz TWFyZ2luQWZ0ZXJRdWlyayhoYXNNYXJnaW5BZnRlclF1aXJrKQorICAgICwgbV9kZXRlcm1pbmVk TWFyZ2luQmVmb3JlUXVpcmsoZGV0ZXJtaW5lZE1hcmdpbkJlZm9yZVF1aXJrKQorICAgICwgbV9w b3NpdGl2ZU1hcmdpbihwb3NpdGl2ZU1hcmdpbikKKyAgICAsIG1fbmVnYXRpdmVNYXJnaW4obmVn YXRpdmVNYXJnaW4pCit7Cit9CisKIFJlbmRlckJsb2NrRmxvdzo6UmVuZGVyQmxvY2tGbG93KFR5 cGUgdHlwZSwgRWxlbWVudCYgZWxlbWVudCwgUmVuZGVyU3R5bGUmJiBzdHlsZSwgT3B0aW9uU2V0 PEJsb2NrRmxvd0ZsYWc+IGZsYWdzKQogICAgIDogUmVuZGVyQmxvY2sodHlwZSwgZWxlbWVudCwg V1RGTW92ZShzdHlsZSksIHsgfSwgZmxhZ3MpCiAjaWYgRU5BQkxFKFRFWFRfQVVUT1NJWklORykK QEAgLTkyNiw2ICs5NDEsMTcgQEAgdm9pZCBSZW5kZXJCbG9ja0Zsb3c6OmxheW91dEJsb2NrQ2hp bGRyZW4oUmVsYXlvdXRDaGlsZHJlbiByZWxheW91dENoaWxkcmVuLCBMYXkKICAgICBoYW5kbGVB ZnRlclNpZGVPZkJsb2NrKG1hcmdpbkluZm8pOwogfQogCitSZW5kZXJCbG9ja0Zsb3c6OkJsb2Nr UG9zaXRpb25BbmRNYXJnaW4gUmVuZGVyQmxvY2tGbG93OjpsYXlvdXRCbG9ja0NoaWxkRnJvbUlG QyhSZW5kZXJCb3gmIGNoaWxkLCBMYXlvdXRVbml0IGNvbnRlbnRIZWlnaHQsIE1hcmdpbkluZm8g bWFyZ2luSW5mbykKK3sKKyAgICAvLyBSZW5kZXIgdHJlZSB1c2VzIGJsb2NrIGhlaWdodCB0byB0 cmFjayB0aGUgY2hpbGQgYmxvY2sgbGF5b3V0IHBvc2l0aW9uLiBTZXQgaXQgdG8gdGhlIGN1cnJl bnQgcG9zaXRpb24gYmVmb3JlIGNhbGxpbmcgbGF5b3V0QmxvY2tDaGlsZC4KKyAgICBzZXRMb2dp Y2FsSGVpZ2h0KGNvbnRlbnRIZWlnaHQpOworCisgICAgYXV0byBwcmV2aW91c0Zsb2F0TG9naWNh bEJvdHRvbSA9IExheW91dFVuaXQgeyB9OworICAgIGF1dG8gbWF4RmxvYXRMb2dpY2FsQm90dG9t ID0gTGF5b3V0VW5pdCB7IH07CisgICAgbGF5b3V0QmxvY2tDaGlsZChjaGlsZCwgbWFyZ2luSW5m bywgcHJldmlvdXNGbG9hdExvZ2ljYWxCb3R0b20sIG1heEZsb2F0TG9naWNhbEJvdHRvbSk7Cisg ICAgcmV0dXJuIHsgY2hpbGQubG9naWNhbFRvcCgpIC0gY29udGVudEhlaWdodCwgbWFyZ2luSW5m byB9OworfQorCiB2b2lkIFJlbmRlckJsb2NrRmxvdzo6dHJpbUJsb2NrRW5kQ2hpbGRyZW5NYXJn aW5zKCkKIHsKICAgICBhdXRvIHRyaW1TZWxmQ29sbGFwc2luZ0NoaWxkRGVzY2VuZGFudHNNYXJn aW5zID0gWyZdKFJlbmRlckJveCYgY2hpbGQpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCbG9ja0Zsb3cuaAppbmRleCBjODMzMTdlZWYwMTIuLjZmMzFiYzQwYWZiOCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuaApAQCAtMTcxLDYgKzE3MSw3 IEBAIHB1YmxpYzoKICAgICBwdWJsaWM6CiAgICAgICAgIGVudW0gY2xhc3MgSWdub3JlU2Nyb2xs YmFyRm9yQWZ0ZXJNYXJnaW4gOiBib29sIHsgTm8sIFllcyB9OwogICAgICAgICBNYXJnaW5JbmZv KGNvbnN0IFJlbmRlckJsb2NrRmxvdyYsIElnbm9yZVNjcm9sbGJhckZvckFmdGVyTWFyZ2luID0g SWdub3JlU2Nyb2xsYmFyRm9yQWZ0ZXJNYXJnaW46Olllcyk7CisgICAgICAgIE1hcmdpbkluZm8o Ym9vbCBjYW5Db2xsYXBzZVdpdGhDaGlsZHJlbiwgYm9vbCBjYW5Db2xsYXBzZU1hcmdpbkJlZm9y ZVdpdGhDaGlsZHJlbiwgYm9vbCBjYW5Db2xsYXBzZU1hcmdpbkFmdGVyV2l0aENoaWxkcmVuLCBi b29sIHF1aXJrQ29udGFpbmVyLCBib29sIGF0QmVmb3JlU2lkZU9mQmxvY2ssIGJvb2wgYXRBZnRl clNpZGVPZkJsb2NrLCAgYm9vbCBoYXNNYXJnaW5CZWZvcmVRdWlyaywgYm9vbCBoYXNNYXJnaW5B ZnRlclF1aXJrLCBib29sIGRldGVybWluZWRNYXJnaW5CZWZvcmVRdWlyaywgTGF5b3V0VW5pdCBw b3NpdGl2ZU1hcmdpbiwgTGF5b3V0VW5pdCBuZWdhdGl2ZU1hcmdpbik7CiAKICAgICAgICAgdm9p ZCBzZXRBdEJlZm9yZVNpZGVPZkJsb2NrKGJvb2wgYXRCZWZvcmVTaWRlT2ZCbG9jaykgeyBtX2F0 QmVmb3JlU2lkZU9mQmxvY2sgPSBhdEJlZm9yZVNpZGVPZkJsb2NrOyB9CiAgICAgICAgIHZvaWQg c2V0QXRBZnRlclNpZGVPZkJsb2NrKGJvb2wgYXRBZnRlclNpZGVPZkJsb2NrKSB7IG1fYXRBZnRl clNpZGVPZkJsb2NrID0gYXRBZnRlclNpZGVPZkJsb2NrOyB9CkBAIC0yNDMsNiArMjQ0LDEyIEBA IHB1YmxpYzoKICAgICB2b2lkIHBlcmZvcm1CbG9ja1N0ZXBTaXppbmcoUmVuZGVyQm94JiBjaGls ZCwgTGF5b3V0VW5pdCBibG9ja1N0ZXBTaXplRm9yQ2hpbGQpIGNvbnN0OwogCiAgICAgdm9pZCBs YXlvdXRCbG9ja0NoaWxkKFJlbmRlckJveCYgY2hpbGQsIE1hcmdpbkluZm8mLCBMYXlvdXRVbml0 JiBwcmV2aW91c0Zsb2F0TG9naWNhbEJvdHRvbSwgTGF5b3V0VW5pdCYgbWF4RmxvYXRMb2dpY2Fs Qm90dG9tKTsKKyAgICBzdHJ1Y3QgQmxvY2tQb3NpdGlvbkFuZE1hcmdpbiB7CisgICAgICAgIExh eW91dFVuaXQgbG9naWNhbFRvcDsKKyAgICAgICAgTWFyZ2luSW5mbyBtYXJnaW5JbmZvOworICAg IH07CisgICAgQmxvY2tQb3NpdGlvbkFuZE1hcmdpbiBsYXlvdXRCbG9ja0NoaWxkRnJvbUlGQyhS ZW5kZXJCb3gmIGNoaWxkLCBMYXlvdXRVbml0IGJsb2NrTG9naWNhbFRvcCwgTWFyZ2luSW5mbyk7 IC8vIENhbGxlZCBmcm9tIElGQyB3aGVuIGxheWluZyBvdXQgYmxvY2sgaW4gaW5saW5lLgorCiAg ICAgdm9pZCBhZGp1c3RPdXRPZkZsb3dCbG9jayhSZW5kZXJCb3gmIGNoaWxkLCBjb25zdCBNYXJn aW5JbmZvJik7CiAgICAgdm9pZCBhZGp1c3RGbG9hdGluZ0Jsb2NrKGNvbnN0IE1hcmdpbkluZm8m KTsKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvYmxvY2tzLWluLWlubGlu ZS1sYXlvdXQtd2l0aC1tYXJnaW5zLWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2lu bGluZS9ibG9ja3MtaW4taW5saW5lLWxheW91dC13aXRoLW1hcmdpbnMtZXhwZWN0ZWQuaHRtbApu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAuLjJiMDc2ZDNkMzAzYgotLS0g L2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL2Jsb2Nrcy1pbi1pbmxpbmUt bGF5b3V0LXdpdGgtbWFyZ2lucy1leHBlY3RlZC5odG1sCkBAIC0wLDAgKzEsNDMgQEAKKzxzdHls ZT4KKy5jb250YWluZXIgeworICB3aWR0aDogMTAwcHg7CisgIGhlaWdodDogMTAwcHg7CisgIG91 dGxpbmU6IDFweCBzb2xpZCBibGFjazsKK30KKy5taWRkbGUtYmxvY2sgeyAKKyAgYmFja2dyb3Vu ZC1jb2xvcjogYmx1ZTsKKyAgaGVpZ2h0OiAyMHB4OworICBtYXJnaW4tdG9wOiA1cHg7CisgIG1h cmdpbi1ib3R0b206IDEwcHg7Cit9Cis8L3N0eWxlPgorPGRpdiBjbGFzcz1jb250YWluZXI+Cisg IDxzcGFuPgorICAgIHNwYW4gc3RhcnQKKyAgICA8ZGl2IGNsYXNzPW1pZGRsZS1ibG9jaz48L2Rp dj4KKyAgICBzcGFuIGVuZAorICA8L3NwYW4+Cis8L2Rpdj4KKworPGRpdiBjbGFzcz1jb250YWlu ZXI+CisgIDxzcGFuPgorICAgIDxkaXYgY2xhc3M9bWlkZGxlLWJsb2NrPjwvZGl2PgorICAgIHNw YW4gZW5kCisgIDwvc3Bhbj4KKzwvZGl2PgorCis8ZGl2IGNsYXNzPWNvbnRhaW5lcj4KKyAgPHNw YW4+CisgICAgc3BhbiBzdGFydAorICAgIDxkaXYgY2xhc3M9bWlkZGxlLWJsb2NrPjwvZGl2Pgor ICA8L3NwYW4+Cis8L2Rpdj4KKworPGRpdiBjbGFzcz1jb250YWluZXI+CisgIDxzcGFuPgorICAg IHNwYW4gc3RhcnQKKyAgICA8ZGl2IGNsYXNzPW1pZGRsZS1ibG9jaz48L2Rpdj4KKyAgICA8ZGl2 IGNsYXNzPW1pZGRsZS1ibG9jaz48L2Rpdj4KKyAgICBzcGFuIGVuZAorICA8L3NwYW4+Cis8L2Rp dj4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL2Jsb2Nrcy1pbi1pbmxpbmUt bGF5b3V0LXdpdGgtbWFyZ2lucy5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvYmxvY2tz LWluLWlubGluZS1sYXlvdXQtd2l0aC1tYXJnaW5zLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMDAwMDAwLi41MTRkY2I2M2Y0NWEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv dXRUZXN0cy9mYXN0L2lubGluZS9ibG9ja3MtaW4taW5saW5lLWxheW91dC13aXRoLW1hcmdpbnMu aHRtbApAQCAtMCwwICsxLDQ0IEBACis8IS0tIHdlYmtpdC10ZXN0LXJ1bm5lciBbIEJsb2Nrc0lu SW5saW5lTGF5b3V0RW5hYmxlZD10cnVlIF0gLS0+Cis8c3R5bGU+CisuY29udGFpbmVyIHsKKyAg d2lkdGg6IDEwMHB4OworICBoZWlnaHQ6IDEwMHB4OworICBvdXRsaW5lOiAxcHggc29saWQgYmxh Y2s7Cit9CisubWlkZGxlLWJsb2NrIHsgCisgIGJhY2tncm91bmQtY29sb3I6IGJsdWU7CisgIGhl aWdodDogMjBweDsKKyAgbWFyZ2luLXRvcDogNXB4OworICBtYXJnaW4tYm90dG9tOiAxMHB4Owor fQorPC9zdHlsZT4KKzxkaXYgY2xhc3M9Y29udGFpbmVyPgorICA8c3Bhbj4KKyAgICBzcGFuIHN0 YXJ0CisgICAgPGRpdiBjbGFzcz1taWRkbGUtYmxvY2s+PC9kaXY+CisgICAgc3BhbiBlbmQKKyAg PC9zcGFuPgorPC9kaXY+CisKKzxkaXYgY2xhc3M9Y29udGFpbmVyPgorICA8c3Bhbj4KKyAgICA8 ZGl2IGNsYXNzPW1pZGRsZS1ibG9jaz48L2Rpdj4KKyAgICBzcGFuIGVuZAorICA8L3NwYW4+Cis8 L2Rpdj4KKworPGRpdiBjbGFzcz1jb250YWluZXI+CisgIDxzcGFuPgorICAgIHNwYW4gc3RhcnQK KyAgICA8ZGl2IGNsYXNzPW1pZGRsZS1ibG9jaz48L2Rpdj4KKyAgPC9zcGFuPgorPC9kaXY+CisK KzxkaXYgY2xhc3M9Y29udGFpbmVyPgorICA8c3Bhbj4KKyAgICBzcGFuIHN0YXJ0CisgICAgPGRp diBjbGFzcz1taWRkbGUtYmxvY2s+PC9kaXY+CisgICAgPGRpdiBjbGFzcz1taWRkbGUtYmxvY2s+ PC9kaXY+CisgICAgc3BhbiBlbmQKKyAgPC9zcGFuPgorPC9kaXY+Cg== 477409 2025-11-15 18:15:25 -0800 2025-11-15 18:22:44 -0800 Patch bug-302574-20251115181524.patch text/plain 14679 zalan RnJvbSA0ZWM5NWNlMDQzZjljMmQ4ZDVmZTliNWM0NTkyZTY1NDRkMzdhNmEyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFNhdCwgMTUgTm92IDIwMjUgMTA6NTQ6NDggLTA4MDAKU3ViamVjdDogW1BBVENIXSBbYmxvY2tz LWluLWlubGluZV0gRml4IHNpbXBsZSBtYXJnaW4gY29sbGFwc2luZyBiZWZvcmUvYWZ0ZXIKIGJl dHdlZW4gYmxvY2tzIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDI1 NzQKClJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgoKMS4gQmVmb3JlIHJ1bm5pbmcgcmVuZGVy IHRyZWUgbGF5b3V0IGNvdmVydCBNYXJnaW5TdGF0ZSAtPiBNYXJnaW5JbmZvCjIuIENhbGwgZGVk aWNhdGVkIFJlbmRlckJsb2NrRmxvdzo6bGF5b3V0QmxvY2tDaGlsZEZyb21JRkMgdG8gbGF5b3V0 IGJsb2NrKHMpIGluIGlubGluZQozLiBBZnRlciBsYXlvdXQgY292ZXJ0IE1hcmdpbkluZm8gLT4g TWFyZ2luU3RhdGUKClRlc3Q6IGZhc3QvaW5saW5lL2Jsb2Nrcy1pbi1pbmxpbmUtbGF5b3V0LXdp dGgtbWFyZ2lucy5odG1sCgoqIExheW91dFRlc3RzL2Zhc3QvaW5saW5lL2Jsb2Nrcy1pbi1pbmxp bmUtZmxvYXQtY2xlYXIuaHRtbDoKKiBMYXlvdXRUZXN0cy9mYXN0L2lubGluZS9ibG9ja3MtaW4t aW5saW5lLWxheW91dC13aXRoLW1hcmdpbnMtZXhwZWN0ZWQuaHRtbDogQWRkZWQuCiogTGF5b3V0 VGVzdHMvZmFzdC9pbmxpbmUvYmxvY2tzLWluLWlubGluZS1sYXlvdXQtd2l0aC1tYXJnaW5zLmh0 bWw6IEFkZGVkLgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvYmxv Y2svQmxvY2tMYXlvdXRTdGF0ZS5oOgooV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0xheW91dFN0YXRl OjpNYXJnaW5TdGF0ZTo6cmVzZXRCZWZvcmVTaWRlT2ZCbG9jayk6CihXZWJDb3JlOjpMYXlvdXQ6 OkJsb2NrTGF5b3V0U3RhdGU6Ok1hcmdpblN0YXRlOjptYXJnaW4gY29uc3QpOgoqIFNvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdD b250ZXh0LmNwcDoKKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OnVw ZGF0ZUxheW91dFN0YXRlV2l0aExpbmVMYXlvdXRSZXN1bHQpOgoqIFNvdXJjZS9XZWJDb3JlL2xh eW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkZvcm1hdHRpbmdDb250ZXh0TGF5b3V0 LmNwcDoKKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpsYXlvdXRXaXRoRm9ybWF0dGluZ0Nv bnRleHRGb3JCbG9ja0luSW5saW5lKToKKiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy QmxvY2tGbG93LmNwcDoKKFdlYkNvcmU6OlJlbmRlckJsb2NrRmxvdzo6TWFyZ2luSW5mbzo6TWFy Z2luSW5mbyk6CihXZWJDb3JlOjpSZW5kZXJCbG9ja0Zsb3c6OmxheW91dEJsb2NrQ2hpbGRGcm9t SUZDKToKKiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93Lmg6Ci0tLQog Li4uL2Jsb2NrL0Jsb2NrTGF5b3V0U3RhdGUuaCAgICAgICAgICAgICAgICAgIHwgMTMgKysrKysr CiAuLi4vaW5saW5lL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcCAgICAgICAgfCAgOSArKyst CiAuLi55b3V0SW50ZWdyYXRpb25Gb3JtYXR0aW5nQ29udGV4dExheW91dC5jcHAgfCAyMyArKysr Ky0tLS0tCiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcCAgfCAy NiArKysrKysrKysrKwogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5o ICAgIHwgIDcgKysrCiAuLi4vaW5saW5lL2Jsb2Nrcy1pbi1pbmxpbmUtZmxvYXQtY2xlYXIuaHRt bCAgfCAgMSArCiAuLi5uLWlubGluZS1sYXlvdXQtd2l0aC1tYXJnaW5zLWV4cGVjdGVkLmh0bWwg fCA0MyArKysrKysrKysrKysrKysrKysKIC4uLi9ibG9ja3MtaW4taW5saW5lLWxheW91dC13aXRo LW1hcmdpbnMuaHRtbCB8IDQ0ICsrKysrKysrKysrKysrKysrKysKIDggZmlsZXMgY2hhbmdlZCwg MTU0IGluc2VydGlvbnMoKyksIDEyIGRlbGV0aW9ucygtKQogY3JlYXRlIG1vZGUgMTAwNjQ0IExh eW91dFRlc3RzL2Zhc3QvaW5saW5lL2Jsb2Nrcy1pbi1pbmxpbmUtbGF5b3V0LXdpdGgtbWFyZ2lu cy1leHBlY3RlZC5odG1sCiBjcmVhdGUgbW9kZSAxMDA2NDQgTGF5b3V0VGVzdHMvZmFzdC9pbmxp bmUvYmxvY2tzLWluLWlubGluZS1sYXlvdXQtd2l0aC1tYXJnaW5zLmh0bWwKCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2Jsb2NrL0Jsb2NrTGF5 b3V0U3RhdGUuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvYmxv Y2svQmxvY2tMYXlvdXRTdGF0ZS5oCmluZGV4IDBhYzAzYjg0ODQzNS4uMmUyODU4ZmQ0MjExIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2Jsb2Nr L0Jsb2NrTGF5b3V0U3RhdGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2Jsb2NrL0Jsb2NrTGF5b3V0U3RhdGUuaApAQCAtNjEsNiArNjEsMTkgQEAgcHVi bGljOgogICAgIH07CiAKICAgICBzdHJ1Y3QgTWFyZ2luU3RhdGUgeworICAgICAgICB2b2lkIHJl c2V0QmVmb3JlU2lkZU9mQmxvY2soKQorICAgICAgICB7CisgICAgICAgICAgICBpZiAoIWF0QmVm b3JlU2lkZU9mQmxvY2spIHsKKyAgICAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsK KyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9CisgICAgICAgICAgICBhdEJl Zm9yZVNpZGVPZkJsb2NrID0geyB9OworICAgICAgICAgICAgcG9zaXRpdmVNYXJnaW4gPSB7IH07 CisgICAgICAgICAgICBuZWdhdGl2ZU1hcmdpbiA9IHsgfTsKKyAgICAgICAgfQorCisgICAgICAg IExheW91dFVuaXQgbWFyZ2luKCkgY29uc3QgeyByZXR1cm4gcG9zaXRpdmVNYXJnaW4gLSBuZWdh dGl2ZU1hcmdpbjsgfQorCiAgICAgICAgIC8vIEZJWE1FOiBUaGlzIHRyYWNrcyBSZW5kZXJCbG9j a0Zsb3cncyBNYXJnaW5JbmZvIGZvciBub3cuCiAgICAgICAgIGJvb2wgY2FuQ29sbGFwc2VXaXRo Q2hpbGRyZW4gOiAxIHsgZmFsc2UgfTsKICAgICAgICAgYm9vbCBjYW5Db2xsYXBzZU1hcmdpbkJl Zm9yZVdpdGhDaGlsZHJlbiA6IDEgeyBmYWxzZSB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRl eHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUv SW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IDBmM2FiMmY4MTE2NC4uMjk4MDYzZGY0 NWEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQu Y3BwCkBAIC0zOTIsOCArMzkyLDEzIEBAIHZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OnVw ZGF0ZUxheW91dFN0YXRlV2l0aExpbmVMYXlvdXRSZXN1bHQoY29uc3QgTGluZUxhCiAKICAgICBs aW5lTGF5b3V0UmVzdWx0LmVuZHNXaXRoSHlwaGVuKCkgPyBsYXlvdXRTdGF0ZS5pbmNyZW1lbnRT dWNjZXNzaXZlSHlwaGVuYXRlZExpbmVDb3VudCgpIDogbGF5b3V0U3RhdGUucmVzZXRTdWNjZXNz aXZlSHlwaGVuYXRlZExpbmVDb3VudCgpOwogICAgIGxheW91dFN0YXRlLnNldEZpcnN0TGluZVN0 YXJ0VHJpbUZvckluaXRpYWxMZXR0ZXIobGluZUxheW91dFJlc3VsdC5maXJzdExpbmVTdGFydFRy aW0pOwotICAgIGlmIChsaW5lTGF5b3V0UmVzdWx0Lmhhc0luZmxvd0NvbnRlbnQoKSkKLSAgICAg ICAgbGF5b3V0U3RhdGUucGFyZW50QmxvY2tMYXlvdXRTdGF0ZSgpLm1hcmdpblN0YXRlKCkuYXRC ZWZvcmVTaWRlT2ZCbG9jayA9IGZhbHNlOworCisgICAgYXV0byB1cGRhdGVCbG9ja0JlZm9yZU1h cmdpbiA9IFsmXSB7CisgICAgICAgIGF1dG8mIG1hcmdpblN0YXRlID0gbGF5b3V0U3RhdGUucGFy ZW50QmxvY2tMYXlvdXRTdGF0ZSgpLm1hcmdpblN0YXRlKCk7CisgICAgICAgIGlmIChtYXJnaW5T dGF0ZS5hdEJlZm9yZVNpZGVPZkJsb2NrICYmIGxpbmVMYXlvdXRSZXN1bHQuaGFzSW5mbG93Q29u dGVudCgpKQorICAgICAgICAgICAgbWFyZ2luU3RhdGUucmVzZXRCZWZvcmVTaWRlT2ZCbG9jaygp OworICAgIH07CisgICAgdXBkYXRlQmxvY2tCZWZvcmVNYXJnaW4oKTsKIH0KIAogdm9pZCBJbmxp bmVGb3JtYXR0aW5nQ29udGV4dDo6dXBkYXRlQm94R2VvbWV0cnlGb3JQbGFjZWRGbG9hdHMoY29u c3QgTGluZUxheW91dFJlc3VsdDo6UGxhY2VkRmxvYXRMaXN0JiBwbGFjZWRGbG9hdHMpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRp b25Gb3JtYXR0aW5nQ29udGV4dExheW91dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50 ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Gb3JtYXR0aW5nQ29udGV4dExheW91dC5jcHAKaW5k ZXggZmRlMDNkYThlMTI5Li41OTIzNTE2ZDRjZWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkZvcm1hdHRpbmdDb250ZXh0TGF5 b3V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50 ZWdyYXRpb25Gb3JtYXR0aW5nQ29udGV4dExheW91dC5jcHAKQEAgLTk2LDI0ICs5NiwyNyBAQCB2 b2lkIGxheW91dFdpdGhGb3JtYXR0aW5nQ29udGV4dEZvckJsb2NrSW5JbmxpbmUoY29uc3QgTGF5 b3V0OjpFbGVtZW50Qm94JiBibG9jawogICAgIH07CiAgICAgcG9wdWxhdGVSb290UmVuZGVyZXJX aXRoRmxvYXRzRnJvbUlGQygpOwogCi0gICAgLy8gUmVuZGVyIHRyZWUgdXNlcyBibG9jayBoZWln aHQgdG8gdHJhY2sgdGhlIGNoaWxkIGJsb2NrIGxheW91dCBwb3NpdGlvbi4gU2V0IGl0IHRvIHRo ZSBjdXJyZW50IHBvc2l0aW9uIGJlZm9yZSBjYWxsaW5nIGxheW91dEJsb2NrQ2hpbGQuCi0gICAg cm9vdEJsb2NrQ29udGFpbmVyLnNldExvZ2ljYWxIZWlnaHQoYmxvY2tMb2dpY2FsVG9wTGVmdC55 KCkgLSByb290QmxvY2tDb250YWluZXIubWFyZ2luQmVmb3JlKCkpOworICAgIGF1dG8gbWFyZ2lu SW5mb0ZvckJsb2NrID0gWyZdIHsKKyAgICAgICAgYXV0byYgbWFyZ2luU3RhdGUgPSBwYXJlbnRC bG9ja0xheW91dFN0YXRlLm1hcmdpblN0YXRlKCk7CisgICAgICAgIHJldHVybiBSZW5kZXJCbG9j a0Zsb3c6Ok1hcmdpbkluZm8geyBtYXJnaW5TdGF0ZS5jYW5Db2xsYXBzZVdpdGhDaGlsZHJlbiwg bWFyZ2luU3RhdGUuY2FuQ29sbGFwc2VNYXJnaW5CZWZvcmVXaXRoQ2hpbGRyZW4sIG1hcmdpblN0 YXRlLmNhbkNvbGxhcHNlTWFyZ2luQWZ0ZXJXaXRoQ2hpbGRyZW4sIG1hcmdpblN0YXRlLnF1aXJr Q29udGFpbmVyLCBtYXJnaW5TdGF0ZS5hdEJlZm9yZVNpZGVPZkJsb2NrLCBtYXJnaW5TdGF0ZS5h dEFmdGVyU2lkZU9mQmxvY2ssIG1hcmdpblN0YXRlLmhhc01hcmdpbkJlZm9yZVF1aXJrLCBtYXJn aW5TdGF0ZS5oYXNNYXJnaW5BZnRlclF1aXJrLCBtYXJnaW5TdGF0ZS5kZXRlcm1pbmVkTWFyZ2lu QmVmb3JlUXVpcmssIG1hcmdpblN0YXRlLnBvc2l0aXZlTWFyZ2luLCBtYXJnaW5TdGF0ZS5uZWdh dGl2ZU1hcmdpbiB9OworICAgIH07CiAKLSAgICBhdXRvIG1hcmdpbkluZm8gPSBSZW5kZXJCbG9j a0Zsb3c6Ok1hcmdpbkluZm8geyByb290QmxvY2tDb250YWluZXIgfTsKLSAgICAvLyBGSVhNRTog VGhlc2UgYXJlIHByb2JhYmx5IG5lZWRlZCB0byBtYWtlIHRoZSBjb250YWluZXIgbWFyZ2luIGNv bGxhcHNpbmcgd29yay4KLSAgICBtYXJnaW5JbmZvLnNldEF0QmVmb3JlU2lkZU9mQmxvY2soZmFs c2UpOwotICAgIG1hcmdpbkluZm8uc2V0QXRBZnRlclNpZGVPZkJsb2NrKGZhbHNlKTsKKyAgICBh dXRvIHBvc2l0aW9uQW5kTWFyZ2luID0gcm9vdEJsb2NrQ29udGFpbmVyLmxheW91dEJsb2NrQ2hp bGRGcm9tSUZDKGJsb2NrUmVuZGVyZXIsIGJsb2NrTG9naWNhbFRvcExlZnQueSgpLCBtYXJnaW5J bmZvRm9yQmxvY2soKSk7CiAKLSAgICBMYXlvdXRVbml0IHByZXZpb3VzRmxvYXRMb2dpY2FsQm90 dG9tOwotICAgIExheW91dFVuaXQgbWF4RmxvYXRMb2dpY2FsQm90dG9tOwotICAgIHJvb3RCbG9j a0NvbnRhaW5lci5sYXlvdXRCbG9ja0NoaWxkKGJsb2NrUmVuZGVyZXIsIG1hcmdpbkluZm8sIHBy ZXZpb3VzRmxvYXRMb2dpY2FsQm90dG9tLCBtYXhGbG9hdExvZ2ljYWxCb3R0b20pOworICAgIGF1 dG8gdXBkYXRlTWFyZ2luU3RhdGUgPSBbJl0geworICAgICAgICBhdXRvJiBtYXJnaW5JbmZvID0g cG9zaXRpb25BbmRNYXJnaW4ubWFyZ2luSW5mbzsKKyAgICAgICAgcGFyZW50QmxvY2tMYXlvdXRT dGF0ZS5tYXJnaW5TdGF0ZSgpID0geyBtYXJnaW5JbmZvLmNhbkNvbGxhcHNlV2l0aENoaWxkcmVu KCksIG1hcmdpbkluZm8uY2FuQ29sbGFwc2VNYXJnaW5CZWZvcmVXaXRoQ2hpbGRyZW4oKSwgbWFy Z2luSW5mby5jYW5Db2xsYXBzZU1hcmdpbkFmdGVyV2l0aENoaWxkcmVuKCksIG1hcmdpbkluZm8u cXVpcmtDb250YWluZXIoKSwgbWFyZ2luSW5mby5hdEJlZm9yZVNpZGVPZkJsb2NrKCksIG1hcmdp bkluZm8uYXRBZnRlclNpZGVPZkJsb2NrKCksIG1hcmdpbkluZm8uaGFzTWFyZ2luQmVmb3JlUXVp cmsoKSwgbWFyZ2luSW5mby5oYXNNYXJnaW5BZnRlclF1aXJrKCksIG1hcmdpbkluZm8uZGV0ZXJt aW5lZE1hcmdpbkJlZm9yZVF1aXJrKCksIG1hcmdpbkluZm8ucG9zaXRpdmVNYXJnaW4oKSwgbWFy Z2luSW5mby5uZWdhdGl2ZU1hcmdpbigpIH07CisgICAgfTsKKyAgICB1cGRhdGVNYXJnaW5TdGF0 ZSgpOwogCiAgICAgYXV0byB1cGRhdGVyID0gQm94R2VvbWV0cnlVcGRhdGVyIHsgbGF5b3V0U3Rh dGUsIHJvb3RMYXlvdXRCb3goYmxvY2spIH07CiAgICAgdXBkYXRlci51cGRhdGVCb3hHZW9tZXRy eUFmdGVySW50ZWdyYXRpb25MYXlvdXQoYmxvY2ssIHJvb3RCbG9ja0NvbnRhaW5lci5jb250ZW50 Qm94TG9naWNhbFdpZHRoKCkpOwogCiAgICAgQVNTRVJUKCFibG9ja1JlbmRlcmVyLm5lZWRzTGF5 b3V0KCkpOwogICAgIGF1dG8mIGJsb2NrR2VvbWV0cnkgPSBsYXlvdXRTdGF0ZS5lbnN1cmVHZW9t ZXRyeUZvckJveChibG9jayk7Ci0gICAgYmxvY2tHZW9tZXRyeS5zZXRUb3BMZWZ0KExheW91dFBv aW50IHsgYmxvY2tHZW9tZXRyeS5tYXJnaW5TdGFydCgpLCBibG9ja0dlb21ldHJ5Lm1hcmdpbkJl Zm9yZSgpIH0pOworICAgIGJsb2NrR2VvbWV0cnkuc2V0VG9wTGVmdChMYXlvdXRQb2ludCB7IGJs b2NrR2VvbWV0cnkubWFyZ2luU3RhcnQoKSwgcG9zaXRpb25BbmRNYXJnaW4ubG9naWNhbFRvcCB9 KTsKKyAgICAvLyBGSVhNRTogVGhpcyBpcyBvbmx5IHZhbGlkIHVuZGVyIHRoZSBhc3N1bXB0aW9u IHRoYXQgdGhlIGJsb2NrIGlzIGltbWVkaWF0ZWx5IGZvbGxvd2VkIGJ5IGFuIGlubGluZSAoaS5l LiBubyBtYXJnaW4gY29sbGFwc2luZykuCisgICAgYmxvY2tHZW9tZXRyeS5zZXRWZXJ0aWNhbE1h cmdpbih7IHBvc2l0aW9uQW5kTWFyZ2luLmxvZ2ljYWxUb3AsIHBvc2l0aW9uQW5kTWFyZ2luLm1h cmdpbkluZm8ubWFyZ2luKCkgfSk7CiAKICAgICBhdXRvIHBvcHVsYXRlSUZDV2l0aE5ld2x5UGxh Y2VkRmxvYXRzID0gWyZdIHsKICAgICAgICAgYXV0byogcmVuZGVyQmxvY2tGbG93ID0gZHluYW1p Y0Rvd25jYXN0PFJlbmRlckJsb2NrRmxvdz4oYmxvY2tSZW5kZXJlcik7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCmluZGV4IDk5ZWE5MTY0ZDhlNC4uMTUz NmI3NjQ3NDFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxv Y2tGbG93LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93 LmNwcApAQCAtMTM5LDYgKzEzOSwyMSBAQCBSZW5kZXJCbG9ja0Zsb3c6Ok1hcmdpbkluZm86Ok1h cmdpbkluZm8oY29uc3QgUmVuZGVyQmxvY2tGbG93JiBibG9jaywgSWdub3JlU2NybwogICAgIG1f bmVnYXRpdmVNYXJnaW4gPSBtX2NhbkNvbGxhcHNlTWFyZ2luQmVmb3JlV2l0aENoaWxkcmVuID8g YmxvY2subWF4TmVnYXRpdmVNYXJnaW5CZWZvcmUoKSA6IDBfbHU7CiB9CiAKK1JlbmRlckJsb2Nr Rmxvdzo6TWFyZ2luSW5mbzo6TWFyZ2luSW5mbyhib29sIGNhbkNvbGxhcHNlV2l0aENoaWxkcmVu LCBib29sIGNhbkNvbGxhcHNlTWFyZ2luQmVmb3JlV2l0aENoaWxkcmVuLCBib29sIGNhbkNvbGxh cHNlTWFyZ2luQWZ0ZXJXaXRoQ2hpbGRyZW4sIGJvb2wgcXVpcmtDb250YWluZXIsIGJvb2wgYXRC ZWZvcmVTaWRlT2ZCbG9jaywgYm9vbCBhdEFmdGVyU2lkZU9mQmxvY2ssICBib29sIGhhc01hcmdp bkJlZm9yZVF1aXJrLCBib29sIGhhc01hcmdpbkFmdGVyUXVpcmssIGJvb2wgZGV0ZXJtaW5lZE1h cmdpbkJlZm9yZVF1aXJrLCBMYXlvdXRVbml0IHBvc2l0aXZlTWFyZ2luLCBMYXlvdXRVbml0IG5l Z2F0aXZlTWFyZ2luKQorICAgIDogbV9jYW5Db2xsYXBzZVdpdGhDaGlsZHJlbihjYW5Db2xsYXBz ZVdpdGhDaGlsZHJlbikKKyAgICAsIG1fY2FuQ29sbGFwc2VNYXJnaW5CZWZvcmVXaXRoQ2hpbGRy ZW4oY2FuQ29sbGFwc2VNYXJnaW5CZWZvcmVXaXRoQ2hpbGRyZW4pCisgICAgLCBtX2NhbkNvbGxh cHNlTWFyZ2luQWZ0ZXJXaXRoQ2hpbGRyZW4oY2FuQ29sbGFwc2VNYXJnaW5BZnRlcldpdGhDaGls ZHJlbikKKyAgICAsIG1fcXVpcmtDb250YWluZXIocXVpcmtDb250YWluZXIpCisgICAgLCBtX2F0 QmVmb3JlU2lkZU9mQmxvY2soYXRCZWZvcmVTaWRlT2ZCbG9jaykKKyAgICAsIG1fYXRBZnRlclNp ZGVPZkJsb2NrKGF0QWZ0ZXJTaWRlT2ZCbG9jaykKKyAgICAsIG1faGFzTWFyZ2luQmVmb3JlUXVp cmsoaGFzTWFyZ2luQmVmb3JlUXVpcmspCisgICAgLCBtX2hhc01hcmdpbkFmdGVyUXVpcmsoaGFz TWFyZ2luQWZ0ZXJRdWlyaykKKyAgICAsIG1fZGV0ZXJtaW5lZE1hcmdpbkJlZm9yZVF1aXJrKGRl dGVybWluZWRNYXJnaW5CZWZvcmVRdWlyaykKKyAgICAsIG1fcG9zaXRpdmVNYXJnaW4ocG9zaXRp dmVNYXJnaW4pCisgICAgLCBtX25lZ2F0aXZlTWFyZ2luKG5lZ2F0aXZlTWFyZ2luKQoreworfQor CiBSZW5kZXJCbG9ja0Zsb3c6OlJlbmRlckJsb2NrRmxvdyhUeXBlIHR5cGUsIEVsZW1lbnQmIGVs ZW1lbnQsIFJlbmRlclN0eWxlJiYgc3R5bGUsIE9wdGlvblNldDxCbG9ja0Zsb3dGbGFnPiBmbGFn cykKICAgICA6IFJlbmRlckJsb2NrKHR5cGUsIGVsZW1lbnQsIFdURk1vdmUoc3R5bGUpLCB7IH0s IGZsYWdzKQogI2lmIEVOQUJMRShURVhUX0FVVE9TSVpJTkcpCkBAIC05MjYsNiArOTQxLDE3IEBA IHZvaWQgUmVuZGVyQmxvY2tGbG93OjpsYXlvdXRCbG9ja0NoaWxkcmVuKFJlbGF5b3V0Q2hpbGRy ZW4gcmVsYXlvdXRDaGlsZHJlbiwgTGF5CiAgICAgaGFuZGxlQWZ0ZXJTaWRlT2ZCbG9jayhtYXJn aW5JbmZvKTsKIH0KIAorUmVuZGVyQmxvY2tGbG93OjpCbG9ja1Bvc2l0aW9uQW5kTWFyZ2luIFJl bmRlckJsb2NrRmxvdzo6bGF5b3V0QmxvY2tDaGlsZEZyb21JRkMoUmVuZGVyQm94JiBjaGlsZCwg TGF5b3V0VW5pdCBjb250ZW50SGVpZ2h0LCBNYXJnaW5JbmZvIG1hcmdpbkluZm8pCit7CisgICAg Ly8gUmVuZGVyIHRyZWUgdXNlcyBibG9jayBoZWlnaHQgdG8gdHJhY2sgdGhlIGNoaWxkIGJsb2Nr IGxheW91dCBwb3NpdGlvbi4gU2V0IGl0IHRvIHRoZSBjdXJyZW50IHBvc2l0aW9uIGJlZm9yZSBj YWxsaW5nIGxheW91dEJsb2NrQ2hpbGQuCisgICAgc2V0TG9naWNhbEhlaWdodChjb250ZW50SGVp Z2h0KTsKKworICAgIGF1dG8gcHJldmlvdXNGbG9hdExvZ2ljYWxCb3R0b20gPSBMYXlvdXRVbml0 IHsgfTsKKyAgICBhdXRvIG1heEZsb2F0TG9naWNhbEJvdHRvbSA9IExheW91dFVuaXQgeyB9Owor ICAgIGxheW91dEJsb2NrQ2hpbGQoY2hpbGQsIG1hcmdpbkluZm8sIHByZXZpb3VzRmxvYXRMb2dp Y2FsQm90dG9tLCBtYXhGbG9hdExvZ2ljYWxCb3R0b20pOworICAgIHJldHVybiB7IGNoaWxkLmxv Z2ljYWxUb3AoKSAtIGNvbnRlbnRIZWlnaHQsIG1hcmdpbkluZm8gfTsKK30KKwogdm9pZCBSZW5k ZXJCbG9ja0Zsb3c6OnRyaW1CbG9ja0VuZENoaWxkcmVuTWFyZ2lucygpCiB7CiAgICAgYXV0byB0 cmltU2VsZkNvbGxhcHNpbmdDaGlsZERlc2NlbmRhbnRzTWFyZ2lucyA9IFsmXShSZW5kZXJCb3gm IGNoaWxkKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxv Y2tGbG93LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmgKaW5k ZXggYzgzMzE3ZWVmMDEyLi42ZjMxYmM0MGFmYjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQmxvY2tGbG93LmgKQEAgLTE3MSw2ICsxNzEsNyBAQCBwdWJsaWM6CiAgICAgcHVi bGljOgogICAgICAgICBlbnVtIGNsYXNzIElnbm9yZVNjcm9sbGJhckZvckFmdGVyTWFyZ2luIDog Ym9vbCB7IE5vLCBZZXMgfTsKICAgICAgICAgTWFyZ2luSW5mbyhjb25zdCBSZW5kZXJCbG9ja0Zs b3cmLCBJZ25vcmVTY3JvbGxiYXJGb3JBZnRlck1hcmdpbiA9IElnbm9yZVNjcm9sbGJhckZvckFm dGVyTWFyZ2luOjpZZXMpOworICAgICAgICBNYXJnaW5JbmZvKGJvb2wgY2FuQ29sbGFwc2VXaXRo Q2hpbGRyZW4sIGJvb2wgY2FuQ29sbGFwc2VNYXJnaW5CZWZvcmVXaXRoQ2hpbGRyZW4sIGJvb2wg Y2FuQ29sbGFwc2VNYXJnaW5BZnRlcldpdGhDaGlsZHJlbiwgYm9vbCBxdWlya0NvbnRhaW5lciwg Ym9vbCBhdEJlZm9yZVNpZGVPZkJsb2NrLCBib29sIGF0QWZ0ZXJTaWRlT2ZCbG9jaywgIGJvb2wg aGFzTWFyZ2luQmVmb3JlUXVpcmssIGJvb2wgaGFzTWFyZ2luQWZ0ZXJRdWlyaywgYm9vbCBkZXRl cm1pbmVkTWFyZ2luQmVmb3JlUXVpcmssIExheW91dFVuaXQgcG9zaXRpdmVNYXJnaW4sIExheW91 dFVuaXQgbmVnYXRpdmVNYXJnaW4pOwogCiAgICAgICAgIHZvaWQgc2V0QXRCZWZvcmVTaWRlT2ZC bG9jayhib29sIGF0QmVmb3JlU2lkZU9mQmxvY2spIHsgbV9hdEJlZm9yZVNpZGVPZkJsb2NrID0g YXRCZWZvcmVTaWRlT2ZCbG9jazsgfQogICAgICAgICB2b2lkIHNldEF0QWZ0ZXJTaWRlT2ZCbG9j ayhib29sIGF0QWZ0ZXJTaWRlT2ZCbG9jaykgeyBtX2F0QWZ0ZXJTaWRlT2ZCbG9jayA9IGF0QWZ0 ZXJTaWRlT2ZCbG9jazsgfQpAQCAtMjQzLDYgKzI0NCwxMiBAQCBwdWJsaWM6CiAgICAgdm9pZCBw ZXJmb3JtQmxvY2tTdGVwU2l6aW5nKFJlbmRlckJveCYgY2hpbGQsIExheW91dFVuaXQgYmxvY2tT dGVwU2l6ZUZvckNoaWxkKSBjb25zdDsKIAogICAgIHZvaWQgbGF5b3V0QmxvY2tDaGlsZChSZW5k ZXJCb3gmIGNoaWxkLCBNYXJnaW5JbmZvJiwgTGF5b3V0VW5pdCYgcHJldmlvdXNGbG9hdExvZ2lj YWxCb3R0b20sIExheW91dFVuaXQmIG1heEZsb2F0TG9naWNhbEJvdHRvbSk7CisgICAgc3RydWN0 IEJsb2NrUG9zaXRpb25BbmRNYXJnaW4geworICAgICAgICBMYXlvdXRVbml0IGxvZ2ljYWxUb3A7 CisgICAgICAgIE1hcmdpbkluZm8gbWFyZ2luSW5mbzsKKyAgICB9OworICAgIEJsb2NrUG9zaXRp b25BbmRNYXJnaW4gbGF5b3V0QmxvY2tDaGlsZEZyb21JRkMoUmVuZGVyQm94JiBjaGlsZCwgTGF5 b3V0VW5pdCBibG9ja0xvZ2ljYWxUb3AsIE1hcmdpbkluZm8pOyAvLyBDYWxsZWQgZnJvbSBJRkMg d2hlbiBsYXlpbmcgb3V0IGJsb2NrIGluIGlubGluZS4KKwogICAgIHZvaWQgYWRqdXN0T3V0T2ZG bG93QmxvY2soUmVuZGVyQm94JiBjaGlsZCwgY29uc3QgTWFyZ2luSW5mbyYpOwogICAgIHZvaWQg YWRqdXN0RmxvYXRpbmdCbG9jayhjb25zdCBNYXJnaW5JbmZvJik7CiAKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2Zhc3QvaW5saW5lL2Jsb2Nrcy1pbi1pbmxpbmUtZmxvYXQtY2xlYXIuaHRtbCBi L0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL2Jsb2Nrcy1pbi1pbmxpbmUtZmxvYXQtY2xlYXIuaHRt bAppbmRleCA2Y2ExOGQ4YTFhNTcuLjIwNmY3OWI2OWRiOCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvZmFzdC9pbmxpbmUvYmxvY2tzLWluLWlubGluZS1mbG9hdC1jbGVhci5odG1sCisrKyBiL0xh eW91dFRlc3RzL2Zhc3QvaW5saW5lL2Jsb2Nrcy1pbi1pbmxpbmUtZmxvYXQtY2xlYXIuaHRtbApA QCAtNyw1ICs3LDYgQEAKIH0KIC5jbGVhciB7CiAgIGNsZWFyOiBsZWZ0OyAKKyAgd2lkdGg6IDEw MHB4OwogfQogPC9zdHlsZT48c3Bhbj48ZGl2IGNsYXNzPSJmbG9hdCI+PC9kaXY+PGRpdiBjbGFz cz0iY2xlYXIiPjwvZGl2Pjwvc3Bhbj4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2lubGluZS9ibG9ja3MtaW4taW5saW5lLWxheW91dC13 aXRoLW1hcmdpbnMtZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL2Jsb2Nr cy1pbi1pbmxpbmUtbGF5b3V0LXdpdGgtbWFyZ2lucy1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMC4uMmIwNzZkM2QzMDNiCi0tLSAvZGV2L251bGwK KysrIGIvTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvYmxvY2tzLWluLWlubGluZS1sYXlvdXQtd2l0 aC1tYXJnaW5zLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSw0MyBAQAorPHN0eWxlPgorLmNvbnRh aW5lciB7CisgIHdpZHRoOiAxMDBweDsKKyAgaGVpZ2h0OiAxMDBweDsKKyAgb3V0bGluZTogMXB4 IHNvbGlkIGJsYWNrOworfQorLm1pZGRsZS1ibG9jayB7IAorICBiYWNrZ3JvdW5kLWNvbG9yOiBi bHVlOworICBoZWlnaHQ6IDIwcHg7CisgIG1hcmdpbi10b3A6IDVweDsKKyAgbWFyZ2luLWJvdHRv bTogMTBweDsKK30KKzwvc3R5bGU+Cis8ZGl2IGNsYXNzPWNvbnRhaW5lcj4KKyAgPHNwYW4+Cisg ICAgc3BhbiBzdGFydAorICAgIDxkaXYgY2xhc3M9bWlkZGxlLWJsb2NrPjwvZGl2PgorICAgIHNw YW4gZW5kCisgIDwvc3Bhbj4KKzwvZGl2PgorCis8ZGl2IGNsYXNzPWNvbnRhaW5lcj4KKyAgPHNw YW4+CisgICAgPGRpdiBjbGFzcz1taWRkbGUtYmxvY2s+PC9kaXY+CisgICAgc3BhbiBlbmQKKyAg PC9zcGFuPgorPC9kaXY+CisKKzxkaXYgY2xhc3M9Y29udGFpbmVyPgorICA8c3Bhbj4KKyAgICBz cGFuIHN0YXJ0CisgICAgPGRpdiBjbGFzcz1taWRkbGUtYmxvY2s+PC9kaXY+CisgIDwvc3Bhbj4K KzwvZGl2PgorCis8ZGl2IGNsYXNzPWNvbnRhaW5lcj4KKyAgPHNwYW4+CisgICAgc3BhbiBzdGFy dAorICAgIDxkaXYgY2xhc3M9bWlkZGxlLWJsb2NrPjwvZGl2PgorICAgIDxkaXYgY2xhc3M9bWlk ZGxlLWJsb2NrPjwvZGl2PgorICAgIHNwYW4gZW5kCisgIDwvc3Bhbj4KKzwvZGl2PgpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvYmxvY2tzLWluLWlubGluZS1sYXlvdXQtd2l0 aC1tYXJnaW5zLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2lubGluZS9ibG9ja3MtaW4taW5saW5l LWxheW91dC13aXRoLW1hcmdpbnMuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMDAuLjUxNGRjYjYzZjQ1YQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zh c3QvaW5saW5lL2Jsb2Nrcy1pbi1pbmxpbmUtbGF5b3V0LXdpdGgtbWFyZ2lucy5odG1sCkBAIC0w LDAgKzEsNDQgQEAKKzwhLS0gd2Via2l0LXRlc3QtcnVubmVyIFsgQmxvY2tzSW5JbmxpbmVMYXlv dXRFbmFibGVkPXRydWUgXSAtLT4KKzxzdHlsZT4KKy5jb250YWluZXIgeworICB3aWR0aDogMTAw cHg7CisgIGhlaWdodDogMTAwcHg7CisgIG91dGxpbmU6IDFweCBzb2xpZCBibGFjazsKK30KKy5t aWRkbGUtYmxvY2sgeyAKKyAgYmFja2dyb3VuZC1jb2xvcjogYmx1ZTsKKyAgaGVpZ2h0OiAyMHB4 OworICBtYXJnaW4tdG9wOiA1cHg7CisgIG1hcmdpbi1ib3R0b206IDEwcHg7Cit9Cis8L3N0eWxl PgorPGRpdiBjbGFzcz1jb250YWluZXI+CisgIDxzcGFuPgorICAgIHNwYW4gc3RhcnQKKyAgICA8 ZGl2IGNsYXNzPW1pZGRsZS1ibG9jaz48L2Rpdj4KKyAgICBzcGFuIGVuZAorICA8L3NwYW4+Cis8 L2Rpdj4KKworPGRpdiBjbGFzcz1jb250YWluZXI+CisgIDxzcGFuPgorICAgIDxkaXYgY2xhc3M9 bWlkZGxlLWJsb2NrPjwvZGl2PgorICAgIHNwYW4gZW5kCisgIDwvc3Bhbj4KKzwvZGl2PgorCis8 ZGl2IGNsYXNzPWNvbnRhaW5lcj4KKyAgPHNwYW4+CisgICAgc3BhbiBzdGFydAorICAgIDxkaXYg Y2xhc3M9bWlkZGxlLWJsb2NrPjwvZGl2PgorICA8L3NwYW4+Cis8L2Rpdj4KKworPGRpdiBjbGFz cz1jb250YWluZXI+CisgIDxzcGFuPgorICAgIHNwYW4gc3RhcnQKKyAgICA8ZGl2IGNsYXNzPW1p ZGRsZS1ibG9jaz48L2Rpdj4KKyAgICA8ZGl2IGNsYXNzPW1pZGRsZS1ibG9jaz48L2Rpdj4KKyAg ICBzcGFuIGVuZAorICA8L3NwYW4+Cis8L2Rpdj4K 477410 2025-11-15 18:22:46 -0800 2025-11-16 05:26:48 -0800 [fast-cq]Patch bug-302574-20251115182245.patch text/plain 14724 zalan RnJvbSA3MWM4YmI3YjY2Y2FhY2RmZWE4Nzc0NjEzYTQ0NDQ3OGZhNWRmMDMwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFNhdCwgMTUgTm92IDIwMjUgMTA6NTQ6NDggLTA4MDAKU3ViamVjdDogW1BBVENIXSBbYmxvY2tz LWluLWlubGluZV0gRml4IHNpbXBsZSBtYXJnaW4gY29sbGFwc2luZyBiZWZvcmUvYWZ0ZXIKIGJl dHdlZW4gYmxvY2tzIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDI1 NzQKClJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgoKMS4gQmVmb3JlIHJ1bm5pbmcgcmVuZGVy IHRyZWUgbGF5b3V0IGNvdmVydCBNYXJnaW5TdGF0ZSAtPiBNYXJnaW5JbmZvCjIuIENhbGwgZGVk aWNhdGVkIFJlbmRlckJsb2NrRmxvdzo6bGF5b3V0QmxvY2tDaGlsZEZyb21JbmxpbmVMYXlvdXQg dG8gbGF5b3V0IGJsb2NrKHMpIGluIGlubGluZQozLiBBZnRlciBsYXlvdXQgY292ZXJ0IE1hcmdp bkluZm8gLT4gTWFyZ2luU3RhdGUKClRlc3Q6IGZhc3QvaW5saW5lL2Jsb2Nrcy1pbi1pbmxpbmUt bGF5b3V0LXdpdGgtbWFyZ2lucy5odG1sCgoqIExheW91dFRlc3RzL2Zhc3QvaW5saW5lL2Jsb2Nr cy1pbi1pbmxpbmUtZmxvYXQtY2xlYXIuaHRtbDoKKiBMYXlvdXRUZXN0cy9mYXN0L2lubGluZS9i bG9ja3MtaW4taW5saW5lLWxheW91dC13aXRoLW1hcmdpbnMtZXhwZWN0ZWQuaHRtbDogQWRkZWQu CiogTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvYmxvY2tzLWluLWlubGluZS1sYXlvdXQtd2l0aC1t YXJnaW5zLmh0bWw6IEFkZGVkLgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvYmxvY2svQmxvY2tMYXlvdXRTdGF0ZS5oOgooV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0xh eW91dFN0YXRlOjpNYXJnaW5TdGF0ZTo6cmVzZXRCZWZvcmVTaWRlT2ZCbG9jayk6CihXZWJDb3Jl OjpMYXlvdXQ6OkJsb2NrTGF5b3V0U3RhdGU6Ok1hcmdpblN0YXRlOjptYXJnaW4gY29uc3QpOgoq IFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZv cm1hdHRpbmdDb250ZXh0LmNwcDoKKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0Nv bnRleHQ6OnVwZGF0ZUxheW91dFN0YXRlV2l0aExpbmVMYXlvdXRSZXN1bHQpOgoqIFNvdXJjZS9X ZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkZvcm1hdHRpbmdDb250 ZXh0TGF5b3V0LmNwcDoKKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpsYXlvdXRXaXRoRm9y bWF0dGluZ0NvbnRleHRGb3JCbG9ja0luSW5saW5lKToKKiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQmxvY2tGbG93LmNwcDoKKFdlYkNvcmU6OlJlbmRlckJsb2NrRmxvdzo6TWFyZ2lu SW5mbzo6TWFyZ2luSW5mbyk6CihXZWJDb3JlOjpSZW5kZXJCbG9ja0Zsb3c6OmxheW91dEJsb2Nr Q2hpbGRGcm9tSW5saW5lTGF5b3V0KToKKiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy QmxvY2tGbG93Lmg6Ci0tLQogLi4uL2Jsb2NrL0Jsb2NrTGF5b3V0U3RhdGUuaCAgICAgICAgICAg ICAgICAgIHwgMTMgKysrKysrCiAuLi4vaW5saW5lL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNw cCAgICAgICAgfCAgOSArKystCiAuLi55b3V0SW50ZWdyYXRpb25Gb3JtYXR0aW5nQ29udGV4dExh eW91dC5jcHAgfCAyMyArKysrKy0tLS0tCiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy QmxvY2tGbG93LmNwcCAgfCAyNiArKysrKysrKysrKwogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJsb2NrRmxvdy5oICAgIHwgIDcgKysrCiAuLi4vaW5saW5lL2Jsb2Nrcy1pbi1pbmxp bmUtZmxvYXQtY2xlYXIuaHRtbCAgfCAgMSArCiAuLi5uLWlubGluZS1sYXlvdXQtd2l0aC1tYXJn aW5zLWV4cGVjdGVkLmh0bWwgfCA0MyArKysrKysrKysrKysrKysrKysKIC4uLi9ibG9ja3MtaW4t aW5saW5lLWxheW91dC13aXRoLW1hcmdpbnMuaHRtbCB8IDQ0ICsrKysrKysrKysrKysrKysrKysK IDggZmlsZXMgY2hhbmdlZCwgMTU0IGluc2VydGlvbnMoKyksIDEyIGRlbGV0aW9ucygtKQogY3Jl YXRlIG1vZGUgMTAwNjQ0IExheW91dFRlc3RzL2Zhc3QvaW5saW5lL2Jsb2Nrcy1pbi1pbmxpbmUt bGF5b3V0LXdpdGgtbWFyZ2lucy1leHBlY3RlZC5odG1sCiBjcmVhdGUgbW9kZSAxMDA2NDQgTGF5 b3V0VGVzdHMvZmFzdC9pbmxpbmUvYmxvY2tzLWluLWlubGluZS1sYXlvdXQtd2l0aC1tYXJnaW5z Lmh0bWwKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2Jsb2NrL0Jsb2NrTGF5b3V0U3RhdGUuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvYmxvY2svQmxvY2tMYXlvdXRTdGF0ZS5oCmluZGV4IDBhYzAzYjg0ODQz NS4uMmUyODU4ZmQ0MjExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2Jsb2NrL0Jsb2NrTGF5b3V0U3RhdGUuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2Jsb2NrL0Jsb2NrTGF5b3V0U3RhdGUuaApAQCAt NjEsNiArNjEsMTkgQEAgcHVibGljOgogICAgIH07CiAKICAgICBzdHJ1Y3QgTWFyZ2luU3RhdGUg eworICAgICAgICB2b2lkIHJlc2V0QmVmb3JlU2lkZU9mQmxvY2soKQorICAgICAgICB7CisgICAg ICAgICAgICBpZiAoIWF0QmVmb3JlU2lkZU9mQmxvY2spIHsKKyAgICAgICAgICAgICAgICBBU1NF UlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9 CisgICAgICAgICAgICBhdEJlZm9yZVNpZGVPZkJsb2NrID0geyB9OworICAgICAgICAgICAgcG9z aXRpdmVNYXJnaW4gPSB7IH07CisgICAgICAgICAgICBuZWdhdGl2ZU1hcmdpbiA9IHsgfTsKKyAg ICAgICAgfQorCisgICAgICAgIExheW91dFVuaXQgbWFyZ2luKCkgY29uc3QgeyByZXR1cm4gcG9z aXRpdmVNYXJnaW4gLSBuZWdhdGl2ZU1hcmdpbjsgfQorCiAgICAgICAgIC8vIEZJWE1FOiBUaGlz IHRyYWNrcyBSZW5kZXJCbG9ja0Zsb3cncyBNYXJnaW5JbmZvIGZvciBub3cuCiAgICAgICAgIGJv b2wgY2FuQ29sbGFwc2VXaXRoQ2hpbGRyZW4gOiAxIHsgZmFsc2UgfTsKICAgICAgICAgYm9vbCBj YW5Db2xsYXBzZU1hcmdpbkJlZm9yZVdpdGhDaGlsZHJlbiA6IDEgeyBmYWxzZSB9OwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5s aW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IDBmM2Fi MmY4MTE2NC4uMjk4MDYzZGY0NWEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l Rm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC0zOTIsOCArMzkyLDEzIEBAIHZvaWQgSW5saW5lRm9y bWF0dGluZ0NvbnRleHQ6OnVwZGF0ZUxheW91dFN0YXRlV2l0aExpbmVMYXlvdXRSZXN1bHQoY29u c3QgTGluZUxhCiAKICAgICBsaW5lTGF5b3V0UmVzdWx0LmVuZHNXaXRoSHlwaGVuKCkgPyBsYXlv dXRTdGF0ZS5pbmNyZW1lbnRTdWNjZXNzaXZlSHlwaGVuYXRlZExpbmVDb3VudCgpIDogbGF5b3V0 U3RhdGUucmVzZXRTdWNjZXNzaXZlSHlwaGVuYXRlZExpbmVDb3VudCgpOwogICAgIGxheW91dFN0 YXRlLnNldEZpcnN0TGluZVN0YXJ0VHJpbUZvckluaXRpYWxMZXR0ZXIobGluZUxheW91dFJlc3Vs dC5maXJzdExpbmVTdGFydFRyaW0pOwotICAgIGlmIChsaW5lTGF5b3V0UmVzdWx0Lmhhc0luZmxv d0NvbnRlbnQoKSkKLSAgICAgICAgbGF5b3V0U3RhdGUucGFyZW50QmxvY2tMYXlvdXRTdGF0ZSgp Lm1hcmdpblN0YXRlKCkuYXRCZWZvcmVTaWRlT2ZCbG9jayA9IGZhbHNlOworCisgICAgYXV0byB1 cGRhdGVCbG9ja0JlZm9yZU1hcmdpbiA9IFsmXSB7CisgICAgICAgIGF1dG8mIG1hcmdpblN0YXRl ID0gbGF5b3V0U3RhdGUucGFyZW50QmxvY2tMYXlvdXRTdGF0ZSgpLm1hcmdpblN0YXRlKCk7Cisg ICAgICAgIGlmIChtYXJnaW5TdGF0ZS5hdEJlZm9yZVNpZGVPZkJsb2NrICYmIGxpbmVMYXlvdXRS ZXN1bHQuaGFzSW5mbG93Q29udGVudCgpKQorICAgICAgICAgICAgbWFyZ2luU3RhdGUucmVzZXRC ZWZvcmVTaWRlT2ZCbG9jaygpOworICAgIH07CisgICAgdXBkYXRlQmxvY2tCZWZvcmVNYXJnaW4o KTsKIH0KIAogdm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6dXBkYXRlQm94R2VvbWV0cnlG b3JQbGFjZWRGbG9hdHMoY29uc3QgTGluZUxheW91dFJlc3VsdDo6UGxhY2VkRmxvYXRMaXN0JiBw bGFjZWRGbG9hdHMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRp b24vTGF5b3V0SW50ZWdyYXRpb25Gb3JtYXR0aW5nQ29udGV4dExheW91dC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Gb3JtYXR0aW5nQ29u dGV4dExheW91dC5jcHAKaW5kZXggZmRlMDNkYThlMTI5Li5iYzczNTRmMWQxZGMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkZv cm1hdHRpbmdDb250ZXh0TGF5b3V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50 ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Gb3JtYXR0aW5nQ29udGV4dExheW91dC5jcHAKQEAg LTk2LDI0ICs5NiwyNyBAQCB2b2lkIGxheW91dFdpdGhGb3JtYXR0aW5nQ29udGV4dEZvckJsb2Nr SW5JbmxpbmUoY29uc3QgTGF5b3V0OjpFbGVtZW50Qm94JiBibG9jawogICAgIH07CiAgICAgcG9w dWxhdGVSb290UmVuZGVyZXJXaXRoRmxvYXRzRnJvbUlGQygpOwogCi0gICAgLy8gUmVuZGVyIHRy ZWUgdXNlcyBibG9jayBoZWlnaHQgdG8gdHJhY2sgdGhlIGNoaWxkIGJsb2NrIGxheW91dCBwb3Np dGlvbi4gU2V0IGl0IHRvIHRoZSBjdXJyZW50IHBvc2l0aW9uIGJlZm9yZSBjYWxsaW5nIGxheW91 dEJsb2NrQ2hpbGQuCi0gICAgcm9vdEJsb2NrQ29udGFpbmVyLnNldExvZ2ljYWxIZWlnaHQoYmxv Y2tMb2dpY2FsVG9wTGVmdC55KCkgLSByb290QmxvY2tDb250YWluZXIubWFyZ2luQmVmb3JlKCkp OworICAgIGF1dG8gbWFyZ2luSW5mb0ZvckJsb2NrID0gWyZdIHsKKyAgICAgICAgYXV0byYgbWFy Z2luU3RhdGUgPSBwYXJlbnRCbG9ja0xheW91dFN0YXRlLm1hcmdpblN0YXRlKCk7CisgICAgICAg IHJldHVybiBSZW5kZXJCbG9ja0Zsb3c6Ok1hcmdpbkluZm8geyBtYXJnaW5TdGF0ZS5jYW5Db2xs YXBzZVdpdGhDaGlsZHJlbiwgbWFyZ2luU3RhdGUuY2FuQ29sbGFwc2VNYXJnaW5CZWZvcmVXaXRo Q2hpbGRyZW4sIG1hcmdpblN0YXRlLmNhbkNvbGxhcHNlTWFyZ2luQWZ0ZXJXaXRoQ2hpbGRyZW4s IG1hcmdpblN0YXRlLnF1aXJrQ29udGFpbmVyLCBtYXJnaW5TdGF0ZS5hdEJlZm9yZVNpZGVPZkJs b2NrLCBtYXJnaW5TdGF0ZS5hdEFmdGVyU2lkZU9mQmxvY2ssIG1hcmdpblN0YXRlLmhhc01hcmdp bkJlZm9yZVF1aXJrLCBtYXJnaW5TdGF0ZS5oYXNNYXJnaW5BZnRlclF1aXJrLCBtYXJnaW5TdGF0 ZS5kZXRlcm1pbmVkTWFyZ2luQmVmb3JlUXVpcmssIG1hcmdpblN0YXRlLnBvc2l0aXZlTWFyZ2lu LCBtYXJnaW5TdGF0ZS5uZWdhdGl2ZU1hcmdpbiB9OworICAgIH07CiAKLSAgICBhdXRvIG1hcmdp bkluZm8gPSBSZW5kZXJCbG9ja0Zsb3c6Ok1hcmdpbkluZm8geyByb290QmxvY2tDb250YWluZXIg fTsKLSAgICAvLyBGSVhNRTogVGhlc2UgYXJlIHByb2JhYmx5IG5lZWRlZCB0byBtYWtlIHRoZSBj b250YWluZXIgbWFyZ2luIGNvbGxhcHNpbmcgd29yay4KLSAgICBtYXJnaW5JbmZvLnNldEF0QmVm b3JlU2lkZU9mQmxvY2soZmFsc2UpOwotICAgIG1hcmdpbkluZm8uc2V0QXRBZnRlclNpZGVPZkJs b2NrKGZhbHNlKTsKKyAgICBhdXRvIHBvc2l0aW9uQW5kTWFyZ2luID0gcm9vdEJsb2NrQ29udGFp bmVyLmxheW91dEJsb2NrQ2hpbGRGcm9tSW5saW5lTGF5b3V0KGJsb2NrUmVuZGVyZXIsIGJsb2Nr TG9naWNhbFRvcExlZnQueSgpLCBtYXJnaW5JbmZvRm9yQmxvY2soKSk7CiAKLSAgICBMYXlvdXRV bml0IHByZXZpb3VzRmxvYXRMb2dpY2FsQm90dG9tOwotICAgIExheW91dFVuaXQgbWF4RmxvYXRM b2dpY2FsQm90dG9tOwotICAgIHJvb3RCbG9ja0NvbnRhaW5lci5sYXlvdXRCbG9ja0NoaWxkKGJs b2NrUmVuZGVyZXIsIG1hcmdpbkluZm8sIHByZXZpb3VzRmxvYXRMb2dpY2FsQm90dG9tLCBtYXhG bG9hdExvZ2ljYWxCb3R0b20pOworICAgIGF1dG8gdXBkYXRlTWFyZ2luU3RhdGUgPSBbJl0gewor ICAgICAgICBhdXRvJiBtYXJnaW5JbmZvID0gcG9zaXRpb25BbmRNYXJnaW4ubWFyZ2luSW5mbzsK KyAgICAgICAgcGFyZW50QmxvY2tMYXlvdXRTdGF0ZS5tYXJnaW5TdGF0ZSgpID0geyBtYXJnaW5J bmZvLmNhbkNvbGxhcHNlV2l0aENoaWxkcmVuKCksIG1hcmdpbkluZm8uY2FuQ29sbGFwc2VNYXJn aW5CZWZvcmVXaXRoQ2hpbGRyZW4oKSwgbWFyZ2luSW5mby5jYW5Db2xsYXBzZU1hcmdpbkFmdGVy V2l0aENoaWxkcmVuKCksIG1hcmdpbkluZm8ucXVpcmtDb250YWluZXIoKSwgbWFyZ2luSW5mby5h dEJlZm9yZVNpZGVPZkJsb2NrKCksIG1hcmdpbkluZm8uYXRBZnRlclNpZGVPZkJsb2NrKCksIG1h cmdpbkluZm8uaGFzTWFyZ2luQmVmb3JlUXVpcmsoKSwgbWFyZ2luSW5mby5oYXNNYXJnaW5BZnRl clF1aXJrKCksIG1hcmdpbkluZm8uZGV0ZXJtaW5lZE1hcmdpbkJlZm9yZVF1aXJrKCksIG1hcmdp bkluZm8ucG9zaXRpdmVNYXJnaW4oKSwgbWFyZ2luSW5mby5uZWdhdGl2ZU1hcmdpbigpIH07Cisg ICAgfTsKKyAgICB1cGRhdGVNYXJnaW5TdGF0ZSgpOwogCiAgICAgYXV0byB1cGRhdGVyID0gQm94 R2VvbWV0cnlVcGRhdGVyIHsgbGF5b3V0U3RhdGUsIHJvb3RMYXlvdXRCb3goYmxvY2spIH07CiAg ICAgdXBkYXRlci51cGRhdGVCb3hHZW9tZXRyeUFmdGVySW50ZWdyYXRpb25MYXlvdXQoYmxvY2ss IHJvb3RCbG9ja0NvbnRhaW5lci5jb250ZW50Qm94TG9naWNhbFdpZHRoKCkpOwogCiAgICAgQVNT RVJUKCFibG9ja1JlbmRlcmVyLm5lZWRzTGF5b3V0KCkpOwogICAgIGF1dG8mIGJsb2NrR2VvbWV0 cnkgPSBsYXlvdXRTdGF0ZS5lbnN1cmVHZW9tZXRyeUZvckJveChibG9jayk7Ci0gICAgYmxvY2tH ZW9tZXRyeS5zZXRUb3BMZWZ0KExheW91dFBvaW50IHsgYmxvY2tHZW9tZXRyeS5tYXJnaW5TdGFy dCgpLCBibG9ja0dlb21ldHJ5Lm1hcmdpbkJlZm9yZSgpIH0pOworICAgIGJsb2NrR2VvbWV0cnku c2V0VG9wTGVmdChMYXlvdXRQb2ludCB7IGJsb2NrR2VvbWV0cnkubWFyZ2luU3RhcnQoKSwgcG9z aXRpb25BbmRNYXJnaW4ubG9naWNhbFRvcCB9KTsKKyAgICAvLyBGSVhNRTogVGhpcyBpcyBvbmx5 IHZhbGlkIHVuZGVyIHRoZSBhc3N1bXB0aW9uIHRoYXQgdGhlIGJsb2NrIGlzIGltbWVkaWF0ZWx5 IGZvbGxvd2VkIGJ5IGFuIGlubGluZSAoaS5lLiBubyBtYXJnaW4gY29sbGFwc2luZykuCisgICAg YmxvY2tHZW9tZXRyeS5zZXRWZXJ0aWNhbE1hcmdpbih7IHBvc2l0aW9uQW5kTWFyZ2luLmxvZ2lj YWxUb3AsIHBvc2l0aW9uQW5kTWFyZ2luLm1hcmdpbkluZm8ubWFyZ2luKCkgfSk7CiAKICAgICBh dXRvIHBvcHVsYXRlSUZDV2l0aE5ld2x5UGxhY2VkRmxvYXRzID0gWyZdIHsKICAgICAgICAgYXV0 byogcmVuZGVyQmxvY2tGbG93ID0gZHluYW1pY0Rvd25jYXN0PFJlbmRlckJsb2NrRmxvdz4oYmxv Y2tSZW5kZXJlcik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy QmxvY2tGbG93LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cu Y3BwCmluZGV4IDk5ZWE5MTY0ZDhlNC4uNTE4YzZlODQwZTFiIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcApAQCAtMTM5LDYgKzEzOSwyMSBAQCBSZW5k ZXJCbG9ja0Zsb3c6Ok1hcmdpbkluZm86Ok1hcmdpbkluZm8oY29uc3QgUmVuZGVyQmxvY2tGbG93 JiBibG9jaywgSWdub3JlU2NybwogICAgIG1fbmVnYXRpdmVNYXJnaW4gPSBtX2NhbkNvbGxhcHNl TWFyZ2luQmVmb3JlV2l0aENoaWxkcmVuID8gYmxvY2subWF4TmVnYXRpdmVNYXJnaW5CZWZvcmUo KSA6IDBfbHU7CiB9CiAKK1JlbmRlckJsb2NrRmxvdzo6TWFyZ2luSW5mbzo6TWFyZ2luSW5mbyhi b29sIGNhbkNvbGxhcHNlV2l0aENoaWxkcmVuLCBib29sIGNhbkNvbGxhcHNlTWFyZ2luQmVmb3Jl V2l0aENoaWxkcmVuLCBib29sIGNhbkNvbGxhcHNlTWFyZ2luQWZ0ZXJXaXRoQ2hpbGRyZW4sIGJv b2wgcXVpcmtDb250YWluZXIsIGJvb2wgYXRCZWZvcmVTaWRlT2ZCbG9jaywgYm9vbCBhdEFmdGVy U2lkZU9mQmxvY2ssICBib29sIGhhc01hcmdpbkJlZm9yZVF1aXJrLCBib29sIGhhc01hcmdpbkFm dGVyUXVpcmssIGJvb2wgZGV0ZXJtaW5lZE1hcmdpbkJlZm9yZVF1aXJrLCBMYXlvdXRVbml0IHBv c2l0aXZlTWFyZ2luLCBMYXlvdXRVbml0IG5lZ2F0aXZlTWFyZ2luKQorICAgIDogbV9jYW5Db2xs YXBzZVdpdGhDaGlsZHJlbihjYW5Db2xsYXBzZVdpdGhDaGlsZHJlbikKKyAgICAsIG1fY2FuQ29s bGFwc2VNYXJnaW5CZWZvcmVXaXRoQ2hpbGRyZW4oY2FuQ29sbGFwc2VNYXJnaW5CZWZvcmVXaXRo Q2hpbGRyZW4pCisgICAgLCBtX2NhbkNvbGxhcHNlTWFyZ2luQWZ0ZXJXaXRoQ2hpbGRyZW4oY2Fu Q29sbGFwc2VNYXJnaW5BZnRlcldpdGhDaGlsZHJlbikKKyAgICAsIG1fcXVpcmtDb250YWluZXIo cXVpcmtDb250YWluZXIpCisgICAgLCBtX2F0QmVmb3JlU2lkZU9mQmxvY2soYXRCZWZvcmVTaWRl T2ZCbG9jaykKKyAgICAsIG1fYXRBZnRlclNpZGVPZkJsb2NrKGF0QWZ0ZXJTaWRlT2ZCbG9jaykK KyAgICAsIG1faGFzTWFyZ2luQmVmb3JlUXVpcmsoaGFzTWFyZ2luQmVmb3JlUXVpcmspCisgICAg LCBtX2hhc01hcmdpbkFmdGVyUXVpcmsoaGFzTWFyZ2luQWZ0ZXJRdWlyaykKKyAgICAsIG1fZGV0 ZXJtaW5lZE1hcmdpbkJlZm9yZVF1aXJrKGRldGVybWluZWRNYXJnaW5CZWZvcmVRdWlyaykKKyAg ICAsIG1fcG9zaXRpdmVNYXJnaW4ocG9zaXRpdmVNYXJnaW4pCisgICAgLCBtX25lZ2F0aXZlTWFy Z2luKG5lZ2F0aXZlTWFyZ2luKQoreworfQorCiBSZW5kZXJCbG9ja0Zsb3c6OlJlbmRlckJsb2Nr RmxvdyhUeXBlIHR5cGUsIEVsZW1lbnQmIGVsZW1lbnQsIFJlbmRlclN0eWxlJiYgc3R5bGUsIE9w dGlvblNldDxCbG9ja0Zsb3dGbGFnPiBmbGFncykKICAgICA6IFJlbmRlckJsb2NrKHR5cGUsIGVs ZW1lbnQsIFdURk1vdmUoc3R5bGUpLCB7IH0sIGZsYWdzKQogI2lmIEVOQUJMRShURVhUX0FVVE9T SVpJTkcpCkBAIC05MjYsNiArOTQxLDE3IEBAIHZvaWQgUmVuZGVyQmxvY2tGbG93OjpsYXlvdXRC bG9ja0NoaWxkcmVuKFJlbGF5b3V0Q2hpbGRyZW4gcmVsYXlvdXRDaGlsZHJlbiwgTGF5CiAgICAg aGFuZGxlQWZ0ZXJTaWRlT2ZCbG9jayhtYXJnaW5JbmZvKTsKIH0KIAorUmVuZGVyQmxvY2tGbG93 OjpCbG9ja1Bvc2l0aW9uQW5kTWFyZ2luIFJlbmRlckJsb2NrRmxvdzo6bGF5b3V0QmxvY2tDaGls ZEZyb21JbmxpbmVMYXlvdXQoUmVuZGVyQm94JiBjaGlsZCwgTGF5b3V0VW5pdCBjb250ZW50SGVp Z2h0LCBNYXJnaW5JbmZvIG1hcmdpbkluZm8pCit7CisgICAgLy8gUmVuZGVyIHRyZWUgdXNlcyBi bG9jayBoZWlnaHQgdG8gdHJhY2sgdGhlIGNoaWxkIGJsb2NrIGxheW91dCBwb3NpdGlvbi4gU2V0 IGl0IHRvIHRoZSBjdXJyZW50IHBvc2l0aW9uIGJlZm9yZSBjYWxsaW5nIGxheW91dEJsb2NrQ2hp bGQuCisgICAgc2V0TG9naWNhbEhlaWdodChjb250ZW50SGVpZ2h0KTsKKworICAgIGF1dG8gcHJl dmlvdXNGbG9hdExvZ2ljYWxCb3R0b20gPSBMYXlvdXRVbml0IHsgfTsKKyAgICBhdXRvIG1heEZs b2F0TG9naWNhbEJvdHRvbSA9IExheW91dFVuaXQgeyB9OworICAgIGxheW91dEJsb2NrQ2hpbGQo Y2hpbGQsIG1hcmdpbkluZm8sIHByZXZpb3VzRmxvYXRMb2dpY2FsQm90dG9tLCBtYXhGbG9hdExv Z2ljYWxCb3R0b20pOworICAgIHJldHVybiB7IGNoaWxkLmxvZ2ljYWxUb3AoKSAtIGNvbnRlbnRI ZWlnaHQsIG1hcmdpbkluZm8gfTsKK30KKwogdm9pZCBSZW5kZXJCbG9ja0Zsb3c6OnRyaW1CbG9j a0VuZENoaWxkcmVuTWFyZ2lucygpCiB7CiAgICAgYXV0byB0cmltU2VsZkNvbGxhcHNpbmdDaGls ZERlc2NlbmRhbnRzTWFyZ2lucyA9IFsmXShSZW5kZXJCb3gmIGNoaWxkKSB7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmggYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmgKaW5kZXggYzgzMzE3ZWVmMDEyLi4xODdm Y2IxN2MzNDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9j a0Zsb3cuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmgK QEAgLTE3MSw2ICsxNzEsNyBAQCBwdWJsaWM6CiAgICAgcHVibGljOgogICAgICAgICBlbnVtIGNs YXNzIElnbm9yZVNjcm9sbGJhckZvckFmdGVyTWFyZ2luIDogYm9vbCB7IE5vLCBZZXMgfTsKICAg ICAgICAgTWFyZ2luSW5mbyhjb25zdCBSZW5kZXJCbG9ja0Zsb3cmLCBJZ25vcmVTY3JvbGxiYXJG b3JBZnRlck1hcmdpbiA9IElnbm9yZVNjcm9sbGJhckZvckFmdGVyTWFyZ2luOjpZZXMpOworICAg ICAgICBNYXJnaW5JbmZvKGJvb2wgY2FuQ29sbGFwc2VXaXRoQ2hpbGRyZW4sIGJvb2wgY2FuQ29s bGFwc2VNYXJnaW5CZWZvcmVXaXRoQ2hpbGRyZW4sIGJvb2wgY2FuQ29sbGFwc2VNYXJnaW5BZnRl cldpdGhDaGlsZHJlbiwgYm9vbCBxdWlya0NvbnRhaW5lciwgYm9vbCBhdEJlZm9yZVNpZGVPZkJs b2NrLCBib29sIGF0QWZ0ZXJTaWRlT2ZCbG9jaywgIGJvb2wgaGFzTWFyZ2luQmVmb3JlUXVpcmss IGJvb2wgaGFzTWFyZ2luQWZ0ZXJRdWlyaywgYm9vbCBkZXRlcm1pbmVkTWFyZ2luQmVmb3JlUXVp cmssIExheW91dFVuaXQgcG9zaXRpdmVNYXJnaW4sIExheW91dFVuaXQgbmVnYXRpdmVNYXJnaW4p OwogCiAgICAgICAgIHZvaWQgc2V0QXRCZWZvcmVTaWRlT2ZCbG9jayhib29sIGF0QmVmb3JlU2lk ZU9mQmxvY2spIHsgbV9hdEJlZm9yZVNpZGVPZkJsb2NrID0gYXRCZWZvcmVTaWRlT2ZCbG9jazsg fQogICAgICAgICB2b2lkIHNldEF0QWZ0ZXJTaWRlT2ZCbG9jayhib29sIGF0QWZ0ZXJTaWRlT2ZC bG9jaykgeyBtX2F0QWZ0ZXJTaWRlT2ZCbG9jayA9IGF0QWZ0ZXJTaWRlT2ZCbG9jazsgfQpAQCAt MjQzLDYgKzI0NCwxMiBAQCBwdWJsaWM6CiAgICAgdm9pZCBwZXJmb3JtQmxvY2tTdGVwU2l6aW5n KFJlbmRlckJveCYgY2hpbGQsIExheW91dFVuaXQgYmxvY2tTdGVwU2l6ZUZvckNoaWxkKSBjb25z dDsKIAogICAgIHZvaWQgbGF5b3V0QmxvY2tDaGlsZChSZW5kZXJCb3gmIGNoaWxkLCBNYXJnaW5J bmZvJiwgTGF5b3V0VW5pdCYgcHJldmlvdXNGbG9hdExvZ2ljYWxCb3R0b20sIExheW91dFVuaXQm IG1heEZsb2F0TG9naWNhbEJvdHRvbSk7CisgICAgc3RydWN0IEJsb2NrUG9zaXRpb25BbmRNYXJn aW4geworICAgICAgICBMYXlvdXRVbml0IGxvZ2ljYWxUb3A7CisgICAgICAgIE1hcmdpbkluZm8g bWFyZ2luSW5mbzsKKyAgICB9OworICAgIEJsb2NrUG9zaXRpb25BbmRNYXJnaW4gbGF5b3V0Qmxv Y2tDaGlsZEZyb21JbmxpbmVMYXlvdXQoUmVuZGVyQm94JiBjaGlsZCwgTGF5b3V0VW5pdCBibG9j a0xvZ2ljYWxUb3AsIE1hcmdpbkluZm8pOyAvLyBDYWxsZWQgZnJvbSBJRkMgd2hlbiBsYXlpbmcg b3V0IGJsb2NrIGluIGlubGluZS4KKwogICAgIHZvaWQgYWRqdXN0T3V0T2ZGbG93QmxvY2soUmVu ZGVyQm94JiBjaGlsZCwgY29uc3QgTWFyZ2luSW5mbyYpOwogICAgIHZvaWQgYWRqdXN0RmxvYXRp bmdCbG9jayhjb25zdCBNYXJnaW5JbmZvJik7CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zh c3QvaW5saW5lL2Jsb2Nrcy1pbi1pbmxpbmUtZmxvYXQtY2xlYXIuaHRtbCBiL0xheW91dFRlc3Rz L2Zhc3QvaW5saW5lL2Jsb2Nrcy1pbi1pbmxpbmUtZmxvYXQtY2xlYXIuaHRtbAppbmRleCA2Y2Ex OGQ4YTFhNTcuLjIwNmY3OWI2OWRiOCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9pbmxp bmUvYmxvY2tzLWluLWlubGluZS1mbG9hdC1jbGVhci5odG1sCisrKyBiL0xheW91dFRlc3RzL2Zh c3QvaW5saW5lL2Jsb2Nrcy1pbi1pbmxpbmUtZmxvYXQtY2xlYXIuaHRtbApAQCAtNyw1ICs3LDYg QEAKIH0KIC5jbGVhciB7CiAgIGNsZWFyOiBsZWZ0OyAKKyAgd2lkdGg6IDEwMHB4OwogfQogPC9z dHlsZT48c3Bhbj48ZGl2IGNsYXNzPSJmbG9hdCI+PC9kaXY+PGRpdiBjbGFzcz0iY2xlYXIiPjwv ZGl2Pjwvc3Bhbj4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9mYXN0L2lubGluZS9ibG9ja3MtaW4taW5saW5lLWxheW91dC13aXRoLW1hcmdpbnMt ZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL2Jsb2Nrcy1pbi1pbmxpbmUt bGF5b3V0LXdpdGgtbWFyZ2lucy1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAwMDAwMC4uMmIwNzZkM2QzMDNiCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0 VGVzdHMvZmFzdC9pbmxpbmUvYmxvY2tzLWluLWlubGluZS1sYXlvdXQtd2l0aC1tYXJnaW5zLWV4 cGVjdGVkLmh0bWwKQEAgLTAsMCArMSw0MyBAQAorPHN0eWxlPgorLmNvbnRhaW5lciB7CisgIHdp ZHRoOiAxMDBweDsKKyAgaGVpZ2h0OiAxMDBweDsKKyAgb3V0bGluZTogMXB4IHNvbGlkIGJsYWNr OworfQorLm1pZGRsZS1ibG9jayB7IAorICBiYWNrZ3JvdW5kLWNvbG9yOiBibHVlOworICBoZWln aHQ6IDIwcHg7CisgIG1hcmdpbi10b3A6IDVweDsKKyAgbWFyZ2luLWJvdHRvbTogMTBweDsKK30K Kzwvc3R5bGU+Cis8ZGl2IGNsYXNzPWNvbnRhaW5lcj4KKyAgPHNwYW4+CisgICAgc3BhbiBzdGFy dAorICAgIDxkaXYgY2xhc3M9bWlkZGxlLWJsb2NrPjwvZGl2PgorICAgIHNwYW4gZW5kCisgIDwv c3Bhbj4KKzwvZGl2PgorCis8ZGl2IGNsYXNzPWNvbnRhaW5lcj4KKyAgPHNwYW4+CisgICAgPGRp diBjbGFzcz1taWRkbGUtYmxvY2s+PC9kaXY+CisgICAgc3BhbiBlbmQKKyAgPC9zcGFuPgorPC9k aXY+CisKKzxkaXYgY2xhc3M9Y29udGFpbmVyPgorICA8c3Bhbj4KKyAgICBzcGFuIHN0YXJ0Cisg ICAgPGRpdiBjbGFzcz1taWRkbGUtYmxvY2s+PC9kaXY+CisgIDwvc3Bhbj4KKzwvZGl2PgorCis8 ZGl2IGNsYXNzPWNvbnRhaW5lcj4KKyAgPHNwYW4+CisgICAgc3BhbiBzdGFydAorICAgIDxkaXYg Y2xhc3M9bWlkZGxlLWJsb2NrPjwvZGl2PgorICAgIDxkaXYgY2xhc3M9bWlkZGxlLWJsb2NrPjwv ZGl2PgorICAgIHNwYW4gZW5kCisgIDwvc3Bhbj4KKzwvZGl2PgpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvZmFzdC9pbmxpbmUvYmxvY2tzLWluLWlubGluZS1sYXlvdXQtd2l0aC1tYXJnaW5zLmh0 bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2lubGluZS9ibG9ja3MtaW4taW5saW5lLWxheW91dC13aXRo LW1hcmdpbnMuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAuLjUx NGRjYjYzZjQ1YQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL2Js b2Nrcy1pbi1pbmxpbmUtbGF5b3V0LXdpdGgtbWFyZ2lucy5odG1sCkBAIC0wLDAgKzEsNDQgQEAK KzwhLS0gd2Via2l0LXRlc3QtcnVubmVyIFsgQmxvY2tzSW5JbmxpbmVMYXlvdXRFbmFibGVkPXRy dWUgXSAtLT4KKzxzdHlsZT4KKy5jb250YWluZXIgeworICB3aWR0aDogMTAwcHg7CisgIGhlaWdo dDogMTAwcHg7CisgIG91dGxpbmU6IDFweCBzb2xpZCBibGFjazsKK30KKy5taWRkbGUtYmxvY2sg eyAKKyAgYmFja2dyb3VuZC1jb2xvcjogYmx1ZTsKKyAgaGVpZ2h0OiAyMHB4OworICBtYXJnaW4t dG9wOiA1cHg7CisgIG1hcmdpbi1ib3R0b206IDEwcHg7Cit9Cis8L3N0eWxlPgorPGRpdiBjbGFz cz1jb250YWluZXI+CisgIDxzcGFuPgorICAgIHNwYW4gc3RhcnQKKyAgICA8ZGl2IGNsYXNzPW1p ZGRsZS1ibG9jaz48L2Rpdj4KKyAgICBzcGFuIGVuZAorICA8L3NwYW4+Cis8L2Rpdj4KKworPGRp diBjbGFzcz1jb250YWluZXI+CisgIDxzcGFuPgorICAgIDxkaXYgY2xhc3M9bWlkZGxlLWJsb2Nr PjwvZGl2PgorICAgIHNwYW4gZW5kCisgIDwvc3Bhbj4KKzwvZGl2PgorCis8ZGl2IGNsYXNzPWNv bnRhaW5lcj4KKyAgPHNwYW4+CisgICAgc3BhbiBzdGFydAorICAgIDxkaXYgY2xhc3M9bWlkZGxl LWJsb2NrPjwvZGl2PgorICA8L3NwYW4+Cis8L2Rpdj4KKworPGRpdiBjbGFzcz1jb250YWluZXI+ CisgIDxzcGFuPgorICAgIHNwYW4gc3RhcnQKKyAgICA8ZGl2IGNsYXNzPW1pZGRsZS1ibG9jaz48 L2Rpdj4KKyAgICA8ZGl2IGNsYXNzPW1pZGRsZS1ibG9jaz48L2Rpdj4KKyAgICBzcGFuIGVuZAor ICA8L3NwYW4+Cis8L2Rpdj4K