222557 2021-03-01 09:14:30 -0800 Apply transferred min/max sizes for intrinsic sizing 2021-03-11 10:11:06 -0800 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 47738 1 rbuis rbuis achristensen changseok esprehn+autocc ews-watchlist glenn kondapallykalyan pdr simon.fraser webkit-bug-importer oldest_to_newest 1734443 0 rbuis 2021-03-01 09:14:30 -0800 Apply transferred min/max sizes for intrinsic sizing. 1734444 1 421833 rbuis 2021-03-01 09:15:59 -0800 Created attachment 421833 Patch 1737107 2 422573 rbuis 2021-03-08 08:58:03 -0800 Created attachment 422573 Patch 1737115 3 webkit-bug-importer 2021-03-08 09:15:23 -0800 <rdar://problem/75172854> 1737213 4 422601 rbuis 2021-03-08 12:11:27 -0800 Created attachment 422601 Patch 1737271 5 422601 rbuis 2021-03-08 13:39:25 -0800 Comment on attachment 422601 Patch Not sure about the percentage height code, let me know if there is a better way. 1737295 6 422601 simon.fraser 2021-03-08 14:26:39 -0800 Comment on attachment 422601 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=422601&action=review > Source/WebCore/rendering/RenderBlock.cpp:263 > + bool m_hasAspectRatioPercentageHeightDescendant; This probably introduced several bytes of padding. Is there a spare bit you can fit this into? These "descendant has" bits are notoriously hard to keep up-to-date accurately. Is there a way to fix this without storing state like this? > Source/WebCore/rendering/RenderBlock.cpp:2437 > + const_cast<RenderBlock*>(this)->setHasAspectRatioPercentageHeightDescendant(); Yuck. 1737509 7 422679 rbuis 2021-03-09 01:43:18 -0800 Created attachment 422679 Patch 1737761 8 422601 rbuis 2021-03-09 14:30:57 -0800 Comment on attachment 422601 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=422601&action=review >> Source/WebCore/rendering/RenderBlock.cpp:2437 >> + const_cast<RenderBlock*>(this)->setHasAspectRatioPercentageHeightDescendant(); > > Yuck. Agreed, but sometimes it can't be avoided :) Anyway I hope I have a better solution now. 1738167 9 422679 simon.fraser 2021-03-10 12:19:23 -0800 Comment on attachment 422679 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=422679&action=review > Source/WebCore/rendering/RenderBlock.cpp:842 > + if (renderer->hasAspectRatio() || renderer->style().hasAspectRatio()) This is confusing; I feel like renderer->hasAspectRatio() could be renamed (maybe hasIntrinsicAspectRatio()). We have other properties with the same name on both style and renderer; they generally mean the same thing, but in situations where a property does not apply to some kinds of renderers. This one is different though. 1738220 10 422868 rbuis 2021-03-10 13:57:29 -0800 Created attachment 422868 Patch 1738233 11 422679 rbuis 2021-03-10 14:21:58 -0800 Comment on attachment 422679 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=422679&action=review >> Source/WebCore/rendering/RenderBlock.cpp:842 >> + if (renderer->hasAspectRatio() || renderer->style().hasAspectRatio()) > > This is confusing; I feel like renderer->hasAspectRatio() could be renamed (maybe hasIntrinsicAspectRatio()). > > We have other properties with the same name on both style and renderer; they generally mean the same thing, but in situations where a property does not apply to some kinds of renderers. This one is different though. Agreed, I mixed up child.style().hasAspectRatio() and child.hasAspectRatio() quite some times in development (and vice versa). Fixed now. 1738370 12 422906 rbuis 2021-03-10 23:50:53 -0800 Created attachment 422906 Patch 1738511 13 ews-feeder 2021-03-11 10:11:04 -0800 Committed r274287: <https://commits.webkit.org/r274287> All reviewed patches have been landed. Closing bug and clearing flags on attachment 422906. 421833 2021-03-01 09:15:59 -0800 2021-03-08 08:57:59 -0800 Patch bug-222557-20210301181558.patch text/plain 3077 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjczNjUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWUwNWU0OGMzYTQxODM1 OTg4NmQ2MDhlMjliMzFjZGU3MjM3Y2Q4Yi4uN2JhYjRkZjU0ZWQ5OGJhZjM5MWRkZWQ5YjUxNGJl OGZmYzNkNDk5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTAzLTAxICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQXBwbHkgdHJhbnNmZXJyZWQgbWlu L21heCBzaXplcyBmb3IgaW50cmluc2ljIHNpemluZworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIyNTU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl ckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVQcmVmZXJyZWRM b2dpY2FsV2lkdGhzKToKKwogMjAyMS0wMy0wMSAgQ2hyaXMgTG9yZCAgPGNsb3JkQGlnYWxpYS5j b20+CiAKICAgICAgICAgQ1NTRm9udEZhY2Ugc2hvdWxkIG5vdCBuZWVkIGl0cyBtX2ZvbnRTZWxl Y3RvciBkYXRhIG1lbWJlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAppbmRl eCA1M2ZkMGYwZjM4Y2E1YWZkMTA3OWZkYzM0MDc0OGIxNGM5YzI5MDAwLi41MWU3NTMyYzI0NTkw ZTkyZDlkNzVkODBiYzM2NzFkYmVlNWU5OTM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQm94LmNwcApAQCAtMzIyOCwxNiArMzIyOCwyMiBAQCBzdGF0aWMgYm9vbCBhbGxvd01pbk1h eFBlcmNlbnRhZ2VzSW5BdXRvSGVpZ2h0QmxvY2tzUXVpcmsoKQogCiB2b2lkIFJlbmRlckJveDo6 Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMoY29uc3QgTGVuZ3RoJiBtaW5XaWR0aCwgY29u c3QgTGVuZ3RoJiBtYXhXaWR0aCwgTGF5b3V0VW5pdCBib3JkZXJBbmRQYWRkaW5nKQogewotICAg IGlmIChtYXhXaWR0aC5pc0ZpeGVkKCkpIHsKLSAgICAgICAgYXV0byBhZGp1c3RDb250ZW50Qm94 TG9naWNhbFdpZHRoID0gYWRqdXN0Q29udGVudEJveExvZ2ljYWxXaWR0aEZvckJveFNpemluZyht YXhXaWR0aCk7Ci0gICAgICAgIG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoID0gc3RkOjptaW4o bV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGgsIGFkanVzdENvbnRlbnRCb3hMb2dpY2FsV2lkdGgp OwotICAgICAgICBtX21pblByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IHN0ZDo6bWluKG1fbWluUHJl ZmVycmVkTG9naWNhbFdpZHRoLCBhZGp1c3RDb250ZW50Qm94TG9naWNhbFdpZHRoKTsKLSAgICB9 CisgICAgaWYgKHNob3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJvbUFzcGVjdFJhdGlvKCkpIHsK KyAgICAgICAgYXV0byBbbG9naWNhbE1pbldpZHRoLCBsb2dpY2FsTWF4V2lkdGhdID0gY29tcHV0 ZU1pbk1heExvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpOworICAgICAgICBtX21heFByZWZl cnJlZExvZ2ljYWxXaWR0aCA9IHN0ZDo6bWluKG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoLCBs b2dpY2FsTWF4V2lkdGgpOworICAgICAgICBtX21pblByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IHN0 ZDo6bWluKG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoLCBsb2dpY2FsTWluV2lkdGgpOworICAg IH0gZWxzZSB7CisgICAgICAgIGlmIChtYXhXaWR0aC5pc0ZpeGVkKCkpIHsKKyAgICAgICAgICAg IGF1dG8gYWRqdXN0Q29udGVudEJveExvZ2ljYWxXaWR0aCA9IGFkanVzdENvbnRlbnRCb3hMb2dp Y2FsV2lkdGhGb3JCb3hTaXppbmcobWF4V2lkdGgpOworICAgICAgICAgICAgbV9tYXhQcmVmZXJy ZWRMb2dpY2FsV2lkdGggPSBzdGQ6Om1pbihtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCwgYWRq dXN0Q29udGVudEJveExvZ2ljYWxXaWR0aCk7CisgICAgICAgICAgICBtX21pblByZWZlcnJlZExv Z2ljYWxXaWR0aCA9IHN0ZDo6bWluKG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoLCBhZGp1c3RD b250ZW50Qm94TG9naWNhbFdpZHRoKTsKKyAgICAgICAgfQogCi0gICAgaWYgKG1pbldpZHRoLmlz Rml4ZWQoKSAmJiBtaW5XaWR0aC52YWx1ZSgpID4gMCkgewotICAgICAgICBhdXRvIGFkanVzdENv bnRlbnRCb3hMb2dpY2FsV2lkdGggPSBhZGp1c3RDb250ZW50Qm94TG9naWNhbFdpZHRoRm9yQm94 U2l6aW5nKG1pbldpZHRoKTsKLSAgICAgICAgbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBz dGQ6Om1heChtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCwgYWRqdXN0Q29udGVudEJveExvZ2lj YWxXaWR0aCk7Ci0gICAgICAgIG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoID0gc3RkOjptYXgo bV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgsIGFkanVzdENvbnRlbnRCb3hMb2dpY2FsV2lkdGgp OworICAgICAgICBpZiAobWluV2lkdGguaXNGaXhlZCgpICYmIG1pbldpZHRoLnZhbHVlKCkgPiAw KSB7CisgICAgICAgICAgICBhdXRvIGFkanVzdENvbnRlbnRCb3hMb2dpY2FsV2lkdGggPSBhZGp1 c3RDb250ZW50Qm94TG9naWNhbFdpZHRoRm9yQm94U2l6aW5nKG1pbldpZHRoKTsKKyAgICAgICAg ICAgIG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoID0gc3RkOjptYXgobV9tYXhQcmVmZXJyZWRM b2dpY2FsV2lkdGgsIGFkanVzdENvbnRlbnRCb3hMb2dpY2FsV2lkdGgpOworICAgICAgICAgICAg bV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBzdGQ6Om1heChtX21pblByZWZlcnJlZExvZ2lj YWxXaWR0aCwgYWRqdXN0Q29udGVudEJveExvZ2ljYWxXaWR0aCk7CisgICAgICAgIH0KICAgICB9 CiAKICAgICBtX21pblByZWZlcnJlZExvZ2ljYWxXaWR0aCArPSBib3JkZXJBbmRQYWRkaW5nOwo= 422573 2021-03-08 08:58:03 -0800 2021-03-08 12:11:23 -0800 Patch bug-222557-20210308175802.patch text/plain 8060 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MDY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjc0NjBiMmM2MTAwMDRi NDA0MTMzYmVjZWZkMmUyNGI1NjYyMmRjMC4uY2Y5NTgwYjk1NDY4MjZkZGY4NTNiOTNiNTc4OTQ5 NzBhNTAyNmNlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTAzLTA4ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQXBwbHkgdHJhbnNmZXJyZWQgbWlu L21heCBzaXplcyBmb3IgaW50cmluc2ljIHNpemluZworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIyNTU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl ckJsb2NrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpkaXJ0eUZvckxheW91 dEZyb21QZXJjZW50YWdlSGVpZ2h0RGVzY2VuZGFudHMpOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyQmxvY2s6OmFkZFBlcmNlbnRIZWlnaHREZXNjZW5kYW50KToKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlckJsb2NrOjpjb21wdXRlQ2hpbGRQcmVmZXJyZWRMb2dpY2FsV2lkdGhzIGNvbnN0KToK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpoYXNEZXBlbmRlbnRBc3BlY3RSYXRpb0hl aWdodCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6c2V0SGFzRGVwZW5k ZW50QXNwZWN0UmF0aW9IZWlnaHQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9jay5o OgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyQm94Ojpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocyk6CisKIDIwMjEtMDMtMDgg IFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KIAogICAgICAgICBTdXBwb3J0IGFzcGVjdC1y YXRpbyBpbiBpbnRyaW5zaWMgc2l6aW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2suY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJs b2NrLmNwcAppbmRleCA0NmI1YzY5ZmQ0ZDQ5YmQ5MGQ2ZDUzZDg4ODdkOWQ4OWIzYTQwZTcxLi44 ZTBkMGFkODI1OGNiZWFhODAwZWFjZDYzOGE0N2JjMDUxMDc4ZDNiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKQEAgLTI2MCw2ICsyNjAsNyBAQCBwdWJsaWM6CiAg ICAgTGF5b3V0VW5pdCBtX3BhZ2luYXRpb25TdHJ1dDsKICAgICBMYXlvdXRVbml0IG1fcGFnZUxv Z2ljYWxPZmZzZXQ7CiAgICAgTGF5b3V0VW5pdCBtX2ludHJpbnNpY0JvcmRlckZvckZpZWxkc2V0 OworICAgIGJvb2wgbV9oYXNEZXBlbmRlbnRBc3BlY3RSYXRpb0hlaWdodDsKICAgICAKICAgICBP cHRpb25hbDxXZWFrUHRyPFJlbmRlckZyYWdtZW50ZWRGbG93Pj4gbV9lbmNsb3NpbmdGcmFnbWVu dGVkRmxvdzsKIH07CkBAIC04MzksNyArODQwLDcgQEAgdm9pZCBSZW5kZXJCbG9jazo6ZGlydHlG b3JMYXlvdXRGcm9tUGVyY2VudGFnZUhlaWdodERlc2NlbmRhbnRzKCkKICAgICAgICAgICAgIC8v IElmIHRoZSB3aWR0aCBvZiBhbiBpbWFnZSBpcyBhZmZlY3RlZCBieSB0aGUgaGVpZ2h0IG9mIGEg Y2hpbGQgKGUuZy4sIGFuIGltYWdlIHdpdGggYW4gYXNwZWN0IHJhdGlvKSwKICAgICAgICAgICAg IC8vIHRoZW4gd2UgaGF2ZSB0byBkaXJ0eSBwcmVmZXJyZWQgd2lkdGhzLCBzaW5jZSBldmVuIGVu Y2xvc2luZyBibG9ja3MgY2FuIGJlY29tZSBkaXJ0eSBhcyBhIHJlc3VsdC4KICAgICAgICAgICAg IC8vIChBIGhvcml6b250YWwgZmxleGJveCB0aGF0IGNvbnRhaW5zIGFuIGlubGluZSBpbWFnZSB3 cmFwcGVkIGluIGFuIGFub255bW91cyBibG9jayBmb3IgZXhhbXBsZS4pCi0gICAgICAgICAgICBp ZiAocmVuZGVyZXItPmhhc0FzcGVjdFJhdGlvKCkpCisgICAgICAgICAgICBpZiAocmVuZGVyZXIt Pmhhc0FzcGVjdFJhdGlvKCkgfHwgcmVuZGVyZXItPnN0eWxlKCkuaGFzQXNwZWN0UmF0aW8oKSkK ICAgICAgICAgICAgICAgICByZW5kZXJlci0+c2V0UHJlZmVycmVkTG9naWNhbFdpZHRoc0RpcnR5 KHRydWUpOwogICAgICAgICAgICAgYXV0byogY29udGFpbmVyID0gcmVuZGVyZXItPmNvbnRhaW5l cigpOwogICAgICAgICAgICAgLy8gTWFyayB0aGUgc3ZnIGFuY2VzdG9yIGNoYWluIGRpcnR5IGFz IHdlIHdhbGsgdG8gdGhlIGNvbnRhaW5lci4KQEAgLTE4MjYsNiArMTgyNyw4IEBAIHZvaWQgUmVu ZGVyQmxvY2s6OnJlbW92ZVBvc2l0aW9uZWRPYmplY3RzKGNvbnN0IFJlbmRlckJsb2NrKiBuZXdD b250YWluaW5nQmxvY2tDCiAKIHZvaWQgUmVuZGVyQmxvY2s6OmFkZFBlcmNlbnRIZWlnaHREZXNj ZW5kYW50KFJlbmRlckJveCYgZGVzY2VuZGFudCkKIHsKKyAgICBpZiAoZGVzY2VuZGFudC5zdHls ZSgpLmhhc0FzcGVjdFJhdGlvKCkpCisgICAgICAgIHNldEhhc0RlcGVuZGVudEFzcGVjdFJhdGlv SGVpZ2h0KCk7CiAgICAgaW5zZXJ0SW50b1RyYWNrZWRSZW5kZXJlck1hcHMoKnRoaXMsIGRlc2Nl bmRhbnQpOwogfQogCkBAIC0yNDIzLDYgKzI0MjYsMTIgQEAgdm9pZCBSZW5kZXJCbG9jazo6Y29t cHV0ZUNoaWxkUHJlZmVycmVkTG9naWNhbFdpZHRocyhSZW5kZXJPYmplY3QmIGNoaWxkLCBMYXlv dXQKICAgICAgICAgfQogICAgIH0KICAgICAKKyAgICBpZiAoaGFzRGVwZW5kZW50QXNwZWN0UmF0 aW9IZWlnaHQoKSkgeworICAgICAgICBjaGlsZC5zZXRQcmVmZXJyZWRMb2dpY2FsV2lkdGhzRGly dHkodHJ1ZSk7CisgICAgICAgIGlmIChjaGlsZC5pc1JlbmRlckJsb2NrKCkpCisgICAgICAgICAg ICBkb3duY2FzdDxSZW5kZXJCbG9jaz4oY2hpbGQpLnNldEhhc0RlcGVuZGVudEFzcGVjdFJhdGlv SGVpZ2h0KCk7CisgICAgfQorCiAgICAgbWluUHJlZmVycmVkTG9naWNhbFdpZHRoID0gY2hpbGQu bWluUHJlZmVycmVkTG9naWNhbFdpZHRoKCk7CiAgICAgbWF4UHJlZmVycmVkTG9naWNhbFdpZHRo ID0gY2hpbGQubWF4UHJlZmVycmVkTG9naWNhbFdpZHRoKCk7CiAgICAgCkBAIC0yNzYwLDYgKzI3 NjksMTIgQEAgTGF5b3V0VW5pdCBSZW5kZXJCbG9jazo6cGFnZUxvZ2ljYWxPZmZzZXQoKSBjb25z dAogICAgIHJldHVybiByYXJlRGF0YSA/IHJhcmVEYXRhLT5tX3BhZ2VMb2dpY2FsT2Zmc2V0IDog MF9sdTsKIH0KIAorYm9vbCBSZW5kZXJCbG9jazo6aGFzRGVwZW5kZW50QXNwZWN0UmF0aW9IZWln aHQoKSBjb25zdAoreworICAgIFJlbmRlckJsb2NrUmFyZURhdGEqIHJhcmVEYXRhID0gZ2V0Qmxv Y2tSYXJlRGF0YSgqdGhpcyk7CisgICAgcmV0dXJuIHJhcmVEYXRhID8gcmFyZURhdGEtPm1faGFz RGVwZW5kZW50QXNwZWN0UmF0aW9IZWlnaHQgOiBmYWxzZTsKK30KKwogdm9pZCBSZW5kZXJCbG9j azo6c2V0UGFnaW5hdGlvblN0cnV0KExheW91dFVuaXQgc3RydXQpCiB7CiAgICAgUmVuZGVyQmxv Y2tSYXJlRGF0YSogcmFyZURhdGEgPSBnZXRCbG9ja1JhcmVEYXRhKCp0aGlzKTsKQEAgLTI3ODIs NiArMjc5NywxNCBAQCB2b2lkIFJlbmRlckJsb2NrOjpzZXRQYWdlTG9naWNhbE9mZnNldChMYXlv dXRVbml0IGxvZ2ljYWxPZmZzZXQpCiAgICAgcmFyZURhdGEtPm1fcGFnZUxvZ2ljYWxPZmZzZXQg PSBsb2dpY2FsT2Zmc2V0OwogfQogCit2b2lkIFJlbmRlckJsb2NrOjpzZXRIYXNEZXBlbmRlbnRB c3BlY3RSYXRpb0hlaWdodCgpCit7CisgICAgUmVuZGVyQmxvY2tSYXJlRGF0YSogcmFyZURhdGEg PSBnZXRCbG9ja1JhcmVEYXRhKCp0aGlzKTsKKyAgICBpZiAoIXJhcmVEYXRhKQorICAgICAgICBy YXJlRGF0YSA9ICZlbnN1cmVCbG9ja1JhcmVEYXRhKCp0aGlzKTsKKyAgICByYXJlRGF0YS0+bV9o YXNEZXBlbmRlbnRBc3BlY3RSYXRpb0hlaWdodCA9IHRydWU7Cit9CisKIHZvaWQgUmVuZGVyQmxv Y2s6OmFic29sdXRlUmVjdHMoVmVjdG9yPEludFJlY3Q+JiByZWN0cywgY29uc3QgTGF5b3V0UG9p bnQmIGFjY3VtdWxhdGVkT2Zmc2V0KSBjb25zdAogewogICAgIC8vIEZvciBibG9ja3MgaW5zaWRl IGlubGluZXMsIHdlIGluY2x1ZGUgbWFyZ2lucyBzbyB0aGF0IHdlIHJ1biByaWdodCB1cCB0byB0 aGUgaW5saW5lIGJveGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQmxvY2suaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oCmluZGV4 IGY5YjJkOThkZDlhOWU1OWRlMWNhZTkzNjIxMjc2YzY4ZDQxMzNlZDcuLmNkOWM2N2NkNTJiODdm MTQyZmUxY2M1NjdmOTAxYjc5NWQ5MTEyMTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCbG9jay5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCbG9jay5oCkBAIC0yMTgsNiArMjE4LDkgQEAgcHVibGljOgogICAgIExheW91dFVuaXQgcGFn ZUxvZ2ljYWxPZmZzZXQoKSBjb25zdDsKICAgICB2b2lkIHNldFBhZ2VMb2dpY2FsT2Zmc2V0KExh eW91dFVuaXQpOwogCisgICAgYm9vbCBoYXNEZXBlbmRlbnRBc3BlY3RSYXRpb0hlaWdodCgpIGNv bnN0OworICAgIHZvaWQgc2V0SGFzRGVwZW5kZW50QXNwZWN0UmF0aW9IZWlnaHQoKTsKKwogICAg IC8vIEZpZWxkc2V0IGxlZ2VuZHMgdGhhdCBhcmUgdGFsbGVyIHRoYW4gdGhlIGZpZWxkc2V0IGJv cmRlciBhZGQgaW4gaW50cmluc2ljIGJvcmRlcgogICAgIC8vIGluIG9yZGVyIHRvIGVuc3VyZSB0 aGF0IGNvbnRlbnQgZ2V0cyBwcm9wZXJseSBwdXNoZWQgZG93biBhY3Jvc3MgYWxsIGxheW91dCBz eXN0ZW1zCiAgICAgLy8gKGZsZXhib3gsIGJsb2NrLCBldGMuKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQm94LmNwcAppbmRleCA1ZGNlYmFhYmVkOTRmNzcxNjNhN2Y0YjNkYjA1Y2YxNjM0 YWVlY2Y0Li4yOGY3MDAzYzU4OTFhNGRhN2I2NWYxODc4ZGE5NzhhZmMwNjgzYzE4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcApAQCAtMzIzMyw2ICszMjMzLDEyIEBAIHN0 YXRpYyBib29sIGFsbG93TWluTWF4UGVyY2VudGFnZXNJbkF1dG9IZWlnaHRCbG9ja3NRdWlyaygp CiAKIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocyhjb25zdCBM ZW5ndGgmIG1pbldpZHRoLCBjb25zdCBMZW5ndGgmIG1heFdpZHRoLCBMYXlvdXRVbml0IGJvcmRl ckFuZFBhZGRpbmcpCiB7CisgICAgaWYgKHNob3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJvbUFz cGVjdFJhdGlvKCkpIHsKKyAgICAgICAgYXV0byBbbG9naWNhbE1pbldpZHRoLCBsb2dpY2FsTWF4 V2lkdGhdID0gY29tcHV0ZU1pbk1heExvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpOworICAg ICAgICBtX21pblByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IHN0ZDo6Y2xhbXAobV9taW5QcmVmZXJy ZWRMb2dpY2FsV2lkdGgsIGxvZ2ljYWxNaW5XaWR0aCwgbG9naWNhbE1heFdpZHRoKTsKKyAgICAg ICAgbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBzdGQ6OmNsYW1wKG1fbWF4UHJlZmVycmVk TG9naWNhbFdpZHRoLCBsb2dpY2FsTWluV2lkdGgsIGxvZ2ljYWxNYXhXaWR0aCk7CisgICAgfQor CiAgICAgaWYgKG1heFdpZHRoLmlzRml4ZWQoKSkgewogICAgICAgICBhdXRvIGFkanVzdENvbnRl bnRCb3hMb2dpY2FsV2lkdGggPSBhZGp1c3RDb250ZW50Qm94TG9naWNhbFdpZHRoRm9yQm94U2l6 aW5nKG1heFdpZHRoKTsKICAgICAgICAgbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBzdGQ6 Om1pbihtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCwgYWRqdXN0Q29udGVudEJveExvZ2ljYWxX aWR0aCk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0 VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwppbmRleCA3YWNjYzA2YzU2Mjk5MDhmYzQwYTQxNzllZmI4 ZWU4MjhhYWJlOWIwLi4zNjhjY2I2NjU1NmM1ZjFkNGZkMzU3ODcwY2RmNjZhOGI4NWFhZWQ2IDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3Rz L1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTQ1NTYsMTUgKzQ1NTYsMTIgQEAgd2Via2l0Lm9yZy9iLzIx NDQ2MiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2NvcGluZy9zbG90 dGVkLXBsYWMKIAogIyAgY29udGFpbi1pbnRyaW5zaWMtc2l6ZQogd2Via2l0Lm9yZy9iLzIxNDQ2 MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1y YXRpby9hYnNwb3MtMDE0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8y MTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl Y3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAyNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd Ci13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz L2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMjguaHRtbCBbIElt YWdlT25seUZhaWx1cmUgXQogIyBmbGV4LWJhc2lzOmNvbnRlbnQKIHdlYmtpdC5vcmcvYi8yMTQ0 NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3Qt cmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDIxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdl YmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz LXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDIyLmh0bWwgWyBJbWFnZU9u bHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDI1 Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQv dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1h c3BlY3QtcmF0aW8tMDI2Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8y MTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl Y3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDA1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdl YmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz LXNpemluZy9hc3BlY3QtcmF0aW8vaW50cmluc2ljLXNpemUtMDA4Lmh0bWwgWyBJbWFnZU9ubHlG YWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vdGFibGUtZWxlbWVudC0wMDEuaHRtbCBb IEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2NvbnRhaW4taW50cmluc2ljLXNpemUvY29u dGFpbi1pbnRyaW5zaWMtc2l6ZS0wMDEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0 Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6 aW5nL2NvbnRhaW4taW50cmluc2ljLXNpemUvY29udGFpbi1pbnRyaW5zaWMtc2l6ZS0wMDIuaHRt bCBbIEltYWdlT25seUZhaWx1cmUgXQo= 422601 2021-03-08 12:11:27 -0800 2021-03-09 01:43:13 -0800 Patch bug-222557-20210308211126.patch text/plain 8634 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MDY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjc0NjBiMmM2MTAwMDRi NDA0MTMzYmVjZWZkMmUyNGI1NjYyMmRjMC4uYTc3NDM4ZjgyMTg0YWJjZGZmMmUyNzVkZGJhZmE4 Mzc4MzllYjMwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIxLTAzLTA4ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQXBwbHkgdHJhbnNmZXJyZWQgbWlu L21heCBzaXplcyBmb3IgaW50cmluc2ljIHNpemluZworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIyNTU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQXBwbHkgdHJhbnNmZXJyZWQgbWluL21heCBzaXplcyBm b3IgaW50cmluc2ljIHNpemluZyBbMV0uCisKKyAgICAgICAgVGhpcyBhbHNvIGFkZHMgbG9naWMg dG8gdHJhY2sgcGVyY2VudGFnZSBoZWlnaHQgdXNhZ2UgaW4KKyAgICAgICAgZGVzY2VuZGVudHMs IHdoaWNoIG5lZWRzIGNvbnRhaW5pbmcgYmxvY2tzIHRvIHNldCBjaGlsZAorICAgICAgICBwcmVm IHdpZHRocyB0byBkaXJ0eSB0byByZWNhbGN1bGF0ZSB0aGUgcGVyY2VudGFnZSBoZWlnaHRzLgor CisgICAgICAgIEJlaGF2aW9yIG1hdGNoZXMgRmlyZWZveCBhbmQgQ2hyb21lLgorCisgICAgICAg IFsxXSBodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLXNpemluZy00LyNhc3BlY3QtcmF0aW8t c2l6ZS10cmFuc2ZlcnMKKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9jay5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6YWRkUGVyY2VudEhlaWdodERlc2NlbmRhbnQp OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmNvbXB1dGVDaGlsZFByZWZlcnJlZExv Z2ljYWxXaWR0aHMgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6Omhhc0Fz cGVjdFJhdGlvUGVyY2VudGFnZUhlaWdodERlc2NlbmRhbnQgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyQmxvY2s6OnNldEhhc0FzcGVjdFJhdGlvUGVyY2VudGFnZUhlaWdodERlc2Nl bmRhbnQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9jay5oOgorICAgICAgICAqIHJl bmRlcmluZy9SZW5kZXJCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21w dXRlUHJlZmVycmVkTG9naWNhbFdpZHRocyk6CisKIDIwMjEtMDMtMDggIFJvYiBCdWlzICA8cmJ1 aXNAaWdhbGlhLmNvbT4KIAogICAgICAgICBTdXBwb3J0IGFzcGVjdC1yYXRpbyBpbiBpbnRyaW5z aWMgc2l6aW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxv Y2suY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAppbmRleCA0 NmI1YzY5ZmQ0ZDQ5YmQ5MGQ2ZDUzZDg4ODdkOWQ4OWIzYTQwZTcxLi5jN2MxN2Y3MDIyZWExMTZi Y2M1NTNmMTRmYjVhOTc0OTliZWFhNzg2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2suY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCbG9jay5jcHAKQEAgLTI2MCw2ICsyNjAsNyBAQCBwdWJsaWM6CiAgICAgTGF5b3V0VW5pdCBt X3BhZ2luYXRpb25TdHJ1dDsKICAgICBMYXlvdXRVbml0IG1fcGFnZUxvZ2ljYWxPZmZzZXQ7CiAg ICAgTGF5b3V0VW5pdCBtX2ludHJpbnNpY0JvcmRlckZvckZpZWxkc2V0OworICAgIGJvb2wgbV9o YXNBc3BlY3RSYXRpb1BlcmNlbnRhZ2VIZWlnaHREZXNjZW5kYW50OwogICAgIAogICAgIE9wdGlv bmFsPFdlYWtQdHI8UmVuZGVyRnJhZ21lbnRlZEZsb3c+PiBtX2VuY2xvc2luZ0ZyYWdtZW50ZWRG bG93OwogfTsKQEAgLTE4MjYsNiArMTgyNyw4IEBAIHZvaWQgUmVuZGVyQmxvY2s6OnJlbW92ZVBv c2l0aW9uZWRPYmplY3RzKGNvbnN0IFJlbmRlckJsb2NrKiBuZXdDb250YWluaW5nQmxvY2tDCiAK IHZvaWQgUmVuZGVyQmxvY2s6OmFkZFBlcmNlbnRIZWlnaHREZXNjZW5kYW50KFJlbmRlckJveCYg ZGVzY2VuZGFudCkKIHsKKyAgICBpZiAoZGVzY2VuZGFudC5zdHlsZSgpLmhhc0FzcGVjdFJhdGlv KCkpCisgICAgICAgIHNldEhhc0FzcGVjdFJhdGlvUGVyY2VudGFnZUhlaWdodERlc2NlbmRhbnQo KTsKICAgICBpbnNlcnRJbnRvVHJhY2tlZFJlbmRlcmVyTWFwcygqdGhpcywgZGVzY2VuZGFudCk7 CiB9CiAKQEAgLTI0MjIsOSArMjQyNSwxNiBAQCB2b2lkIFJlbmRlckJsb2NrOjpjb21wdXRlQ2hp bGRQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKFJlbmRlck9iamVjdCYgY2hpbGQsIExheW91dAogICAg ICAgICAgICAgYm94LmNsZWFyT3ZlcnJpZGluZ0NvbnRlbnRTaXplKCk7CiAgICAgICAgIH0KICAg ICB9Ci0gICAgCisKKyAgICBib29sIHNlbGZQcmVmZXJyZWRMb2dpY2FsV2lkdGhzRGlydHkgPSBw cmVmZXJyZWRMb2dpY2FsV2lkdGhzRGlydHkoKTsKKyAgICBpZiAoaGFzQXNwZWN0UmF0aW9QZXJj ZW50YWdlSGVpZ2h0RGVzY2VuZGFudCgpKQorICAgICAgICBjaGlsZC5zZXRQcmVmZXJyZWRMb2dp Y2FsV2lkdGhzRGlydHkodHJ1ZSk7CisKICAgICBtaW5QcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBj aGlsZC5taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgoKTsKICAgICBtYXhQcmVmZXJyZWRMb2dpY2Fs V2lkdGggPSBjaGlsZC5tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGgoKTsKKworICAgIGlmIChzZWxm UHJlZmVycmVkTG9naWNhbFdpZHRoc0RpcnR5ICYmIGNoaWxkLmlzUmVuZGVyQmxvY2soKSAmJiBk b3duY2FzdDxSZW5kZXJCbG9jaz4oY2hpbGQpLmhhc0FzcGVjdFJhdGlvUGVyY2VudGFnZUhlaWdo dERlc2NlbmRhbnQoKSkKKyAgICAgICAgY29uc3RfY2FzdDxSZW5kZXJCbG9jayo+KHRoaXMpLT5z ZXRIYXNBc3BlY3RSYXRpb1BlcmNlbnRhZ2VIZWlnaHREZXNjZW5kYW50KCk7CiAgICAgCiAgICAg aWYgKGNoaWxkLmlzQm94KCkpIHsKICAgICAgICAgYXV0byYgYm94ID0gZG93bmNhc3Q8UmVuZGVy Qm94PihjaGlsZCk7CkBAIC0yNzYwLDYgKzI3NzAsMTIgQEAgTGF5b3V0VW5pdCBSZW5kZXJCbG9j azo6cGFnZUxvZ2ljYWxPZmZzZXQoKSBjb25zdAogICAgIHJldHVybiByYXJlRGF0YSA/IHJhcmVE YXRhLT5tX3BhZ2VMb2dpY2FsT2Zmc2V0IDogMF9sdTsKIH0KIAorYm9vbCBSZW5kZXJCbG9jazo6 aGFzQXNwZWN0UmF0aW9QZXJjZW50YWdlSGVpZ2h0RGVzY2VuZGFudCgpIGNvbnN0Cit7CisgICAg UmVuZGVyQmxvY2tSYXJlRGF0YSogcmFyZURhdGEgPSBnZXRCbG9ja1JhcmVEYXRhKCp0aGlzKTsK KyAgICByZXR1cm4gcmFyZURhdGEgPyByYXJlRGF0YS0+bV9oYXNBc3BlY3RSYXRpb1BlcmNlbnRh Z2VIZWlnaHREZXNjZW5kYW50IDogZmFsc2U7Cit9CisKIHZvaWQgUmVuZGVyQmxvY2s6OnNldFBh Z2luYXRpb25TdHJ1dChMYXlvdXRVbml0IHN0cnV0KQogewogICAgIFJlbmRlckJsb2NrUmFyZURh dGEqIHJhcmVEYXRhID0gZ2V0QmxvY2tSYXJlRGF0YSgqdGhpcyk7CkBAIC0yNzgyLDYgKzI3OTgs MTQgQEAgdm9pZCBSZW5kZXJCbG9jazo6c2V0UGFnZUxvZ2ljYWxPZmZzZXQoTGF5b3V0VW5pdCBs b2dpY2FsT2Zmc2V0KQogICAgIHJhcmVEYXRhLT5tX3BhZ2VMb2dpY2FsT2Zmc2V0ID0gbG9naWNh bE9mZnNldDsKIH0KIAordm9pZCBSZW5kZXJCbG9jazo6c2V0SGFzQXNwZWN0UmF0aW9QZXJjZW50 YWdlSGVpZ2h0RGVzY2VuZGFudCgpCit7CisgICAgUmVuZGVyQmxvY2tSYXJlRGF0YSogcmFyZURh dGEgPSBnZXRCbG9ja1JhcmVEYXRhKCp0aGlzKTsKKyAgICBpZiAoIXJhcmVEYXRhKQorICAgICAg ICByYXJlRGF0YSA9ICZlbnN1cmVCbG9ja1JhcmVEYXRhKCp0aGlzKTsKKyAgICByYXJlRGF0YS0+ bV9oYXNBc3BlY3RSYXRpb1BlcmNlbnRhZ2VIZWlnaHREZXNjZW5kYW50ID0gdHJ1ZTsKK30KKwog dm9pZCBSZW5kZXJCbG9jazo6YWJzb2x1dGVSZWN0cyhWZWN0b3I8SW50UmVjdD4mIHJlY3RzLCBj b25zdCBMYXlvdXRQb2ludCYgYWNjdW11bGF0ZWRPZmZzZXQpIGNvbnN0CiB7CiAgICAgLy8gRm9y IGJsb2NrcyBpbnNpZGUgaW5saW5lcywgd2UgaW5jbHVkZSBtYXJnaW5zIHNvIHRoYXQgd2UgcnVu IHJpZ2h0IHVwIHRvIHRoZSBpbmxpbmUgYm94ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCbG9jay5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJsb2NrLmgKaW5kZXggZjliMmQ5OGRkOWE5ZTU5ZGUxY2FlOTM2MjEyNzZjNjhkNDEzM2VkNy4u MTU5MjQwZTJlZTQwYTkxNzdmOTAxZGQxYzdlYmI3YTdhYjIxNGJjZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKQEAgLTIxOCw2ICsyMTgsOSBAQCBwdWJsaWM6CiAgICAg TGF5b3V0VW5pdCBwYWdlTG9naWNhbE9mZnNldCgpIGNvbnN0OwogICAgIHZvaWQgc2V0UGFnZUxv Z2ljYWxPZmZzZXQoTGF5b3V0VW5pdCk7CiAKKyAgICBib29sIGhhc0FzcGVjdFJhdGlvUGVyY2Vu dGFnZUhlaWdodERlc2NlbmRhbnQoKSBjb25zdDsKKyAgICB2b2lkIHNldEhhc0FzcGVjdFJhdGlv UGVyY2VudGFnZUhlaWdodERlc2NlbmRhbnQoKTsKKwogICAgIC8vIEZpZWxkc2V0IGxlZ2VuZHMg dGhhdCBhcmUgdGFsbGVyIHRoYW4gdGhlIGZpZWxkc2V0IGJvcmRlciBhZGQgaW4gaW50cmluc2lj IGJvcmRlcgogICAgIC8vIGluIG9yZGVyIHRvIGVuc3VyZSB0aGF0IGNvbnRlbnQgZ2V0cyBwcm9w ZXJseSBwdXNoZWQgZG93biBhY3Jvc3MgYWxsIGxheW91dCBzeXN0ZW1zCiAgICAgLy8gKGZsZXhi b3gsIGJsb2NrLCBldGMuKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAppbmRl eCA1ZGNlYmFhYmVkOTRmNzcxNjNhN2Y0YjNkYjA1Y2YxNjM0YWVlY2Y0Li4yOGY3MDAzYzU4OTFh NGRhN2I2NWYxODc4ZGE5NzhhZmMwNjgzYzE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQm94LmNwcApAQCAtMzIzMyw2ICszMjMzLDEyIEBAIHN0YXRpYyBib29sIGFsbG93TWluTWF4 UGVyY2VudGFnZXNJbkF1dG9IZWlnaHRCbG9ja3NRdWlyaygpCiAKIHZvaWQgUmVuZGVyQm94Ojpj b21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocyhjb25zdCBMZW5ndGgmIG1pbldpZHRoLCBjb25z dCBMZW5ndGgmIG1heFdpZHRoLCBMYXlvdXRVbml0IGJvcmRlckFuZFBhZGRpbmcpCiB7CisgICAg aWYgKHNob3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJvbUFzcGVjdFJhdGlvKCkpIHsKKyAgICAg ICAgYXV0byBbbG9naWNhbE1pbldpZHRoLCBsb2dpY2FsTWF4V2lkdGhdID0gY29tcHV0ZU1pbk1h eExvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpOworICAgICAgICBtX21pblByZWZlcnJlZExv Z2ljYWxXaWR0aCA9IHN0ZDo6Y2xhbXAobV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgsIGxvZ2lj YWxNaW5XaWR0aCwgbG9naWNhbE1heFdpZHRoKTsKKyAgICAgICAgbV9tYXhQcmVmZXJyZWRMb2dp Y2FsV2lkdGggPSBzdGQ6OmNsYW1wKG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoLCBsb2dpY2Fs TWluV2lkdGgsIGxvZ2ljYWxNYXhXaWR0aCk7CisgICAgfQorCiAgICAgaWYgKG1heFdpZHRoLmlz Rml4ZWQoKSkgewogICAgICAgICBhdXRvIGFkanVzdENvbnRlbnRCb3hMb2dpY2FsV2lkdGggPSBh ZGp1c3RDb250ZW50Qm94TG9naWNhbFdpZHRoRm9yQm94U2l6aW5nKG1heFdpZHRoKTsKICAgICAg ICAgbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBzdGQ6Om1pbihtX21heFByZWZlcnJlZExv Z2ljYWxXaWR0aCwgYWRqdXN0Q29udGVudEJveExvZ2ljYWxXaWR0aCk7CmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMWQzNWNm MTE1YTBjNjlmMjg3MDdhZDkzYWEyYTUxNWY4N2RkMjkxYi4uZjFjOWQzNDhhODAxMTM4M2U3YmUw MGUzYTk0MTc2ZDYzMTM1YmQ1ZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisr KyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTAzLTA4ICBS b2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQXBwbHkgdHJhbnNmZXJyZWQg bWluL21heCBzaXplcyBmb3IgaW50cmluc2ljIHNpemluZworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIyNTU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRW5hYmxlIHRlc3RzIHRoYXQgcGFzcyBub3cuCisK KyAgICAgICAgKiBUZXN0RXhwZWN0YXRpb25zOgorCiAyMDIxLTAzLTA4ICBSb2IgQnVpcyAgPHJi dWlzQGlnYWxpYS5jb20+CiAKICAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8gaW4gaW50cmlu c2ljIHNpemluZwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xh eW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggN2FjY2MwNmM1NjI5OTA4ZmM0MGE0MTc5 ZWZiOGVlODI4YWFiZTliMC4uMzY4Y2NiNjY1NTZjNWYxZDRmZDM1Nzg3MGNkZjY2YThiODVhYWVk NiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRU ZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00NTU2LDE1ICs0NTU2LDEyIEBAIHdlYmtpdC5vcmcv Yi8yMTQ0NjIgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNjb3Bpbmcv c2xvdHRlZC1wbGFjCiAKICMgIGNvbnRhaW4taW50cmluc2ljLXNpemUKIHdlYmtpdC5vcmcvYi8y MTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl Y3QtcmF0aW8vYWJzcG9zLTAxNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3Jn L2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcv YXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMjQuaHRtbCBbIEltYWdlT25seUZhaWx1 cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz L2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDI4Lmh0bWwg WyBJbWFnZU9ubHlGYWlsdXJlIF0KICMgZmxleC1iYXNpczpjb250ZW50CiB3ZWJraXQub3JnL2Iv MjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNw ZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd CiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz L2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyMi5odG1sIFsgSW1h Z2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlv LTAyNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9y dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Zs ZXgtYXNwZWN0LXJhdGlvLTAyNi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3Jn L2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcv YXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAwNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd Ci13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz L2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAwOC5odG1sIFsgSW1hZ2VP bmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZv cm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL3RhYmxlLWVsZW1lbnQtMDAxLmh0 bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNj L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9jb250YWluLWludHJpbnNpYy1zaXpl L2NvbnRhaW4taW50cmluc2ljLXNpemUtMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdl YmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz LXNpemluZy9jb250YWluLWludHJpbnNpYy1zaXplL2NvbnRhaW4taW50cmluc2ljLXNpemUtMDAy Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K 422679 2021-03-09 01:43:18 -0800 2021-03-10 13:57:24 -0800 Patch bug-222557-20210309104316.patch text/plain 6234 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MDY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjc0NjBiMmM2MTAwMDRi NDA0MTMzYmVjZWZkMmUyNGI1NjYyMmRjMC4uYzQ3YWI5Zjc3MDBiM2QyZWQ4MzllZDkyYTYzODlh ZjI1YmMzZDlhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTAzLTA5ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQXBwbHkgdHJhbnNmZXJyZWQgbWlu L21heCBzaXplcyBmb3IgaW50cmluc2ljIHNpemluZworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIyNTU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQXBwbHkgdHJhbnNmZXJyZWQgbWluL21heCBzaXplcyBm b3IgaW50cmluc2ljIHNpemluZyBbMV0uCisKKyAgICAgICAgQmVoYXZpb3IgbWF0Y2hlcyBGaXJl Zm94IGFuZCBDaHJvbWUuCisKKyAgICAgICAgWzFdIGh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9j c3Mtc2l6aW5nLTQvI2FzcGVjdC1yYXRpby1zaXplLXRyYW5zZmVycworCisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpk aXJ0eUZvckxheW91dEZyb21QZXJjZW50YWdlSGVpZ2h0RGVzY2VuZGFudHMpOgorICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpu ZWVkc1ByZWZlcnJlZFdpZHRoc1JlY2FsY3VsYXRpb24gY29uc3QpOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyQm94Ojpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocyk6CisKIDIwMjEtMDMt MDggIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KIAogICAgICAgICBTdXBwb3J0IGFzcGVj dC1yYXRpbyBpbiBpbnRyaW5zaWMgc2l6aW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJsb2NrLmNwcAppbmRleCA0NmI1YzY5ZmQ0ZDQ5YmQ5MGQ2ZDUzZDg4ODdkOWQ4OWIzYTQwZTcx Li5jNmIxNTU3ZmM4M2M1ODJkZjQyY2IyOTE5M2FhNWU4OTYzNzUxZjNjIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKQEAgLTgzOSw3ICs4MzksNyBAQCB2b2lkIFJl bmRlckJsb2NrOjpkaXJ0eUZvckxheW91dEZyb21QZXJjZW50YWdlSGVpZ2h0RGVzY2VuZGFudHMo KQogICAgICAgICAgICAgLy8gSWYgdGhlIHdpZHRoIG9mIGFuIGltYWdlIGlzIGFmZmVjdGVkIGJ5 IHRoZSBoZWlnaHQgb2YgYSBjaGlsZCAoZS5nLiwgYW4gaW1hZ2Ugd2l0aCBhbiBhc3BlY3QgcmF0 aW8pLAogICAgICAgICAgICAgLy8gdGhlbiB3ZSBoYXZlIHRvIGRpcnR5IHByZWZlcnJlZCB3aWR0 aHMsIHNpbmNlIGV2ZW4gZW5jbG9zaW5nIGJsb2NrcyBjYW4gYmVjb21lIGRpcnR5IGFzIGEgcmVz dWx0LgogICAgICAgICAgICAgLy8gKEEgaG9yaXpvbnRhbCBmbGV4Ym94IHRoYXQgY29udGFpbnMg YW4gaW5saW5lIGltYWdlIHdyYXBwZWQgaW4gYW4gYW5vbnltb3VzIGJsb2NrIGZvciBleGFtcGxl LikKLSAgICAgICAgICAgIGlmIChyZW5kZXJlci0+aGFzQXNwZWN0UmF0aW8oKSkKKyAgICAgICAg ICAgIGlmIChyZW5kZXJlci0+aGFzQXNwZWN0UmF0aW8oKSB8fCByZW5kZXJlci0+c3R5bGUoKS5o YXNBc3BlY3RSYXRpbygpKQogICAgICAgICAgICAgICAgIHJlbmRlcmVyLT5zZXRQcmVmZXJyZWRM b2dpY2FsV2lkdGhzRGlydHkodHJ1ZSk7CiAgICAgICAgICAgICBhdXRvKiBjb250YWluZXIgPSBy ZW5kZXJlci0+Y29udGFpbmVyKCk7CiAgICAgICAgICAgICAvLyBNYXJrIHRoZSBzdmcgYW5jZXN0 b3IgY2hhaW4gZGlydHkgYXMgd2Ugd2FsayB0byB0aGUgY29udGFpbmVyLgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQm94LmNwcAppbmRleCA1ZGNlYmFhYmVkOTRmNzcxNjNhN2Y0YjNkYjA1 Y2YxNjM0YWVlY2Y0Li4yZDE1NjEwNzk5MjUwZWU1ZmExMjIxMWEzNzA5YmNkNmE1MjM5ODI1IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcApAQCAtMTA3NCw3ICsxMDc0LDcg QEAgYm9vbCBSZW5kZXJCb3g6Omhhc0hvcml6b250YWxTY3JvbGxiYXJXaXRoQXV0b0JlaGF2aW9y KCkgY29uc3QKIAogYm9vbCBSZW5kZXJCb3g6Om5lZWRzUHJlZmVycmVkV2lkdGhzUmVjYWxjdWxh dGlvbigpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIHN0eWxlKCkucGFkZGluZ1N0YXJ0KCkuaXNQZXJj ZW50T3JDYWxjdWxhdGVkKCkgfHwgc3R5bGUoKS5wYWRkaW5nRW5kKCkuaXNQZXJjZW50T3JDYWxj dWxhdGVkKCk7CisgICAgcmV0dXJuIHN0eWxlKCkucGFkZGluZ1N0YXJ0KCkuaXNQZXJjZW50T3JD YWxjdWxhdGVkKCkgfHwgc3R5bGUoKS5wYWRkaW5nRW5kKCkuaXNQZXJjZW50T3JDYWxjdWxhdGVk KCkgfHwgKHN0eWxlKCkuaGFzQXNwZWN0UmF0aW8oKSAmJiBoYXNSZWxhdGl2ZUxvZ2ljYWxIZWln aHQoKSk7CiB9CiAKIFNjcm9sbFBvc2l0aW9uIFJlbmRlckJveDo6c2Nyb2xsUG9zaXRpb24oKSBj b25zdApAQCAtMzIzMyw2ICszMjMzLDEyIEBAIHN0YXRpYyBib29sIGFsbG93TWluTWF4UGVyY2Vu dGFnZXNJbkF1dG9IZWlnaHRCbG9ja3NRdWlyaygpCiAKIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRl UHJlZmVycmVkTG9naWNhbFdpZHRocyhjb25zdCBMZW5ndGgmIG1pbldpZHRoLCBjb25zdCBMZW5n dGgmIG1heFdpZHRoLCBMYXlvdXRVbml0IGJvcmRlckFuZFBhZGRpbmcpCiB7CisgICAgaWYgKHNo b3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJvbUFzcGVjdFJhdGlvKCkpIHsKKyAgICAgICAgYXV0 byBbbG9naWNhbE1pbldpZHRoLCBsb2dpY2FsTWF4V2lkdGhdID0gY29tcHV0ZU1pbk1heExvZ2lj YWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpOworICAgICAgICBtX21pblByZWZlcnJlZExvZ2ljYWxX aWR0aCA9IHN0ZDo6Y2xhbXAobV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgsIGxvZ2ljYWxNaW5X aWR0aCwgbG9naWNhbE1heFdpZHRoKTsKKyAgICAgICAgbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lk dGggPSBzdGQ6OmNsYW1wKG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoLCBsb2dpY2FsTWluV2lk dGgsIGxvZ2ljYWxNYXhXaWR0aCk7CisgICAgfQorCiAgICAgaWYgKG1heFdpZHRoLmlzRml4ZWQo KSkgewogICAgICAgICBhdXRvIGFkanVzdENvbnRlbnRCb3hMb2dpY2FsV2lkdGggPSBhZGp1c3RD b250ZW50Qm94TG9naWNhbFdpZHRoRm9yQm94U2l6aW5nKG1heFdpZHRoKTsKICAgICAgICAgbV9t YXhQcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBzdGQ6Om1pbihtX21heFByZWZlcnJlZExvZ2ljYWxX aWR0aCwgYWRqdXN0Q29udGVudEJveExvZ2ljYWxXaWR0aCk7CmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMWQzNWNmMTE1YTBj NjlmMjg3MDdhZDkzYWEyYTUxNWY4N2RkMjkxYi4uYTNlNTY3ZTczZmY2NzUzNGQxODZhYjdhYTRj Y2M5MDY3Y2ZiNDFjMyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xh eW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTAzLTA5ICBSb2IgQnVp cyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQXBwbHkgdHJhbnNmZXJyZWQgbWluL21h eCBzaXplcyBmb3IgaW50cmluc2ljIHNpemluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIyNTU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgRW5hYmxlIHRlc3RzIHRoYXQgcGFzcyBub3cuCisKKyAgICAg ICAgKiBUZXN0RXhwZWN0YXRpb25zOgorCiAyMDIxLTAzLTA4ICBSb2IgQnVpcyAgPHJidWlzQGln YWxpYS5jb20+CiAKICAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8gaW4gaW50cmluc2ljIHNp emluZwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRl c3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggN2FjY2MwNmM1NjI5OTA4ZmM0MGE0MTc5ZWZiOGVl ODI4YWFiZTliMC4uMzY4Y2NiNjY1NTZjNWYxZDRmZDM1Nzg3MGNkZjY2YThiODVhYWVkNiAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9U ZXN0RXhwZWN0YXRpb25zCkBAIC00NTU2LDE1ICs0NTU2LDEyIEBAIHdlYmtpdC5vcmcvYi8yMTQ0 NjIgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNjb3Bpbmcvc2xvdHRl ZC1wbGFjCiAKICMgIGNvbnRhaW4taW50cmluc2ljLXNpemUKIHdlYmtpdC5vcmcvYi8yMTQ0NjMg aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0 aW8vYWJzcG9zLTAxNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0 NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0 LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMjQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQot d2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j c3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDI4Lmh0bWwgWyBJbWFn ZU9ubHlGYWlsdXJlIF0KICMgZmxleC1iYXNpczpjb250ZW50CiB3ZWJraXQub3JnL2IvMjE0NDYz IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJh dGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJr aXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1z aXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyMi5odG1sIFsgSW1hZ2VPbmx5 RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t dGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAyNS5o dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3cz Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNw ZWN0LXJhdGlvLTAyNi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0 NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0 LXJhdGlvL2ludHJpbnNpYy1zaXplLTAwNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJr aXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1z aXppbmcvYXNwZWN0LXJhdGlvL2ludHJpbnNpYy1zaXplLTAwOC5odG1sIFsgSW1hZ2VPbmx5RmFp bHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz dHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL3RhYmxlLWVsZW1lbnQtMDAxLmh0bWwgWyBJ bWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9jb250YWluLWludHJpbnNpYy1zaXplL2NvbnRh aW4taW50cmluc2ljLXNpemUtMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5v cmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu Zy9jb250YWluLWludHJpbnNpYy1zaXplL2NvbnRhaW4taW50cmluc2ljLXNpemUtMDAyLmh0bWwg WyBJbWFnZU9ubHlGYWlsdXJlIF0K 422868 2021-03-10 13:57:29 -0800 2021-03-10 23:50:48 -0800 Patch bug-222557-20210310225728.patch text/plain 9835 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MjI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzQ5NjUzODU2NGZjMDIz NTUyOGVlNDFjNDk2MWEyYWZkOWI4ZDlhOC4uNGVhMTYyYjg0YmY4N2VkNTBiM2Q4NDQ5MWU0Y2Y0 NWVmZjhiNTg0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDIxLTAzLTEwICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQXBwbHkgdHJhbnNmZXJyZWQgbWlu L21heCBzaXplcyBmb3IgaW50cmluc2ljIHNpemluZworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIyNTU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQXBwbHkgdHJhbnNmZXJyZWQgbWluL21heCBzaXplcyBm b3IgaW50cmluc2ljIHNpemluZyBbMV0uCisgICAgICAgIFJlbmFtZSBSZW5kZXJPYmplY3Q6Omhh c0FzcGVjdFJhdGlvIHRvIGhhc0ludHJpbnNpY0FzcGVjdFJhdGlvCisgICAgICAgIHRvIG5vdCBi ZSBjb25mdXNlZCB3aXRoIFJlbmRlclN0eWxlOjpoYXNBc3BlY3RSYXRpby4KKworICAgICAgICBC ZWhhdmlvciBtYXRjaGVzIEZpcmVmb3ggYW5kIENocm9tZS4KKworICAgICAgICBbMV0gaHR0cHM6 Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1zaXppbmctNC8jYXNwZWN0LXJhdGlvLXNpemUtdHJhbnNm ZXJzCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyQmxvY2s6OmRpcnR5Rm9yTGF5b3V0RnJvbVBlcmNlbnRhZ2VIZWlnaHREZXNj ZW5kYW50cyk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJCb3g6Om5lZWRzUHJlZmVycmVkV2lkdGhzUmVjYWxjdWxhdGlvbiBjb25z dCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVQcmVmZXJyZWRMb2dpY2Fs V2lkdGhzKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwOgorICAg ICAgICAoV2ViQ29yZTo6Y2hpbGRIYXNBc3BlY3RSYXRpbyk6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJGbGV4aWJsZUJveDo6YWRqdXN0Q2hpbGRTaXplRm9yTWluQW5kTWF4KToKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyT2JqZWN0Lmg6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJPYmpl Y3Q6Omhhc0ludHJpbnNpY0FzcGVjdFJhdGlvIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlck9iamVjdDo6aGFzQXNwZWN0UmF0aW8gY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIHJl bmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJSZXBs YWNlZDo6Y29tcHV0ZUludHJpbnNpY1JhdGlvSW5mb3JtYXRpb24gY29uc3QpOgorCiAyMDIxLTAz LTA5ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAogICAgICAgICBbQ29jb2FdIE1h a2UgV2ViS2l0IEFQSSBPYmplY3RpdmUtQyBvYmplY3RzIHNhZmUgdG8gcmVsZWFzZSBvbiBub24t bWFpbiB0aHJlYWRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy QmxvY2suY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAppbmRl eCA0NmI1YzY5ZmQ0ZDQ5YmQ5MGQ2ZDUzZDg4ODdkOWQ4OWIzYTQwZTcxLi42ZjY4NDIzOGYxNmZk MGU1Mzc2NDlkYWE0ODhlOTk5MTljNTQ2Y2NlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCbG9jay5jcHAKQEAgLTgzOSw3ICs4MzksNyBAQCB2b2lkIFJlbmRlckJsb2NrOjpkaXJ0 eUZvckxheW91dEZyb21QZXJjZW50YWdlSGVpZ2h0RGVzY2VuZGFudHMoKQogICAgICAgICAgICAg Ly8gSWYgdGhlIHdpZHRoIG9mIGFuIGltYWdlIGlzIGFmZmVjdGVkIGJ5IHRoZSBoZWlnaHQgb2Yg YSBjaGlsZCAoZS5nLiwgYW4gaW1hZ2Ugd2l0aCBhbiBhc3BlY3QgcmF0aW8pLAogICAgICAgICAg ICAgLy8gdGhlbiB3ZSBoYXZlIHRvIGRpcnR5IHByZWZlcnJlZCB3aWR0aHMsIHNpbmNlIGV2ZW4g ZW5jbG9zaW5nIGJsb2NrcyBjYW4gYmVjb21lIGRpcnR5IGFzIGEgcmVzdWx0LgogICAgICAgICAg ICAgLy8gKEEgaG9yaXpvbnRhbCBmbGV4Ym94IHRoYXQgY29udGFpbnMgYW4gaW5saW5lIGltYWdl IHdyYXBwZWQgaW4gYW4gYW5vbnltb3VzIGJsb2NrIGZvciBleGFtcGxlLikKLSAgICAgICAgICAg IGlmIChyZW5kZXJlci0+aGFzQXNwZWN0UmF0aW8oKSkKKyAgICAgICAgICAgIGlmIChyZW5kZXJl ci0+aGFzSW50cmluc2ljQXNwZWN0UmF0aW8oKSB8fCByZW5kZXJlci0+c3R5bGUoKS5oYXNBc3Bl Y3RSYXRpbygpKQogICAgICAgICAgICAgICAgIHJlbmRlcmVyLT5zZXRQcmVmZXJyZWRMb2dpY2Fs V2lkdGhzRGlydHkodHJ1ZSk7CiAgICAgICAgICAgICBhdXRvKiBjb250YWluZXIgPSByZW5kZXJl ci0+Y29udGFpbmVyKCk7CiAgICAgICAgICAgICAvLyBNYXJrIHRoZSBzdmcgYW5jZXN0b3IgY2hh aW4gZGlydHkgYXMgd2Ugd2FsayB0byB0aGUgY29udGFpbmVyLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQm94LmNwcAppbmRleCA1ZGNlYmFhYmVkOTRmNzcxNjNhN2Y0YjNkYjA1Y2YxNjM0 YWVlY2Y0Li4yZDE1NjEwNzk5MjUwZWU1ZmExMjIxMWEzNzA5YmNkNmE1MjM5ODI1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcApAQCAtMTA3NCw3ICsxMDc0LDcgQEAgYm9v bCBSZW5kZXJCb3g6Omhhc0hvcml6b250YWxTY3JvbGxiYXJXaXRoQXV0b0JlaGF2aW9yKCkgY29u c3QKIAogYm9vbCBSZW5kZXJCb3g6Om5lZWRzUHJlZmVycmVkV2lkdGhzUmVjYWxjdWxhdGlvbigp IGNvbnN0CiB7Ci0gICAgcmV0dXJuIHN0eWxlKCkucGFkZGluZ1N0YXJ0KCkuaXNQZXJjZW50T3JD YWxjdWxhdGVkKCkgfHwgc3R5bGUoKS5wYWRkaW5nRW5kKCkuaXNQZXJjZW50T3JDYWxjdWxhdGVk KCk7CisgICAgcmV0dXJuIHN0eWxlKCkucGFkZGluZ1N0YXJ0KCkuaXNQZXJjZW50T3JDYWxjdWxh dGVkKCkgfHwgc3R5bGUoKS5wYWRkaW5nRW5kKCkuaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkgfHwg KHN0eWxlKCkuaGFzQXNwZWN0UmF0aW8oKSAmJiBoYXNSZWxhdGl2ZUxvZ2ljYWxIZWlnaHQoKSk7 CiB9CiAKIFNjcm9sbFBvc2l0aW9uIFJlbmRlckJveDo6c2Nyb2xsUG9zaXRpb24oKSBjb25zdApA QCAtMzIzMyw2ICszMjMzLDEyIEBAIHN0YXRpYyBib29sIGFsbG93TWluTWF4UGVyY2VudGFnZXNJ bkF1dG9IZWlnaHRCbG9ja3NRdWlyaygpCiAKIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlUHJlZmVy cmVkTG9naWNhbFdpZHRocyhjb25zdCBMZW5ndGgmIG1pbldpZHRoLCBjb25zdCBMZW5ndGgmIG1h eFdpZHRoLCBMYXlvdXRVbml0IGJvcmRlckFuZFBhZGRpbmcpCiB7CisgICAgaWYgKHNob3VsZENv bXB1dGVMb2dpY2FsSGVpZ2h0RnJvbUFzcGVjdFJhdGlvKCkpIHsKKyAgICAgICAgYXV0byBbbG9n aWNhbE1pbldpZHRoLCBsb2dpY2FsTWF4V2lkdGhdID0gY29tcHV0ZU1pbk1heExvZ2ljYWxXaWR0 aEZyb21Bc3BlY3RSYXRpbygpOworICAgICAgICBtX21pblByZWZlcnJlZExvZ2ljYWxXaWR0aCA9 IHN0ZDo6Y2xhbXAobV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgsIGxvZ2ljYWxNaW5XaWR0aCwg bG9naWNhbE1heFdpZHRoKTsKKyAgICAgICAgbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBz dGQ6OmNsYW1wKG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoLCBsb2dpY2FsTWluV2lkdGgsIGxv Z2ljYWxNYXhXaWR0aCk7CisgICAgfQorCiAgICAgaWYgKG1heFdpZHRoLmlzRml4ZWQoKSkgewog ICAgICAgICBhdXRvIGFkanVzdENvbnRlbnRCb3hMb2dpY2FsV2lkdGggPSBhZGp1c3RDb250ZW50 Qm94TG9naWNhbFdpZHRoRm9yQm94U2l6aW5nKG1heFdpZHRoKTsKICAgICAgICAgbV9tYXhQcmVm ZXJyZWRMb2dpY2FsV2lkdGggPSBzdGQ6Om1pbihtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCwg YWRqdXN0Q29udGVudEJveExvZ2ljYWxXaWR0aCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAppbmRleCA5YmM2MzYyNjM5ZmUxMmQ1ZjQ5MjBlZDg3 YzI2YTU5ZWE1NGVjMGYxLi40NDhhNjg2NzllODgwZWEyMDk2MmE5NjY0Y2FhNWFkMzkzN2Q0YWZj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3gu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAK QEAgLTU0OSw3ICs1NDksNyBAQCBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94OjptYWluQXhp c0NvbnRlbnRFeHRlbnQoTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbEhlaQogCiBzdGF0aWMgYm9v bCBjaGlsZEhhc0FzcGVjdFJhdGlvKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpCiB7Ci0gICAgcmV0 dXJuIGNoaWxkLmhhc0FzcGVjdFJhdGlvKCkgfHwgY2hpbGQuc3R5bGUoKS5oYXNBc3BlY3RSYXRp bygpOworICAgIHJldHVybiBjaGlsZC5oYXNJbnRyaW5zaWNBc3BlY3RSYXRpbygpIHx8IGNoaWxk LnN0eWxlKCkuaGFzQXNwZWN0UmF0aW8oKTsKIH0KIAogT3B0aW9uYWw8TGF5b3V0VW5pdD4gUmVu ZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluQXhpc0V4dGVudEZvckNoaWxkKGNvbnN0IFJlbmRl ckJveCYgY2hpbGQsIFNpemVUeXBlIHNpemVUeXBlLCBjb25zdCBMZW5ndGgmIHNpemUpCkBAIC0x MjEwLDcgKzEyMTAsNyBAQCBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94OjphZGp1c3RDaGls ZFNpemVGb3JNaW5BbmRNYXgoY29uc3QgUmVuZGVyQm94JiBjaGlsZAogICAgICAgICAgICAgY29u dGVudFNpemUgPSBjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyhjaGlsZCwgY2hp bGRDcm9zc1NpemVMZW5ndGgpOwogICAgICAgICBlbHNlCiAgICAgICAgICAgICBjb250ZW50U2l6 ZSA9IGNvbXB1dGVNYWluQXhpc0V4dGVudEZvckNoaWxkKGNoaWxkLCBNaW5TaXplLCBMZW5ndGgo TGVuZ3RoVHlwZTo6TWluQ29udGVudCkpLnZhbHVlT3IoMCk7Ci0gICAgICAgIGlmIChjaGlsZC5o YXNBc3BlY3RSYXRpbygpICYmIGNoaWxkLmludHJpbnNpY1NpemUoKS5oZWlnaHQoKSkKKyAgICAg ICAgaWYgKGNoaWxkLmhhc0ludHJpbnNpY0FzcGVjdFJhdGlvKCkgJiYgY2hpbGQuaW50cmluc2lj U2l6ZSgpLmhlaWdodCgpKQogICAgICAgICAgICAgY29udGVudFNpemUgPSBhZGp1c3RDaGlsZFNp emVGb3JBc3BlY3RSYXRpb0Nyb3NzQXhpc01pbkFuZE1heChjaGlsZCwgY29udGVudFNpemUpOwog ICAgICAgICBBU1NFUlQoY29udGVudFNpemUgPj0gMCk7CiAgICAgICAgIGNvbnRlbnRTaXplID0g c3RkOjptaW4oY29udGVudFNpemUsIG1heEV4dGVudC52YWx1ZU9yKGNvbnRlbnRTaXplKSk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmggYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgKaW5kZXggNDA1M2YzMjc3OTk5YzE4 ZDIyZjIxMDhmZjM2ZTI4YjgyM2NjMzM5NS4uMzlmOWViZWUyODhmM2I1MGQ1NzE3NDYxNDk1NTli YTZiNjQ5YjU1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9i amVjdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaApAQCAt Mzc2LDcgKzM3Niw3IEBAIHB1YmxpYzoKICAgICAvLyByZXN0IG9mIHRoZSByZW5kZXJpbmcgdHJl ZSB3aWxsIG1vdmUgdG8gYSBzaW1pbGFyIG1vZGVsLgogICAgIHZpcnR1YWwgYm9vbCBub2RlQXRG bG9hdFBvaW50KGNvbnN0IEhpdFRlc3RSZXF1ZXN0JiwgSGl0VGVzdFJlc3VsdCYsIGNvbnN0IEZs b2F0UG9pbnQmIHBvaW50SW5QYXJlbnQsIEhpdFRlc3RBY3Rpb24pOwogCi0gICAgYm9vbCBoYXNB c3BlY3RSYXRpbygpIGNvbnN0IHsgcmV0dXJuIGlzUmVwbGFjZWQoKSAmJiAoaXNJbWFnZSgpIHx8 IGlzVmlkZW8oKSB8fCBpc0NhbnZhcygpKTsgfQorICAgIGJvb2wgaGFzSW50cmluc2ljQXNwZWN0 UmF0aW8oKSBjb25zdCB7IHJldHVybiBpc1JlcGxhY2VkKCkgJiYgKGlzSW1hZ2UoKSB8fCBpc1Zp ZGVvKCkgfHwgaXNDYW52YXMoKSk7IH0KICAgICBib29sIGlzQW5vbnltb3VzKCkgY29uc3QgeyBy ZXR1cm4gbV9iaXRmaWVsZHMuaXNBbm9ueW1vdXMoKTsgfQogICAgIGJvb2wgaXNBbm9ueW1vdXNC bG9jaygpIGNvbnN0OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyUmVwbGFjZWQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJlcGxhY2Vk LmNwcAppbmRleCA4MzRlNDU2NjQ3ZjQzYjQ3NzRmNzU2YWU2MDQ3MWU1OTQ3MjA0MzY2Li44Mzdl OGM1YzE0YzAwY2Q1NThjMzg2NTkwNWI3MWEzOTYwOTVlZDA2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUmVwbGFjZWQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHAKQEAgLTQ4Niw3ICs0ODYsNyBAQCB2b2lkIFJl bmRlclJlcGxhY2VkOjpjb21wdXRlSW50cmluc2ljUmF0aW9JbmZvcm1hdGlvbihGbG9hdFNpemUm IGludHJpbnNpY1NpemUsCiAgICAgICAgICAgICByZXR1cm47CiAgICAgfQogICAgIC8vIEZpZ3Vy ZSBvdXQgaWYgd2UgbmVlZCB0byBjb21wdXRlIGFuIGludHJpbnNpYyByYXRpby4KLSAgICBpZiAo IWhhc0FzcGVjdFJhdGlvKCkpCisgICAgaWYgKCFoYXNJbnRyaW5zaWNBc3BlY3RSYXRpbygpKQog ICAgICAgICByZXR1cm47CiAKICAgICBpZiAoaW50cmluc2ljU2l6ZS5pc0VtcHR5KCkpIHsKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpp bmRleCBhNWE0MDAyYTdiMjczMjY3MDI0YmMxZDQ5Mzc3YmVlZWU4NTI0MjM2Li42ZTg3ZWZmOWVi MTg0NTY4Y2M2ZTBkM2Q3NjA3MTdhODY3ZTk5Y2JkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIw MjEtMDMtMTAgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBBcHBseSB0 cmFuc2ZlcnJlZCBtaW4vbWF4IHNpemVzIGZvciBpbnRyaW5zaWMgc2l6aW5nCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjI1NTcKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFbmFibGUgdGVzdHMgdGhhdCBw YXNzIG5vdy4KKworICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMDMtMTAgIFJv YmVydCBKZW5uZXIgIDxqZW5uZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFsgbWFjT1Mgd2syIF0g aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3NlbWFudGljcy9lbWJlZGRlZC1j b250ZW50L21lZGlhLWVsZW1lbnRzL21lZGlhX2ZyYWdtZW50X3NlZWsuaHRtbCBpcyBhIGZsYWtl eSB0ZXh0IGZhaWx1cmUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMg Yi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IGRhN2NlZjRhMWNhNDFmOWMwZmQ0 MDg0NmY0ZTQyMTIyNGI5NGU1MWYuLmRlOTE2MjZlOGZkN2IxNzEzODBmNDdjNDViNzk1OTMxYzUx MDdhZWEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5 b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNDU1MywxNSArNDU1MywxMiBAQCB3ZWJraXQu b3JnL2IvMjE0NDYyIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zY29w aW5nL3Nsb3R0ZWQtcGxhYwogCiAjICBjb250YWluLWludHJpbnNpYy1zaXplCiB3ZWJraXQub3Jn L2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcv YXNwZWN0LXJhdGlvL2Fic3Bvcy0wMTQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0 Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6 aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDI0Lmh0bWwgWyBJbWFnZU9ubHlG YWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAyOC5o dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiAjIGZsZXgtYmFzaXM6Y29udGVudAogd2Via2l0Lm9y Zy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5n L2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjEuaHRtbCBbIEltYWdlT25seUZhaWx1 cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz L2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjIuaHRtbCBb IEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1y YXRpby0wMjUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBp bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRp by9mbGV4LWFzcGVjdC1yYXRpby0wMjYuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0 Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6 aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMDUuaHRtbCBbIEltYWdlT25seUZhaWx1 cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz L2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMDguaHRtbCBbIElt YWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby90YWJsZS1lbGVtZW50LTAw MS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVk L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvY29udGFpbi1pbnRyaW5zaWMt c2l6ZS9jb250YWluLWludHJpbnNpYy1zaXplLTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd CiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz L2Nzcy1zaXppbmcvY29udGFpbi1pbnRyaW5zaWMtc2l6ZS9jb250YWluLWludHJpbnNpYy1zaXpl LTAwMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCg== 422906 2021-03-10 23:50:53 -0800 2021-03-11 10:11:05 -0800 Patch bug-222557-20210311085052.patch text/plain 9535 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MjY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjdkNTg4MGYzZDk2MDQy YmMxNTVjYmZiNDhlNWIwYjhjODhkOGYyZC4uOGE0NjBhYjY4YzMyZjkxZTBlOGJjNWIzYTIzNjgy YmFlOTNmZmRjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDIxLTAzLTEwICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQXBwbHkgdHJhbnNmZXJyZWQgbWlu L21heCBzaXplcyBmb3IgaW50cmluc2ljIHNpemluZworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIyNTU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQXBwbHkgdHJhbnNmZXJyZWQgbWluL21heCBzaXplcyBm b3IgaW50cmluc2ljIHNpemluZyBbMV0uCisgICAgICAgIFJlbmFtZSBSZW5kZXJPYmplY3Q6Omhh c0FzcGVjdFJhdGlvIHRvIGhhc0ludHJpbnNpY0FzcGVjdFJhdGlvCisgICAgICAgIHRvIG5vdCBi ZSBjb25mdXNlZCB3aXRoIFJlbmRlclN0eWxlOjpoYXNBc3BlY3RSYXRpby4KKworICAgICAgICBC ZWhhdmlvciBtYXRjaGVzIEZpcmVmb3ggYW5kIENocm9tZS4KKworICAgICAgICBbMV0gaHR0cHM6 Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1zaXppbmctNC8jYXNwZWN0LXJhdGlvLXNpemUtdHJhbnNm ZXJzCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyQmxvY2s6OmRpcnR5Rm9yTGF5b3V0RnJvbVBlcmNlbnRhZ2VIZWlnaHREZXNj ZW5kYW50cyk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJCb3g6Om5lZWRzUHJlZmVycmVkV2lkdGhzUmVjYWxjdWxhdGlvbiBjb25z dCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVQcmVmZXJyZWRMb2dpY2Fs V2lkdGhzKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwOgorICAg ICAgICAoV2ViQ29yZTo6Y2hpbGRIYXNBc3BlY3RSYXRpbyk6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJGbGV4aWJsZUJveDo6YWRqdXN0Q2hpbGRTaXplRm9yTWluQW5kTWF4KToKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyT2JqZWN0Lmg6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJPYmpl Y3Q6Omhhc0ludHJpbnNpY0FzcGVjdFJhdGlvIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlck9iamVjdDo6aGFzQXNwZWN0UmF0aW8gY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIHJl bmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJSZXBs YWNlZDo6Y29tcHV0ZUludHJpbnNpY1JhdGlvSW5mb3JtYXRpb24gY29uc3QpOgorCiAyMDIxLTAz LTEwICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CiAKICAgICAgICAgRml4IGludHJpbnNp Yy1zaXplLTAwNS5odG1sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQmxvY2suY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcApp bmRleCBiYWJjMGIxM2FkOTZmYTAwOWFjNzc2MGQzYzcwNjBhMzUwMjBlYjRlLi4xOTAwNDNlNDM3 NWVjZmU5MmNkY2VmMzBiZGQ4ZWIxZDM1MzlmMTdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCbG9jay5jcHAKQEAgLTgzOSw3ICs4MzksNyBAQCB2b2lkIFJlbmRlckJsb2NrOjpk aXJ0eUZvckxheW91dEZyb21QZXJjZW50YWdlSGVpZ2h0RGVzY2VuZGFudHMoKQogICAgICAgICAg ICAgLy8gSWYgdGhlIHdpZHRoIG9mIGFuIGltYWdlIGlzIGFmZmVjdGVkIGJ5IHRoZSBoZWlnaHQg b2YgYSBjaGlsZCAoZS5nLiwgYW4gaW1hZ2Ugd2l0aCBhbiBhc3BlY3QgcmF0aW8pLAogICAgICAg ICAgICAgLy8gdGhlbiB3ZSBoYXZlIHRvIGRpcnR5IHByZWZlcnJlZCB3aWR0aHMsIHNpbmNlIGV2 ZW4gZW5jbG9zaW5nIGJsb2NrcyBjYW4gYmVjb21lIGRpcnR5IGFzIGEgcmVzdWx0LgogICAgICAg ICAgICAgLy8gKEEgaG9yaXpvbnRhbCBmbGV4Ym94IHRoYXQgY29udGFpbnMgYW4gaW5saW5lIGlt YWdlIHdyYXBwZWQgaW4gYW4gYW5vbnltb3VzIGJsb2NrIGZvciBleGFtcGxlLikKLSAgICAgICAg ICAgIGlmIChyZW5kZXJlci0+aGFzQXNwZWN0UmF0aW8oKSkKKyAgICAgICAgICAgIGlmIChyZW5k ZXJlci0+aGFzSW50cmluc2ljQXNwZWN0UmF0aW8oKSB8fCByZW5kZXJlci0+c3R5bGUoKS5oYXNB c3BlY3RSYXRpbygpKQogICAgICAgICAgICAgICAgIHJlbmRlcmVyLT5zZXRQcmVmZXJyZWRMb2dp Y2FsV2lkdGhzRGlydHkodHJ1ZSk7CiAgICAgICAgICAgICBhdXRvKiBjb250YWluZXIgPSByZW5k ZXJlci0+Y29udGFpbmVyKCk7CiAgICAgICAgICAgICAvLyBNYXJrIHRoZSBzdmcgYW5jZXN0b3Ig Y2hhaW4gZGlydHkgYXMgd2Ugd2FsayB0byB0aGUgY29udGFpbmVyLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQm94LmNwcAppbmRleCA1ZGNlYmFhYmVkOTRmNzcxNjNhN2Y0YjNkYjA1Y2Yx NjM0YWVlY2Y0Li4yZDE1NjEwNzk5MjUwZWU1ZmExMjIxMWEzNzA5YmNkNmE1MjM5ODI1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcApAQCAtMTA3NCw3ICsxMDc0LDcgQEAg Ym9vbCBSZW5kZXJCb3g6Omhhc0hvcml6b250YWxTY3JvbGxiYXJXaXRoQXV0b0JlaGF2aW9yKCkg Y29uc3QKIAogYm9vbCBSZW5kZXJCb3g6Om5lZWRzUHJlZmVycmVkV2lkdGhzUmVjYWxjdWxhdGlv bigpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIHN0eWxlKCkucGFkZGluZ1N0YXJ0KCkuaXNQZXJjZW50 T3JDYWxjdWxhdGVkKCkgfHwgc3R5bGUoKS5wYWRkaW5nRW5kKCkuaXNQZXJjZW50T3JDYWxjdWxh dGVkKCk7CisgICAgcmV0dXJuIHN0eWxlKCkucGFkZGluZ1N0YXJ0KCkuaXNQZXJjZW50T3JDYWxj dWxhdGVkKCkgfHwgc3R5bGUoKS5wYWRkaW5nRW5kKCkuaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkg fHwgKHN0eWxlKCkuaGFzQXNwZWN0UmF0aW8oKSAmJiBoYXNSZWxhdGl2ZUxvZ2ljYWxIZWlnaHQo KSk7CiB9CiAKIFNjcm9sbFBvc2l0aW9uIFJlbmRlckJveDo6c2Nyb2xsUG9zaXRpb24oKSBjb25z dApAQCAtMzIzMyw2ICszMjMzLDEyIEBAIHN0YXRpYyBib29sIGFsbG93TWluTWF4UGVyY2VudGFn ZXNJbkF1dG9IZWlnaHRCbG9ja3NRdWlyaygpCiAKIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlUHJl ZmVycmVkTG9naWNhbFdpZHRocyhjb25zdCBMZW5ndGgmIG1pbldpZHRoLCBjb25zdCBMZW5ndGgm IG1heFdpZHRoLCBMYXlvdXRVbml0IGJvcmRlckFuZFBhZGRpbmcpCiB7CisgICAgaWYgKHNob3Vs ZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJvbUFzcGVjdFJhdGlvKCkpIHsKKyAgICAgICAgYXV0byBb bG9naWNhbE1pbldpZHRoLCBsb2dpY2FsTWF4V2lkdGhdID0gY29tcHV0ZU1pbk1heExvZ2ljYWxX aWR0aEZyb21Bc3BlY3RSYXRpbygpOworICAgICAgICBtX21pblByZWZlcnJlZExvZ2ljYWxXaWR0 aCA9IHN0ZDo6Y2xhbXAobV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgsIGxvZ2ljYWxNaW5XaWR0 aCwgbG9naWNhbE1heFdpZHRoKTsKKyAgICAgICAgbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGgg PSBzdGQ6OmNsYW1wKG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoLCBsb2dpY2FsTWluV2lkdGgs IGxvZ2ljYWxNYXhXaWR0aCk7CisgICAgfQorCiAgICAgaWYgKG1heFdpZHRoLmlzRml4ZWQoKSkg ewogICAgICAgICBhdXRvIGFkanVzdENvbnRlbnRCb3hMb2dpY2FsV2lkdGggPSBhZGp1c3RDb250 ZW50Qm94TG9naWNhbFdpZHRoRm9yQm94U2l6aW5nKG1heFdpZHRoKTsKICAgICAgICAgbV9tYXhQ cmVmZXJyZWRMb2dpY2FsV2lkdGggPSBzdGQ6Om1pbihtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0 aCwgYWRqdXN0Q29udGVudEJveExvZ2ljYWxXaWR0aCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAppbmRleCA5YmM2MzYyNjM5ZmUxMmQ1ZjQ5MjBl ZDg3YzI2YTU5ZWE1NGVjMGYxLi40NDhhNjg2NzllODgwZWEyMDk2MmE5NjY0Y2FhNWFkMzkzN2Q0 YWZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVC b3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5j cHAKQEAgLTU0OSw3ICs1NDksNyBAQCBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94OjptYWlu QXhpc0NvbnRlbnRFeHRlbnQoTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbEhlaQogCiBzdGF0aWMg Ym9vbCBjaGlsZEhhc0FzcGVjdFJhdGlvKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpCiB7Ci0gICAg cmV0dXJuIGNoaWxkLmhhc0FzcGVjdFJhdGlvKCkgfHwgY2hpbGQuc3R5bGUoKS5oYXNBc3BlY3RS YXRpbygpOworICAgIHJldHVybiBjaGlsZC5oYXNJbnRyaW5zaWNBc3BlY3RSYXRpbygpIHx8IGNo aWxkLnN0eWxlKCkuaGFzQXNwZWN0UmF0aW8oKTsKIH0KIAogT3B0aW9uYWw8TGF5b3V0VW5pdD4g UmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVNYWluQXhpc0V4dGVudEZvckNoaWxkKGNvbnN0IFJl bmRlckJveCYgY2hpbGQsIFNpemVUeXBlIHNpemVUeXBlLCBjb25zdCBMZW5ndGgmIHNpemUpCkBA IC0xMjEwLDcgKzEyMTAsNyBAQCBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94OjphZGp1c3RD aGlsZFNpemVGb3JNaW5BbmRNYXgoY29uc3QgUmVuZGVyQm94JiBjaGlsZAogICAgICAgICAgICAg Y29udGVudFNpemUgPSBjb21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyhjaGlsZCwg Y2hpbGRDcm9zc1NpemVMZW5ndGgpOwogICAgICAgICBlbHNlCiAgICAgICAgICAgICBjb250ZW50 U2l6ZSA9IGNvbXB1dGVNYWluQXhpc0V4dGVudEZvckNoaWxkKGNoaWxkLCBNaW5TaXplLCBMZW5n dGgoTGVuZ3RoVHlwZTo6TWluQ29udGVudCkpLnZhbHVlT3IoMCk7Ci0gICAgICAgIGlmIChjaGls ZC5oYXNBc3BlY3RSYXRpbygpICYmIGNoaWxkLmludHJpbnNpY1NpemUoKS5oZWlnaHQoKSkKKyAg ICAgICAgaWYgKGNoaWxkLmhhc0ludHJpbnNpY0FzcGVjdFJhdGlvKCkgJiYgY2hpbGQuaW50cmlu c2ljU2l6ZSgpLmhlaWdodCgpKQogICAgICAgICAgICAgY29udGVudFNpemUgPSBhZGp1c3RDaGls ZFNpemVGb3JBc3BlY3RSYXRpb0Nyb3NzQXhpc01pbkFuZE1heChjaGlsZCwgY29udGVudFNpemUp OwogICAgICAgICBBU1NFUlQoY29udGVudFNpemUgPj0gMCk7CiAgICAgICAgIGNvbnRlbnRTaXpl ID0gc3RkOjptaW4oY29udGVudFNpemUsIG1heEV4dGVudC52YWx1ZU9yKGNvbnRlbnRTaXplKSk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmggYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgKaW5kZXggNDA1M2YzMjc3OTk5 YzE4ZDIyZjIxMDhmZjM2ZTI4YjgyM2NjMzM5NS4uMzlmOWViZWUyODhmM2I1MGQ1NzE3NDYxNDk1 NTliYTZiNjQ5YjU1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ck9iamVjdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaApA QCAtMzc2LDcgKzM3Niw3IEBAIHB1YmxpYzoKICAgICAvLyByZXN0IG9mIHRoZSByZW5kZXJpbmcg dHJlZSB3aWxsIG1vdmUgdG8gYSBzaW1pbGFyIG1vZGVsLgogICAgIHZpcnR1YWwgYm9vbCBub2Rl QXRGbG9hdFBvaW50KGNvbnN0IEhpdFRlc3RSZXF1ZXN0JiwgSGl0VGVzdFJlc3VsdCYsIGNvbnN0 IEZsb2F0UG9pbnQmIHBvaW50SW5QYXJlbnQsIEhpdFRlc3RBY3Rpb24pOwogCi0gICAgYm9vbCBo YXNBc3BlY3RSYXRpbygpIGNvbnN0IHsgcmV0dXJuIGlzUmVwbGFjZWQoKSAmJiAoaXNJbWFnZSgp IHx8IGlzVmlkZW8oKSB8fCBpc0NhbnZhcygpKTsgfQorICAgIGJvb2wgaGFzSW50cmluc2ljQXNw ZWN0UmF0aW8oKSBjb25zdCB7IHJldHVybiBpc1JlcGxhY2VkKCkgJiYgKGlzSW1hZ2UoKSB8fCBp c1ZpZGVvKCkgfHwgaXNDYW52YXMoKSk7IH0KICAgICBib29sIGlzQW5vbnltb3VzKCkgY29uc3Qg eyByZXR1cm4gbV9iaXRmaWVsZHMuaXNBbm9ueW1vdXMoKTsgfQogICAgIGJvb2wgaXNBbm9ueW1v dXNCbG9jaygpIGNvbnN0OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyUmVwbGFjZWQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJlcGxh Y2VkLmNwcAppbmRleCA4MzRlNDU2NjQ3ZjQzYjQ3NzRmNzU2YWU2MDQ3MWU1OTQ3MjA0MzY2Li44 MzdlOGM1YzE0YzAwY2Q1NThjMzg2NTkwNWI3MWEzOTYwOTVlZDA2IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUmVwbGFjZWQuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHAKQEAgLTQ4Niw3ICs0ODYsNyBAQCB2b2lk IFJlbmRlclJlcGxhY2VkOjpjb21wdXRlSW50cmluc2ljUmF0aW9JbmZvcm1hdGlvbihGbG9hdFNp emUmIGludHJpbnNpY1NpemUsCiAgICAgICAgICAgICByZXR1cm47CiAgICAgfQogICAgIC8vIEZp Z3VyZSBvdXQgaWYgd2UgbmVlZCB0byBjb21wdXRlIGFuIGludHJpbnNpYyByYXRpby4KLSAgICBp ZiAoIWhhc0FzcGVjdFJhdGlvKCkpCisgICAgaWYgKCFoYXNJbnRyaW5zaWNBc3BlY3RSYXRpbygp KQogICAgICAgICByZXR1cm47CiAKICAgICBpZiAoaW50cmluc2ljU2l6ZS5pc0VtcHR5KCkpIHsK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAyMTEwOTEzOGIyMDJlYmE5YzM0MWJiYTRkNDhjMjZmOWQ1YTdlMGExLi5lZjAzNWY4 OGZhNDExN2JjMTQzOWVjODRiODM1ZjM3MGZhMWZkOTg0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAK KzIwMjEtMDMtMTAgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBBcHBs eSB0cmFuc2ZlcnJlZCBtaW4vbWF4IHNpemVzIGZvciBpbnRyaW5zaWMgc2l6aW5nCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjI1NTcKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFbmFibGUgdGVzdHMgdGhh dCBwYXNzIG5vdy4KKworICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMDMtMTAg IFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KIAogICAgICAgICBGaXggaW50cmluc2ljLXNp emUtMDA1Lmh0bWwKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9M YXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IDE0YWU5NmFjYWM1MjE0NmM1Yjg5ZjNm MjI1NGVlZjQ4MDRkMWViYzMuLmMzZTRkMTljYWMyN2M1MGMyMWRiZTI3YWIxNGE0OTBiNTNhNWYz OTAgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0 VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNDU1MywxNCArNDU1MywxMSBAQCB3ZWJraXQub3Jn L2IvMjE0NDYyIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zY29waW5n L3Nsb3R0ZWQtcGxhYwogCiAjICBjb250YWluLWludHJpbnNpYy1zaXplCiB3ZWJraXQub3JnL2Iv MjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNw ZWN0LXJhdGlvL2Fic3Bvcy0wMTQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9y Zy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5n L2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDI0Lmh0bWwgWyBJbWFnZU9ubHlGYWls dXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0 cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAyOC5odG1s IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiAjIGZsZXgtYmFzaXM6Y29udGVudAogd2Via2l0Lm9yZy9i LzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2Fz cGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUg XQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz cy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMjIuaHRtbCBbIElt YWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRp by0wMjUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBv cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9m bGV4LWFzcGVjdC1yYXRpby0wMjYuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9y Zy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5n L2FzcGVjdC1yYXRpby9pbnRyaW5zaWMtc2l6ZS0wMDguaHRtbCBbIEltYWdlT25seUZhaWx1cmUg XQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz cy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby90YWJsZS1lbGVtZW50LTAwMS5odG1sIFsgSW1hZ2VP bmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZv cm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvY29udGFpbi1pbnRyaW5zaWMtc2l6ZS9jb250YWluLWlu dHJpbnNpYy1zaXplLTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2Iv MjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvY29u dGFpbi1pbnRyaW5zaWMtc2l6ZS9jb250YWluLWludHJpbnNpYy1zaXplLTAwMi5odG1sIFsgSW1h Z2VPbmx5RmFpbHVyZSBdCg==