220252 2021-01-04 12:46:47 -0800 [LFC][IFC][Quirk] Let's adopt a less quirky behavior for line breaks on non-empty lines 2021-01-14 06:30:26 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham changseok esprehn+autocc ews-watchlist glenn koivisto kondapallykalyan mmaxfield pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1717186 0 zalan 2021-01-04 12:46:47 -0800 <br> in non-standard mode stretches the line box only when the line is empty. e.g. <div><span><br></span></div> will stretch but <div>this will not stretch to 200px<span style="font-size: 200px;"><br></span></div> However it's way too quirky and it does not even match Chrome's behavior. 1717189 1 416960 zalan 2021-01-04 12:52:51 -0800 Created attachment 416960 Patch 1718616 2 417359 zalan 2021-01-10 19:59:26 -0800 Created attachment 417359 Patch 1718621 3 417359 koivisto 2021-01-10 22:27:08 -0800 Comment on attachment 417359 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=417359&action=review > Source/WebCore/ChangeLog:17 > + Removing this quirk makes the inlineLevelBoxAffectsLineBox logic simpler since we don't have to check against > + whether the line is considered empty and the result is aligned with Chrome's behavior. Should it be removed from legacy too? 1718721 4 zalan 2021-01-11 10:08:20 -0800 (In reply to Antti Koivisto from comment #3) > Comment on attachment 417359 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=417359&action=review > > > Source/WebCore/ChangeLog:17 > > + Removing this quirk makes the inlineLevelBoxAffectsLineBox logic simpler since we don't have to check against > > + whether the line is considered empty and the result is aligned with Chrome's behavior. > > Should it be removed from legacy too? Yeah good point. 1718784 5 webkit-bug-importer 2021-01-11 12:47:12 -0800 <rdar://problem/73009786> 1718867 6 417421 zalan 2021-01-11 16:45:09 -0800 Created attachment 417421 Patch 1719096 7 417482 zalan 2021-01-12 12:57:12 -0800 Created attachment 417482 Patch 1719100 8 417484 zalan 2021-01-12 13:02:43 -0800 Created attachment 417484 Patch 1719202 9 417506 zalan 2021-01-12 21:20:12 -0800 Created attachment 417506 Patch 1719527 10 417594 zalan 2021-01-13 20:41:22 -0800 Created attachment 417594 Patch 1719582 11 ews-feeder 2021-01-14 06:30:23 -0800 Committed r271481: <https://trac.webkit.org/changeset/271481> All reviewed patches have been landed. Closing bug and clearing flags on attachment 417594. 416960 2021-01-04 12:52:51 -0800 2021-01-10 19:59:24 -0800 Patch bug-220252-20210104125250.patch text/plain 3833 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMTE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDc4NzIxNTQ3MjA5ZTI0 NjM1OGQ4NjlmYmUzZjgxNmNjMDA5ZmY2ZC4uOWRlMmJjNThmMjJhNGVjZTMyYjFjMTg3MGZhOTcx MWIwMTAzZmZlNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTAxLTA0ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXVtRdWlya10g TGV0J3MgYWRvcHQgYSBsZXNzIHF1aXJreSBiZWhhdmlvciBmb3IgbGluZSBicmVha3Mgb24gbm9u LWVtcHR5IGxpbmVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMjAyNTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBMZXQncyBzZXQgdGhlIHBhcmVudCBpbmxpbmUgYm94J3MgImhhc0NvbnRlbnQiIGJpdCB3 aGVuIGxpbmVicmVhayBib3ggaXMgcHJlc2VudC4gSXQnbGwgbWFrZSB0aGUgcGFyZW50CisgICAg ICAgIGlubGluZSBib3ggc3RyZXRjaCB0aGUgbGluZSBib3ggaW4gYm90aCBzdGFuZGFyZCAoc3Ry dXQpIGFuZCBub24tc3RhbmRhcmQgbW9kZS4gCisgICAgICAgIFJlbW92aW5nIHRoaXMgcXVpcmsg bWFrZXMgdGhlIGlubGluZUxldmVsQm94QWZmZWN0c0xpbmVCb3ggbG9naWMgc2ltcGxlciBhbmQg dGhlIHJlc3VsdCBpcyBhbGlnbmVkIHdpdGgKKyAgICAgICAgQ2hyb21lJ3MgYmVoYXZpb3IuCisK KyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4 dEdlb21ldHJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveEJ1aWxkZXI6 OmNvbnN0cnVjdElubGluZUxldmVsQm94ZXMpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OlF1aXJrczo6aW5saW5lTGV2ZWxC b3hBZmZlY3RzTGluZUJveCBjb25zdCk6CisKIDIwMjEtMDEtMDQgIFphbGFuIEJ1anRhcyAgPHph bGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIElubGluZUJveDo6c2V0SGFzQ29u dGVudCBzaG91bGQgYmUgY2FsbGVkIHdoZW4gdGhlIGlubGluZSBib3ggYWN0dWFsbHkgaGFzIHNv bWUgY29udGVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5 LmNwcAppbmRleCAzMGJhZDFmM2Q1NzI4MGYzNTczZjYxYmIxZDMxYzY3ZjgwNWM4YTk3Li5jNGNi MzRlMDlmNGVmMzNkM2MxNTliNDJkN2Y5ZjVlNjVkY2ExN2EwIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdl b21ldHJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcApAQCAtMzI4LDYgKzMyOCw3IEBAIHZv aWQgTGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdElubGluZUxldmVsQm94ZXMoTGluZUJveCYgbGlu ZUJveCwgY29uc3QgTGluZTo6UnVuCiAgICAgICAgIH0KICAgICAgICAgaWYgKHJ1bi5pc0hhcmRM aW5lQnJlYWsoKSkgewogICAgICAgICAgICAgYXV0byBsaW5lQnJlYWtCb3ggPSBMaW5lQm94OjpJ bmxpbmVMZXZlbEJveDo6Y3JlYXRlTGluZUJyZWFrQm94KGxheW91dEJveCwgbG9naWNhbExlZnQp OworICAgICAgICAgICAgbGluZUJveC5pbmxpbmVMZXZlbEJveEZvckxheW91dEJveChsYXlvdXRC b3gucGFyZW50KCkpLnNldEhhc0NvbnRlbnQoKTsKICAgICAgICAgICAgIHNldFZlcnRpY2FsR2Vv bWV0cnlGb3JJbmxpbmVCb3goKmxpbmVCcmVha0JveCk7CiAgICAgICAgICAgICBsaW5lQm94LmFk ZElubGluZUxldmVsQm94KFdURk1vdmUobGluZUJyZWFrQm94KSk7CiAgICAgICAgICAgICBjb250 aW51ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcAppbmRl eCAyMGUwNzJlYjljOWQ5YTkzMjE2ZGRmNzM2MGY5NjI3YjA4Yzg3ZTBiLi4yOTk2ZmIyMTRlOGVl YjQ0ZDI4OTQ0OTg5ZWM5NDhiMTJlMDQzYWY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0 dGluZ0NvbnRleHRRdWlya3MuY3BwCkBAIC01NiwxMSArNTYsNiBAQCBib29sIElubGluZUZvcm1h dHRpbmdDb250ZXh0OjpRdWlya3M6OmlubGluZUxldmVsQm94QWZmZWN0c0xpbmVCb3goY29uc3Qg TGluZUJveAogICAgICAgICBhdXRvIGlubGluZUJveEhhc0ltYWdpbmFyeVN0cnV0ID0gbGF5b3V0 U3RhdGUoKS5pbk5vUXVpcmtzTW9kZSgpOwogICAgICAgICByZXR1cm4gaW5saW5lQm94SGFzSW1h Z2luYXJ5U3RydXQgJiYgIWxpbmVCb3guaXNDb25zaWRlcmVkRW1wdHkoKTsKICAgICB9Ci0gICAg aWYgKGlubGluZUxldmVsQm94LmlzTGluZUJyZWFrQm94KCkpIHsKLSAgICAgICAgLy8gPGJyPiBp biBub24tc3RhbmRhcmQgbW9kZSBzdHJldGNoZXMgdGhlIGxpbmUgYm94IG9ubHkgd2hlbiB0aGUg bGluZSBpcyBlbXB0eS4KLSAgICAgICAgLy8gZS5nLiA8ZGl2PjxzcGFuPjxicj48L3NwYW4+PC9k aXY+IHdpbGwgc3RyZXRjaCBidXQgPGRpdj50aGlzIHdpbGwgbm90IHN0cmV0Y2ggdG8gMjAwcHg8 c3BhbiBzdHlsZT0iZm9udC1zaXplOiAyMDBweDsiPjxicj48L3NwYW4+PC9kaXY+Ci0gICAgICAg IHJldHVybiBsYXlvdXRTdGF0ZSgpLmluTm9RdWlya3NNb2RlKCkgPyB0cnVlIDogbGluZUJveC5p c0NvbnNpZGVyZWRFbXB0eSgpOwotICAgIH0KICAgICBpZiAoaW5saW5lTGV2ZWxCb3guaXNBdG9t aWNJbmxpbmVMZXZlbEJveCgpKSB7CiAgICAgICAgIGlmIChpbmxpbmVMZXZlbEJveC5sYXlvdXRC b3VuZHMoKS5hc2NlbnQpCiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKQEAgLTY5LDYgKzY0LDcg QEAgYm9vbCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6UXVpcmtzOjppbmxpbmVMZXZlbEJveEFm ZmVjdHNMaW5lQm94KGNvbnN0IExpbmVCb3gKICAgICAgICAgYXV0byYgYm94R2VvbWV0cnkgPSBm b3JtYXR0aW5nQ29udGV4dCgpLmdlb21ldHJ5Rm9yQm94KGlubGluZUxldmVsQm94LmxheW91dEJv eCgpKTsKICAgICAgICAgcmV0dXJuIGJveEdlb21ldHJ5Lm1hcmdpbkJlZm9yZSgpIHx8IGJveEdl b21ldHJ5Lm1hcmdpbkFmdGVyKCk7CiAgICAgfQorICAgIC8vIExpbmVicmVhayBib3hlcyAoPGJy PikgYWZmZWN0IHRoZSBsaW5lIGJveCB0aHJvdWdoIHRoZWlyIHBhcmVudCBpbmxpbmUgYm94IChz ZWUgTGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdElubGluZUxldmVsQm94ZXMpLgogICAgIHJldHVy biBmYWxzZTsKIH0KIAo= 417359 2021-01-10 19:59:26 -0800 2021-01-11 16:45:07 -0800 Patch bug-220252-20210110195925.patch text/plain 4335 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMzUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjBlMGJkZjNlM2Y0ZmMw NGVjNDMyMjU4ZDNlM2U1ZjRhOTJmODZjYy4uNDhlZmE5NGNlMDI0ZmYzODkyM2I3ZjZkZmVjMWFj MmE2ZmVjOTY5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIxLTAxLTEwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXVtRdWlya10g TGV0J3MgYWRvcHQgYSBsZXNzIHF1aXJreSBiZWhhdmlvciBmb3IgbGluZSBicmVha3Mgb24gbm9u LWVtcHR5IGxpbmVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMjAyNTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBXZWJLaXQgaGFzIHRoaXMgcXVpcmsgYmVoYXZpb3Igd2hlcmUgPGJyPiBzdHJldGNoZXMg dGhlIGxpbmUgYm94IHZlcnRpY2FsbHkgb25seSB3aGVuIHRoZSBsaW5lIGlzIGVtcHR5LgorICAg ICAgICBlLmcuCisgICAgICAgICI8ZGl2PjxzcGFuPjxicj48L3NwYW4+PC9kaXY+IiBtYWtlcyB0 aGUgbGluZSBhcyB0YWxsIGFzIHRoZSA8YnI+IGlzIGJ1dAorICAgICAgICAiPGRpdj5zb21lIGNv bnRlbnQ8c3BhbiBzdHlsZT0iZm9udC1zaXplOiAyMDBweDsiPjxicj48L3NwYW4+PC9kaXY+IiBk b2VzIG5vdCBwcm9kdWNlIGEgMjAwcHggdGFsbCBsaW5lLgorCisgICAgICAgIFRoaXMgcXVpcmsg YWxzbyBvbmx5IGFwcGxpZXMgdG8gbm9uLXJvb3QgaW5saW5lIGJveGVzICg8c3Bhbj48YnI+PC9z cGFuPikgc2luY2UgPGRpdiBzdHlsZT0iZm9udC1zaXplOiAyMDBweDsiPjxicj5zb21lIGNvbnRl bnQ8L2Rpdj4KKyAgICAgICAgcHJvZHVjZXMgYSAyMDBweCB0YWxsIGVtcHR5IHJvb3QgaW5saW5l IGJveC4KKworICAgICAgICBSZW1vdmluZyB0aGlzIHF1aXJrIG1ha2VzIHRoZSBpbmxpbmVMZXZl bEJveEFmZmVjdHNMaW5lQm94IGxvZ2ljIHNpbXBsZXIgc2luY2Ugd2UgZG9uJ3QgaGF2ZSB0byBj aGVjayBhZ2FpbnN0CisgICAgICAgIHdoZXRoZXIgdGhlIGxpbmUgaXMgY29uc2lkZXJlZCBlbXB0 eSBhbmQgdGhlIHJlc3VsdCBpcyBhbGlnbmVkIHdpdGggQ2hyb21lJ3MgYmVoYXZpb3IuCisgICAg ICAgIChUaGlzIGlzIGluIHByZXBhcmF0aW9uIGZvciBnZXR0aW5nIHJpZCBvZiB0aGUgaXMtY29u c2lkZXJlZC1lbXB0eSBjb25jZXB0IGZvciBsaW5lL2xpbmUgYm94LikKKworICAgICAgICAqIGxh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0SW5s aW5lTGV2ZWxCb3hlcyk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l Rm9ybWF0dGluZ0NvbnRleHRRdWlya3MuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJ bmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6UXVpcmtzOjppbmxpbmVMZXZlbEJveEFmZmVjdHNMaW5l Qm94IGNvbnN0KToKKwogMjAyMS0wMS0xMCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29t PgogCiAgICAgICAgIFtMRkNdW0lGQ10gSW5saW5lQm94OjpzZXRIYXNDb250ZW50IHNob3VsZCBi ZSBjYWxsZWQgd2hlbiB0aGUgaW5saW5lIGJveCBhY3R1YWxseSBoYXMgc29tZSBjb250ZW50CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVG b3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCmluZGV4IGM2 YWI4YzNiNTkxZmRlNTI1MDE0YzcxNDgwNzRjOTI0MzZhMzRkYzUuLjdlNWE0N2Q0NTRjMzZmNzky ZDJlMjI2MTFmNjMwN2QzYWZiYzVjNzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRp bmdDb250ZXh0R2VvbWV0cnkuY3BwCkBAIC0zMzksNiArMzM5LDcgQEAgdm9pZCBMaW5lQm94QnVp bGRlcjo6Y29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyhMaW5lQm94JiBsaW5lQm94LCBjb25zdCBM aW5lOjpSdW4KICAgICAgICAgfQogICAgICAgICBpZiAocnVuLmlzSGFyZExpbmVCcmVhaygpKSB7 CiAgICAgICAgICAgICBhdXRvIGxpbmVCcmVha0JveCA9IExpbmVCb3g6OklubGluZUxldmVsQm94 OjpjcmVhdGVMaW5lQnJlYWtCb3gobGF5b3V0Qm94LCBsb2dpY2FsTGVmdCk7CisgICAgICAgICAg ICBsaW5lQm94LmlubGluZUxldmVsQm94Rm9yTGF5b3V0Qm94KGxheW91dEJveC5wYXJlbnQoKSku c2V0SGFzQ29udGVudCgpOwogICAgICAgICAgICAgc2V0VmVydGljYWxHZW9tZXRyeUZvcklubGlu ZUJveCgqbGluZUJyZWFrQm94KTsKICAgICAgICAgICAgIGxpbmVCb3guYWRkSW5saW5lTGV2ZWxC b3goV1RGTW92ZShsaW5lQnJlYWtCb3gpKTsKICAgICAgICAgICAgIGNvbnRpbnVlOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0 dGluZ0NvbnRleHRRdWlya3MuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRRdWlya3MuY3BwCmluZGV4IGI4NDE3OWE0YzE0 ZmQxNzJkZGZjMmQyM2FjZTQ0MDg5ZjE1Mzg0YzIuLjFiZTJkYmYyY2UzZGVjOWMxYjk4NDQ4N2Yx NmM0MTZjNGRiYmYzZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1 aXJrcy5jcHAKQEAgLTU2LDExICs1Niw2IEBAIGJvb2wgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6 OlF1aXJrczo6aW5saW5lTGV2ZWxCb3hBZmZlY3RzTGluZUJveChjb25zdCBMaW5lQm94CiAgICAg ICAgIGF1dG8gaW5saW5lQm94SGFzSW1hZ2luYXJ5U3RydXQgPSBsYXlvdXRTdGF0ZSgpLmluTm9R dWlya3NNb2RlKCk7CiAgICAgICAgIHJldHVybiBpbmxpbmVCb3hIYXNJbWFnaW5hcnlTdHJ1dCAm JiAhbGluZUJveC5pc0NvbnNpZGVyZWRFbXB0eSgpOwogICAgIH0KLSAgICBpZiAoaW5saW5lTGV2 ZWxCb3guaXNMaW5lQnJlYWtCb3goKSkgewotICAgICAgICAvLyA8YnI+IGluIG5vbi1zdGFuZGFy ZCBtb2RlIHN0cmV0Y2hlcyB0aGUgbGluZSBib3ggb25seSB3aGVuIHRoZSBsaW5lIGlzIGVtcHR5 LgotICAgICAgICAvLyBlLmcuIDxkaXY+PHNwYW4+PGJyPjwvc3Bhbj48L2Rpdj4gd2lsbCBzdHJl dGNoIGJ1dCA8ZGl2PnRoaXMgd2lsbCBub3Qgc3RyZXRjaCB0byAyMDBweDxzcGFuIHN0eWxlPSJm b250LXNpemU6IDIwMHB4OyI+PGJyPjwvc3Bhbj48L2Rpdj4KLSAgICAgICAgcmV0dXJuIGxheW91 dFN0YXRlKCkuaW5Ob1F1aXJrc01vZGUoKSA/IHRydWUgOiBsaW5lQm94LmlzQ29uc2lkZXJlZEVt cHR5KCk7Ci0gICAgfQogICAgIGlmIChpbmxpbmVMZXZlbEJveC5pc0F0b21pY0lubGluZUxldmVs Qm94KCkpIHsKICAgICAgICAgaWYgKGlubGluZUxldmVsQm94LmxheW91dEJvdW5kcygpLmhlaWdo dCgpKQogICAgICAgICAgICAgcmV0dXJuIHRydWU7CkBAIC02OSw2ICs2NCw3IEBAIGJvb2wgSW5s aW5lRm9ybWF0dGluZ0NvbnRleHQ6OlF1aXJrczo6aW5saW5lTGV2ZWxCb3hBZmZlY3RzTGluZUJv eChjb25zdCBMaW5lQm94CiAgICAgICAgIGF1dG8mIGJveEdlb21ldHJ5ID0gZm9ybWF0dGluZ0Nv bnRleHQoKS5nZW9tZXRyeUZvckJveChpbmxpbmVMZXZlbEJveC5sYXlvdXRCb3goKSk7CiAgICAg ICAgIHJldHVybiBib3hHZW9tZXRyeS5tYXJnaW5CZWZvcmUoKSB8fCBib3hHZW9tZXRyeS5tYXJn aW5BZnRlcigpOwogICAgIH0KKyAgICAvLyBMaW5lYnJlYWsgYm94ZXMgKDxicj4pIGFmZmVjdCB0 aGUgbGluZSBib3ggdGhyb3VnaCB0aGVpciBwYXJlbnQgaW5saW5lIGJveCAoc2VlIExpbmVCb3hC dWlsZGVyOjpjb25zdHJ1Y3RJbmxpbmVMZXZlbEJveGVzKS4KICAgICByZXR1cm4gZmFsc2U7CiB9 CiAK 417421 2021-01-11 16:45:09 -0800 2021-01-12 12:57:09 -0800 Patch bug-220252-20210111164508.patch text/plain 8981 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMzYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjEwMTNhNDE3NmJjZDFk YWU1ZTBhOTRmOGRkMWQ0NjgzYjk1MmEyOS4uZTJhMzNmMjlhMTAxYTg0ZTgwNmJkZmU2NDJlNTIz NTk2MDJiZGUwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIxLTAxLTExICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXVtRdWlya10g TGV0J3MgYWRvcHQgYSBsZXNzIHF1aXJreSBiZWhhdmlvciBmb3IgbGluZSBicmVha3Mgb24gbm9u LWVtcHR5IGxpbmVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMjAyNTIKKworICAgICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KKworICAg ICAgICBXZWJLaXQgaGFzIHRoaXMgcXVpcmsgYmVoYXZpb3Igd2hlcmUgPGJyPiBzdHJldGNoZXMg dGhlIGxpbmUgYm94IHZlcnRpY2FsbHkgb25seSB3aGVuIHRoZSBsaW5lIGlzIGVtcHR5LgorICAg ICAgICBlLmcuCisgICAgICAgICI8ZGl2PjxzcGFuPjxicj48L3NwYW4+PC9kaXY+IiBtYWtlcyB0 aGUgbGluZSBhcyB0YWxsIGFzIHRoZSA8YnI+IGlzIGJ1dAorICAgICAgICAiPGRpdj5zb21lIGNv bnRlbnQ8c3BhbiBzdHlsZT0iZm9udC1zaXplOiAyMDBweDsiPjxicj48L3NwYW4+PC9kaXY+IiBk b2VzIG5vdCBwcm9kdWNlIGEgMjAwcHggdGFsbCBsaW5lLgorCisgICAgICAgIFRoaXMgcXVpcmsg YWxzbyBvbmx5IGFwcGxpZXMgdG8gbm9uLXJvb3QgaW5saW5lIGJveGVzICg8c3Bhbj48YnI+PC9z cGFuPikgc2luY2UgPGRpdiBzdHlsZT0iZm9udC1zaXplOiAyMDBweDsiPjxicj5zb21lIGNvbnRl bnQ8L2Rpdj4KKyAgICAgICAgcHJvZHVjZXMgYSAyMDBweCB0YWxsIGVtcHR5IHJvb3QgaW5saW5l IGJveC4KKworICAgICAgICBSZW1vdmluZyB0aGlzIHF1aXJrIG1ha2VzIHRoZSBpbmxpbmVMZXZl bEJveEFmZmVjdHNMaW5lQm94IGxvZ2ljIHNpbXBsZXIgc2luY2Ugd2UgZG9uJ3QgaGF2ZSB0byBj aGVjayBhZ2FpbnN0CisgICAgICAgIHdoZXRoZXIgdGhlIGxpbmUgaXMgY29uc2lkZXJlZCBlbXB0 eSBhbmQgdGhlIHJlc3VsdCBpcyBhbGlnbmVkIHdpdGggQ2hyb21lJ3MgYmVoYXZpb3IuCisgICAg ICAgIChUaGlzIGlzIGluIHByZXBhcmF0aW9uIGZvciBnZXR0aW5nIHJpZCBvZiB0aGUgaXMtY29u c2lkZXJlZC1lbXB0eSBjb25jZXB0IGZvciBsaW5lL2xpbmUgYm94LikKKworICAgICAgICAqIGxh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0SW5s aW5lTGV2ZWxCb3hlcyk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l Rm9ybWF0dGluZ0NvbnRleHRRdWlya3MuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJ bmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6UXVpcmtzOjppbmxpbmVMZXZlbEJveEFmZmVjdHNMaW5l Qm94IGNvbnN0KToKKwogMjAyMS0wMS0xMSAgWW9zaGlha2kgSml0c3VrYXdhICA8eW9zaGlha2ku aml0c3VrYXdhQHNvbnkuY29tPgogCiAgICAgICAgIFtQbGF5U3RhdGlvbl0gQWRkIE1pbmlCcm93 c2VyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCmlu ZGV4IGM2YWI4YzNiNTkxZmRlNTI1MDE0YzcxNDgwNzRjOTI0MzZhMzRkYzUuLjdlNWE0N2Q0NTRj MzZmNzkyZDJlMjI2MTFmNjMwN2QzYWZiYzVjNzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnku Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZv cm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCkBAIC0zMzksNiArMzM5LDcgQEAgdm9pZCBMaW5l Qm94QnVpbGRlcjo6Y29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyhMaW5lQm94JiBsaW5lQm94LCBj b25zdCBMaW5lOjpSdW4KICAgICAgICAgfQogICAgICAgICBpZiAocnVuLmlzSGFyZExpbmVCcmVh aygpKSB7CiAgICAgICAgICAgICBhdXRvIGxpbmVCcmVha0JveCA9IExpbmVCb3g6OklubGluZUxl dmVsQm94OjpjcmVhdGVMaW5lQnJlYWtCb3gobGF5b3V0Qm94LCBsb2dpY2FsTGVmdCk7CisgICAg ICAgICAgICBsaW5lQm94LmlubGluZUxldmVsQm94Rm9yTGF5b3V0Qm94KGxheW91dEJveC5wYXJl bnQoKSkuc2V0SGFzQ29udGVudCgpOwogICAgICAgICAgICAgc2V0VmVydGljYWxHZW9tZXRyeUZv cklubGluZUJveCgqbGluZUJyZWFrQm94KTsKICAgICAgICAgICAgIGxpbmVCb3guYWRkSW5saW5l TGV2ZWxCb3goV1RGTW92ZShsaW5lQnJlYWtCb3gpKTsKICAgICAgICAgICAgIGNvbnRpbnVlOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l Rm9ybWF0dGluZ0NvbnRleHRRdWlya3MuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRRdWlya3MuY3BwCmluZGV4IGI4NDE3 OWE0YzE0ZmQxNzJkZGZjMmQyM2FjZTQ0MDg5ZjE1Mzg0YzIuLjFiZTJkYmYyY2UzZGVjOWMxYjk4 NDQ4N2YxNmM0MTZjNGRiYmYzZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29u dGV4dFF1aXJrcy5jcHAKQEAgLTU2LDExICs1Niw2IEBAIGJvb2wgSW5saW5lRm9ybWF0dGluZ0Nv bnRleHQ6OlF1aXJrczo6aW5saW5lTGV2ZWxCb3hBZmZlY3RzTGluZUJveChjb25zdCBMaW5lQm94 CiAgICAgICAgIGF1dG8gaW5saW5lQm94SGFzSW1hZ2luYXJ5U3RydXQgPSBsYXlvdXRTdGF0ZSgp LmluTm9RdWlya3NNb2RlKCk7CiAgICAgICAgIHJldHVybiBpbmxpbmVCb3hIYXNJbWFnaW5hcnlT dHJ1dCAmJiAhbGluZUJveC5pc0NvbnNpZGVyZWRFbXB0eSgpOwogICAgIH0KLSAgICBpZiAoaW5s aW5lTGV2ZWxCb3guaXNMaW5lQnJlYWtCb3goKSkgewotICAgICAgICAvLyA8YnI+IGluIG5vbi1z dGFuZGFyZCBtb2RlIHN0cmV0Y2hlcyB0aGUgbGluZSBib3ggb25seSB3aGVuIHRoZSBsaW5lIGlz IGVtcHR5LgotICAgICAgICAvLyBlLmcuIDxkaXY+PHNwYW4+PGJyPjwvc3Bhbj48L2Rpdj4gd2ls bCBzdHJldGNoIGJ1dCA8ZGl2PnRoaXMgd2lsbCBub3Qgc3RyZXRjaCB0byAyMDBweDxzcGFuIHN0 eWxlPSJmb250LXNpemU6IDIwMHB4OyI+PGJyPjwvc3Bhbj48L2Rpdj4KLSAgICAgICAgcmV0dXJu IGxheW91dFN0YXRlKCkuaW5Ob1F1aXJrc01vZGUoKSA/IHRydWUgOiBsaW5lQm94LmlzQ29uc2lk ZXJlZEVtcHR5KCk7Ci0gICAgfQogICAgIGlmIChpbmxpbmVMZXZlbEJveC5pc0F0b21pY0lubGlu ZUxldmVsQm94KCkpIHsKICAgICAgICAgaWYgKGlubGluZUxldmVsQm94LmxheW91dEJvdW5kcygp LmhlaWdodCgpKQogICAgICAgICAgICAgcmV0dXJuIHRydWU7CkBAIC02OSw2ICs2NCw3IEBAIGJv b2wgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OlF1aXJrczo6aW5saW5lTGV2ZWxCb3hBZmZlY3Rz TGluZUJveChjb25zdCBMaW5lQm94CiAgICAgICAgIGF1dG8mIGJveEdlb21ldHJ5ID0gZm9ybWF0 dGluZ0NvbnRleHQoKS5nZW9tZXRyeUZvckJveChpbmxpbmVMZXZlbEJveC5sYXlvdXRCb3goKSk7 CiAgICAgICAgIHJldHVybiBib3hHZW9tZXRyeS5tYXJnaW5CZWZvcmUoKSB8fCBib3hHZW9tZXRy eS5tYXJnaW5BZnRlcigpOwogICAgIH0KKyAgICAvLyBMaW5lYnJlYWsgYm94ZXMgKDxicj4pIGFm ZmVjdCB0aGUgbGluZSBib3ggdGhyb3VnaCB0aGVpciBwYXJlbnQgaW5saW5lIGJveCAoc2VlIExp bmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJbmxpbmVMZXZlbEJveGVzKS4KICAgICByZXR1cm4gZmFs c2U7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVGbG93 Qm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVGbG93Qm94LmNwcAppbmRl eCBjOTkyM2I1MDMyOWQ5MmQ3ZmY2ZjE0OTdjZDNlNDQ1ZDM4MzIzZjk0Li4yZjEwYzBiZjdlMTlh OWQ0OTQyN2NkNDk0YTZkYTVkOTg4YzkyNjZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvSW5saW5lRmxvd0JveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L0lubGluZUZsb3dCb3guY3BwCkBAIC0xMzcsNyArMTM3LDkgQEAgdm9pZCBJbmxpbmVGbG93Qm94 OjphZGRUb0xpbmUoSW5saW5lQm94KiBjaGlsZCkKICAgICAgICAgICAgIGlmIChjaGlsZC0+cmVu ZGVyZXIoKS5pc0xpbmVCcmVhaygpKSB7CiAgICAgICAgICAgICAgICAgLy8gRklYTUU6IFRoaXMg aXNuJ3QgaWRlYWwuIFdlIG9ubHkgdHVybiBvZmYgYmVjYXVzZSBjdXJyZW50IGxheW91dCB0ZXN0 IHJlc3VsdHMgZXhwZWN0IHRoZSA8YnI+IHRvIGJlIDAtaGVpZ2h0IG9uIHRoZSBiYXNlbGluZS4K ICAgICAgICAgICAgICAgICAvLyBPdGhlciB0aGFuIG1ha2luZyBhIHppbGxpb24gdGVzdHMgaGF2 ZSB0byByZWdlbmVyYXRlIHJlc3VsdHMsIHRoZXJlJ3Mgbm8gcmVhc29uIHRvIGRpdGNoIHRoZSBv cHRpbWl6YXRpb24gaGVyZS4KLSAgICAgICAgICAgICAgICBzaG91bGRDbGVhckRlc2NlbmRhbnRz SGF2ZVNhbWVMaW5lSGVpZ2h0QW5kQmFzZWxpbmUgPSBjaGlsZC0+cmVuZGVyZXIoKS5pc0JSKCk7 CisgICAgICAgICAgICAgICAgYXV0byBjaGlsZElzSGFyZExpbmVicmVhayA9IGNoaWxkLT5yZW5k ZXJlcigpLmlzQlIoKTsKKyAgICAgICAgICAgICAgICBzaG91bGRDbGVhckRlc2NlbmRhbnRzSGF2 ZVNhbWVMaW5lSGVpZ2h0QW5kQmFzZWxpbmUgPSBjaGlsZElzSGFyZExpbmVicmVhazsKKyAgICAg ICAgICAgICAgICBtX2hhc0hhcmRMaW5lYnJlYWsgPSBtX2hhc0hhcmRMaW5lYnJlYWsgfHwgY2hp bGRJc0hhcmRMaW5lYnJlYWs7CiAgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAg IGF1dG8mIGNoaWxkRmxvd0JveCA9IGRvd25jYXN0PElubGluZUZsb3dCb3g+KCpjaGlsZCk7CiAg ICAgICAgICAgICAgICAgLy8gQ2hlY2sgdGhlIGNoaWxkJ3MgYml0LCBhbmQgdGhlbiBhbHNvIGNo ZWNrIGZvciBkaWZmZXJlbmNlcyBpbiBmb250LCBsaW5lLWhlaWdodCwgdmVydGljYWwtYWxpZ24K QEAgLTU5NSw4ICs1OTcsMTIgQEAgdm9pZCBJbmxpbmVGbG93Qm94Ojpjb21wdXRlTG9naWNhbEJv eEhlaWdodHMoUm9vdElubGluZUJveCYgcm9vdEJveCwgTGF5b3V0VW5pdCYKICAgICAgICAgfSBl bHNlIGlmIChjaGlsZC0+dmVydGljYWxBbGlnbigpID09IFZlcnRpY2FsQWxpZ246OkJvdHRvbSAm JiB2ZXJ0aWNhbEFsaWduQXBwbGllcyhjaGlsZC0+cmVuZGVyZXIoKSkpIHsKICAgICAgICAgICAg IGlmIChtYXhQb3NpdGlvbkJvdHRvbSA8IGJveEhlaWdodCkKICAgICAgICAgICAgICAgICBtYXhQ b3NpdGlvbkJvdHRvbSA9IGJveEhlaWdodDsKLSAgICAgICAgfSBlbHNlIGlmICghaW5saW5lRmxv d0JveCB8fCBzdHJpY3RNb2RlIHx8IGlubGluZUZsb3dCb3gtPmhhc1RleHRDaGlsZHJlbigpIHx8 IChpbmxpbmVGbG93Qm94LT5kZXNjZW5kYW50c0hhdmVTYW1lTGluZUhlaWdodEFuZEJhc2VsaW5l KCkgJiYgaW5saW5lRmxvd0JveC0+aGFzVGV4dERlc2NlbmRhbnRzKCkpCi0gICAgICAgICAgICAg ICAgICAgfHwgaW5saW5lRmxvd0JveC0+cmVuZGVyZXIoKS5oYXNJbmxpbmVEaXJlY3Rpb25Cb3Jk ZXJzT3JQYWRkaW5nKCkpIHsKKyAgICAgICAgfSBlbHNlIGlmIChzdHJpY3RNb2RlCisgICAgICAg ICAgICB8fCAhaW5saW5lRmxvd0JveAorICAgICAgICAgICAgfHwgaW5saW5lRmxvd0JveC0+aGFz VGV4dENoaWxkcmVuKCkKKyAgICAgICAgICAgIHx8IChpbmxpbmVGbG93Qm94LT5kZXNjZW5kYW50 c0hhdmVTYW1lTGluZUhlaWdodEFuZEJhc2VsaW5lKCkgJiYgaW5saW5lRmxvd0JveC0+aGFzVGV4 dERlc2NlbmRhbnRzKCkpCisgICAgICAgICAgICB8fCBpbmxpbmVGbG93Qm94LT5yZW5kZXJlcigp Lmhhc0lubGluZURpcmVjdGlvbkJvcmRlcnNPclBhZGRpbmcoKQorICAgICAgICAgICAgfHwgaW5s aW5lRmxvd0JveC0+aGFzSGFyZExpbmVicmVhaygpKSB7CiAgICAgICAgICAgICAvLyBOb3RlIHRo YXQgdGhlc2UgdmFsdWVzIGNhbiBiZSBuZWdhdGl2ZS4gIEV2ZW4gdGhvdWdoIHdlIG9ubHkgYWZm ZWN0IHRoZSBtYXhBc2NlbnQgYW5kIG1heERlc2NlbnQgdmFsdWVzCiAgICAgICAgICAgICAvLyBp ZiBvdXIgYm94IChleGNsdWRpbmcgbGluZS1oZWlnaHQpIHdhcyBhYm92ZSAoZm9yIGFzY2VudCkg b3IgYmVsb3cgKGZvciBkZXNjZW50KSB0aGUgcm9vdCBiYXNlbGluZSwgb25jZSB5b3UgZmFjdG9y IGluIGxpbmUtaGVpZ2h0CiAgICAgICAgICAgICAvLyB0aGUgZmluYWwgYm94IGNhbiBlbmQgdXAg YmVpbmcgZnVsbHkgYWJvdmUgb3IgZnVsbHkgYmVsb3cgdGhlIHJvb3QgYm94J3MgYmFzZWxpbmUh ICBUaGlzIGlzIG9rLCBidXQgd2hhdCBpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL0lubGluZUZsb3dCb3guaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVG bG93Qm94LmgKaW5kZXggNDA1NTVmZjU0ZTAzMTBmZjc5ZGQ5Y2U5MzIxZGJhMmYwYWE3OTk3OS4u N2MyMjhiY2I4ZDJiZWNkMDQ0MDUxNmQyYzY0ZGUxNmEzZDY5ZGRjMCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUZsb3dCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvSW5saW5lRmxvd0JveC5oCkBAIC00NCw2ICs0NCw3IEBAIHB1YmxpYzoKICAg ICAgICAgOiBJbmxpbmVCb3gocmVuZGVyZXIpCiAgICAgICAgICwgbV9pbmNsdWRlTG9naWNhbExl ZnRFZGdlKGZhbHNlKQogICAgICAgICAsIG1faW5jbHVkZUxvZ2ljYWxSaWdodEVkZ2UoZmFsc2Up CisgICAgICAgICwgbV9oYXNIYXJkTGluZWJyZWFrKGZhbHNlKQogICAgICAgICAsIG1fZGVzY2Vu ZGFudHNIYXZlU2FtZUxpbmVIZWlnaHRBbmRCYXNlbGluZSh0cnVlKQogICAgICAgICAsIG1fYmFz ZWxpbmVUeXBlKEFscGhhYmV0aWNCYXNlbGluZSkKICAgICAgICAgLCBtX2hhc0Fubm90YXRpb25z QmVmb3JlKGZhbHNlKQpAQCAtMjA4LDYgKzIwOSw3IEBAIHB1YmxpYzoKIAogICAgIGJvb2wgaGFz VGV4dENoaWxkcmVuKCkgY29uc3QgeyByZXR1cm4gbV9oYXNUZXh0Q2hpbGRyZW47IH0KICAgICBi b29sIGhhc1RleHREZXNjZW5kYW50cygpIGNvbnN0IHsgcmV0dXJuIG1faGFzVGV4dERlc2NlbmRh bnRzOyB9CisgICAgYm9vbCBoYXNIYXJkTGluZWJyZWFrKCkgY29uc3QgeyByZXR1cm4gbV9oYXNI YXJkTGluZWJyZWFrOyB9CiAgICAgdm9pZCBzZXRIYXNUZXh0Q2hpbGRyZW4oKSB7IG1faGFzVGV4 dENoaWxkcmVuID0gdHJ1ZTsgc2V0SGFzVGV4dERlc2NlbmRhbnRzKCk7IH0KICAgICB2b2lkIHNl dEhhc1RleHREZXNjZW5kYW50cygpIHsgbV9oYXNUZXh0RGVzY2VuZGFudHMgPSB0cnVlOyB9CiAg ICAgCkBAIC0zMTIsNiArMzE0LDcgQEAgcHJpdmF0ZToKICAgICB1bnNpZ25lZCBtX2luY2x1ZGVM b2dpY2FsUmlnaHRFZGdlIDogMTsKICAgICB1bnNpZ25lZCBtX2hhc1RleHRDaGlsZHJlbiA6IDE7 CiAgICAgdW5zaWduZWQgbV9oYXNUZXh0RGVzY2VuZGFudHMgOiAxOworICAgIHVuc2lnbmVkIG1f aGFzSGFyZExpbmVicmVhayA6IDE7CiAgICAgdW5zaWduZWQgbV9kZXNjZW5kYW50c0hhdmVTYW1l TGluZUhlaWdodEFuZEJhc2VsaW5lIDogMTsKIAogcHJvdGVjdGVkOgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcAppbmRleCA4YWJiZWVmYzc5N2VhNWMyYWY2NThlZmUx NDQ3MzA0YjY1YTk5OTU0Li41ODgwNGVmNDEyZWI4YzFjNjQ3NmE1ZDBjM2NhYTI1NTIzZmI4YTk4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcApAQCAtMjE5LDYg KzIxOSw3IEBAIHZvaWQgUmVuZGVySW5saW5lOjp1cGRhdGVBbHdheXNDcmVhdGVMaW5lQm94ZXMo Ym9vbCBmdWxsTGF5b3V0KQogICAgICAgICB8fCBzdHlsZSgpLnRleHRFbXBoYXNpc01hcmsoKSAh PSBUZXh0RW1waGFzaXNNYXJrOjpOb25lCiAgICAgICAgIHx8IChjaGVja0ZvbnRzICYmICghcGFy ZW50U3R5bGUtPmZvbnRDYXNjYWRlKCkuZm9udE1ldHJpY3MoKS5oYXNJZGVudGljYWxBc2NlbnRE ZXNjZW50QW5kTGluZUdhcChzdHlsZSgpLmZvbnRDYXNjYWRlKCkuZm9udE1ldHJpY3MoKSkKICAg ICAgICAgfHwgcGFyZW50U3R5bGUtPmxpbmVIZWlnaHQoKSAhPSBzdHlsZSgpLmxpbmVIZWlnaHQo KSkpOworICAgIGFsd2F5c0NyZWF0ZUxpbmVCb3hlcyA9IGFsd2F5c0NyZWF0ZUxpbmVCb3hlcyB8 fCB0cnVlOwogCiAgICAgaWYgKCFhbHdheXNDcmVhdGVMaW5lQm94ZXMgJiYgY2hlY2tGb250cyAm JiB2aWV3KCkudXNlc0ZpcnN0TGluZVJ1bGVzKCkpIHsKICAgICAgICAgLy8gSGF2ZSB0byBjaGVj ayB0aGUgZmlyc3QgbGluZSBzdHlsZSBhcyB3ZWxsLgo= 417482 2021-01-12 12:57:12 -0800 2021-01-12 13:02:41 -0800 Patch bug-220252-20210112125711.patch text/plain 9604 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMzYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjEwMTNhNDE3NmJjZDFk YWU1ZTBhOTRmOGRkMWQ0NjgzYjk1MmEyOS4uMjRhYjhlYzdiNjYxODVmZTQ2ZjNmYmU5NGQ4MTFh NDhiZTRmZWE3MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIxLTAxLTEyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXVtRdWlya10g TGV0J3MgYWRvcHQgYSBsZXNzIHF1aXJreSBiZWhhdmlvciBmb3IgbGluZSBicmVha3Mgb24gbm9u LWVtcHR5IGxpbmVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMjAyNTIKKworICAgICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KKworICAg ICAgICBXZWJLaXQgaGFzIHRoaXMgcXVpcmsgYmVoYXZpb3Igd2hlcmUgPGJyPiBzdHJldGNoZXMg dGhlIGxpbmUgYm94IHZlcnRpY2FsbHkgb25seSB3aGVuIHRoZSBsaW5lIGlzIGVtcHR5LgorICAg ICAgICBlLmcuCisgICAgICAgICI8ZGl2PjxzcGFuPjxicj48L3NwYW4+PC9kaXY+IiBtYWtlcyB0 aGUgbGluZSBhcyB0YWxsIGFzIHRoZSA8YnI+IGlzIGJ1dAorICAgICAgICAiPGRpdj5zb21lIGNv bnRlbnQ8c3BhbiBzdHlsZT0iZm9udC1zaXplOiAyMDBweDsiPjxicj48L3NwYW4+PC9kaXY+IiBk b2VzIG5vdCBwcm9kdWNlIGEgMjAwcHggdGFsbCBsaW5lLgorCisgICAgICAgIFRoaXMgcXVpcmsg YWxzbyBvbmx5IGFwcGxpZXMgdG8gbm9uLXJvb3QgaW5saW5lIGJveGVzICg8c3Bhbj48YnI+PC9z cGFuPikgc2luY2UgPGRpdiBzdHlsZT0iZm9udC1zaXplOiAyMDBweDsiPjxicj5zb21lIGNvbnRl bnQ8L2Rpdj4KKyAgICAgICAgcHJvZHVjZXMgYSAyMDBweCB0YWxsIGVtcHR5IHJvb3QgaW5saW5l IGJveC4KKworICAgICAgICBSZW1vdmluZyB0aGlzIHF1aXJrIG1ha2VzIHRoZSBpbmxpbmVMZXZl bEJveEFmZmVjdHNMaW5lQm94IGxvZ2ljIHNpbXBsZXIgc2luY2Ugd2UgZG9uJ3QgaGF2ZSB0byBj aGVjayBhZ2FpbnN0CisgICAgICAgIHdoZXRoZXIgdGhlIGxpbmUgaXMgY29uc2lkZXJlZCBlbXB0 eSBhbmQgdGhlIHJlc3VsdCBpcyBhbGlnbmVkIHdpdGggQ2hyb21lJ3MgYmVoYXZpb3IuCisgICAg ICAgIChUaGlzIGlzIGluIHByZXBhcmF0aW9uIGZvciBnZXR0aW5nIHJpZCBvZiB0aGUgaXMtY29u c2lkZXJlZC1lbXB0eSBjb25jZXB0IGZvciBsaW5lL2xpbmUgYm94LikKKworICAgICAgICAqIGxh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0SW5s aW5lTGV2ZWxCb3hlcyk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l Rm9ybWF0dGluZ0NvbnRleHRRdWlya3MuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJ bmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6UXVpcmtzOjppbmxpbmVMZXZlbEJveEFmZmVjdHNMaW5l Qm94IGNvbnN0KToKKwogMjAyMS0wMS0xMSAgWW9zaGlha2kgSml0c3VrYXdhICA8eW9zaGlha2ku aml0c3VrYXdhQHNvbnkuY29tPgogCiAgICAgICAgIFtQbGF5U3RhdGlvbl0gQWRkIE1pbmlCcm93 c2VyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCmlu ZGV4IGM2YWI4YzNiNTkxZmRlNTI1MDE0YzcxNDgwNzRjOTI0MzZhMzRkYzUuLjdlNWE0N2Q0NTRj MzZmNzkyZDJlMjI2MTFmNjMwN2QzYWZiYzVjNzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnku Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZv cm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCkBAIC0zMzksNiArMzM5LDcgQEAgdm9pZCBMaW5l Qm94QnVpbGRlcjo6Y29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyhMaW5lQm94JiBsaW5lQm94LCBj b25zdCBMaW5lOjpSdW4KICAgICAgICAgfQogICAgICAgICBpZiAocnVuLmlzSGFyZExpbmVCcmVh aygpKSB7CiAgICAgICAgICAgICBhdXRvIGxpbmVCcmVha0JveCA9IExpbmVCb3g6OklubGluZUxl dmVsQm94OjpjcmVhdGVMaW5lQnJlYWtCb3gobGF5b3V0Qm94LCBsb2dpY2FsTGVmdCk7CisgICAg ICAgICAgICBsaW5lQm94LmlubGluZUxldmVsQm94Rm9yTGF5b3V0Qm94KGxheW91dEJveC5wYXJl bnQoKSkuc2V0SGFzQ29udGVudCgpOwogICAgICAgICAgICAgc2V0VmVydGljYWxHZW9tZXRyeUZv cklubGluZUJveCgqbGluZUJyZWFrQm94KTsKICAgICAgICAgICAgIGxpbmVCb3guYWRkSW5saW5l TGV2ZWxCb3goV1RGTW92ZShsaW5lQnJlYWtCb3gpKTsKICAgICAgICAgICAgIGNvbnRpbnVlOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l Rm9ybWF0dGluZ0NvbnRleHRRdWlya3MuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRRdWlya3MuY3BwCmluZGV4IGI4NDE3 OWE0YzE0ZmQxNzJkZGZjMmQyM2FjZTQ0MDg5ZjE1Mzg0YzIuLjFiZTJkYmYyY2UzZGVjOWMxYjk4 NDQ4N2YxNmM0MTZjNGRiYmYzZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29u dGV4dFF1aXJrcy5jcHAKQEAgLTU2LDExICs1Niw2IEBAIGJvb2wgSW5saW5lRm9ybWF0dGluZ0Nv bnRleHQ6OlF1aXJrczo6aW5saW5lTGV2ZWxCb3hBZmZlY3RzTGluZUJveChjb25zdCBMaW5lQm94 CiAgICAgICAgIGF1dG8gaW5saW5lQm94SGFzSW1hZ2luYXJ5U3RydXQgPSBsYXlvdXRTdGF0ZSgp LmluTm9RdWlya3NNb2RlKCk7CiAgICAgICAgIHJldHVybiBpbmxpbmVCb3hIYXNJbWFnaW5hcnlT dHJ1dCAmJiAhbGluZUJveC5pc0NvbnNpZGVyZWRFbXB0eSgpOwogICAgIH0KLSAgICBpZiAoaW5s aW5lTGV2ZWxCb3guaXNMaW5lQnJlYWtCb3goKSkgewotICAgICAgICAvLyA8YnI+IGluIG5vbi1z dGFuZGFyZCBtb2RlIHN0cmV0Y2hlcyB0aGUgbGluZSBib3ggb25seSB3aGVuIHRoZSBsaW5lIGlz IGVtcHR5LgotICAgICAgICAvLyBlLmcuIDxkaXY+PHNwYW4+PGJyPjwvc3Bhbj48L2Rpdj4gd2ls bCBzdHJldGNoIGJ1dCA8ZGl2PnRoaXMgd2lsbCBub3Qgc3RyZXRjaCB0byAyMDBweDxzcGFuIHN0 eWxlPSJmb250LXNpemU6IDIwMHB4OyI+PGJyPjwvc3Bhbj48L2Rpdj4KLSAgICAgICAgcmV0dXJu IGxheW91dFN0YXRlKCkuaW5Ob1F1aXJrc01vZGUoKSA/IHRydWUgOiBsaW5lQm94LmlzQ29uc2lk ZXJlZEVtcHR5KCk7Ci0gICAgfQogICAgIGlmIChpbmxpbmVMZXZlbEJveC5pc0F0b21pY0lubGlu ZUxldmVsQm94KCkpIHsKICAgICAgICAgaWYgKGlubGluZUxldmVsQm94LmxheW91dEJvdW5kcygp LmhlaWdodCgpKQogICAgICAgICAgICAgcmV0dXJuIHRydWU7CkBAIC02OSw2ICs2NCw3IEBAIGJv b2wgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OlF1aXJrczo6aW5saW5lTGV2ZWxCb3hBZmZlY3Rz TGluZUJveChjb25zdCBMaW5lQm94CiAgICAgICAgIGF1dG8mIGJveEdlb21ldHJ5ID0gZm9ybWF0 dGluZ0NvbnRleHQoKS5nZW9tZXRyeUZvckJveChpbmxpbmVMZXZlbEJveC5sYXlvdXRCb3goKSk7 CiAgICAgICAgIHJldHVybiBib3hHZW9tZXRyeS5tYXJnaW5CZWZvcmUoKSB8fCBib3hHZW9tZXRy eS5tYXJnaW5BZnRlcigpOwogICAgIH0KKyAgICAvLyBMaW5lYnJlYWsgYm94ZXMgKDxicj4pIGFm ZmVjdCB0aGUgbGluZSBib3ggdGhyb3VnaCB0aGVpciBwYXJlbnQgaW5saW5lIGJveCAoc2VlIExp bmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJbmxpbmVMZXZlbEJveGVzKS4KICAgICByZXR1cm4gZmFs c2U7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVGbG93 Qm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVGbG93Qm94LmNwcAppbmRl eCBjOTkyM2I1MDMyOWQ5MmQ3ZmY2ZjE0OTdjZDNlNDQ1ZDM4MzIzZjk0Li4yZjEwYzBiZjdlMTlh OWQ0OTQyN2NkNDk0YTZkYTVkOTg4YzkyNjZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvSW5saW5lRmxvd0JveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L0lubGluZUZsb3dCb3guY3BwCkBAIC0xMzcsNyArMTM3LDkgQEAgdm9pZCBJbmxpbmVGbG93Qm94 OjphZGRUb0xpbmUoSW5saW5lQm94KiBjaGlsZCkKICAgICAgICAgICAgIGlmIChjaGlsZC0+cmVu ZGVyZXIoKS5pc0xpbmVCcmVhaygpKSB7CiAgICAgICAgICAgICAgICAgLy8gRklYTUU6IFRoaXMg aXNuJ3QgaWRlYWwuIFdlIG9ubHkgdHVybiBvZmYgYmVjYXVzZSBjdXJyZW50IGxheW91dCB0ZXN0 IHJlc3VsdHMgZXhwZWN0IHRoZSA8YnI+IHRvIGJlIDAtaGVpZ2h0IG9uIHRoZSBiYXNlbGluZS4K ICAgICAgICAgICAgICAgICAvLyBPdGhlciB0aGFuIG1ha2luZyBhIHppbGxpb24gdGVzdHMgaGF2 ZSB0byByZWdlbmVyYXRlIHJlc3VsdHMsIHRoZXJlJ3Mgbm8gcmVhc29uIHRvIGRpdGNoIHRoZSBv cHRpbWl6YXRpb24gaGVyZS4KLSAgICAgICAgICAgICAgICBzaG91bGRDbGVhckRlc2NlbmRhbnRz SGF2ZVNhbWVMaW5lSGVpZ2h0QW5kQmFzZWxpbmUgPSBjaGlsZC0+cmVuZGVyZXIoKS5pc0JSKCk7 CisgICAgICAgICAgICAgICAgYXV0byBjaGlsZElzSGFyZExpbmVicmVhayA9IGNoaWxkLT5yZW5k ZXJlcigpLmlzQlIoKTsKKyAgICAgICAgICAgICAgICBzaG91bGRDbGVhckRlc2NlbmRhbnRzSGF2 ZVNhbWVMaW5lSGVpZ2h0QW5kQmFzZWxpbmUgPSBjaGlsZElzSGFyZExpbmVicmVhazsKKyAgICAg ICAgICAgICAgICBtX2hhc0hhcmRMaW5lYnJlYWsgPSBtX2hhc0hhcmRMaW5lYnJlYWsgfHwgY2hp bGRJc0hhcmRMaW5lYnJlYWs7CiAgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAg IGF1dG8mIGNoaWxkRmxvd0JveCA9IGRvd25jYXN0PElubGluZUZsb3dCb3g+KCpjaGlsZCk7CiAg ICAgICAgICAgICAgICAgLy8gQ2hlY2sgdGhlIGNoaWxkJ3MgYml0LCBhbmQgdGhlbiBhbHNvIGNo ZWNrIGZvciBkaWZmZXJlbmNlcyBpbiBmb250LCBsaW5lLWhlaWdodCwgdmVydGljYWwtYWxpZ24K QEAgLTU5NSw4ICs1OTcsMTIgQEAgdm9pZCBJbmxpbmVGbG93Qm94Ojpjb21wdXRlTG9naWNhbEJv eEhlaWdodHMoUm9vdElubGluZUJveCYgcm9vdEJveCwgTGF5b3V0VW5pdCYKICAgICAgICAgfSBl bHNlIGlmIChjaGlsZC0+dmVydGljYWxBbGlnbigpID09IFZlcnRpY2FsQWxpZ246OkJvdHRvbSAm JiB2ZXJ0aWNhbEFsaWduQXBwbGllcyhjaGlsZC0+cmVuZGVyZXIoKSkpIHsKICAgICAgICAgICAg IGlmIChtYXhQb3NpdGlvbkJvdHRvbSA8IGJveEhlaWdodCkKICAgICAgICAgICAgICAgICBtYXhQ b3NpdGlvbkJvdHRvbSA9IGJveEhlaWdodDsKLSAgICAgICAgfSBlbHNlIGlmICghaW5saW5lRmxv d0JveCB8fCBzdHJpY3RNb2RlIHx8IGlubGluZUZsb3dCb3gtPmhhc1RleHRDaGlsZHJlbigpIHx8 IChpbmxpbmVGbG93Qm94LT5kZXNjZW5kYW50c0hhdmVTYW1lTGluZUhlaWdodEFuZEJhc2VsaW5l KCkgJiYgaW5saW5lRmxvd0JveC0+aGFzVGV4dERlc2NlbmRhbnRzKCkpCi0gICAgICAgICAgICAg ICAgICAgfHwgaW5saW5lRmxvd0JveC0+cmVuZGVyZXIoKS5oYXNJbmxpbmVEaXJlY3Rpb25Cb3Jk ZXJzT3JQYWRkaW5nKCkpIHsKKyAgICAgICAgfSBlbHNlIGlmIChzdHJpY3RNb2RlCisgICAgICAg ICAgICB8fCAhaW5saW5lRmxvd0JveAorICAgICAgICAgICAgfHwgaW5saW5lRmxvd0JveC0+aGFz VGV4dENoaWxkcmVuKCkKKyAgICAgICAgICAgIHx8IChpbmxpbmVGbG93Qm94LT5kZXNjZW5kYW50 c0hhdmVTYW1lTGluZUhlaWdodEFuZEJhc2VsaW5lKCkgJiYgaW5saW5lRmxvd0JveC0+aGFzVGV4 dERlc2NlbmRhbnRzKCkpCisgICAgICAgICAgICB8fCBpbmxpbmVGbG93Qm94LT5yZW5kZXJlcigp Lmhhc0lubGluZURpcmVjdGlvbkJvcmRlcnNPclBhZGRpbmcoKQorICAgICAgICAgICAgfHwgaW5s aW5lRmxvd0JveC0+aGFzSGFyZExpbmVicmVhaygpKSB7CiAgICAgICAgICAgICAvLyBOb3RlIHRo YXQgdGhlc2UgdmFsdWVzIGNhbiBiZSBuZWdhdGl2ZS4gIEV2ZW4gdGhvdWdoIHdlIG9ubHkgYWZm ZWN0IHRoZSBtYXhBc2NlbnQgYW5kIG1heERlc2NlbnQgdmFsdWVzCiAgICAgICAgICAgICAvLyBp ZiBvdXIgYm94IChleGNsdWRpbmcgbGluZS1oZWlnaHQpIHdhcyBhYm92ZSAoZm9yIGFzY2VudCkg b3IgYmVsb3cgKGZvciBkZXNjZW50KSB0aGUgcm9vdCBiYXNlbGluZSwgb25jZSB5b3UgZmFjdG9y IGluIGxpbmUtaGVpZ2h0CiAgICAgICAgICAgICAvLyB0aGUgZmluYWwgYm94IGNhbiBlbmQgdXAg YmVpbmcgZnVsbHkgYWJvdmUgb3IgZnVsbHkgYmVsb3cgdGhlIHJvb3QgYm94J3MgYmFzZWxpbmUh ICBUaGlzIGlzIG9rLCBidXQgd2hhdCBpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL0lubGluZUZsb3dCb3guaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVG bG93Qm94LmgKaW5kZXggNDA1NTVmZjU0ZTAzMTBmZjc5ZGQ5Y2U5MzIxZGJhMmYwYWE3OTk3OS4u N2MyMjhiY2I4ZDJiZWNkMDQ0MDUxNmQyYzY0ZGUxNmEzZDY5ZGRjMCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUZsb3dCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvSW5saW5lRmxvd0JveC5oCkBAIC00NCw2ICs0NCw3IEBAIHB1YmxpYzoKICAg ICAgICAgOiBJbmxpbmVCb3gocmVuZGVyZXIpCiAgICAgICAgICwgbV9pbmNsdWRlTG9naWNhbExl ZnRFZGdlKGZhbHNlKQogICAgICAgICAsIG1faW5jbHVkZUxvZ2ljYWxSaWdodEVkZ2UoZmFsc2Up CisgICAgICAgICwgbV9oYXNIYXJkTGluZWJyZWFrKGZhbHNlKQogICAgICAgICAsIG1fZGVzY2Vu ZGFudHNIYXZlU2FtZUxpbmVIZWlnaHRBbmRCYXNlbGluZSh0cnVlKQogICAgICAgICAsIG1fYmFz ZWxpbmVUeXBlKEFscGhhYmV0aWNCYXNlbGluZSkKICAgICAgICAgLCBtX2hhc0Fubm90YXRpb25z QmVmb3JlKGZhbHNlKQpAQCAtMjA4LDYgKzIwOSw3IEBAIHB1YmxpYzoKIAogICAgIGJvb2wgaGFz VGV4dENoaWxkcmVuKCkgY29uc3QgeyByZXR1cm4gbV9oYXNUZXh0Q2hpbGRyZW47IH0KICAgICBi b29sIGhhc1RleHREZXNjZW5kYW50cygpIGNvbnN0IHsgcmV0dXJuIG1faGFzVGV4dERlc2NlbmRh bnRzOyB9CisgICAgYm9vbCBoYXNIYXJkTGluZWJyZWFrKCkgY29uc3QgeyByZXR1cm4gbV9oYXNI YXJkTGluZWJyZWFrOyB9CiAgICAgdm9pZCBzZXRIYXNUZXh0Q2hpbGRyZW4oKSB7IG1faGFzVGV4 dENoaWxkcmVuID0gdHJ1ZTsgc2V0SGFzVGV4dERlc2NlbmRhbnRzKCk7IH0KICAgICB2b2lkIHNl dEhhc1RleHREZXNjZW5kYW50cygpIHsgbV9oYXNUZXh0RGVzY2VuZGFudHMgPSB0cnVlOyB9CiAg ICAgCkBAIC0zMTIsNiArMzE0LDcgQEAgcHJpdmF0ZToKICAgICB1bnNpZ25lZCBtX2luY2x1ZGVM b2dpY2FsUmlnaHRFZGdlIDogMTsKICAgICB1bnNpZ25lZCBtX2hhc1RleHRDaGlsZHJlbiA6IDE7 CiAgICAgdW5zaWduZWQgbV9oYXNUZXh0RGVzY2VuZGFudHMgOiAxOworICAgIHVuc2lnbmVkIG1f aGFzSGFyZExpbmVicmVhayA6IDE7CiAgICAgdW5zaWduZWQgbV9kZXNjZW5kYW50c0hhdmVTYW1l TGluZUhlaWdodEFuZEJhc2VsaW5lIDogMTsKIAogcHJvdGVjdGVkOgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcAppbmRleCA4YWJiZWVmYzc5N2VhNWMyYWY2NThlZmUx NDQ3MzA0YjY1YTk5OTU0Li4zZTljYTM3NDk0ZTY0NzY1OWJlZjllOTU0ODlhYmM2Njc5M2VkYzQ1 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcApAQCAtMjEyLDEz ICsyMTIsMTUgQEAgdm9pZCBSZW5kZXJJbmxpbmU6OnVwZGF0ZUFsd2F5c0NyZWF0ZUxpbmVCb3hl cyhib29sIGZ1bGxMYXlvdXQpCiAKICAgICBhdXRvKiBwYXJlbnRTdHlsZSA9ICZwYXJlbnQoKS0+ c3R5bGUoKTsKICAgICBSZW5kZXJJbmxpbmUqIHBhcmVudFJlbmRlcklubGluZSA9IGlzPFJlbmRl cklubGluZT4oKnBhcmVudCgpKSA/IGRvd25jYXN0PFJlbmRlcklubGluZT4ocGFyZW50KCkpIDog bnVsbHB0cjsKKyAgICBhdXRvIGhhc0hhcmRMaW5lQnJlYWtDaGlsZE9ubHkgPSBmaXJzdENoaWxk KCkgJiYgZmlyc3RDaGlsZCgpID09IGxhc3RDaGlsZCgpICYmIGZpcnN0Q2hpbGQoKS0+aXNCUigp OyAKICAgICBib29sIGNoZWNrRm9udHMgPSBkb2N1bWVudCgpLmluTm9RdWlya3NNb2RlKCk7CiAg ICAgYm9vbCBhbHdheXNDcmVhdGVMaW5lQm94ZXMgPSAocGFyZW50UmVuZGVySW5saW5lICYmIHBh cmVudFJlbmRlcklubGluZS0+YWx3YXlzQ3JlYXRlTGluZUJveGVzKCkpCiAgICAgICAgIHx8IChw YXJlbnRSZW5kZXJJbmxpbmUgJiYgcGFyZW50U3R5bGUtPnZlcnRpY2FsQWxpZ24oKSAhPSBWZXJ0 aWNhbEFsaWduOjpCYXNlbGluZSkKICAgICAgICAgfHwgc3R5bGUoKS52ZXJ0aWNhbEFsaWduKCkg IT0gVmVydGljYWxBbGlnbjo6QmFzZWxpbmUKICAgICAgICAgfHwgc3R5bGUoKS50ZXh0RW1waGFz aXNNYXJrKCkgIT0gVGV4dEVtcGhhc2lzTWFyazo6Tm9uZQogICAgICAgICB8fCAoY2hlY2tGb250 cyAmJiAoIXBhcmVudFN0eWxlLT5mb250Q2FzY2FkZSgpLmZvbnRNZXRyaWNzKCkuaGFzSWRlbnRp Y2FsQXNjZW50RGVzY2VudEFuZExpbmVHYXAoc3R5bGUoKS5mb250Q2FzY2FkZSgpLmZvbnRNZXRy aWNzKCkpCi0gICAgICAgIHx8IHBhcmVudFN0eWxlLT5saW5lSGVpZ2h0KCkgIT0gc3R5bGUoKS5s aW5lSGVpZ2h0KCkpKTsKKyAgICAgICAgfHwgcGFyZW50U3R5bGUtPmxpbmVIZWlnaHQoKSAhPSBz dHlsZSgpLmxpbmVIZWlnaHQoKSkpCisgICAgICAgIHx8IGhhc0hhcmRMaW5lQnJlYWtDaGlsZE9u bHk7CiAKICAgICBpZiAoIWFsd2F5c0NyZWF0ZUxpbmVCb3hlcyAmJiBjaGVja0ZvbnRzICYmIHZp ZXcoKS51c2VzRmlyc3RMaW5lUnVsZXMoKSkgewogICAgICAgICAvLyBIYXZlIHRvIGNoZWNrIHRo ZSBmaXJzdCBsaW5lIHN0eWxlIGFzIHdlbGwuCg== 417484 2021-01-12 13:02:43 -0800 2021-01-12 21:20:09 -0800 Patch bug-220252-20210112130243.patch text/plain 9611 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMzYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjEwMTNhNDE3NmJjZDFk YWU1ZTBhOTRmOGRkMWQ0NjgzYjk1MmEyOS4uY2Y1MzhjNTQxYjVkN2U1MTA5MjllM2JjYzcwMGMy ZjQ3YWU0NmRmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDIxLTAxLTEyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXVtRdWlya10g TGV0J3MgYWRvcHQgYSBsZXNzIHF1aXJreSBiZWhhdmlvciBmb3IgbGluZSBicmVha3Mgb24gbm9u LWVtcHR5IGxpbmVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMjAyNTIKKworICAgICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KKworICAg ICAgICBXZWJLaXQgaGFzIHRoaXMgcXVpcmsgYmVoYXZpb3Igd2hlcmUgPGJyPiBzdHJldGNoZXMg dGhlIGxpbmUgYm94IHZlcnRpY2FsbHkgb25seSB3aGVuIHRoZSBsaW5lIGlzIGVtcHR5LgorICAg ICAgICBlLmcuCisKKyAgICAgICAgPGRpdj48c3Bhbj48YnI+PC9zcGFuPjwvZGl2PgorICAgICAg ICBXZSBtYWtlIHRoZSBsaW5lIGFzIHRhbGwgYXMgdGhlIDxicj4gaXMgYnV0CisKKyAgICAgICAg PGRpdj5zb21lIGNvbnRlbnQ8c3BhbiBzdHlsZT0iZm9udC1zaXplOiAyMDBweDsiPjxicj48L3Nw YW4+PC9kaXY+CisgICAgICAgIGRvZXMgbm90IHByb2R1Y2UgYSB+MjAwcHggdGFsbCBsaW5lLgor CisgICAgICAgIEhvd2V2ZXIgd2hlbiBob3Jpem9udGFsIHBhZGRpbmcvYm9yZGVyIGFkZGVkLCB0 aGUgbGluZSBzdWRkZW5seSBiZWNvbWVzIH4yMDBweCB0YWxsOgorICAgICAgICA8ZGl2PnNvbWUg Y29udGVudDxzcGFuIHN0eWxlPSJmb250LXNpemU6IDIwMHB4OyBwYWRkaW5nOiAxcHg7Ij48YnI+ PC9zcGFuPjwvZGl2PgorCisgICAgICAgIFJlbW92aW5nIHRoaXMgcXVpcmsgbWFrZXMgdGhlIGlu bGluZUxldmVsQm94QWZmZWN0c0xpbmVCb3ggbG9naWMgc2ltcGxlciBzaW5jZSB3ZSBkb24ndCBo YXZlIHRvIGNoZWNrIGFnYWluc3QKKyAgICAgICAgd2hldGhlciB0aGUgbGluZSBpcyBjb25zaWRl cmVkIGVtcHR5IGFuZCB0aGUgcmVzdWx0IGlzIGFsaWduZWQgd2l0aCBDaHJvbWUncyBiZWhhdmlv ci4KKyAgICAgICAgKFRoaXMgaXMgaW4gcHJlcGFyYXRpb24gZm9yIGdldHRpbmcgcmlkIG9mIHRo ZSBpcy1jb25zaWRlcmVkLWVtcHR5IGNvbmNlcHQgZm9yIGxpbmUvbGluZSBib3guKQorCisgICAg ICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9t ZXRyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjpjb25z dHJ1Y3RJbmxpbmVMZXZlbEJveGVzKToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0OjpRdWlya3M6OmlubGluZUxldmVsQm94QWZm ZWN0c0xpbmVCb3ggY29uc3QpOgorCiAyMDIxLTAxLTExICBZb3NoaWFraSBKaXRzdWthd2EgIDx5 b3NoaWFraS5qaXRzdWthd2FAc29ueS5jb20+CiAKICAgICAgICAgW1BsYXlTdGF0aW9uXSBBZGQg TWluaUJyb3dzZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRy eS5jcHAKaW5kZXggYzZhYjhjM2I1OTFmZGU1MjUwMTRjNzE0ODA3NGM5MjQzNmEzNGRjNS4uN2U1 YTQ3ZDQ1NGMzNmY3OTJkMmUyMjYxMWY2MzA3ZDNhZmJjNWM3OSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRH ZW9tZXRyeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv SW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKQEAgLTMzOSw2ICszMzksNyBAQCB2 b2lkIExpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJbmxpbmVMZXZlbEJveGVzKExpbmVCb3gmIGxp bmVCb3gsIGNvbnN0IExpbmU6OlJ1bgogICAgICAgICB9CiAgICAgICAgIGlmIChydW4uaXNIYXJk TGluZUJyZWFrKCkpIHsKICAgICAgICAgICAgIGF1dG8gbGluZUJyZWFrQm94ID0gTGluZUJveDo6 SW5saW5lTGV2ZWxCb3g6OmNyZWF0ZUxpbmVCcmVha0JveChsYXlvdXRCb3gsIGxvZ2ljYWxMZWZ0 KTsKKyAgICAgICAgICAgIGxpbmVCb3guaW5saW5lTGV2ZWxCb3hGb3JMYXlvdXRCb3gobGF5b3V0 Qm94LnBhcmVudCgpKS5zZXRIYXNDb250ZW50KCk7CiAgICAgICAgICAgICBzZXRWZXJ0aWNhbEdl b21ldHJ5Rm9ySW5saW5lQm94KCpsaW5lQnJlYWtCb3gpOwogICAgICAgICAgICAgbGluZUJveC5h ZGRJbmxpbmVMZXZlbEJveChXVEZNb3ZlKGxpbmVCcmVha0JveCkpOwogICAgICAgICAgICAgY29u dGludWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAKaW5k ZXggYjg0MTc5YTRjMTRmZDE3MmRkZmMyZDIzYWNlNDQwODlmMTUzODRjMi4uMWJlMmRiZjJjZTNk ZWM5YzFiOTg0NDg3ZjE2YzQxNmM0ZGJiZjNlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRRdWlya3MuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1h dHRpbmdDb250ZXh0UXVpcmtzLmNwcApAQCAtNTYsMTEgKzU2LDYgQEAgYm9vbCBJbmxpbmVGb3Jt YXR0aW5nQ29udGV4dDo6UXVpcmtzOjppbmxpbmVMZXZlbEJveEFmZmVjdHNMaW5lQm94KGNvbnN0 IExpbmVCb3gKICAgICAgICAgYXV0byBpbmxpbmVCb3hIYXNJbWFnaW5hcnlTdHJ1dCA9IGxheW91 dFN0YXRlKCkuaW5Ob1F1aXJrc01vZGUoKTsKICAgICAgICAgcmV0dXJuIGlubGluZUJveEhhc0lt YWdpbmFyeVN0cnV0ICYmICFsaW5lQm94LmlzQ29uc2lkZXJlZEVtcHR5KCk7CiAgICAgfQotICAg IGlmIChpbmxpbmVMZXZlbEJveC5pc0xpbmVCcmVha0JveCgpKSB7Ci0gICAgICAgIC8vIDxicj4g aW4gbm9uLXN0YW5kYXJkIG1vZGUgc3RyZXRjaGVzIHRoZSBsaW5lIGJveCBvbmx5IHdoZW4gdGhl IGxpbmUgaXMgZW1wdHkuCi0gICAgICAgIC8vIGUuZy4gPGRpdj48c3Bhbj48YnI+PC9zcGFuPjwv ZGl2PiB3aWxsIHN0cmV0Y2ggYnV0IDxkaXY+dGhpcyB3aWxsIG5vdCBzdHJldGNoIHRvIDIwMHB4 PHNwYW4gc3R5bGU9ImZvbnQtc2l6ZTogMjAwcHg7Ij48YnI+PC9zcGFuPjwvZGl2PgotICAgICAg ICByZXR1cm4gbGF5b3V0U3RhdGUoKS5pbk5vUXVpcmtzTW9kZSgpID8gdHJ1ZSA6IGxpbmVCb3gu aXNDb25zaWRlcmVkRW1wdHkoKTsKLSAgICB9CiAgICAgaWYgKGlubGluZUxldmVsQm94LmlzQXRv bWljSW5saW5lTGV2ZWxCb3goKSkgewogICAgICAgICBpZiAoaW5saW5lTGV2ZWxCb3gubGF5b3V0 Qm91bmRzKCkuaGVpZ2h0KCkpCiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKQEAgLTY5LDYgKzY0 LDcgQEAgYm9vbCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6UXVpcmtzOjppbmxpbmVMZXZlbEJv eEFmZmVjdHNMaW5lQm94KGNvbnN0IExpbmVCb3gKICAgICAgICAgYXV0byYgYm94R2VvbWV0cnkg PSBmb3JtYXR0aW5nQ29udGV4dCgpLmdlb21ldHJ5Rm9yQm94KGlubGluZUxldmVsQm94LmxheW91 dEJveCgpKTsKICAgICAgICAgcmV0dXJuIGJveEdlb21ldHJ5Lm1hcmdpbkJlZm9yZSgpIHx8IGJv eEdlb21ldHJ5Lm1hcmdpbkFmdGVyKCk7CiAgICAgfQorICAgIC8vIExpbmVicmVhayBib3hlcyAo PGJyPikgYWZmZWN0IHRoZSBsaW5lIGJveCB0aHJvdWdoIHRoZWlyIHBhcmVudCBpbmxpbmUgYm94 IChzZWUgTGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdElubGluZUxldmVsQm94ZXMpLgogICAgIHJl dHVybiBmYWxzZTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lu bGluZUZsb3dCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUZsb3dCb3gu Y3BwCmluZGV4IGM5OTIzYjUwMzI5ZDkyZDdmZjZmMTQ5N2NkM2U0NDVkMzgzMjNmOTQuLjJmMTBj MGJmN2UxOWE5ZDQ5NDI3Y2Q0OTRhNmRhNWQ5ODhjOTI2NmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVGbG93Qm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvSW5saW5lRmxvd0JveC5jcHAKQEAgLTEzNyw3ICsxMzcsOSBAQCB2b2lkIElubGlu ZUZsb3dCb3g6OmFkZFRvTGluZShJbmxpbmVCb3gqIGNoaWxkKQogICAgICAgICAgICAgaWYgKGNo aWxkLT5yZW5kZXJlcigpLmlzTGluZUJyZWFrKCkpIHsKICAgICAgICAgICAgICAgICAvLyBGSVhN RTogVGhpcyBpc24ndCBpZGVhbC4gV2Ugb25seSB0dXJuIG9mZiBiZWNhdXNlIGN1cnJlbnQgbGF5 b3V0IHRlc3QgcmVzdWx0cyBleHBlY3QgdGhlIDxicj4gdG8gYmUgMC1oZWlnaHQgb24gdGhlIGJh c2VsaW5lLgogICAgICAgICAgICAgICAgIC8vIE90aGVyIHRoYW4gbWFraW5nIGEgemlsbGlvbiB0 ZXN0cyBoYXZlIHRvIHJlZ2VuZXJhdGUgcmVzdWx0cywgdGhlcmUncyBubyByZWFzb24gdG8gZGl0 Y2ggdGhlIG9wdGltaXphdGlvbiBoZXJlLgotICAgICAgICAgICAgICAgIHNob3VsZENsZWFyRGVz Y2VuZGFudHNIYXZlU2FtZUxpbmVIZWlnaHRBbmRCYXNlbGluZSA9IGNoaWxkLT5yZW5kZXJlcigp LmlzQlIoKTsKKyAgICAgICAgICAgICAgICBhdXRvIGNoaWxkSXNIYXJkTGluZWJyZWFrID0gY2hp bGQtPnJlbmRlcmVyKCkuaXNCUigpOworICAgICAgICAgICAgICAgIHNob3VsZENsZWFyRGVzY2Vu ZGFudHNIYXZlU2FtZUxpbmVIZWlnaHRBbmRCYXNlbGluZSA9IGNoaWxkSXNIYXJkTGluZWJyZWFr OworICAgICAgICAgICAgICAgIG1faGFzSGFyZExpbmVicmVhayA9IG1faGFzSGFyZExpbmVicmVh ayB8fCBjaGlsZElzSGFyZExpbmVicmVhazsKICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAg ICAgICAgICAgYXV0byYgY2hpbGRGbG93Qm94ID0gZG93bmNhc3Q8SW5saW5lRmxvd0JveD4oKmNo aWxkKTsKICAgICAgICAgICAgICAgICAvLyBDaGVjayB0aGUgY2hpbGQncyBiaXQsIGFuZCB0aGVu IGFsc28gY2hlY2sgZm9yIGRpZmZlcmVuY2VzIGluIGZvbnQsIGxpbmUtaGVpZ2h0LCB2ZXJ0aWNh bC1hbGlnbgpAQCAtNTk1LDggKzU5NywxMiBAQCB2b2lkIElubGluZUZsb3dCb3g6OmNvbXB1dGVM b2dpY2FsQm94SGVpZ2h0cyhSb290SW5saW5lQm94JiByb290Qm94LCBMYXlvdXRVbml0JgogICAg ICAgICB9IGVsc2UgaWYgKGNoaWxkLT52ZXJ0aWNhbEFsaWduKCkgPT0gVmVydGljYWxBbGlnbjo6 Qm90dG9tICYmIHZlcnRpY2FsQWxpZ25BcHBsaWVzKGNoaWxkLT5yZW5kZXJlcigpKSkgewogICAg ICAgICAgICAgaWYgKG1heFBvc2l0aW9uQm90dG9tIDwgYm94SGVpZ2h0KQogICAgICAgICAgICAg ICAgIG1heFBvc2l0aW9uQm90dG9tID0gYm94SGVpZ2h0OwotICAgICAgICB9IGVsc2UgaWYgKCFp bmxpbmVGbG93Qm94IHx8IHN0cmljdE1vZGUgfHwgaW5saW5lRmxvd0JveC0+aGFzVGV4dENoaWxk cmVuKCkgfHwgKGlubGluZUZsb3dCb3gtPmRlc2NlbmRhbnRzSGF2ZVNhbWVMaW5lSGVpZ2h0QW5k QmFzZWxpbmUoKSAmJiBpbmxpbmVGbG93Qm94LT5oYXNUZXh0RGVzY2VuZGFudHMoKSkKLSAgICAg ICAgICAgICAgICAgICB8fCBpbmxpbmVGbG93Qm94LT5yZW5kZXJlcigpLmhhc0lubGluZURpcmVj dGlvbkJvcmRlcnNPclBhZGRpbmcoKSkgeworICAgICAgICB9IGVsc2UgaWYgKHN0cmljdE1vZGUK KyAgICAgICAgICAgIHx8ICFpbmxpbmVGbG93Qm94CisgICAgICAgICAgICB8fCBpbmxpbmVGbG93 Qm94LT5oYXNUZXh0Q2hpbGRyZW4oKQorICAgICAgICAgICAgfHwgKGlubGluZUZsb3dCb3gtPmRl c2NlbmRhbnRzSGF2ZVNhbWVMaW5lSGVpZ2h0QW5kQmFzZWxpbmUoKSAmJiBpbmxpbmVGbG93Qm94 LT5oYXNUZXh0RGVzY2VuZGFudHMoKSkKKyAgICAgICAgICAgIHx8IGlubGluZUZsb3dCb3gtPnJl bmRlcmVyKCkuaGFzSW5saW5lRGlyZWN0aW9uQm9yZGVyc09yUGFkZGluZygpCisgICAgICAgICAg ICB8fCBpbmxpbmVGbG93Qm94LT5oYXNIYXJkTGluZWJyZWFrKCkpIHsKICAgICAgICAgICAgIC8v IE5vdGUgdGhhdCB0aGVzZSB2YWx1ZXMgY2FuIGJlIG5lZ2F0aXZlLiAgRXZlbiB0aG91Z2ggd2Ug b25seSBhZmZlY3QgdGhlIG1heEFzY2VudCBhbmQgbWF4RGVzY2VudCB2YWx1ZXMKICAgICAgICAg ICAgIC8vIGlmIG91ciBib3ggKGV4Y2x1ZGluZyBsaW5lLWhlaWdodCkgd2FzIGFib3ZlIChmb3Ig YXNjZW50KSBvciBiZWxvdyAoZm9yIGRlc2NlbnQpIHRoZSByb290IGJhc2VsaW5lLCBvbmNlIHlv dSBmYWN0b3IgaW4gbGluZS1oZWlnaHQKICAgICAgICAgICAgIC8vIHRoZSBmaW5hbCBib3ggY2Fu IGVuZCB1cCBiZWluZyBmdWxseSBhYm92ZSBvciBmdWxseSBiZWxvdyB0aGUgcm9vdCBib3gncyBi YXNlbGluZSEgIFRoaXMgaXMgb2ssIGJ1dCB3aGF0IGl0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvSW5saW5lRmxvd0JveC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L0lubGluZUZsb3dCb3guaAppbmRleCA0MDU1NWZmNTRlMDMxMGZmNzlkZDljZTkzMjFkYmEyZjBh YTc5OTc5Li43YzIyOGJjYjhkMmJlY2QwNDQwNTE2ZDJjNjRkZTE2YTNkNjlkZGMwIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lRmxvd0JveC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVGbG93Qm94LmgKQEAgLTQ0LDYgKzQ0LDcgQEAgcHVi bGljOgogICAgICAgICA6IElubGluZUJveChyZW5kZXJlcikKICAgICAgICAgLCBtX2luY2x1ZGVM b2dpY2FsTGVmdEVkZ2UoZmFsc2UpCiAgICAgICAgICwgbV9pbmNsdWRlTG9naWNhbFJpZ2h0RWRn ZShmYWxzZSkKKyAgICAgICAgLCBtX2hhc0hhcmRMaW5lYnJlYWsoZmFsc2UpCiAgICAgICAgICwg bV9kZXNjZW5kYW50c0hhdmVTYW1lTGluZUhlaWdodEFuZEJhc2VsaW5lKHRydWUpCiAgICAgICAg ICwgbV9iYXNlbGluZVR5cGUoQWxwaGFiZXRpY0Jhc2VsaW5lKQogICAgICAgICAsIG1faGFzQW5u b3RhdGlvbnNCZWZvcmUoZmFsc2UpCkBAIC0yMDgsNiArMjA5LDcgQEAgcHVibGljOgogCiAgICAg Ym9vbCBoYXNUZXh0Q2hpbGRyZW4oKSBjb25zdCB7IHJldHVybiBtX2hhc1RleHRDaGlsZHJlbjsg fQogICAgIGJvb2wgaGFzVGV4dERlc2NlbmRhbnRzKCkgY29uc3QgeyByZXR1cm4gbV9oYXNUZXh0 RGVzY2VuZGFudHM7IH0KKyAgICBib29sIGhhc0hhcmRMaW5lYnJlYWsoKSBjb25zdCB7IHJldHVy biBtX2hhc0hhcmRMaW5lYnJlYWs7IH0KICAgICB2b2lkIHNldEhhc1RleHRDaGlsZHJlbigpIHsg bV9oYXNUZXh0Q2hpbGRyZW4gPSB0cnVlOyBzZXRIYXNUZXh0RGVzY2VuZGFudHMoKTsgfQogICAg IHZvaWQgc2V0SGFzVGV4dERlc2NlbmRhbnRzKCkgeyBtX2hhc1RleHREZXNjZW5kYW50cyA9IHRy dWU7IH0KICAgICAKQEAgLTMxMiw2ICszMTQsNyBAQCBwcml2YXRlOgogICAgIHVuc2lnbmVkIG1f aW5jbHVkZUxvZ2ljYWxSaWdodEVkZ2UgOiAxOwogICAgIHVuc2lnbmVkIG1faGFzVGV4dENoaWxk cmVuIDogMTsKICAgICB1bnNpZ25lZCBtX2hhc1RleHREZXNjZW5kYW50cyA6IDE7CisgICAgdW5z aWduZWQgbV9oYXNIYXJkTGluZWJyZWFrIDogMTsKICAgICB1bnNpZ25lZCBtX2Rlc2NlbmRhbnRz SGF2ZVNhbWVMaW5lSGVpZ2h0QW5kQmFzZWxpbmUgOiAxOwogCiBwcm90ZWN0ZWQ6CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwCmluZGV4IDhhYmJlZWZjNzk3ZWE1YzJh ZjY1OGVmZTE0NDczMDRiNjVhOTk5NTQuLmQyMjNlYjJkODQ0ZTNkMDBmYzAxZjQwZGI3NWZhZTZk NGQzNTFiMWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbmxp bmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwCkBA IC0yMTIsMTMgKzIxMiwxNSBAQCB2b2lkIFJlbmRlcklubGluZTo6dXBkYXRlQWx3YXlzQ3JlYXRl TGluZUJveGVzKGJvb2wgZnVsbExheW91dCkKIAogICAgIGF1dG8qIHBhcmVudFN0eWxlID0gJnBh cmVudCgpLT5zdHlsZSgpOwogICAgIFJlbmRlcklubGluZSogcGFyZW50UmVuZGVySW5saW5lID0g aXM8UmVuZGVySW5saW5lPigqcGFyZW50KCkpID8gZG93bmNhc3Q8UmVuZGVySW5saW5lPihwYXJl bnQoKSkgOiBudWxscHRyOworICAgIGF1dG8gaGFzSGFyZExpbmVCcmVha0NoaWxkT25seSA9IGZp cnN0Q2hpbGQoKSAmJiBmaXJzdENoaWxkKCkgPT0gbGFzdENoaWxkKCkgJiYgZmlyc3RDaGlsZCgp LT5pc0JSKCk7CiAgICAgYm9vbCBjaGVja0ZvbnRzID0gZG9jdW1lbnQoKS5pbk5vUXVpcmtzTW9k ZSgpOwogICAgIGJvb2wgYWx3YXlzQ3JlYXRlTGluZUJveGVzID0gKHBhcmVudFJlbmRlcklubGlu ZSAmJiBwYXJlbnRSZW5kZXJJbmxpbmUtPmFsd2F5c0NyZWF0ZUxpbmVCb3hlcygpKQogICAgICAg ICB8fCAocGFyZW50UmVuZGVySW5saW5lICYmIHBhcmVudFN0eWxlLT52ZXJ0aWNhbEFsaWduKCkg IT0gVmVydGljYWxBbGlnbjo6QmFzZWxpbmUpCiAgICAgICAgIHx8IHN0eWxlKCkudmVydGljYWxB bGlnbigpICE9IFZlcnRpY2FsQWxpZ246OkJhc2VsaW5lCiAgICAgICAgIHx8IHN0eWxlKCkudGV4 dEVtcGhhc2lzTWFyaygpICE9IFRleHRFbXBoYXNpc01hcms6Ok5vbmUKICAgICAgICAgfHwgKGNo ZWNrRm9udHMgJiYgKCFwYXJlbnRTdHlsZS0+Zm9udENhc2NhZGUoKS5mb250TWV0cmljcygpLmhh c0lkZW50aWNhbEFzY2VudERlc2NlbnRBbmRMaW5lR2FwKHN0eWxlKCkuZm9udENhc2NhZGUoKS5m b250TWV0cmljcygpKQotICAgICAgICB8fCBwYXJlbnRTdHlsZS0+bGluZUhlaWdodCgpICE9IHN0 eWxlKCkubGluZUhlaWdodCgpKSk7CisgICAgICAgIHx8IHBhcmVudFN0eWxlLT5saW5lSGVpZ2h0 KCkgIT0gc3R5bGUoKS5saW5lSGVpZ2h0KCkpKQorICAgICAgICB8fCBoYXNIYXJkTGluZUJyZWFr Q2hpbGRPbmx5OwogCiAgICAgaWYgKCFhbHdheXNDcmVhdGVMaW5lQm94ZXMgJiYgY2hlY2tGb250 cyAmJiB2aWV3KCkudXNlc0ZpcnN0TGluZVJ1bGVzKCkpIHsKICAgICAgICAgLy8gSGF2ZSB0byBj aGVjayB0aGUgZmlyc3QgbGluZSBzdHlsZSBhcyB3ZWxsLgo= 417506 2021-01-12 21:20:12 -0800 2021-01-13 20:41:19 -0800 Patch bug-220252-20210112212011.patch text/plain 9767 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMzg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjk0ZmRmMTBiODUxNDQw ZWQ3YWNmOGU5ZmIxZTJhYTgwMzZkMzkwZS4uMjRmYzgyN2UzY2JjOWQ2Mzk2ODVjN2FjNmYzZTZk OTMyM2YwYjY0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDIxLTAxLTEyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXVtRdWlya10g TGV0J3MgYWRvcHQgYSBsZXNzIHF1aXJreSBiZWhhdmlvciBmb3IgbGluZSBicmVha3Mgb24gbm9u LWVtcHR5IGxpbmVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMjAyNTIKKworICAgICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KKworICAg ICAgICBXZWJLaXQgaGFzIHRoaXMgcXVpcmsgYmVoYXZpb3Igd2hlcmUgPGJyPiBzdHJldGNoZXMg dGhlIGxpbmUgYm94IHZlcnRpY2FsbHkgb25seSB3aGVuIHRoZSBsaW5lIGlzIGVtcHR5LgorICAg ICAgICBlLmcuCisKKyAgICAgICAgPGRpdj48c3Bhbj48YnI+PC9zcGFuPjwvZGl2PgorICAgICAg ICBXZSBtYWtlIHRoZSBsaW5lIGFzIHRhbGwgYXMgdGhlIDxicj4gaXMgYnV0CisKKyAgICAgICAg PGRpdj5zb21lIGNvbnRlbnQ8c3BhbiBzdHlsZT0iZm9udC1zaXplOiAyMDBweDsiPjxicj48L3Nw YW4+PC9kaXY+CisgICAgICAgIGRvZXMgbm90IHByb2R1Y2UgYSB+MjAwcHggdGFsbCBsaW5lLgor CisgICAgICAgIEhvd2V2ZXIgd2hlbiBob3Jpem9udGFsIHBhZGRpbmcvYm9yZGVyIGFkZGVkLCB0 aGUgbGluZSBzdWRkZW5seSBiZWNvbWVzIH4yMDBweCB0YWxsOgorICAgICAgICA8ZGl2PnNvbWUg Y29udGVudDxzcGFuIHN0eWxlPSJmb250LXNpemU6IDIwMHB4OyBwYWRkaW5nOiAxcHg7Ij48YnI+ PC9zcGFuPjwvZGl2PgorCisgICAgICAgIFJlbW92aW5nIHRoaXMgcXVpcmsgbWFrZXMgdGhlIGlu bGluZUxldmVsQm94QWZmZWN0c0xpbmVCb3ggbG9naWMgc2ltcGxlciBzaW5jZSB3ZSBkb24ndCBo YXZlIHRvIGNoZWNrIGFnYWluc3QKKyAgICAgICAgd2hldGhlciB0aGUgbGluZSBpcyBjb25zaWRl cmVkIGVtcHR5IGFuZCB0aGUgcmVzdWx0IGlzIGFsaWduZWQgd2l0aCBDaHJvbWUncyBiZWhhdmlv ci4KKyAgICAgICAgKFRoaXMgaXMgaW4gcHJlcGFyYXRpb24gZm9yIGdldHRpbmcgcmlkIG9mIHRo ZSBpcy1jb25zaWRlcmVkLWVtcHR5IGNvbmNlcHQgZm9yIGxpbmUvbGluZSBib3guKQorCisgICAg ICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9t ZXRyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjpjb25z dHJ1Y3RJbmxpbmVMZXZlbEJveGVzKToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0OjpRdWlya3M6OmlubGluZUxldmVsQm94QWZm ZWN0c0xpbmVCb3ggY29uc3QpOgorCiAyMDIxLTAxLTExICBQZW5nIExpdSAgPHBlbmcubGl1NkBh cHBsZS5jb20+CiAKICAgICAgICAgUmVjZWl2aW5nIHR3byBlbnRlci9leGl0IGZ1bGxzY3JlZW4g ZGVsZWdhdGUgY2FsbGJhY2tzIG9uIGlQYWQgd2hlbiBwcmVzZW50aW5nIGZ1bGxzY3JlZW4gZWxl bWVudHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAK aW5kZXggYzZhYjhjM2I1OTFmZGU1MjUwMTRjNzE0ODA3NGM5MjQzNmEzNGRjNS4uNGM1ZTZmMzI0 NjUyNzM0ZmM0Y2QzMmZkZmZkZDdjOTM4ZDlmN2Q5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRy eS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l Rm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKQEAgLTMzOSw2ICszMzksOSBAQCB2b2lkIExp bmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJbmxpbmVMZXZlbEJveGVzKExpbmVCb3gmIGxpbmVCb3gs IGNvbnN0IExpbmU6OlJ1bgogICAgICAgICB9CiAgICAgICAgIGlmIChydW4uaXNIYXJkTGluZUJy ZWFrKCkpIHsKICAgICAgICAgICAgIGF1dG8gbGluZUJyZWFrQm94ID0gTGluZUJveDo6SW5saW5l TGV2ZWxCb3g6OmNyZWF0ZUxpbmVCcmVha0JveChsYXlvdXRCb3gsIGxvZ2ljYWxMZWZ0KTsKKyAg ICAgICAgICAgIGF1dG8mIHBhcmVudExpbmVCb3ggPSBsaW5lQm94LmlubGluZUxldmVsQm94Rm9y TGF5b3V0Qm94KGxheW91dEJveC5wYXJlbnQoKSk7CisgICAgICAgICAgICBpZiAoJnBhcmVudExp bmVCb3ggIT0gJnJvb3RJbmxpbmVCb3gpCisgICAgICAgICAgICAgICAgcGFyZW50TGluZUJveC5z ZXRIYXNDb250ZW50KCk7CiAgICAgICAgICAgICBzZXRWZXJ0aWNhbEdlb21ldHJ5Rm9ySW5saW5l Qm94KCpsaW5lQnJlYWtCb3gpOwogICAgICAgICAgICAgbGluZUJveC5hZGRJbmxpbmVMZXZlbEJv eChXVEZNb3ZlKGxpbmVCcmVha0JveCkpOwogICAgICAgICAgICAgY29udGludWU7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0 aW5nQ29udGV4dFF1aXJrcy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0 dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAKaW5kZXggYjg0MTc5YTRjMTRm ZDE3MmRkZmMyZDIzYWNlNDQwODlmMTUzODRjMi4uMWJlMmRiZjJjZTNkZWM5YzFiOTg0NDg3ZjE2 YzQxNmM0ZGJiZjNlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZv cm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRRdWlya3MuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0UXVp cmtzLmNwcApAQCAtNTYsMTEgKzU2LDYgQEAgYm9vbCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6 UXVpcmtzOjppbmxpbmVMZXZlbEJveEFmZmVjdHNMaW5lQm94KGNvbnN0IExpbmVCb3gKICAgICAg ICAgYXV0byBpbmxpbmVCb3hIYXNJbWFnaW5hcnlTdHJ1dCA9IGxheW91dFN0YXRlKCkuaW5Ob1F1 aXJrc01vZGUoKTsKICAgICAgICAgcmV0dXJuIGlubGluZUJveEhhc0ltYWdpbmFyeVN0cnV0ICYm ICFsaW5lQm94LmlzQ29uc2lkZXJlZEVtcHR5KCk7CiAgICAgfQotICAgIGlmIChpbmxpbmVMZXZl bEJveC5pc0xpbmVCcmVha0JveCgpKSB7Ci0gICAgICAgIC8vIDxicj4gaW4gbm9uLXN0YW5kYXJk IG1vZGUgc3RyZXRjaGVzIHRoZSBsaW5lIGJveCBvbmx5IHdoZW4gdGhlIGxpbmUgaXMgZW1wdHku Ci0gICAgICAgIC8vIGUuZy4gPGRpdj48c3Bhbj48YnI+PC9zcGFuPjwvZGl2PiB3aWxsIHN0cmV0 Y2ggYnV0IDxkaXY+dGhpcyB3aWxsIG5vdCBzdHJldGNoIHRvIDIwMHB4PHNwYW4gc3R5bGU9ImZv bnQtc2l6ZTogMjAwcHg7Ij48YnI+PC9zcGFuPjwvZGl2PgotICAgICAgICByZXR1cm4gbGF5b3V0 U3RhdGUoKS5pbk5vUXVpcmtzTW9kZSgpID8gdHJ1ZSA6IGxpbmVCb3guaXNDb25zaWRlcmVkRW1w dHkoKTsKLSAgICB9CiAgICAgaWYgKGlubGluZUxldmVsQm94LmlzQXRvbWljSW5saW5lTGV2ZWxC b3goKSkgewogICAgICAgICBpZiAoaW5saW5lTGV2ZWxCb3gubGF5b3V0Qm91bmRzKCkuaGVpZ2h0 KCkpCiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKQEAgLTY5LDYgKzY0LDcgQEAgYm9vbCBJbmxp bmVGb3JtYXR0aW5nQ29udGV4dDo6UXVpcmtzOjppbmxpbmVMZXZlbEJveEFmZmVjdHNMaW5lQm94 KGNvbnN0IExpbmVCb3gKICAgICAgICAgYXV0byYgYm94R2VvbWV0cnkgPSBmb3JtYXR0aW5nQ29u dGV4dCgpLmdlb21ldHJ5Rm9yQm94KGlubGluZUxldmVsQm94LmxheW91dEJveCgpKTsKICAgICAg ICAgcmV0dXJuIGJveEdlb21ldHJ5Lm1hcmdpbkJlZm9yZSgpIHx8IGJveEdlb21ldHJ5Lm1hcmdp bkFmdGVyKCk7CiAgICAgfQorICAgIC8vIExpbmVicmVhayBib3hlcyAoPGJyPikgYWZmZWN0IHRo ZSBsaW5lIGJveCB0aHJvdWdoIHRoZWlyIHBhcmVudCBpbmxpbmUgYm94IChzZWUgTGluZUJveEJ1 aWxkZXI6OmNvbnN0cnVjdElubGluZUxldmVsQm94ZXMpLgogICAgIHJldHVybiBmYWxzZTsKIH0K IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUZsb3dCb3guY3Bw IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUZsb3dCb3guY3BwCmluZGV4IGM5OTIz YjUwMzI5ZDkyZDdmZjZmMTQ5N2NkM2U0NDVkMzgzMjNmOTQuLjJmMTBjMGJmN2UxOWE5ZDQ5NDI3 Y2Q0OTRhNmRhNWQ5ODhjOTI2NmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9JbmxpbmVGbG93Qm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5l Rmxvd0JveC5jcHAKQEAgLTEzNyw3ICsxMzcsOSBAQCB2b2lkIElubGluZUZsb3dCb3g6OmFkZFRv TGluZShJbmxpbmVCb3gqIGNoaWxkKQogICAgICAgICAgICAgaWYgKGNoaWxkLT5yZW5kZXJlcigp LmlzTGluZUJyZWFrKCkpIHsKICAgICAgICAgICAgICAgICAvLyBGSVhNRTogVGhpcyBpc24ndCBp ZGVhbC4gV2Ugb25seSB0dXJuIG9mZiBiZWNhdXNlIGN1cnJlbnQgbGF5b3V0IHRlc3QgcmVzdWx0 cyBleHBlY3QgdGhlIDxicj4gdG8gYmUgMC1oZWlnaHQgb24gdGhlIGJhc2VsaW5lLgogICAgICAg ICAgICAgICAgIC8vIE90aGVyIHRoYW4gbWFraW5nIGEgemlsbGlvbiB0ZXN0cyBoYXZlIHRvIHJl Z2VuZXJhdGUgcmVzdWx0cywgdGhlcmUncyBubyByZWFzb24gdG8gZGl0Y2ggdGhlIG9wdGltaXph dGlvbiBoZXJlLgotICAgICAgICAgICAgICAgIHNob3VsZENsZWFyRGVzY2VuZGFudHNIYXZlU2Ft ZUxpbmVIZWlnaHRBbmRCYXNlbGluZSA9IGNoaWxkLT5yZW5kZXJlcigpLmlzQlIoKTsKKyAgICAg ICAgICAgICAgICBhdXRvIGNoaWxkSXNIYXJkTGluZWJyZWFrID0gY2hpbGQtPnJlbmRlcmVyKCku aXNCUigpOworICAgICAgICAgICAgICAgIHNob3VsZENsZWFyRGVzY2VuZGFudHNIYXZlU2FtZUxp bmVIZWlnaHRBbmRCYXNlbGluZSA9IGNoaWxkSXNIYXJkTGluZWJyZWFrOworICAgICAgICAgICAg ICAgIG1faGFzSGFyZExpbmVicmVhayA9IG1faGFzSGFyZExpbmVicmVhayB8fCBjaGlsZElzSGFy ZExpbmVicmVhazsKICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgYXV0byYg Y2hpbGRGbG93Qm94ID0gZG93bmNhc3Q8SW5saW5lRmxvd0JveD4oKmNoaWxkKTsKICAgICAgICAg ICAgICAgICAvLyBDaGVjayB0aGUgY2hpbGQncyBiaXQsIGFuZCB0aGVuIGFsc28gY2hlY2sgZm9y IGRpZmZlcmVuY2VzIGluIGZvbnQsIGxpbmUtaGVpZ2h0LCB2ZXJ0aWNhbC1hbGlnbgpAQCAtNTk1 LDggKzU5NywxMiBAQCB2b2lkIElubGluZUZsb3dCb3g6OmNvbXB1dGVMb2dpY2FsQm94SGVpZ2h0 cyhSb290SW5saW5lQm94JiByb290Qm94LCBMYXlvdXRVbml0JgogICAgICAgICB9IGVsc2UgaWYg KGNoaWxkLT52ZXJ0aWNhbEFsaWduKCkgPT0gVmVydGljYWxBbGlnbjo6Qm90dG9tICYmIHZlcnRp Y2FsQWxpZ25BcHBsaWVzKGNoaWxkLT5yZW5kZXJlcigpKSkgewogICAgICAgICAgICAgaWYgKG1h eFBvc2l0aW9uQm90dG9tIDwgYm94SGVpZ2h0KQogICAgICAgICAgICAgICAgIG1heFBvc2l0aW9u Qm90dG9tID0gYm94SGVpZ2h0OwotICAgICAgICB9IGVsc2UgaWYgKCFpbmxpbmVGbG93Qm94IHx8 IHN0cmljdE1vZGUgfHwgaW5saW5lRmxvd0JveC0+aGFzVGV4dENoaWxkcmVuKCkgfHwgKGlubGlu ZUZsb3dCb3gtPmRlc2NlbmRhbnRzSGF2ZVNhbWVMaW5lSGVpZ2h0QW5kQmFzZWxpbmUoKSAmJiBp bmxpbmVGbG93Qm94LT5oYXNUZXh0RGVzY2VuZGFudHMoKSkKLSAgICAgICAgICAgICAgICAgICB8 fCBpbmxpbmVGbG93Qm94LT5yZW5kZXJlcigpLmhhc0lubGluZURpcmVjdGlvbkJvcmRlcnNPclBh ZGRpbmcoKSkgeworICAgICAgICB9IGVsc2UgaWYgKHN0cmljdE1vZGUKKyAgICAgICAgICAgIHx8 ICFpbmxpbmVGbG93Qm94CisgICAgICAgICAgICB8fCBpbmxpbmVGbG93Qm94LT5oYXNUZXh0Q2hp bGRyZW4oKQorICAgICAgICAgICAgfHwgKGlubGluZUZsb3dCb3gtPmRlc2NlbmRhbnRzSGF2ZVNh bWVMaW5lSGVpZ2h0QW5kQmFzZWxpbmUoKSAmJiBpbmxpbmVGbG93Qm94LT5oYXNUZXh0RGVzY2Vu ZGFudHMoKSkKKyAgICAgICAgICAgIHx8IGlubGluZUZsb3dCb3gtPnJlbmRlcmVyKCkuaGFzSW5s aW5lRGlyZWN0aW9uQm9yZGVyc09yUGFkZGluZygpCisgICAgICAgICAgICB8fCBpbmxpbmVGbG93 Qm94LT5oYXNIYXJkTGluZWJyZWFrKCkpIHsKICAgICAgICAgICAgIC8vIE5vdGUgdGhhdCB0aGVz ZSB2YWx1ZXMgY2FuIGJlIG5lZ2F0aXZlLiAgRXZlbiB0aG91Z2ggd2Ugb25seSBhZmZlY3QgdGhl IG1heEFzY2VudCBhbmQgbWF4RGVzY2VudCB2YWx1ZXMKICAgICAgICAgICAgIC8vIGlmIG91ciBi b3ggKGV4Y2x1ZGluZyBsaW5lLWhlaWdodCkgd2FzIGFib3ZlIChmb3IgYXNjZW50KSBvciBiZWxv dyAoZm9yIGRlc2NlbnQpIHRoZSByb290IGJhc2VsaW5lLCBvbmNlIHlvdSBmYWN0b3IgaW4gbGlu ZS1oZWlnaHQKICAgICAgICAgICAgIC8vIHRoZSBmaW5hbCBib3ggY2FuIGVuZCB1cCBiZWluZyBm dWxseSBhYm92ZSBvciBmdWxseSBiZWxvdyB0aGUgcm9vdCBib3gncyBiYXNlbGluZSEgIFRoaXMg aXMgb2ssIGJ1dCB3aGF0IGl0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv SW5saW5lRmxvd0JveC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUZsb3dCb3gu aAppbmRleCA0MDU1NWZmNTRlMDMxMGZmNzlkZDljZTkzMjFkYmEyZjBhYTc5OTc5Li43YzIyOGJj YjhkMmJlY2QwNDQwNTE2ZDJjNjRkZTE2YTNkNjlkZGMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvSW5saW5lRmxvd0JveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9JbmxpbmVGbG93Qm94LmgKQEAgLTQ0LDYgKzQ0LDcgQEAgcHVibGljOgogICAgICAgICA6 IElubGluZUJveChyZW5kZXJlcikKICAgICAgICAgLCBtX2luY2x1ZGVMb2dpY2FsTGVmdEVkZ2Uo ZmFsc2UpCiAgICAgICAgICwgbV9pbmNsdWRlTG9naWNhbFJpZ2h0RWRnZShmYWxzZSkKKyAgICAg ICAgLCBtX2hhc0hhcmRMaW5lYnJlYWsoZmFsc2UpCiAgICAgICAgICwgbV9kZXNjZW5kYW50c0hh dmVTYW1lTGluZUhlaWdodEFuZEJhc2VsaW5lKHRydWUpCiAgICAgICAgICwgbV9iYXNlbGluZVR5 cGUoQWxwaGFiZXRpY0Jhc2VsaW5lKQogICAgICAgICAsIG1faGFzQW5ub3RhdGlvbnNCZWZvcmUo ZmFsc2UpCkBAIC0yMDgsNiArMjA5LDcgQEAgcHVibGljOgogCiAgICAgYm9vbCBoYXNUZXh0Q2hp bGRyZW4oKSBjb25zdCB7IHJldHVybiBtX2hhc1RleHRDaGlsZHJlbjsgfQogICAgIGJvb2wgaGFz VGV4dERlc2NlbmRhbnRzKCkgY29uc3QgeyByZXR1cm4gbV9oYXNUZXh0RGVzY2VuZGFudHM7IH0K KyAgICBib29sIGhhc0hhcmRMaW5lYnJlYWsoKSBjb25zdCB7IHJldHVybiBtX2hhc0hhcmRMaW5l YnJlYWs7IH0KICAgICB2b2lkIHNldEhhc1RleHRDaGlsZHJlbigpIHsgbV9oYXNUZXh0Q2hpbGRy ZW4gPSB0cnVlOyBzZXRIYXNUZXh0RGVzY2VuZGFudHMoKTsgfQogICAgIHZvaWQgc2V0SGFzVGV4 dERlc2NlbmRhbnRzKCkgeyBtX2hhc1RleHREZXNjZW5kYW50cyA9IHRydWU7IH0KICAgICAKQEAg LTMxMiw2ICszMTQsNyBAQCBwcml2YXRlOgogICAgIHVuc2lnbmVkIG1faW5jbHVkZUxvZ2ljYWxS aWdodEVkZ2UgOiAxOwogICAgIHVuc2lnbmVkIG1faGFzVGV4dENoaWxkcmVuIDogMTsKICAgICB1 bnNpZ25lZCBtX2hhc1RleHREZXNjZW5kYW50cyA6IDE7CisgICAgdW5zaWduZWQgbV9oYXNIYXJk TGluZWJyZWFrIDogMTsKICAgICB1bnNpZ25lZCBtX2Rlc2NlbmRhbnRzSGF2ZVNhbWVMaW5lSGVp Z2h0QW5kQmFzZWxpbmUgOiAxOwogCiBwcm90ZWN0ZWQ6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJJbmxpbmUuY3BwCmluZGV4IDhhYmJlZWZjNzk3ZWE1YzJhZjY1OGVmZTE0NDczMDRi NjVhOTk5NTQuLmQyMjNlYjJkODQ0ZTNkMDBmYzAxZjQwZGI3NWZhZTZkNGQzNTFiMWUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwCkBAIC0yMTIsMTMgKzIxMiwx NSBAQCB2b2lkIFJlbmRlcklubGluZTo6dXBkYXRlQWx3YXlzQ3JlYXRlTGluZUJveGVzKGJvb2wg ZnVsbExheW91dCkKIAogICAgIGF1dG8qIHBhcmVudFN0eWxlID0gJnBhcmVudCgpLT5zdHlsZSgp OwogICAgIFJlbmRlcklubGluZSogcGFyZW50UmVuZGVySW5saW5lID0gaXM8UmVuZGVySW5saW5l PigqcGFyZW50KCkpID8gZG93bmNhc3Q8UmVuZGVySW5saW5lPihwYXJlbnQoKSkgOiBudWxscHRy OworICAgIGF1dG8gaGFzSGFyZExpbmVCcmVha0NoaWxkT25seSA9IGZpcnN0Q2hpbGQoKSAmJiBm aXJzdENoaWxkKCkgPT0gbGFzdENoaWxkKCkgJiYgZmlyc3RDaGlsZCgpLT5pc0JSKCk7CiAgICAg Ym9vbCBjaGVja0ZvbnRzID0gZG9jdW1lbnQoKS5pbk5vUXVpcmtzTW9kZSgpOwogICAgIGJvb2wg YWx3YXlzQ3JlYXRlTGluZUJveGVzID0gKHBhcmVudFJlbmRlcklubGluZSAmJiBwYXJlbnRSZW5k ZXJJbmxpbmUtPmFsd2F5c0NyZWF0ZUxpbmVCb3hlcygpKQogICAgICAgICB8fCAocGFyZW50UmVu ZGVySW5saW5lICYmIHBhcmVudFN0eWxlLT52ZXJ0aWNhbEFsaWduKCkgIT0gVmVydGljYWxBbGln bjo6QmFzZWxpbmUpCiAgICAgICAgIHx8IHN0eWxlKCkudmVydGljYWxBbGlnbigpICE9IFZlcnRp Y2FsQWxpZ246OkJhc2VsaW5lCiAgICAgICAgIHx8IHN0eWxlKCkudGV4dEVtcGhhc2lzTWFyaygp ICE9IFRleHRFbXBoYXNpc01hcms6Ok5vbmUKICAgICAgICAgfHwgKGNoZWNrRm9udHMgJiYgKCFw YXJlbnRTdHlsZS0+Zm9udENhc2NhZGUoKS5mb250TWV0cmljcygpLmhhc0lkZW50aWNhbEFzY2Vu dERlc2NlbnRBbmRMaW5lR2FwKHN0eWxlKCkuZm9udENhc2NhZGUoKS5mb250TWV0cmljcygpKQot ICAgICAgICB8fCBwYXJlbnRTdHlsZS0+bGluZUhlaWdodCgpICE9IHN0eWxlKCkubGluZUhlaWdo dCgpKSk7CisgICAgICAgIHx8IHBhcmVudFN0eWxlLT5saW5lSGVpZ2h0KCkgIT0gc3R5bGUoKS5s aW5lSGVpZ2h0KCkpKQorICAgICAgICB8fCBoYXNIYXJkTGluZUJyZWFrQ2hpbGRPbmx5OwogCiAg ICAgaWYgKCFhbHdheXNDcmVhdGVMaW5lQm94ZXMgJiYgY2hlY2tGb250cyAmJiB2aWV3KCkudXNl c0ZpcnN0TGluZVJ1bGVzKCkpIHsKICAgICAgICAgLy8gSGF2ZSB0byBjaGVjayB0aGUgZmlyc3Qg bGluZSBzdHlsZSBhcyB3ZWxsLgo= 417594 2021-01-13 20:41:22 -0800 2021-01-14 06:30:25 -0800 Patch bug-220252-20210113204121.patch text/plain 9394 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMzg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjk0ZmRmMTBiODUxNDQw ZWQ3YWNmOGU5ZmIxZTJhYTgwMzZkMzkwZS4uMjRmYzgyN2UzY2JjOWQ2Mzk2ODVjN2FjNmYzZTZk OTMyM2YwYjY0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDIxLTAxLTEyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXVtRdWlya10g TGV0J3MgYWRvcHQgYSBsZXNzIHF1aXJreSBiZWhhdmlvciBmb3IgbGluZSBicmVha3Mgb24gbm9u LWVtcHR5IGxpbmVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMjAyNTIKKworICAgICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KKworICAg ICAgICBXZWJLaXQgaGFzIHRoaXMgcXVpcmsgYmVoYXZpb3Igd2hlcmUgPGJyPiBzdHJldGNoZXMg dGhlIGxpbmUgYm94IHZlcnRpY2FsbHkgb25seSB3aGVuIHRoZSBsaW5lIGlzIGVtcHR5LgorICAg ICAgICBlLmcuCisKKyAgICAgICAgPGRpdj48c3Bhbj48YnI+PC9zcGFuPjwvZGl2PgorICAgICAg ICBXZSBtYWtlIHRoZSBsaW5lIGFzIHRhbGwgYXMgdGhlIDxicj4gaXMgYnV0CisKKyAgICAgICAg PGRpdj5zb21lIGNvbnRlbnQ8c3BhbiBzdHlsZT0iZm9udC1zaXplOiAyMDBweDsiPjxicj48L3Nw YW4+PC9kaXY+CisgICAgICAgIGRvZXMgbm90IHByb2R1Y2UgYSB+MjAwcHggdGFsbCBsaW5lLgor CisgICAgICAgIEhvd2V2ZXIgd2hlbiBob3Jpem9udGFsIHBhZGRpbmcvYm9yZGVyIGFkZGVkLCB0 aGUgbGluZSBzdWRkZW5seSBiZWNvbWVzIH4yMDBweCB0YWxsOgorICAgICAgICA8ZGl2PnNvbWUg Y29udGVudDxzcGFuIHN0eWxlPSJmb250LXNpemU6IDIwMHB4OyBwYWRkaW5nOiAxcHg7Ij48YnI+ PC9zcGFuPjwvZGl2PgorCisgICAgICAgIFJlbW92aW5nIHRoaXMgcXVpcmsgbWFrZXMgdGhlIGlu bGluZUxldmVsQm94QWZmZWN0c0xpbmVCb3ggbG9naWMgc2ltcGxlciBzaW5jZSB3ZSBkb24ndCBo YXZlIHRvIGNoZWNrIGFnYWluc3QKKyAgICAgICAgd2hldGhlciB0aGUgbGluZSBpcyBjb25zaWRl cmVkIGVtcHR5IGFuZCB0aGUgcmVzdWx0IGlzIGFsaWduZWQgd2l0aCBDaHJvbWUncyBiZWhhdmlv ci4KKyAgICAgICAgKFRoaXMgaXMgaW4gcHJlcGFyYXRpb24gZm9yIGdldHRpbmcgcmlkIG9mIHRo ZSBpcy1jb25zaWRlcmVkLWVtcHR5IGNvbmNlcHQgZm9yIGxpbmUvbGluZSBib3guKQorCisgICAg ICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9t ZXRyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjpjb25z dHJ1Y3RJbmxpbmVMZXZlbEJveGVzKToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0OjpRdWlya3M6OmlubGluZUxldmVsQm94QWZm ZWN0c0xpbmVCb3ggY29uc3QpOgorCiAyMDIxLTAxLTExICBQZW5nIExpdSAgPHBlbmcubGl1NkBh cHBsZS5jb20+CiAKICAgICAgICAgUmVjZWl2aW5nIHR3byBlbnRlci9leGl0IGZ1bGxzY3JlZW4g ZGVsZWdhdGUgY2FsbGJhY2tzIG9uIGlQYWQgd2hlbiBwcmVzZW50aW5nIGZ1bGxzY3JlZW4gZWxl bWVudHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcAppbmRl eCBiODQxNzlhNGMxNGZkMTcyZGRmYzJkMjNhY2U0NDA4OWYxNTM4NGMyLi40MGE2Y2U5NDQ0YjVk NmFjYzEwNDZjOGUxZTFhM2Q2OTBhNzIxNjdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0 dGluZ0NvbnRleHRRdWlya3MuY3BwCkBAIC00Miw2ICs0MiwxNiBAQCBJbmxpbmVMYXlvdXRVbml0 IElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpRdWlya3M6OmluaXRpYWxMaW5lSGVpZ2h0KCkgY29u c3QKIAogYm9vbCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6UXVpcmtzOjppbmxpbmVMZXZlbEJv eEFmZmVjdHNMaW5lQm94KGNvbnN0IExpbmVCb3g6OklubGluZUxldmVsQm94JiBpbmxpbmVMZXZl bEJveCwgY29uc3QgTGluZUJveCYgbGluZUJveCkgY29uc3QKIHsKKyAgICBpZiAoaW5saW5lTGV2 ZWxCb3guaXNMaW5lQnJlYWtCb3goKSkgeworICAgICAgICBpZiAobGF5b3V0U3RhdGUoKS5pbk5v UXVpcmtzTW9kZSgpKQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIC8vIEluIHF1 aXJrcyBtb2RlIGxpbmVicmVhayBib3hlcyAoPGJyPikgYWZmZWN0IHRoZSBsaW5lIGJveCB3aGVu IHRoZXkgYXJlIGluc2lkZSBhIG5vbi1yb290IGlubGluZSBib3ggKDxzcGFuPjwvc3Bhbj4pIG9y IHdoZW4KKyAgICAgICAgLy8gdGhlIGxpbmUgaGFzIG5vIG90aGVyIGlubGluZSBsZXZlbCBib3gv cm9vdCBpbmxpbmVib3ggaGFzIG5vIGNvbnRlbnQuCisgICAgICAgIGF1dG8mIHBhcmVudElubGlu ZUJveCA9IGxpbmVCb3guaW5saW5lTGV2ZWxCb3hGb3JMYXlvdXRCb3goaW5saW5lTGV2ZWxCb3gu bGF5b3V0Qm94KCkucGFyZW50KCkpOworICAgICAgICBpZiAoIXBhcmVudElubGluZUJveC5pc1Jv b3RJbmxpbmVCb3goKSkKKyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICByZXR1cm4g IXBhcmVudElubGluZUJveC5oYXNDb250ZW50KCkgJiYgbGluZUJveC5ub25Sb290SW5saW5lTGV2 ZWxCb3hlcygpLnNpemUoKSA9PSAxOworICAgIH0KICAgICBpZiAoaW5saW5lTGV2ZWxCb3guaXNJ bmxpbmVCb3goKSkgewogICAgICAgICAvLyBJbmxpbmUgYm94ZXMgKGUuZy4gcm9vdCBpbmxpbmUg Ym94IG9yIDxzcGFuPikgYWZmZWN0cyBsaW5lIGJveGVzIGVpdGhlciB0aHJvdWdoIHRoZSBzdHJ1 dCBvciBhY3R1YWwgY29udGVudC4KICAgICAgICAgaWYgKGlubGluZUxldmVsQm94Lmhhc0NvbnRl bnQoKSkKQEAgLTU2LDExICs2Niw2IEBAIGJvb2wgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OlF1 aXJrczo6aW5saW5lTGV2ZWxCb3hBZmZlY3RzTGluZUJveChjb25zdCBMaW5lQm94CiAgICAgICAg IGF1dG8gaW5saW5lQm94SGFzSW1hZ2luYXJ5U3RydXQgPSBsYXlvdXRTdGF0ZSgpLmluTm9RdWly a3NNb2RlKCk7CiAgICAgICAgIHJldHVybiBpbmxpbmVCb3hIYXNJbWFnaW5hcnlTdHJ1dCAmJiAh bGluZUJveC5pc0NvbnNpZGVyZWRFbXB0eSgpOwogICAgIH0KLSAgICBpZiAoaW5saW5lTGV2ZWxC b3guaXNMaW5lQnJlYWtCb3goKSkgewotICAgICAgICAvLyA8YnI+IGluIG5vbi1zdGFuZGFyZCBt b2RlIHN0cmV0Y2hlcyB0aGUgbGluZSBib3ggb25seSB3aGVuIHRoZSBsaW5lIGlzIGVtcHR5Lgot ICAgICAgICAvLyBlLmcuIDxkaXY+PHNwYW4+PGJyPjwvc3Bhbj48L2Rpdj4gd2lsbCBzdHJldGNo IGJ1dCA8ZGl2PnRoaXMgd2lsbCBub3Qgc3RyZXRjaCB0byAyMDBweDxzcGFuIHN0eWxlPSJmb250 LXNpemU6IDIwMHB4OyI+PGJyPjwvc3Bhbj48L2Rpdj4KLSAgICAgICAgcmV0dXJuIGxheW91dFN0 YXRlKCkuaW5Ob1F1aXJrc01vZGUoKSA/IHRydWUgOiBsaW5lQm94LmlzQ29uc2lkZXJlZEVtcHR5 KCk7Ci0gICAgfQogICAgIGlmIChpbmxpbmVMZXZlbEJveC5pc0F0b21pY0lubGluZUxldmVsQm94 KCkpIHsKICAgICAgICAgaWYgKGlubGluZUxldmVsQm94LmxheW91dEJvdW5kcygpLmhlaWdodCgp KQogICAgICAgICAgICAgcmV0dXJuIHRydWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvSW5saW5lRmxvd0JveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5s aW5lRmxvd0JveC5jcHAKaW5kZXggYzk5MjNiNTAzMjlkOTJkN2ZmNmYxNDk3Y2QzZTQ0NWQzODMy M2Y5NC4uMmYxMGMwYmY3ZTE5YTlkNDk0MjdjZDQ5NGE2ZGE1ZDk4OGM5MjY2YSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUZsb3dCb3guY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVGbG93Qm94LmNwcApAQCAtMTM3LDcgKzEzNyw5IEBA IHZvaWQgSW5saW5lRmxvd0JveDo6YWRkVG9MaW5lKElubGluZUJveCogY2hpbGQpCiAgICAgICAg ICAgICBpZiAoY2hpbGQtPnJlbmRlcmVyKCkuaXNMaW5lQnJlYWsoKSkgewogICAgICAgICAgICAg ICAgIC8vIEZJWE1FOiBUaGlzIGlzbid0IGlkZWFsLiBXZSBvbmx5IHR1cm4gb2ZmIGJlY2F1c2Ug Y3VycmVudCBsYXlvdXQgdGVzdCByZXN1bHRzIGV4cGVjdCB0aGUgPGJyPiB0byBiZSAwLWhlaWdo dCBvbiB0aGUgYmFzZWxpbmUuCiAgICAgICAgICAgICAgICAgLy8gT3RoZXIgdGhhbiBtYWtpbmcg YSB6aWxsaW9uIHRlc3RzIGhhdmUgdG8gcmVnZW5lcmF0ZSByZXN1bHRzLCB0aGVyZSdzIG5vIHJl YXNvbiB0byBkaXRjaCB0aGUgb3B0aW1pemF0aW9uIGhlcmUuCi0gICAgICAgICAgICAgICAgc2hv dWxkQ2xlYXJEZXNjZW5kYW50c0hhdmVTYW1lTGluZUhlaWdodEFuZEJhc2VsaW5lID0gY2hpbGQt PnJlbmRlcmVyKCkuaXNCUigpOworICAgICAgICAgICAgICAgIGF1dG8gY2hpbGRJc0hhcmRMaW5l YnJlYWsgPSBjaGlsZC0+cmVuZGVyZXIoKS5pc0JSKCk7CisgICAgICAgICAgICAgICAgc2hvdWxk Q2xlYXJEZXNjZW5kYW50c0hhdmVTYW1lTGluZUhlaWdodEFuZEJhc2VsaW5lID0gY2hpbGRJc0hh cmRMaW5lYnJlYWs7CisgICAgICAgICAgICAgICAgbV9oYXNIYXJkTGluZWJyZWFrID0gbV9oYXNI YXJkTGluZWJyZWFrIHx8IGNoaWxkSXNIYXJkTGluZWJyZWFrOwogICAgICAgICAgICAgfSBlbHNl IHsKICAgICAgICAgICAgICAgICBhdXRvJiBjaGlsZEZsb3dCb3ggPSBkb3duY2FzdDxJbmxpbmVG bG93Qm94PigqY2hpbGQpOwogICAgICAgICAgICAgICAgIC8vIENoZWNrIHRoZSBjaGlsZCdzIGJp dCwgYW5kIHRoZW4gYWxzbyBjaGVjayBmb3IgZGlmZmVyZW5jZXMgaW4gZm9udCwgbGluZS1oZWln aHQsIHZlcnRpY2FsLWFsaWduCkBAIC01OTUsOCArNTk3LDEyIEBAIHZvaWQgSW5saW5lRmxvd0Jv eDo6Y29tcHV0ZUxvZ2ljYWxCb3hIZWlnaHRzKFJvb3RJbmxpbmVCb3gmIHJvb3RCb3gsIExheW91 dFVuaXQmCiAgICAgICAgIH0gZWxzZSBpZiAoY2hpbGQtPnZlcnRpY2FsQWxpZ24oKSA9PSBWZXJ0 aWNhbEFsaWduOjpCb3R0b20gJiYgdmVydGljYWxBbGlnbkFwcGxpZXMoY2hpbGQtPnJlbmRlcmVy KCkpKSB7CiAgICAgICAgICAgICBpZiAobWF4UG9zaXRpb25Cb3R0b20gPCBib3hIZWlnaHQpCiAg ICAgICAgICAgICAgICAgbWF4UG9zaXRpb25Cb3R0b20gPSBib3hIZWlnaHQ7Ci0gICAgICAgIH0g ZWxzZSBpZiAoIWlubGluZUZsb3dCb3ggfHwgc3RyaWN0TW9kZSB8fCBpbmxpbmVGbG93Qm94LT5o YXNUZXh0Q2hpbGRyZW4oKSB8fCAoaW5saW5lRmxvd0JveC0+ZGVzY2VuZGFudHNIYXZlU2FtZUxp bmVIZWlnaHRBbmRCYXNlbGluZSgpICYmIGlubGluZUZsb3dCb3gtPmhhc1RleHREZXNjZW5kYW50 cygpKQotICAgICAgICAgICAgICAgICAgIHx8IGlubGluZUZsb3dCb3gtPnJlbmRlcmVyKCkuaGFz SW5saW5lRGlyZWN0aW9uQm9yZGVyc09yUGFkZGluZygpKSB7CisgICAgICAgIH0gZWxzZSBpZiAo c3RyaWN0TW9kZQorICAgICAgICAgICAgfHwgIWlubGluZUZsb3dCb3gKKyAgICAgICAgICAgIHx8 IGlubGluZUZsb3dCb3gtPmhhc1RleHRDaGlsZHJlbigpCisgICAgICAgICAgICB8fCAoaW5saW5l Rmxvd0JveC0+ZGVzY2VuZGFudHNIYXZlU2FtZUxpbmVIZWlnaHRBbmRCYXNlbGluZSgpICYmIGlu bGluZUZsb3dCb3gtPmhhc1RleHREZXNjZW5kYW50cygpKQorICAgICAgICAgICAgfHwgaW5saW5l Rmxvd0JveC0+cmVuZGVyZXIoKS5oYXNJbmxpbmVEaXJlY3Rpb25Cb3JkZXJzT3JQYWRkaW5nKCkK KyAgICAgICAgICAgIHx8IGlubGluZUZsb3dCb3gtPmhhc0hhcmRMaW5lYnJlYWsoKSkgewogICAg ICAgICAgICAgLy8gTm90ZSB0aGF0IHRoZXNlIHZhbHVlcyBjYW4gYmUgbmVnYXRpdmUuICBFdmVu IHRob3VnaCB3ZSBvbmx5IGFmZmVjdCB0aGUgbWF4QXNjZW50IGFuZCBtYXhEZXNjZW50IHZhbHVl cwogICAgICAgICAgICAgLy8gaWYgb3VyIGJveCAoZXhjbHVkaW5nIGxpbmUtaGVpZ2h0KSB3YXMg YWJvdmUgKGZvciBhc2NlbnQpIG9yIGJlbG93IChmb3IgZGVzY2VudCkgdGhlIHJvb3QgYmFzZWxp bmUsIG9uY2UgeW91IGZhY3RvciBpbiBsaW5lLWhlaWdodAogICAgICAgICAgICAgLy8gdGhlIGZp bmFsIGJveCBjYW4gZW5kIHVwIGJlaW5nIGZ1bGx5IGFib3ZlIG9yIGZ1bGx5IGJlbG93IHRoZSBy b290IGJveCdzIGJhc2VsaW5lISAgVGhpcyBpcyBvaywgYnV0IHdoYXQgaXQKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVGbG93Qm94LmggYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvSW5saW5lRmxvd0JveC5oCmluZGV4IDQwNTU1ZmY1NGUwMzEwZmY3OWRkOWNl OTMyMWRiYTJmMGFhNzk5NzkuLjdjMjI4YmNiOGQyYmVjZDA0NDA1MTZkMmM2NGRlMTZhM2Q2OWRk YzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVGbG93Qm94LmgK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUZsb3dCb3guaApAQCAtNDQsNiAr NDQsNyBAQCBwdWJsaWM6CiAgICAgICAgIDogSW5saW5lQm94KHJlbmRlcmVyKQogICAgICAgICAs IG1faW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZShmYWxzZSkKICAgICAgICAgLCBtX2luY2x1ZGVMb2dp Y2FsUmlnaHRFZGdlKGZhbHNlKQorICAgICAgICAsIG1faGFzSGFyZExpbmVicmVhayhmYWxzZSkK ICAgICAgICAgLCBtX2Rlc2NlbmRhbnRzSGF2ZVNhbWVMaW5lSGVpZ2h0QW5kQmFzZWxpbmUodHJ1 ZSkKICAgICAgICAgLCBtX2Jhc2VsaW5lVHlwZShBbHBoYWJldGljQmFzZWxpbmUpCiAgICAgICAg ICwgbV9oYXNBbm5vdGF0aW9uc0JlZm9yZShmYWxzZSkKQEAgLTIwOCw2ICsyMDksNyBAQCBwdWJs aWM6CiAKICAgICBib29sIGhhc1RleHRDaGlsZHJlbigpIGNvbnN0IHsgcmV0dXJuIG1faGFzVGV4 dENoaWxkcmVuOyB9CiAgICAgYm9vbCBoYXNUZXh0RGVzY2VuZGFudHMoKSBjb25zdCB7IHJldHVy biBtX2hhc1RleHREZXNjZW5kYW50czsgfQorICAgIGJvb2wgaGFzSGFyZExpbmVicmVhaygpIGNv bnN0IHsgcmV0dXJuIG1faGFzSGFyZExpbmVicmVhazsgfQogICAgIHZvaWQgc2V0SGFzVGV4dENo aWxkcmVuKCkgeyBtX2hhc1RleHRDaGlsZHJlbiA9IHRydWU7IHNldEhhc1RleHREZXNjZW5kYW50 cygpOyB9CiAgICAgdm9pZCBzZXRIYXNUZXh0RGVzY2VuZGFudHMoKSB7IG1faGFzVGV4dERlc2Nl bmRhbnRzID0gdHJ1ZTsgfQogICAgIApAQCAtMzEyLDYgKzMxNCw3IEBAIHByaXZhdGU6CiAgICAg dW5zaWduZWQgbV9pbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSA6IDE7CiAgICAgdW5zaWduZWQgbV9o YXNUZXh0Q2hpbGRyZW4gOiAxOwogICAgIHVuc2lnbmVkIG1faGFzVGV4dERlc2NlbmRhbnRzIDog MTsKKyAgICB1bnNpZ25lZCBtX2hhc0hhcmRMaW5lYnJlYWsgOiAxOwogICAgIHVuc2lnbmVkIG1f ZGVzY2VuZGFudHNIYXZlU2FtZUxpbmVIZWlnaHRBbmRCYXNlbGluZSA6IDE7CiAKIHByb3RlY3Rl ZDoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbmxpbmUuY3Bw IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHAKaW5kZXggOGFiYmVl ZmM3OTdlYTVjMmFmNjU4ZWZlMTQ0NzMwNGI2NWE5OTk1NC4uZDIyM2ViMmQ4NDRlM2QwMGZjMDFm NDBkYjc1ZmFlNmQ0ZDM1MWIxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlcklubGluZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklu bGluZS5jcHAKQEAgLTIxMiwxMyArMjEyLDE1IEBAIHZvaWQgUmVuZGVySW5saW5lOjp1cGRhdGVB bHdheXNDcmVhdGVMaW5lQm94ZXMoYm9vbCBmdWxsTGF5b3V0KQogCiAgICAgYXV0byogcGFyZW50 U3R5bGUgPSAmcGFyZW50KCktPnN0eWxlKCk7CiAgICAgUmVuZGVySW5saW5lKiBwYXJlbnRSZW5k ZXJJbmxpbmUgPSBpczxSZW5kZXJJbmxpbmU+KCpwYXJlbnQoKSkgPyBkb3duY2FzdDxSZW5kZXJJ bmxpbmU+KHBhcmVudCgpKSA6IG51bGxwdHI7CisgICAgYXV0byBoYXNIYXJkTGluZUJyZWFrQ2hp bGRPbmx5ID0gZmlyc3RDaGlsZCgpICYmIGZpcnN0Q2hpbGQoKSA9PSBsYXN0Q2hpbGQoKSAmJiBm aXJzdENoaWxkKCktPmlzQlIoKTsKICAgICBib29sIGNoZWNrRm9udHMgPSBkb2N1bWVudCgpLmlu Tm9RdWlya3NNb2RlKCk7CiAgICAgYm9vbCBhbHdheXNDcmVhdGVMaW5lQm94ZXMgPSAocGFyZW50 UmVuZGVySW5saW5lICYmIHBhcmVudFJlbmRlcklubGluZS0+YWx3YXlzQ3JlYXRlTGluZUJveGVz KCkpCiAgICAgICAgIHx8IChwYXJlbnRSZW5kZXJJbmxpbmUgJiYgcGFyZW50U3R5bGUtPnZlcnRp Y2FsQWxpZ24oKSAhPSBWZXJ0aWNhbEFsaWduOjpCYXNlbGluZSkKICAgICAgICAgfHwgc3R5bGUo KS52ZXJ0aWNhbEFsaWduKCkgIT0gVmVydGljYWxBbGlnbjo6QmFzZWxpbmUKICAgICAgICAgfHwg c3R5bGUoKS50ZXh0RW1waGFzaXNNYXJrKCkgIT0gVGV4dEVtcGhhc2lzTWFyazo6Tm9uZQogICAg ICAgICB8fCAoY2hlY2tGb250cyAmJiAoIXBhcmVudFN0eWxlLT5mb250Q2FzY2FkZSgpLmZvbnRN ZXRyaWNzKCkuaGFzSWRlbnRpY2FsQXNjZW50RGVzY2VudEFuZExpbmVHYXAoc3R5bGUoKS5mb250 Q2FzY2FkZSgpLmZvbnRNZXRyaWNzKCkpCi0gICAgICAgIHx8IHBhcmVudFN0eWxlLT5saW5lSGVp Z2h0KCkgIT0gc3R5bGUoKS5saW5lSGVpZ2h0KCkpKTsKKyAgICAgICAgfHwgcGFyZW50U3R5bGUt PmxpbmVIZWlnaHQoKSAhPSBzdHlsZSgpLmxpbmVIZWlnaHQoKSkpCisgICAgICAgIHx8IGhhc0hh cmRMaW5lQnJlYWtDaGlsZE9ubHk7CiAKICAgICBpZiAoIWFsd2F5c0NyZWF0ZUxpbmVCb3hlcyAm JiBjaGVja0ZvbnRzICYmIHZpZXcoKS51c2VzRmlyc3RMaW5lUnVsZXMoKSkgewogICAgICAgICAv LyBIYXZlIHRvIGNoZWNrIHRoZSBmaXJzdCBsaW5lIHN0eWxlIGFzIHdlbGwuCg==