222976 2021-03-09 08:18:35 -0800 Cleanup RenderFlexibleBox 2021-03-11 09:58:18 -0800 1 1 1 Unclassified WebKit CSS Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rbuis rbuis changseok esprehn+autocc ews-watchlist glenn kondapallykalyan pdr svillar webkit-bug-importer oldest_to_newest 1737564 0 rbuis 2021-03-09 08:18:35 -0800 Cleanup RenderFlexibleBox. 1737566 1 422698 rbuis 2021-03-09 08:20:09 -0800 Created attachment 422698 Patch 1737587 2 422705 rbuis 2021-03-09 08:39:02 -0800 Created attachment 422705 Patch 1737713 3 422746 rbuis 2021-03-09 12:42:24 -0800 Created attachment 422746 Patch 1737980 4 422807 rbuis 2021-03-10 01:25:57 -0800 Created attachment 422807 Patch 1738383 5 422912 rbuis 2021-03-11 01:03:57 -0800 Created attachment 422912 Patch 1738420 6 422912 svillar 2021-03-11 04:51:21 -0800 Comment on attachment 422912 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=422912&action=review Thanks for the cleanup! > Source/WebCore/rendering/RenderFlexibleBox.cpp:1226 > + return std::max(childSize, std::min(transferredSize, contentSize)); This is correct from the current API POV, but I think we should review at some point computeMainSizeFromAspectRatioUsing() because it's OK if it returns a nullopt. Right now it isn't possible because we replace it by 0_lu just before returning but I think that is not very precise. Could you add some FIXME so that we don't forget about it? 1738422 7 422924 rbuis 2021-03-11 05:04:31 -0800 Created attachment 422924 Patch 1738503 8 ews-feeder 2021-03-11 09:57:26 -0800 Committed r274284: <https://commits.webkit.org/r274284> All reviewed patches have been landed. Closing bug and clearing flags on attachment 422924. 1738504 9 webkit-bug-importer 2021-03-11 09:58:18 -0800 <rdar://problem/75320821> 422698 2021-03-09 08:20:09 -0800 2021-03-09 08:40:22 -0800 Patch bug-222976-20210309172007.patch text/plain 3544 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MTQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2VkNGFiOWMwZDE2YmI2 OWQzMzYzMTIzOGMzNDM0MTNiZTYzOTEzZC4uYTMxYTQ3ZmRkMDM3NzcwMGY5ZDA1NDNkMGY5OTcy MGQ5YTg1ZmY5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTAzLTA5ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQ2xlYW51cCBSZW5kZXJGbGV4aWJs ZUJveAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIy OTc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2xl YW51cCBSZW5kZXJGbGV4aWJsZUJveC4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4 aWJsZUJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y2hpbGRN YWluU2l6ZUlzRGVmaW5pdGUgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGli bGVCb3g6OmFkanVzdENoaWxkU2l6ZUZvck1pbkFuZE1heCk6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJGbGV4aWJsZUJveDo6Y29uc3RydWN0RmxleEl0ZW0pOgorCiAyMDIxLTAzLTA5ICBDYXJs b3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBTdXNwZW5k IHdpZGdldCBoaWVyYXJjaHkgdXBkYXRlcyB3aGlsZSBleGVjdXRpbmcgbm9kZSBpbnNlcnRpb24K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCmluZGV4 IDliYzYzNjI2MzlmZTEyZDVmNDkyMGVkODdjMjZhNTllYTU0ZWMwZjEuLjExMTNiZWYyZGU2ODA3 Y2NlYzk4N2RiZTdiZmYxZGFlMjY5ZDE0ZTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcApAQCAtODUzLDcgKzg1Myw3IEBAIGJvb2wgUmVuZGVy RmxleGlibGVCb3g6OmNoaWxkTWFpblNpemVJc0RlZmluaXRlKGNvbnN0IFJlbmRlckJveCYgY2hp bGQsIGNvbnN0IExlCiAgICAgICAgIC8vIERvIG5vdCBjYWNoZSB0aGUgZGVmaW5pdGUgaGVpZ2h0 IHN0YXRlIHdpdGggb3J0aG9nb25hbCBjaGlsZHJlbiBhcyBpbiB0aGF0IGNhc2UgdGhlIGxvZ2lj YWwgaGVpZ2h0CiAgICAgICAgIC8vIG9mIHRoZSBjaGlsZCBpcyBub3QgaW4gdGhlIHNhbWUgYXhp cyBhcyB0aGUgbG9naWNhbCBoZWlnaHQgb2YgdGhlIGZsZXggY29udGFpbmVyLiBBbHNvIGRvIG5v dCBjYWNoZSBpdAogICAgICAgICAvLyBvdXRzaWRlIHRoZSBsYXlvdXQgcHJvY2VzcyAod2UgY2Fu IHJlYWNoIHRoaXMgY29kZSBhcyBmcm9tIG1haW5TaXplRm9yUGVyY2VudGFnZVJlc29sdXRpb24o KSkuCi0gICAgICAgIGlmIChtX2luTGF5b3V0ICYmIChpc0hvcml6b250YWxXcml0aW5nTW9kZSgp ID09IGNoaWxkLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpKQorICAgICAgICBpZiAobV9pbkxh eW91dCAmJiBtYWluQXhpc0lzQ2hpbGRJbmxpbmVBeGlzKGNoaWxkKSkKICAgICAgICAgICAgIG1f aGFzRGVmaW5pdGVIZWlnaHQgPSBkZWZpbml0ZSA/IFNpemVEZWZpbml0ZW5lc3M6OkRlZmluaXRl IDogU2l6ZURlZmluaXRlbmVzczo6SW5kZWZpbml0ZTsKIAogICAgICAgICByZXR1cm4gZGVmaW5p dGU7CkBAIC0xMjI0LDExICsxMjI0LDkgQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6 YWRqdXN0Q2hpbGRTaXplRm9yTWluQW5kTWF4KGNvbnN0IFJlbmRlckJveCYgY2hpbGQKICAgICAg ICAgfQogCiAgICAgICAgIGlmICh1c2VDaGlsZEFzcGVjdFJhdGlvKGNoaWxkKSB8fCBjaGlsZENy b3NzU2l6ZVNob3VsZFVzZUNvbnRhaW5lckNyb3NzU2l6ZShjaGlsZCkpIHsKLSAgICAgICAgICAg IE9wdGlvbmFsPExheW91dFVuaXQ+IHRyYW5zZmVycmVkU2l6ZSA9IGNvbXB1dGVNYWluU2l6ZUZy b21Bc3BlY3RSYXRpb1VzaW5nKGNoaWxkLCBjaGlsZENyb3NzU2l6ZUxlbmd0aCk7Ci0gICAgICAg ICAgICBpZiAodHJhbnNmZXJyZWRTaXplKSB7Ci0gICAgICAgICAgICAgICAgdHJhbnNmZXJyZWRT aXplID0gYWRqdXN0Q2hpbGRTaXplRm9yQXNwZWN0UmF0aW9Dcm9zc0F4aXNNaW5BbmRNYXgoY2hp bGQsIHRyYW5zZmVycmVkU2l6ZS52YWx1ZSgpKTsKLSAgICAgICAgICAgICAgICByZXR1cm4gc3Rk OjptYXgoY2hpbGRTaXplLCBzdGQ6Om1pbih0cmFuc2ZlcnJlZFNpemUudmFsdWUoKSwgY29udGVu dFNpemUpKTsKLSAgICAgICAgICAgIH0KKyAgICAgICAgICAgIHRyYW5zZmVycmVkU2l6ZSA9IGNv bXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNoaWxkLCBjaGlsZENyb3NzU2l6ZUxl bmd0aCk7CisgICAgICAgICAgICB0cmFuc2ZlcnJlZFNpemUgPSBhZGp1c3RDaGlsZFNpemVGb3JB c3BlY3RSYXRpb0Nyb3NzQXhpc01pbkFuZE1heChjaGlsZCwgdHJhbnNmZXJyZWRTaXplKTsKKyAg ICAgICAgICAgIHJldHVybiBzdGQ6Om1heChjaGlsZFNpemUsIHN0ZDo6bWluKHRyYW5zZmVycmVk U2l6ZSwgY29udGVudFNpemUpKTsKICAgICAgICAgfQogCiAgICAgICAgIHJldHVybiBzdGQ6Om1h eChjaGlsZFNpemUsIGNvbnRlbnRTaXplKTsKQEAgLTEzMDYsNyArMTMwNCw3IEBAIEZsZXhJdGVt IFJlbmRlckZsZXhpYmxlQm94Ojpjb25zdHJ1Y3RGbGV4SXRlbShSZW5kZXJCb3gmIGNoaWxkLCBi b29sIHJlbGF5b3V0Q2hpCiAgICAgICAgIC8vIHdoZXJlIHdlIHdhbnQgcGVyY2VudGFnZXMgdG8g YmUgdHJlYXRlZCBhcyBhdXRvLiBGb3IgZmxleC1iYXNpcyBpdHNlbGYsIHRoaXMgaXMgbm90IGEg cHJvYmxlbSBiZWNhdXNlCiAgICAgICAgIC8vIGJ5IGRlZmluaXRpb24gd2UgaGF2ZSBhbiBpbmRl ZmluaXRlIGZsZXggYmFzaXMgaGVyZSBhbmQgdGh1cyBwZXJjZW50YWdlcyBzaG91bGQgbm90IHJl c29sdmUuCiAgICAgICAgIGlmIChjaGlsZC5uZWVkc0xheW91dCgpIHx8ICFtX2ludHJpbnNpY1Np emVBbG9uZ01haW5BeGlzLmNvbnRhaW5zKCZjaGlsZCkpIHsKLSAgICAgICAgICAgIGlmIChpc0hv cml6b250YWxXcml0aW5nTW9kZSgpID09IGNoaWxkLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkp CisgICAgICAgICAgICBpZiAobWFpbkF4aXNJc0NoaWxkSW5saW5lQXhpcygpKQogICAgICAgICAg ICAgICAgIGNoaWxkLnNldE92ZXJyaWRpbmdDb250YWluaW5nQmxvY2tDb250ZW50TG9naWNhbEhl aWdodChXVEY6Om51bGxvcHQpOwogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIGNo aWxkLnNldE92ZXJyaWRpbmdDb250YWluaW5nQmxvY2tDb250ZW50TG9naWNhbFdpZHRoKFdURjo6 bnVsbG9wdCk7Cg== 422705 2021-03-09 08:39:02 -0800 2021-03-09 13:47:31 -0800 Patch bug-222976-20210309173900.patch text/plain 3560 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MTQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2VkNGFiOWMwZDE2YmI2 OWQzMzYzMTIzOGMzNDM0MTNiZTYzOTEzZC4uYTMxYTQ3ZmRkMDM3NzcwMGY5ZDA1NDNkMGY5OTcy MGQ5YTg1ZmY5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTAzLTA5ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQ2xlYW51cCBSZW5kZXJGbGV4aWJs ZUJveAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIy OTc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2xl YW51cCBSZW5kZXJGbGV4aWJsZUJveC4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4 aWJsZUJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y2hpbGRN YWluU2l6ZUlzRGVmaW5pdGUgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGli bGVCb3g6OmFkanVzdENoaWxkU2l6ZUZvck1pbkFuZE1heCk6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJGbGV4aWJsZUJveDo6Y29uc3RydWN0RmxleEl0ZW0pOgorCiAyMDIxLTAzLTA5ICBDYXJs b3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBTdXNwZW5k IHdpZGdldCBoaWVyYXJjaHkgdXBkYXRlcyB3aGlsZSBleGVjdXRpbmcgbm9kZSBpbnNlcnRpb24K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCmluZGV4 IDliYzYzNjI2MzlmZTEyZDVmNDkyMGVkODdjMjZhNTllYTU0ZWMwZjEuLmE5NzM1NGM4MWE4Zjc5 ZWViZjliYzRlYmZhYzQ2NWQyNDVlNWZiMGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcApAQCAtODUzLDcgKzg1Myw3IEBAIGJvb2wgUmVuZGVy RmxleGlibGVCb3g6OmNoaWxkTWFpblNpemVJc0RlZmluaXRlKGNvbnN0IFJlbmRlckJveCYgY2hp bGQsIGNvbnN0IExlCiAgICAgICAgIC8vIERvIG5vdCBjYWNoZSB0aGUgZGVmaW5pdGUgaGVpZ2h0 IHN0YXRlIHdpdGggb3J0aG9nb25hbCBjaGlsZHJlbiBhcyBpbiB0aGF0IGNhc2UgdGhlIGxvZ2lj YWwgaGVpZ2h0CiAgICAgICAgIC8vIG9mIHRoZSBjaGlsZCBpcyBub3QgaW4gdGhlIHNhbWUgYXhp cyBhcyB0aGUgbG9naWNhbCBoZWlnaHQgb2YgdGhlIGZsZXggY29udGFpbmVyLiBBbHNvIGRvIG5v dCBjYWNoZSBpdAogICAgICAgICAvLyBvdXRzaWRlIHRoZSBsYXlvdXQgcHJvY2VzcyAod2UgY2Fu IHJlYWNoIHRoaXMgY29kZSBhcyBmcm9tIG1haW5TaXplRm9yUGVyY2VudGFnZVJlc29sdXRpb24o KSkuCi0gICAgICAgIGlmIChtX2luTGF5b3V0ICYmIChpc0hvcml6b250YWxXcml0aW5nTW9kZSgp ID09IGNoaWxkLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpKQorICAgICAgICBpZiAobV9pbkxh eW91dCAmJiBtYWluQXhpc0lzQ2hpbGRJbmxpbmVBeGlzKGNoaWxkKSkKICAgICAgICAgICAgIG1f aGFzRGVmaW5pdGVIZWlnaHQgPSBkZWZpbml0ZSA/IFNpemVEZWZpbml0ZW5lc3M6OkRlZmluaXRl IDogU2l6ZURlZmluaXRlbmVzczo6SW5kZWZpbml0ZTsKIAogICAgICAgICByZXR1cm4gZGVmaW5p dGU7CkBAIC0xMjI0LDExICsxMjI0LDkgQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6 YWRqdXN0Q2hpbGRTaXplRm9yTWluQW5kTWF4KGNvbnN0IFJlbmRlckJveCYgY2hpbGQKICAgICAg ICAgfQogCiAgICAgICAgIGlmICh1c2VDaGlsZEFzcGVjdFJhdGlvKGNoaWxkKSB8fCBjaGlsZENy b3NzU2l6ZVNob3VsZFVzZUNvbnRhaW5lckNyb3NzU2l6ZShjaGlsZCkpIHsKLSAgICAgICAgICAg IE9wdGlvbmFsPExheW91dFVuaXQ+IHRyYW5zZmVycmVkU2l6ZSA9IGNvbXB1dGVNYWluU2l6ZUZy b21Bc3BlY3RSYXRpb1VzaW5nKGNoaWxkLCBjaGlsZENyb3NzU2l6ZUxlbmd0aCk7Ci0gICAgICAg ICAgICBpZiAodHJhbnNmZXJyZWRTaXplKSB7Ci0gICAgICAgICAgICAgICAgdHJhbnNmZXJyZWRT aXplID0gYWRqdXN0Q2hpbGRTaXplRm9yQXNwZWN0UmF0aW9Dcm9zc0F4aXNNaW5BbmRNYXgoY2hp bGQsIHRyYW5zZmVycmVkU2l6ZS52YWx1ZSgpKTsKLSAgICAgICAgICAgICAgICByZXR1cm4gc3Rk OjptYXgoY2hpbGRTaXplLCBzdGQ6Om1pbih0cmFuc2ZlcnJlZFNpemUudmFsdWUoKSwgY29udGVu dFNpemUpKTsKLSAgICAgICAgICAgIH0KKyAgICAgICAgICAgIExheW91dFVuaXQgdHJhbnNmZXJy ZWRTaXplID0gY29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNpbmcoY2hpbGQsIGNoaWxk Q3Jvc3NTaXplTGVuZ3RoKTsKKyAgICAgICAgICAgIHRyYW5zZmVycmVkU2l6ZSA9IGFkanVzdENo aWxkU2l6ZUZvckFzcGVjdFJhdGlvQ3Jvc3NBeGlzTWluQW5kTWF4KGNoaWxkLCB0cmFuc2ZlcnJl ZFNpemUpOworICAgICAgICAgICAgcmV0dXJuIHN0ZDo6bWF4KGNoaWxkU2l6ZSwgc3RkOjptaW4o dHJhbnNmZXJyZWRTaXplLCBjb250ZW50U2l6ZSkpOwogICAgICAgICB9CiAKICAgICAgICAgcmV0 dXJuIHN0ZDo6bWF4KGNoaWxkU2l6ZSwgY29udGVudFNpemUpOwpAQCAtMTMwNiw3ICsxMzA0LDcg QEAgRmxleEl0ZW0gUmVuZGVyRmxleGlibGVCb3g6OmNvbnN0cnVjdEZsZXhJdGVtKFJlbmRlckJv eCYgY2hpbGQsIGJvb2wgcmVsYXlvdXRDaGkKICAgICAgICAgLy8gd2hlcmUgd2Ugd2FudCBwZXJj ZW50YWdlcyB0byBiZSB0cmVhdGVkIGFzIGF1dG8uIEZvciBmbGV4LWJhc2lzIGl0c2VsZiwgdGhp cyBpcyBub3QgYSBwcm9ibGVtIGJlY2F1c2UKICAgICAgICAgLy8gYnkgZGVmaW5pdGlvbiB3ZSBo YXZlIGFuIGluZGVmaW5pdGUgZmxleCBiYXNpcyBoZXJlIGFuZCB0aHVzIHBlcmNlbnRhZ2VzIHNo b3VsZCBub3QgcmVzb2x2ZS4KICAgICAgICAgaWYgKGNoaWxkLm5lZWRzTGF5b3V0KCkgfHwgIW1f aW50cmluc2ljU2l6ZUFsb25nTWFpbkF4aXMuY29udGFpbnMoJmNoaWxkKSkgewotICAgICAgICAg ICAgaWYgKGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPT0gY2hpbGQuaXNIb3Jpem9udGFsV3Jp dGluZ01vZGUoKSkKKyAgICAgICAgICAgIGlmIChtYWluQXhpc0lzQ2hpbGRJbmxpbmVBeGlzKGNo aWxkKSkKICAgICAgICAgICAgICAgICBjaGlsZC5zZXRPdmVycmlkaW5nQ29udGFpbmluZ0Jsb2Nr Q29udGVudExvZ2ljYWxIZWlnaHQoV1RGOjpudWxsb3B0KTsKICAgICAgICAgICAgIGVsc2UKICAg ICAgICAgICAgICAgICBjaGlsZC5zZXRPdmVycmlkaW5nQ29udGFpbmluZ0Jsb2NrQ29udGVudExv Z2ljYWxXaWR0aChXVEY6Om51bGxvcHQpOwo= 422746 2021-03-09 12:42:24 -0800 2021-03-10 01:26:51 -0800 Patch bug-222976-20210309214222.patch text/plain 3196 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MTQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2VkNGFiOWMwZDE2YmI2 OWQzMzYzMTIzOGMzNDM0MTNiZTYzOTEzZC4uNTRkNTgyMTk3M2M1NmExNmViZDI3ZTcxY2U4MmE0 MmZlOGVhMGZhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTAzLTA5ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQ2xlYW51cCBSZW5kZXJGbGV4aWJs ZUJveAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIy OTc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2xl YW51cCBSZW5kZXJGbGV4aWJsZUJveC4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4 aWJsZUJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0 ZU1haW5BeGlzRXh0ZW50Rm9yQ2hpbGQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGli bGVCb3g6OmFkanVzdENoaWxkU2l6ZUZvck1pbkFuZE1heCk6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJGbGV4aWJsZUJveDo6Y2hpbGRIYXNJbnRyaW5zaWNNYWluQXhpc1NpemUgY29uc3QpOgor CiAyMDIxLTAzLTA5ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4K IAogICAgICAgICBTdXNwZW5kIHdpZGdldCBoaWVyYXJjaHkgdXBkYXRlcyB3aGlsZSBleGVjdXRp bmcgbm9kZSBpbnNlcnRpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJGbGV4aWJsZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxl eGlibGVCb3guY3BwCmluZGV4IDliYzYzNjI2MzlmZTEyZDVmNDkyMGVkODdjMjZhNTllYTU0ZWMw ZjEuLjZiMTFjMzlhNWQ2MjZlNzFmY2Q4ZWQyNTBjZjkyNzc0YjQ4ZDUxOTEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcApAQCAtNTYwLDcgKzU2 MCw3IEBAIE9wdGlvbmFsPExheW91dFVuaXQ+IFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlTWFp bkF4aXNFeHRlbnRGb3JDaGlsZChjb25zdCBSZW5kCiAgICAgLy8gaGVpZ2h0LCBzbyBpdCdzIHRo ZSBpbnZlcnNlLiBTbyB3ZSBuZWVkIHRoZSBsb2dpY2FsIHdpZHRoIGlmIHdlIGhhdmUgYQogICAg IC8vIGhvcml6b250YWwgZmxvdyBhbmQgaG9yaXpvbnRhbCB3cml0aW5nIG1vZGUsIG9yIHZlcnRp Y2FsIGZsb3cgYW5kIHZlcnRpY2FsCiAgICAgLy8gd3JpdGluZyBtb2RlLiBPdGhlcndpc2Ugd2Ug bmVlZCB0aGUgbG9naWNhbCBoZWlnaHQuCi0gICAgaWYgKGlzSG9yaXpvbnRhbEZsb3coKSAhPSBj aGlsZC5zdHlsZSgpLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpIHsKKyAgICBpZiAoIW1haW5B eGlzSXNJbmxpbmVBeGlzKGNoaWxkKSkgewogICAgICAgICAvLyBXZSBkb24ndCBoYXZlIHRvIGNo ZWNrIGZvciAiYXV0byIgaGVyZSAtIGNvbXB1dGVDb250ZW50TG9naWNhbEhlaWdodAogICAgICAg ICAvLyB3aWxsIGp1c3QgcmV0dXJuIGEgbnVsbCBPcHRpb25hbCBmb3IgdGhhdCBjYXNlIGFueXdh eS4gSXQncyBzYWZlIHRvIGFjY2VzcwogICAgICAgICAvLyBzY3JvbGxiYXJMb2dpY2FsSGVpZ2h0 IGhlcmUgYmVjYXVzZSBDb21wdXRlTmV4dEZsZXhMaW5lIHdpbGwgaGF2ZQpAQCAtMTIyNCwxMSAr MTIyNCw5IEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmFkanVzdENoaWxkU2l6ZUZv ck1pbkFuZE1heChjb25zdCBSZW5kZXJCb3gmIGNoaWxkCiAgICAgICAgIH0KIAogICAgICAgICBp ZiAodXNlQ2hpbGRBc3BlY3RSYXRpbyhjaGlsZCkgfHwgY2hpbGRDcm9zc1NpemVTaG91bGRVc2VD b250YWluZXJDcm9zc1NpemUoY2hpbGQpKSB7Ci0gICAgICAgICAgICBPcHRpb25hbDxMYXlvdXRV bml0PiB0cmFuc2ZlcnJlZFNpemUgPSBjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2lu ZyhjaGlsZCwgY2hpbGRDcm9zc1NpemVMZW5ndGgpOwotICAgICAgICAgICAgaWYgKHRyYW5zZmVy cmVkU2l6ZSkgewotICAgICAgICAgICAgICAgIHRyYW5zZmVycmVkU2l6ZSA9IGFkanVzdENoaWxk U2l6ZUZvckFzcGVjdFJhdGlvQ3Jvc3NBeGlzTWluQW5kTWF4KGNoaWxkLCB0cmFuc2ZlcnJlZFNp emUudmFsdWUoKSk7Ci0gICAgICAgICAgICAgICAgcmV0dXJuIHN0ZDo6bWF4KGNoaWxkU2l6ZSwg c3RkOjptaW4odHJhbnNmZXJyZWRTaXplLnZhbHVlKCksIGNvbnRlbnRTaXplKSk7Ci0gICAgICAg ICAgICB9CisgICAgICAgICAgICBMYXlvdXRVbml0IHRyYW5zZmVycmVkU2l6ZSA9IGNvbXB1dGVN YWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNoaWxkLCBjaGlsZENyb3NzU2l6ZUxlbmd0aCk7 CisgICAgICAgICAgICB0cmFuc2ZlcnJlZFNpemUgPSBhZGp1c3RDaGlsZFNpemVGb3JBc3BlY3RS YXRpb0Nyb3NzQXhpc01pbkFuZE1heChjaGlsZCwgdHJhbnNmZXJyZWRTaXplKTsKKyAgICAgICAg ICAgIHJldHVybiBzdGQ6Om1heChjaGlsZFNpemUsIHN0ZDo6bWluKHRyYW5zZmVycmVkU2l6ZSwg Y29udGVudFNpemUpKTsKICAgICAgICAgfQogCiAgICAgICAgIHJldHVybiBzdGQ6Om1heChjaGls ZFNpemUsIGNvbnRlbnRTaXplKTsKQEAgLTE2MzMsNyArMTYzMSw3IEBAIGJvb2wgUmVuZGVyRmxl eGlibGVCb3g6Om5lZWRUb1N0cmV0Y2hDaGlsZExvZ2ljYWxIZWlnaHQoY29uc3QgUmVuZGVyQm94 JiBjaGlsZCkKIAogYm9vbCBSZW5kZXJGbGV4aWJsZUJveDo6Y2hpbGRIYXNJbnRyaW5zaWNNYWlu QXhpc1NpemUoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3QKIHsKLSAgICBpZiAoaXNIb3Jp em9udGFsRmxvdygpID09IGNoaWxkLnN0eWxlKCkuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSkK KyAgICBpZiAobWFpbkF4aXNJc0lubGluZUF4aXMoY2hpbGQpKQogICAgICAgICByZXR1cm4gZmFs c2U7CiAKICAgICBMZW5ndGggY2hpbGRGbGV4QmFzaXMgPSBmbGV4QmFzaXNGb3JDaGlsZChjaGls ZCk7Cg== 422807 2021-03-10 01:25:57 -0800 2021-03-11 01:03:51 -0800 Patch bug-222976-20210310102556.patch text/plain 3212 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MjAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGE2MzEyNWRmMTQzNDc3 MTAwNmRlNDcyMmI1MWM3YjZiMjgxMjY5Yi4uNDEzYjkyMDg3OGVmMzJhOThlN2Y2ZDkzMzFmMjk2 OWVjMDlhZDk1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTAzLTEwICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQ2xlYW51cCBSZW5kZXJGbGV4aWJs ZUJveAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIy OTc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2xl YW51cCBSZW5kZXJGbGV4aWJsZUJveC4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4 aWJsZUJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0 ZU1haW5BeGlzRXh0ZW50Rm9yQ2hpbGQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGli bGVCb3g6OmFkanVzdENoaWxkU2l6ZUZvck1pbkFuZE1heCk6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJGbGV4aWJsZUJveDo6Y2hpbGRIYXNJbnRyaW5zaWNNYWluQXhpc1NpemUgY29uc3QpOgor CiAyMDIxLTAzLTEwICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAg ICAgICAgIFJlbGVhc2UgYXNzZXJ0aW9uIGZhaWx1cmVzIHVuZGVyIEVkaXRvcjo6c2NhblNlbGVj dGlvbkZvclRlbGVwaG9uZU51bWJlcnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyRmxleGlibGVCb3guY3BwCmluZGV4IDliYzYzNjI2MzlmZTEyZDVmNDkyMGVkODdjMjZhNTll YTU0ZWMwZjEuLmI4ZGQ4OWEyMmY3MWE3ZDEwNTcwNzk1MTg0MTg0OTFhOWIzMDc1YTMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcApAQCAtNTYw LDcgKzU2MCw3IEBAIE9wdGlvbmFsPExheW91dFVuaXQ+IFJlbmRlckZsZXhpYmxlQm94Ojpjb21w dXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZChjb25zdCBSZW5kCiAgICAgLy8gaGVpZ2h0LCBzbyBp dCdzIHRoZSBpbnZlcnNlLiBTbyB3ZSBuZWVkIHRoZSBsb2dpY2FsIHdpZHRoIGlmIHdlIGhhdmUg YQogICAgIC8vIGhvcml6b250YWwgZmxvdyBhbmQgaG9yaXpvbnRhbCB3cml0aW5nIG1vZGUsIG9y IHZlcnRpY2FsIGZsb3cgYW5kIHZlcnRpY2FsCiAgICAgLy8gd3JpdGluZyBtb2RlLiBPdGhlcndp c2Ugd2UgbmVlZCB0aGUgbG9naWNhbCBoZWlnaHQuCi0gICAgaWYgKGlzSG9yaXpvbnRhbEZsb3co KSAhPSBjaGlsZC5zdHlsZSgpLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpIHsKKyAgICBpZiAo IW1haW5BeGlzSXNDaGlsZElubGluZUF4aXMoY2hpbGQpKSB7CiAgICAgICAgIC8vIFdlIGRvbid0 IGhhdmUgdG8gY2hlY2sgZm9yICJhdXRvIiBoZXJlIC0gY29tcHV0ZUNvbnRlbnRMb2dpY2FsSGVp Z2h0CiAgICAgICAgIC8vIHdpbGwganVzdCByZXR1cm4gYSBudWxsIE9wdGlvbmFsIGZvciB0aGF0 IGNhc2UgYW55d2F5LiBJdCdzIHNhZmUgdG8gYWNjZXNzCiAgICAgICAgIC8vIHNjcm9sbGJhckxv Z2ljYWxIZWlnaHQgaGVyZSBiZWNhdXNlIENvbXB1dGVOZXh0RmxleExpbmUgd2lsbCBoYXZlCkBA IC0xMjI0LDExICsxMjI0LDkgQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6YWRqdXN0 Q2hpbGRTaXplRm9yTWluQW5kTWF4KGNvbnN0IFJlbmRlckJveCYgY2hpbGQKICAgICAgICAgfQog CiAgICAgICAgIGlmICh1c2VDaGlsZEFzcGVjdFJhdGlvKGNoaWxkKSB8fCBjaGlsZENyb3NzU2l6 ZVNob3VsZFVzZUNvbnRhaW5lckNyb3NzU2l6ZShjaGlsZCkpIHsKLSAgICAgICAgICAgIE9wdGlv bmFsPExheW91dFVuaXQ+IHRyYW5zZmVycmVkU2l6ZSA9IGNvbXB1dGVNYWluU2l6ZUZyb21Bc3Bl Y3RSYXRpb1VzaW5nKGNoaWxkLCBjaGlsZENyb3NzU2l6ZUxlbmd0aCk7Ci0gICAgICAgICAgICBp ZiAodHJhbnNmZXJyZWRTaXplKSB7Ci0gICAgICAgICAgICAgICAgdHJhbnNmZXJyZWRTaXplID0g YWRqdXN0Q2hpbGRTaXplRm9yQXNwZWN0UmF0aW9Dcm9zc0F4aXNNaW5BbmRNYXgoY2hpbGQsIHRy YW5zZmVycmVkU2l6ZS52YWx1ZSgpKTsKLSAgICAgICAgICAgICAgICByZXR1cm4gc3RkOjptYXgo Y2hpbGRTaXplLCBzdGQ6Om1pbih0cmFuc2ZlcnJlZFNpemUudmFsdWUoKSwgY29udGVudFNpemUp KTsKLSAgICAgICAgICAgIH0KKyAgICAgICAgICAgIExheW91dFVuaXQgdHJhbnNmZXJyZWRTaXpl ID0gY29tcHV0ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNpbmcoY2hpbGQsIGNoaWxkQ3Jvc3NT aXplTGVuZ3RoKTsKKyAgICAgICAgICAgIHRyYW5zZmVycmVkU2l6ZSA9IGFkanVzdENoaWxkU2l6 ZUZvckFzcGVjdFJhdGlvQ3Jvc3NBeGlzTWluQW5kTWF4KGNoaWxkLCB0cmFuc2ZlcnJlZFNpemUp OworICAgICAgICAgICAgcmV0dXJuIHN0ZDo6bWF4KGNoaWxkU2l6ZSwgc3RkOjptaW4odHJhbnNm ZXJyZWRTaXplLCBjb250ZW50U2l6ZSkpOwogICAgICAgICB9CiAKICAgICAgICAgcmV0dXJuIHN0 ZDo6bWF4KGNoaWxkU2l6ZSwgY29udGVudFNpemUpOwpAQCAtMTYzMyw3ICsxNjMxLDcgQEAgYm9v bCBSZW5kZXJGbGV4aWJsZUJveDo6bmVlZFRvU3RyZXRjaENoaWxkTG9naWNhbEhlaWdodChjb25z dCBSZW5kZXJCb3gmIGNoaWxkKQogCiBib29sIFJlbmRlckZsZXhpYmxlQm94OjpjaGlsZEhhc0lu dHJpbnNpY01haW5BeGlzU2l6ZShjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdAogewotICAg IGlmIChpc0hvcml6b250YWxGbG93KCkgPT0gY2hpbGQuc3R5bGUoKS5pc0hvcml6b250YWxXcml0 aW5nTW9kZSgpKQorICAgIGlmIChtYWluQXhpc0lzQ2hpbGRJbmxpbmVBeGlzKGNoaWxkKSkKICAg ICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgTGVuZ3RoIGNoaWxkRmxleEJhc2lzID0gZmxleEJh c2lzRm9yQ2hpbGQoY2hpbGQpOwo= 422912 2021-03-11 01:03:57 -0800 2021-03-11 05:04:24 -0800 Patch bug-222976-20210311100355.patch text/plain 5476 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MjY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjM2ODlkZWEwZDM5YzE1 NDk3YTQ1M2MyOGVjZjJjOWViMTllMjIyMC4uMTM3MGE0YjQzZGUzMGM4MGI2NWQ4MWQ4NzIyMTVl ODRiZTNlYzQxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTAzLTExICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQ2xlYW51cCBSZW5kZXJGbGV4aWJs ZUJveAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIy OTc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVmFh cmlvdXMgUmVuZGVyRmxleGlibGVCb3ggY2xlYW51cHMuCisKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyRmxleGlibGVCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVC b3g6OmNvbXB1dGVNYWluQXhpc0V4dGVudEZvckNoaWxkKToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckZsZXhpYmxlQm94OjphZGp1c3RDaGlsZFNpemVGb3JNaW5BbmRNYXgpOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmNoaWxkSGFzSW50cmluc2ljTWFpbkF4aXNTaXpl IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjphbGlnbkNoaWxk cmVuKToKKwogMjAyMS0wMy0xMSAgU2lodWkgTGl1ICA8c2lodWlfbGl1QGFwcGxlLmNvbT4KIAog ICAgICAgICBJbmRleGVkIERCIHRyYW5zYWN0aW9ucyBvdXRkYXRlZCBpbW1lZGlhdGVseSBhZnRl ciBpdCBqdXN0IGNyZWF0ZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJGbGV4aWJsZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxl eGlibGVCb3guY3BwCmluZGV4IDliYzYzNjI2MzlmZTEyZDVmNDkyMGVkODdjMjZhNTllYTU0ZWMw ZjEuLmZjMGIwNjdjNDhjOTUwMjI5ODNmNzBlMzI5NjMzMDc5YWU3NWJhNzQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcApAQCAtNTYwLDcgKzU2 MCw3IEBAIE9wdGlvbmFsPExheW91dFVuaXQ+IFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlTWFp bkF4aXNFeHRlbnRGb3JDaGlsZChjb25zdCBSZW5kCiAgICAgLy8gaGVpZ2h0LCBzbyBpdCdzIHRo ZSBpbnZlcnNlLiBTbyB3ZSBuZWVkIHRoZSBsb2dpY2FsIHdpZHRoIGlmIHdlIGhhdmUgYQogICAg IC8vIGhvcml6b250YWwgZmxvdyBhbmQgaG9yaXpvbnRhbCB3cml0aW5nIG1vZGUsIG9yIHZlcnRp Y2FsIGZsb3cgYW5kIHZlcnRpY2FsCiAgICAgLy8gd3JpdGluZyBtb2RlLiBPdGhlcndpc2Ugd2Ug bmVlZCB0aGUgbG9naWNhbCBoZWlnaHQuCi0gICAgaWYgKGlzSG9yaXpvbnRhbEZsb3coKSAhPSBj aGlsZC5zdHlsZSgpLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpIHsKKyAgICBpZiAoIW1haW5B eGlzSXNDaGlsZElubGluZUF4aXMoY2hpbGQpKSB7CiAgICAgICAgIC8vIFdlIGRvbid0IGhhdmUg dG8gY2hlY2sgZm9yICJhdXRvIiBoZXJlIC0gY29tcHV0ZUNvbnRlbnRMb2dpY2FsSGVpZ2h0CiAg ICAgICAgIC8vIHdpbGwganVzdCByZXR1cm4gYSBudWxsIE9wdGlvbmFsIGZvciB0aGF0IGNhc2Ug YW55d2F5LiBJdCdzIHNhZmUgdG8gYWNjZXNzCiAgICAgICAgIC8vIHNjcm9sbGJhckxvZ2ljYWxI ZWlnaHQgaGVyZSBiZWNhdXNlIENvbXB1dGVOZXh0RmxleExpbmUgd2lsbCBoYXZlCkBAIC01OTAs NyArNTkwLDYgQEAgT3B0aW9uYWw8TGF5b3V0VW5pdD4gUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1 dGVNYWluQXhpc0V4dGVudEZvckNoaWxkKGNvbnN0IFJlbmQKICAgICByZXR1cm4gY2hpbGQuY29t cHV0ZUxvZ2ljYWxXaWR0aEluRnJhZ21lbnRVc2luZyhzaXplVHlwZSwgc2l6ZSwgY29udGVudExv Z2ljYWxXaWR0aCgpLCAqdGhpcywgZnJhZ21lbnQpIC0gYm9yZGVyQW5kUGFkZGluZzsKIH0KIAot ICAgIAogV3JpdGluZ01vZGUgUmVuZGVyRmxleGlibGVCb3g6OnRyYW5zZm9ybWVkV3JpdGluZ01v ZGUoKSBjb25zdAogewogICAgIFdyaXRpbmdNb2RlIG1vZGUgPSBzdHlsZSgpLndyaXRpbmdNb2Rl KCk7CkBAIC03ODUsNyArNzg0LDYgQEAgYm9vbCBSZW5kZXJGbGV4aWJsZUJveDo6dXNlQ2hpbGRB c3BlY3RSYXRpbyhjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdAogICAgIHJldHVybiBjaGls ZENyb3NzU2l6ZUlzRGVmaW5pdGUoY2hpbGQsIGNyb3NzU2l6ZUxlbmd0aEZvckNoaWxkKE1haW5P clByZWZlcnJlZFNpemUsIGNoaWxkKSk7CiB9CiAKLSAgICAKIExheW91dFVuaXQgUmVuZGVyRmxl eGlibGVCb3g6OmNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5nKGNvbnN0IFJlbmRl ckJveCYgY2hpbGQsIExlbmd0aCBjcm9zc1NpemVMZW5ndGgpIGNvbnN0CiB7CiAgICAgQVNTRVJU KGNoaWxkSGFzQXNwZWN0UmF0aW8oY2hpbGQpKTsKQEAgLTkyNSw3ICs5MjMsNiBAQCB2b2lkIFJl bmRlckZsZXhpYmxlQm94OjpjbGVhckNhY2hlZE1haW5TaXplRm9yQ2hpbGQoY29uc3QgUmVuZGVy Qm94JiBjaGlsZCkKICAgICBtX2ludHJpbnNpY1NpemVBbG9uZ01haW5BeGlzLnJlbW92ZSgmY2hp bGQpOwogfQogCi0gICAgCiBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlSW5u ZXJGbGV4QmFzZVNpemVGb3JDaGlsZChSZW5kZXJCb3gmIGNoaWxkLCBMYXlvdXRVbml0IG1haW5B eGlzQm9yZGVyQW5kUGFkZGluZykKIHsKICAgICBMZW5ndGggZmxleEJhc2lzID0gZmxleEJhc2lz Rm9yQ2hpbGQoY2hpbGQpOwpAQCAtMTIyNCwxMSArMTIyMSw5IEBAIExheW91dFVuaXQgUmVuZGVy RmxleGlibGVCb3g6OmFkanVzdENoaWxkU2l6ZUZvck1pbkFuZE1heChjb25zdCBSZW5kZXJCb3gm IGNoaWxkCiAgICAgICAgIH0KIAogICAgICAgICBpZiAodXNlQ2hpbGRBc3BlY3RSYXRpbyhjaGls ZCkgfHwgY2hpbGRDcm9zc1NpemVTaG91bGRVc2VDb250YWluZXJDcm9zc1NpemUoY2hpbGQpKSB7 Ci0gICAgICAgICAgICBPcHRpb25hbDxMYXlvdXRVbml0PiB0cmFuc2ZlcnJlZFNpemUgPSBjb21w dXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyhjaGlsZCwgY2hpbGRDcm9zc1NpemVMZW5n dGgpOwotICAgICAgICAgICAgaWYgKHRyYW5zZmVycmVkU2l6ZSkgewotICAgICAgICAgICAgICAg IHRyYW5zZmVycmVkU2l6ZSA9IGFkanVzdENoaWxkU2l6ZUZvckFzcGVjdFJhdGlvQ3Jvc3NBeGlz TWluQW5kTWF4KGNoaWxkLCB0cmFuc2ZlcnJlZFNpemUudmFsdWUoKSk7Ci0gICAgICAgICAgICAg ICAgcmV0dXJuIHN0ZDo6bWF4KGNoaWxkU2l6ZSwgc3RkOjptaW4odHJhbnNmZXJyZWRTaXplLnZh bHVlKCksIGNvbnRlbnRTaXplKSk7Ci0gICAgICAgICAgICB9CisgICAgICAgICAgICBMYXlvdXRV bml0IHRyYW5zZmVycmVkU2l6ZSA9IGNvbXB1dGVNYWluU2l6ZUZyb21Bc3BlY3RSYXRpb1VzaW5n KGNoaWxkLCBjaGlsZENyb3NzU2l6ZUxlbmd0aCk7CisgICAgICAgICAgICB0cmFuc2ZlcnJlZFNp emUgPSBhZGp1c3RDaGlsZFNpemVGb3JBc3BlY3RSYXRpb0Nyb3NzQXhpc01pbkFuZE1heChjaGls ZCwgdHJhbnNmZXJyZWRTaXplKTsKKyAgICAgICAgICAgIHJldHVybiBzdGQ6Om1heChjaGlsZFNp emUsIHN0ZDo6bWluKHRyYW5zZmVycmVkU2l6ZSwgY29udGVudFNpemUpKTsKICAgICAgICAgfQog CiAgICAgICAgIHJldHVybiBzdGQ6Om1heChjaGlsZFNpemUsIGNvbnRlbnRTaXplKTsKQEAgLTE0 NTIsNyArMTQ0Nyw2IEBAIHN0YXRpYyBMYXlvdXRVbml0IGp1c3RpZnlDb250ZW50U3BhY2VCZXR3 ZWVuQ2hpbGRyZW4oTGF5b3V0VW5pdCBhdmFpbGFibGVGcmVlU3BhCiAgICAgcmV0dXJuIDA7CiB9 CiAKLQogc3RhdGljIExheW91dFVuaXQgYWxpZ25tZW50T2Zmc2V0KExheW91dFVuaXQgYXZhaWxh YmxlRnJlZVNwYWNlLCBJdGVtUG9zaXRpb24gcG9zaXRpb24sIExheW91dFVuaXQgYXNjZW50LCBM YXlvdXRVbml0IG1heEFzY2VudCwgYm9vbCBpc1dyYXBSZXZlcnNlKQogewogICAgIHN3aXRjaCAo cG9zaXRpb24pIHsKQEAgLTE2MzMsNyArMTYyNyw3IEBAIGJvb2wgUmVuZGVyRmxleGlibGVCb3g6 Om5lZWRUb1N0cmV0Y2hDaGlsZExvZ2ljYWxIZWlnaHQoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkK IAogYm9vbCBSZW5kZXJGbGV4aWJsZUJveDo6Y2hpbGRIYXNJbnRyaW5zaWNNYWluQXhpc1NpemUo Y29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3QKIHsKLSAgICBpZiAoaXNIb3Jpem9udGFsRmxv dygpID09IGNoaWxkLnN0eWxlKCkuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSkKKyAgICBpZiAo bWFpbkF4aXNJc0NoaWxkSW5saW5lQXhpcyhjaGlsZCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsK IAogICAgIExlbmd0aCBjaGlsZEZsZXhCYXNpcyA9IGZsZXhCYXNpc0ZvckNoaWxkKGNoaWxkKTsK QEAgLTE5MzEsOCArMTkyNSw3IEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmFsaWduQ2hpbGRy ZW4oY29uc3QgVmVjdG9yPExpbmVDb250ZXh0PiYgbGluZUNvbnRleHRzKQogICAgICAgICAgICAg SXRlbVBvc2l0aW9uIHBvc2l0aW9uID0gYWxpZ25tZW50Rm9yQ2hpbGQoZmxleEl0ZW0uYm94KTsK ICAgICAgICAgICAgIGlmIChwb3NpdGlvbiA9PSBJdGVtUG9zaXRpb246OlN0cmV0Y2gpCiAgICAg ICAgICAgICAgICAgYXBwbHlTdHJldGNoQWxpZ25tZW50VG9DaGlsZChmbGV4SXRlbS5ib3gsIGxp bmVDcm9zc0F4aXNFeHRlbnQpOwotICAgICAgICAgICAgTGF5b3V0VW5pdCBhdmFpbGFibGVTcGFj ZSA9Ci0gICAgICAgICAgICBhdmFpbGFibGVBbGlnbm1lbnRTcGFjZUZvckNoaWxkKGxpbmVDcm9z c0F4aXNFeHRlbnQsIGZsZXhJdGVtLmJveCk7CisgICAgICAgICAgICBMYXlvdXRVbml0IGF2YWls YWJsZVNwYWNlID0gYXZhaWxhYmxlQWxpZ25tZW50U3BhY2VGb3JDaGlsZChsaW5lQ3Jvc3NBeGlz RXh0ZW50LCBmbGV4SXRlbS5ib3gpOwogICAgICAgICAgICAgTGF5b3V0VW5pdCBvZmZzZXQgPSBh bGlnbm1lbnRPZmZzZXQoYXZhaWxhYmxlU3BhY2UsIHBvc2l0aW9uLCBtYXJnaW5Cb3hBc2NlbnRG b3JDaGlsZChmbGV4SXRlbS5ib3gpLCBtYXhBc2NlbnQsIHN0eWxlKCkuZmxleFdyYXAoKSA9PSBG bGV4V3JhcDo6UmV2ZXJzZSk7CiAgICAgICAgICAgICBhZGp1c3RBbGlnbm1lbnRGb3JDaGlsZChm bGV4SXRlbS5ib3gsIG9mZnNldCk7CiAgICAgICAgICAgICBpZiAocG9zaXRpb24gPT0gSXRlbVBv c2l0aW9uOjpCYXNlbGluZSAmJiBzdHlsZSgpLmZsZXhXcmFwKCkgPT0gRmxleFdyYXA6OlJldmVy c2UpCg== 422924 2021-03-11 05:04:31 -0800 2021-03-11 09:57:27 -0800 Patch bug-222976-20210311140429.patch text/plain 5636 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MjY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjM2ODlkZWEwZDM5YzE1 NDk3YTQ1M2MyOGVjZjJjOWViMTllMjIyMC4uMjRmNzEwMjRkN2Y0NTUyMTRlMWVmMWU5MjM5ZjUy NjMzYjJjZTUxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTAzLTExICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQ2xlYW51cCBSZW5kZXJGbGV4aWJs ZUJveAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIy OTc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2VyZ2lvIFZpbGxhciBTZW5pbi4KKworICAgICAg ICBWYXJpb3VzIFJlbmRlckZsZXhpYmxlQm94IGNsZWFudXBzLgorCisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhp YmxlQm94Ojpjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZCk6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJGbGV4aWJsZUJveDo6YWRqdXN0Q2hpbGRTaXplRm9yTWluQW5kTWF4KToKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpjaGlsZEhhc0ludHJpbnNpY01haW5BeGlz U2l6ZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6YWxpZ25D aGlsZHJlbik6CisKIDIwMjEtMDMtMTEgIFNpaHVpIExpdSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+ CiAKICAgICAgICAgSW5kZXhlZCBEQiB0cmFuc2FjdGlvbnMgb3V0ZGF0ZWQgaW1tZWRpYXRlbHkg YWZ0ZXIgaXQganVzdCBjcmVhdGVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyRmxleGlibGVCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckZsZXhpYmxlQm94LmNwcAppbmRleCA5YmM2MzYyNjM5ZmUxMmQ1ZjQ5MjBlZDg3YzI2YTU5ZWE1 NGVjMGYxLi5lNjM3MzMwZDFlMzM4NWM3YWNhMTMzYTk0YmM1ZWM3ZmIzZjA1NDBlIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKQEAgLTU2MCw3 ICs1NjAsNyBAQCBPcHRpb25hbDxMYXlvdXRVbml0PiBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0 ZU1haW5BeGlzRXh0ZW50Rm9yQ2hpbGQoY29uc3QgUmVuZAogICAgIC8vIGhlaWdodCwgc28gaXQn cyB0aGUgaW52ZXJzZS4gU28gd2UgbmVlZCB0aGUgbG9naWNhbCB3aWR0aCBpZiB3ZSBoYXZlIGEK ICAgICAvLyBob3Jpem9udGFsIGZsb3cgYW5kIGhvcml6b250YWwgd3JpdGluZyBtb2RlLCBvciB2 ZXJ0aWNhbCBmbG93IGFuZCB2ZXJ0aWNhbAogICAgIC8vIHdyaXRpbmcgbW9kZS4gT3RoZXJ3aXNl IHdlIG5lZWQgdGhlIGxvZ2ljYWwgaGVpZ2h0LgotICAgIGlmIChpc0hvcml6b250YWxGbG93KCkg IT0gY2hpbGQuc3R5bGUoKS5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpKSB7CisgICAgaWYgKCFt YWluQXhpc0lzQ2hpbGRJbmxpbmVBeGlzKGNoaWxkKSkgewogICAgICAgICAvLyBXZSBkb24ndCBo YXZlIHRvIGNoZWNrIGZvciAiYXV0byIgaGVyZSAtIGNvbXB1dGVDb250ZW50TG9naWNhbEhlaWdo dAogICAgICAgICAvLyB3aWxsIGp1c3QgcmV0dXJuIGEgbnVsbCBPcHRpb25hbCBmb3IgdGhhdCBj YXNlIGFueXdheS4gSXQncyBzYWZlIHRvIGFjY2VzcwogICAgICAgICAvLyBzY3JvbGxiYXJMb2dp Y2FsSGVpZ2h0IGhlcmUgYmVjYXVzZSBDb21wdXRlTmV4dEZsZXhMaW5lIHdpbGwgaGF2ZQpAQCAt NTkwLDcgKzU5MCw2IEBAIE9wdGlvbmFsPExheW91dFVuaXQ+IFJlbmRlckZsZXhpYmxlQm94Ojpj b21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZChjb25zdCBSZW5kCiAgICAgcmV0dXJuIGNoaWxk LmNvbXB1dGVMb2dpY2FsV2lkdGhJbkZyYWdtZW50VXNpbmcoc2l6ZVR5cGUsIHNpemUsIGNvbnRl bnRMb2dpY2FsV2lkdGgoKSwgKnRoaXMsIGZyYWdtZW50KSAtIGJvcmRlckFuZFBhZGRpbmc7CiB9 CiAKLSAgICAKIFdyaXRpbmdNb2RlIFJlbmRlckZsZXhpYmxlQm94Ojp0cmFuc2Zvcm1lZFdyaXRp bmdNb2RlKCkgY29uc3QKIHsKICAgICBXcml0aW5nTW9kZSBtb2RlID0gc3R5bGUoKS53cml0aW5n TW9kZSgpOwpAQCAtNzg1LDcgKzc4NCw4IEBAIGJvb2wgUmVuZGVyRmxleGlibGVCb3g6OnVzZUNo aWxkQXNwZWN0UmF0aW8oY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3QKICAgICByZXR1cm4g Y2hpbGRDcm9zc1NpemVJc0RlZmluaXRlKGNoaWxkLCBjcm9zc1NpemVMZW5ndGhGb3JDaGlsZChN YWluT3JQcmVmZXJyZWRTaXplLCBjaGlsZCkpOwogfQogCi0gICAgCisvLyBGSVhNRTogY29tcHV0 ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNpbmcgbWF5IG5lZWQgdG8gcmV0dXJuIGFuIE9wdGlv bmFsPExheW91dFVuaXQ+IGluIHRoZSBmdXR1cmUKKy8vIHJhdGhlciB0aGFuIHJldHVybmluZyBp bmRlZmluaXRlIHNpemVzIGFzIDAvLTEuCiBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94Ojpj b21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyhjb25zdCBSZW5kZXJCb3gmIGNoaWxk LCBMZW5ndGggY3Jvc3NTaXplTGVuZ3RoKSBjb25zdAogewogICAgIEFTU0VSVChjaGlsZEhhc0Fz cGVjdFJhdGlvKGNoaWxkKSk7CkBAIC05MjUsNyArOTI1LDYgQEAgdm9pZCBSZW5kZXJGbGV4aWJs ZUJveDo6Y2xlYXJDYWNoZWRNYWluU2l6ZUZvckNoaWxkKGNvbnN0IFJlbmRlckJveCYgY2hpbGQp CiAgICAgbV9pbnRyaW5zaWNTaXplQWxvbmdNYWluQXhpcy5yZW1vdmUoJmNoaWxkKTsKIH0KIAot ICAgIAogTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZUlubmVyRmxleEJhc2VT aXplRm9yQ2hpbGQoUmVuZGVyQm94JiBjaGlsZCwgTGF5b3V0VW5pdCBtYWluQXhpc0JvcmRlckFu ZFBhZGRpbmcpCiB7CiAgICAgTGVuZ3RoIGZsZXhCYXNpcyA9IGZsZXhCYXNpc0ZvckNoaWxkKGNo aWxkKTsKQEAgLTEyMjQsMTEgKzEyMjMsOSBAQCBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94 OjphZGp1c3RDaGlsZFNpemVGb3JNaW5BbmRNYXgoY29uc3QgUmVuZGVyQm94JiBjaGlsZAogICAg ICAgICB9CiAKICAgICAgICAgaWYgKHVzZUNoaWxkQXNwZWN0UmF0aW8oY2hpbGQpIHx8IGNoaWxk Q3Jvc3NTaXplU2hvdWxkVXNlQ29udGFpbmVyQ3Jvc3NTaXplKGNoaWxkKSkgewotICAgICAgICAg ICAgT3B0aW9uYWw8TGF5b3V0VW5pdD4gdHJhbnNmZXJyZWRTaXplID0gY29tcHV0ZU1haW5TaXpl RnJvbUFzcGVjdFJhdGlvVXNpbmcoY2hpbGQsIGNoaWxkQ3Jvc3NTaXplTGVuZ3RoKTsKLSAgICAg ICAgICAgIGlmICh0cmFuc2ZlcnJlZFNpemUpIHsKLSAgICAgICAgICAgICAgICB0cmFuc2ZlcnJl ZFNpemUgPSBhZGp1c3RDaGlsZFNpemVGb3JBc3BlY3RSYXRpb0Nyb3NzQXhpc01pbkFuZE1heChj aGlsZCwgdHJhbnNmZXJyZWRTaXplLnZhbHVlKCkpOwotICAgICAgICAgICAgICAgIHJldHVybiBz dGQ6Om1heChjaGlsZFNpemUsIHN0ZDo6bWluKHRyYW5zZmVycmVkU2l6ZS52YWx1ZSgpLCBjb250 ZW50U2l6ZSkpOwotICAgICAgICAgICAgfQorICAgICAgICAgICAgTGF5b3V0VW5pdCB0cmFuc2Zl cnJlZFNpemUgPSBjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyhjaGlsZCwgY2hp bGRDcm9zc1NpemVMZW5ndGgpOworICAgICAgICAgICAgdHJhbnNmZXJyZWRTaXplID0gYWRqdXN0 Q2hpbGRTaXplRm9yQXNwZWN0UmF0aW9Dcm9zc0F4aXNNaW5BbmRNYXgoY2hpbGQsIHRyYW5zZmVy cmVkU2l6ZSk7CisgICAgICAgICAgICByZXR1cm4gc3RkOjptYXgoY2hpbGRTaXplLCBzdGQ6Om1p bih0cmFuc2ZlcnJlZFNpemUsIGNvbnRlbnRTaXplKSk7CiAgICAgICAgIH0KIAogICAgICAgICBy ZXR1cm4gc3RkOjptYXgoY2hpbGRTaXplLCBjb250ZW50U2l6ZSk7CkBAIC0xNDUyLDcgKzE0NDks NiBAQCBzdGF0aWMgTGF5b3V0VW5pdCBqdXN0aWZ5Q29udGVudFNwYWNlQmV0d2VlbkNoaWxkcmVu KExheW91dFVuaXQgYXZhaWxhYmxlRnJlZVNwYQogICAgIHJldHVybiAwOwogfQogCi0KIHN0YXRp YyBMYXlvdXRVbml0IGFsaWdubWVudE9mZnNldChMYXlvdXRVbml0IGF2YWlsYWJsZUZyZWVTcGFj ZSwgSXRlbVBvc2l0aW9uIHBvc2l0aW9uLCBMYXlvdXRVbml0IGFzY2VudCwgTGF5b3V0VW5pdCBt YXhBc2NlbnQsIGJvb2wgaXNXcmFwUmV2ZXJzZSkKIHsKICAgICBzd2l0Y2ggKHBvc2l0aW9uKSB7 CkBAIC0xNjMzLDcgKzE2MjksNyBAQCBib29sIFJlbmRlckZsZXhpYmxlQm94OjpuZWVkVG9TdHJl dGNoQ2hpbGRMb2dpY2FsSGVpZ2h0KGNvbnN0IFJlbmRlckJveCYgY2hpbGQpCiAKIGJvb2wgUmVu ZGVyRmxleGlibGVCb3g6OmNoaWxkSGFzSW50cmluc2ljTWFpbkF4aXNTaXplKGNvbnN0IFJlbmRl ckJveCYgY2hpbGQpIGNvbnN0CiB7Ci0gICAgaWYgKGlzSG9yaXpvbnRhbEZsb3coKSA9PSBjaGls ZC5zdHlsZSgpLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpCisgICAgaWYgKG1haW5BeGlzSXND aGlsZElubGluZUF4aXMoY2hpbGQpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBMZW5n dGggY2hpbGRGbGV4QmFzaXMgPSBmbGV4QmFzaXNGb3JDaGlsZChjaGlsZCk7CkBAIC0xOTMxLDgg KzE5MjcsNyBAQCB2b2lkIFJlbmRlckZsZXhpYmxlQm94OjphbGlnbkNoaWxkcmVuKGNvbnN0IFZl Y3RvcjxMaW5lQ29udGV4dD4mIGxpbmVDb250ZXh0cykKICAgICAgICAgICAgIEl0ZW1Qb3NpdGlv biBwb3NpdGlvbiA9IGFsaWdubWVudEZvckNoaWxkKGZsZXhJdGVtLmJveCk7CiAgICAgICAgICAg ICBpZiAocG9zaXRpb24gPT0gSXRlbVBvc2l0aW9uOjpTdHJldGNoKQogICAgICAgICAgICAgICAg IGFwcGx5U3RyZXRjaEFsaWdubWVudFRvQ2hpbGQoZmxleEl0ZW0uYm94LCBsaW5lQ3Jvc3NBeGlz RXh0ZW50KTsKLSAgICAgICAgICAgIExheW91dFVuaXQgYXZhaWxhYmxlU3BhY2UgPQotICAgICAg ICAgICAgYXZhaWxhYmxlQWxpZ25tZW50U3BhY2VGb3JDaGlsZChsaW5lQ3Jvc3NBeGlzRXh0ZW50 LCBmbGV4SXRlbS5ib3gpOworICAgICAgICAgICAgTGF5b3V0VW5pdCBhdmFpbGFibGVTcGFjZSA9 IGF2YWlsYWJsZUFsaWdubWVudFNwYWNlRm9yQ2hpbGQobGluZUNyb3NzQXhpc0V4dGVudCwgZmxl eEl0ZW0uYm94KTsKICAgICAgICAgICAgIExheW91dFVuaXQgb2Zmc2V0ID0gYWxpZ25tZW50T2Zm c2V0KGF2YWlsYWJsZVNwYWNlLCBwb3NpdGlvbiwgbWFyZ2luQm94QXNjZW50Rm9yQ2hpbGQoZmxl eEl0ZW0uYm94KSwgbWF4QXNjZW50LCBzdHlsZSgpLmZsZXhXcmFwKCkgPT0gRmxleFdyYXA6OlJl dmVyc2UpOwogICAgICAgICAgICAgYWRqdXN0QWxpZ25tZW50Rm9yQ2hpbGQoZmxleEl0ZW0uYm94 LCBvZmZzZXQpOwogICAgICAgICAgICAgaWYgKHBvc2l0aW9uID09IEl0ZW1Qb3NpdGlvbjo6QmFz ZWxpbmUgJiYgc3R5bGUoKS5mbGV4V3JhcCgpID09IEZsZXhXcmFwOjpSZXZlcnNlKQo=