219741 2020-12-10 07:15:42 -0800 Support aspect-ratio on positioned elements 2021-04-01 13:14:49 -0700 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 47738 1 rbuis rbuis changseok esprehn+autocc ews-watchlist glenn kondapallykalyan pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1713534 0 rbuis 2020-12-10 07:15:42 -0800 Support aspect-ratio on positioned elements 1713535 1 415872 rbuis 2020-12-10 07:18:30 -0800 Created attachment 415872 Patch 1713598 2 415893 rbuis 2020-12-10 10:16:36 -0800 Created attachment 415893 Patch 1713901 3 415994 rbuis 2020-12-11 07:22:27 -0800 Created attachment 415994 Patch 1714016 4 416024 rbuis 2020-12-11 11:59:11 -0800 Created attachment 416024 Patch 1714074 5 416038 rbuis 2020-12-11 13:38:34 -0800 Created attachment 416038 Patch 1715378 6 webkit-bug-importer 2020-12-17 07:16:23 -0800 <rdar://problem/72425425> 1716276 7 416038 simon.fraser 2020-12-22 11:12:53 -0800 Comment on attachment 416038 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=416038&action=review > Source/WebCore/rendering/RenderBox.cpp:5011 > + if (style().width().isAuto() && style().height().isAuto() && !style().top().isAuto() && !style().bottom().isAuto() && (style().left().isAuto() || style().right().isAuto())) Maybe all these could become a helper on RenderStyle. > Source/WebCore/rendering/RenderBox.cpp:5024 > + LayoutUnit containerWidthIninlineDirection = std::max<LayoutUnit>(0, containingBlockLogicalWidthForContentInFragment(fragment)); containerWidthInIInlineDirection 1716290 8 416678 rbuis 2020-12-22 11:40:31 -0800 Created attachment 416678 Patch 1716316 9 ews-feeder 2020-12-22 12:30:50 -0800 Committed r271061: <https://trac.webkit.org/changeset/271061> All reviewed patches have been landed. Closing bug and clearing flags on attachment 416678. 1745939 10 416678 zalan 2021-03-31 20:35:32 -0700 Comment on attachment 416678 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=416678&action=review > Source/WebCore/rendering/RenderBox.cpp:5013 > +bool RenderBox::shouldComputeLogicalWidthFromAspectRatio() const What does inset mean in this context and how would a caller know if shouldComputeLogicalHeightFromAspectRatio() or shouldComputeLogicalWidthFromAspectRatioAndInsets() is the right function to call. 1746042 11 416678 rbuis 2021-04-01 08:42:46 -0700 Comment on attachment 416678 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=416678&action=review >> Source/WebCore/rendering/RenderBox.cpp:5013 >> +bool RenderBox::shouldComputeLogicalWidthFromAspectRatio() const > > What does inset mean in this context and how would a caller know if shouldComputeLogicalHeightFromAspectRatio() or shouldComputeLogicalWidthFromAspectRatioAndInsets() is the right function to call. Inset as defined here https://drafts.csswg.org/css-logical/#inset-properties. shouldComputeLogicalWidthFromAspectRatioAndInsets is more an implementation detail of shouldComputeLogicalWidthFromAspectRatio/shouldComputeLogicalHeightFromAspectRatio, so maybe it would have been better to keep it private. 1746216 12 zalan 2021-04-01 13:14:49 -0700 (In reply to Rob Buis from comment #11) > Comment on attachment 416678 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=416678&action=review > > >> Source/WebCore/rendering/RenderBox.cpp:5013 > >> +bool RenderBox::shouldComputeLogicalWidthFromAspectRatio() const > > > > What does inset mean in this context and how would a caller know if shouldComputeLogicalHeightFromAspectRatio() or shouldComputeLogicalWidthFromAspectRatioAndInsets() is the right function to call. > > Inset as defined here https://drafts.csswg.org/css-logical/#inset-properties. Awesome! Thanks, apparently I am super behind on css-logical. :( 415872 2020-12-10 07:18:30 -0800 2020-12-10 10:23:56 -0800 Patch bug-219741-20201210161829.patch text/plain 7061 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwNjE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzZmNWQ2ZWZjYjEyMTY1 ZTBjMzBjYTk0NDAzOTVhMTAwNjgwYTQxYS4uMTVjNWI1N2VjZjM3ZjM3YzcwM2RhNjY1NTY4Mjg4 NTk2NDdiZDYxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIwLTEyLTEwICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g b24gcG9zaXRpb25lZCBlbGVtZW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjE5NzQxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbFdp ZHRoVXNpbmcgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlUG9z aXRpb25lZExvZ2ljYWxIZWlnaHRVc2luZyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJCb3g6OnNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8gY29uc3QpOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVj dFJhdGlvIGNvbnN0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94Lmg6CisKIDIwMjAt MTItMTAgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KIAogICAgICAgICBTdXBwb3J0IGFz cGVjdC1yYXRpbyBvbiByZXBsYWNlZCBlbGVtZW50cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQm94LmNwcAppbmRleCA4ZDg1M2FhMmM4YWE0YjcwYjBiMmFiYjQxOTJjY2JiMjk5N2NhYzIz Li45ZjY1YWRjZjhmMWFjMzVlYTQ3NTg5NzE4MGJhYWYyMDAzNDUxMjgxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcApAQCAtMzY5Niw5ICszNjk2LDE1IEBAIHZvaWQgUmVu ZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxXaWR0aFVzaW5nKFNpemVUeXBlIHdpZHRo VHlwZSwgTGVuZ3RoIGxvCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMmIGNvbXB1dGVkVmFsdWVzKSBj b25zdAogewogICAgIEFTU0VSVCh3aWR0aFR5cGUgPT0gTWluU2l6ZSB8fCB3aWR0aFR5cGUgPT0g TWFpbk9yUHJlZmVycmVkU2l6ZSB8fCAhbG9naWNhbFdpZHRoLmlzQXV0bygpKTsKLSAgICBpZiAo d2lkdGhUeXBlID09IE1pblNpemUgJiYgbG9naWNhbFdpZHRoLmlzQXV0bygpKQotICAgICAgICBs b2dpY2FsV2lkdGggPSBMZW5ndGgoMCwgRml4ZWQpOwotICAgIGVsc2UgaWYgKGxvZ2ljYWxXaWR0 aC5pc0ludHJpbnNpYygpKQorICAgIGlmICh3aWR0aFR5cGUgPT0gTWluU2l6ZSAmJiBsb2dpY2Fs V2lkdGguaXNBdXRvKCkpIHsKKyAgICAgICAgaWYgKHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhG cm9tQXNwZWN0UmF0aW8oKSkgeworICAgICAgICAgICAgTGF5b3V0VW5pdCBtaW5Mb2dpY2FsV2lk dGgsIG1heExvZ2ljYWxXaWR0aDsKKyAgICAgICAgICAgIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2Fs V2lkdGhzKG1pbkxvZ2ljYWxXaWR0aCwgbWF4TG9naWNhbFdpZHRoKTsKKyAgICAgICAgICAgIGxv Z2ljYWxXaWR0aCA9IExlbmd0aChtaW5Mb2dpY2FsV2lkdGgsIEZpeGVkKTsKKyAgICAgICAgfSBl bHNlCisgICAgICAgICAgICBsb2dpY2FsV2lkdGggPSBMZW5ndGgoMCwgRml4ZWQpOworICAgIH0g ZWxzZSBpZiAod2lkdGhUeXBlID09IE1haW5PclByZWZlcnJlZFNpemUgJiYgbG9naWNhbFdpZHRo LmlzQXV0bygpICYmIGNvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8obG9naWNhbFdp ZHRoKSkgeworICAgIH0gZWxzZSBpZiAobG9naWNhbFdpZHRoLmlzSW50cmluc2ljKCkpCiAgICAg ICAgIGxvZ2ljYWxXaWR0aCA9IExlbmd0aChjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRoVXNp bmcobG9naWNhbFdpZHRoLCBjb250YWluZXJMb2dpY2FsV2lkdGgsIGJvcmRlcnNQbHVzUGFkZGlu ZykgLSBib3JkZXJzUGx1c1BhZGRpbmcsIEZpeGVkKTsKIAogICAgIC8vICdsZWZ0JyBhbmQgJ3Jp Z2h0JyBjYW5ub3QgYm90aCBiZSAnYXV0bycgYmVjYXVzZSBvbmUgd291bGQgb2YgYmVlbgpAQCAt MzcwOSw3ICszNzE1LDcgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNh bFdpZHRoVXNpbmcoU2l6ZVR5cGUgd2lkdGhUeXBlLCBMZW5ndGggbG8KIAogICAgIGNvbnN0IExh eW91dFVuaXQgY29udGFpbmVyUmVsYXRpdmVMb2dpY2FsV2lkdGggPSBjb250YWluaW5nQmxvY2tM b2dpY2FsV2lkdGhGb3JQb3NpdGlvbmVkKGNvbnRhaW5lckJsb2NrLCBudWxscHRyLCBmYWxzZSk7 CiAKLSAgICBib29sIGxvZ2ljYWxXaWR0aElzQXV0byA9IGxvZ2ljYWxXaWR0aC5pc0ludHJpbnNp Y09yQXV0bygpOworICAgIGJvb2wgbG9naWNhbFdpZHRoSXNBdXRvID0gbG9naWNhbFdpZHRoLmlz SW50cmluc2ljT3JBdXRvKCkgJiYgIXNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0 UmF0aW8oKTsKICAgICBib29sIGxvZ2ljYWxMZWZ0SXNBdXRvID0gbG9naWNhbExlZnQuaXNBdXRv KCk7CiAgICAgYm9vbCBsb2dpY2FsUmlnaHRJc0F1dG8gPSBsb2dpY2FsUmlnaHQuaXNBdXRvKCk7 CiAgICAgTGF5b3V0VW5pdCYgbWFyZ2luTG9naWNhbExlZnRWYWx1ZSA9IHN0eWxlKCkuaXNMZWZ0 VG9SaWdodERpcmVjdGlvbigpID8gY29tcHV0ZWRWYWx1ZXMubV9tYXJnaW5zLm1fc3RhcnQgOiBj b21wdXRlZFZhbHVlcy5tX21hcmdpbnMubV9lbmQ7CkBAIC00MDQ2LDcgKzQwNTIsOCBAQCB2b2lk IFJlbmRlckJveDo6Y29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsSGVpZ2h0VXNpbmcoU2l6ZVR5cGUg aGVpZ2h0VHlwZSwgTGVuZ3RoCiAKICAgICBMYXlvdXRVbml0IGxvZ2ljYWxUb3BWYWx1ZTsKIAot ICAgIGJvb2wgbG9naWNhbEhlaWdodElzQXV0byA9IGxvZ2ljYWxIZWlnaHRMZW5ndGguaXNBdXRv KCk7CisgICAgYm9vbCBmcm9tQXNwZWN0UmF0aW8gPSBoZWlnaHRUeXBlID09IE1haW5PclByZWZl cnJlZFNpemUgJiYgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxIZWlnaHRGcm9tQXNwZWN0UmF0aW8oKTsK KyAgICBib29sIGxvZ2ljYWxIZWlnaHRJc0F1dG8gPSBsb2dpY2FsSGVpZ2h0TGVuZ3RoLmlzQXV0 bygpICYmICFmcm9tQXNwZWN0UmF0aW87CiAgICAgYm9vbCBsb2dpY2FsVG9wSXNBdXRvID0gbG9n aWNhbFRvcC5pc0F1dG8oKTsKICAgICBib29sIGxvZ2ljYWxCb3R0b21Jc0F1dG8gPSBsb2dpY2Fs Qm90dG9tLmlzQXV0bygpOwogCkBAIC00MDU4LDYgKzQwNjUsOCBAQCB2b2lkIFJlbmRlckJveDo6 Y29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsSGVpZ2h0VXNpbmcoU2l6ZVR5cGUgaGVpZ2h0VHlwZSwg TGVuZ3RoCiAgICAgfSBlbHNlIHsKICAgICAgICAgaWYgKGxvZ2ljYWxIZWlnaHRMZW5ndGguaXNJ bnRyaW5zaWMoKSkKICAgICAgICAgICAgIHJlc29sdmVkTG9naWNhbEhlaWdodCA9IGNvbXB1dGVJ bnRyaW5zaWNMb2dpY2FsQ29udGVudEhlaWdodFVzaW5nKGxvZ2ljYWxIZWlnaHRMZW5ndGgsIGNv bnRlbnRMb2dpY2FsSGVpZ2h0LCBib3JkZXJzUGx1c1BhZGRpbmcpLnZhbHVlKCk7CisgICAgICAg IGVsc2UgaWYgKGZyb21Bc3BlY3RSYXRpbykKKyAgICAgICAgICAgIHJlc29sdmVkTG9naWNhbEhl aWdodCA9IGJsb2NrU2l6ZUZyb21Bc3BlY3RSYXRpbyhob3Jpem9udGFsQm9yZGVyQW5kUGFkZGlu Z0V4dGVudCgpLCB2ZXJ0aWNhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKSwgc3R5bGUoKS5sb2dp Y2FsQXNwZWN0UmF0aW8oKSAsIHN0eWxlKCkuYm94U2l6aW5nKCksIGxvZ2ljYWxXaWR0aCgpKTsK ICAgICAgICAgZWxzZQogICAgICAgICAgICAgcmVzb2x2ZWRMb2dpY2FsSGVpZ2h0ID0gYWRqdXN0 Q29udGVudEJveExvZ2ljYWxIZWlnaHRGb3JCb3hTaXppbmcodmFsdWVGb3JMZW5ndGgobG9naWNh bEhlaWdodExlbmd0aCwgY29udGFpbmVyTG9naWNhbEhlaWdodCkpOwogICAgIH0KQEAgLTQ5NzUs NiArNDk4NCwyMiBAQCB2b2lkIFJlbmRlckJveDo6YXBwbHlUb3BMZWZ0TG9jYXRpb25PZmZzZXRX aXRoRmxpcHBpbmcoTGF5b3V0UG9pbnQmIHBvaW50KSBjb25zdAogICAgIHBvaW50Lm1vdmUocmVj dC54KCksIHJlY3QueSgpKTsKIH0KIAorYm9vbCBSZW5kZXJCb3g6OnNob3VsZENvbXB1dGVMb2dp Y2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oTGF5b3V0VW5pdCogb3V0TG9naWNhbEhlaWdodCkgY29u c3QKK3sKKyAgICBpZiAoc3R5bGUoKS5hc3BlY3RSYXRpb1R5cGUoKSA9PSBBc3BlY3RSYXRpb1R5 cGU6OkF1dG8pCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIGlmICghaGFzT3ZlcnJpZGlu Z0xvZ2ljYWxIZWlnaHQoKSAmJiAhc3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCkuaXNGaXhlZCgpICYm ICFzdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKS5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSkKKyAgICAg ICAgcmV0dXJuIGZhbHNlOworCisgICAgaWYgKG91dExvZ2ljYWxIZWlnaHQpIHsKKyAgICAgICAg YXV0byBjb21wdXRlZFZhbHVlcyA9IGNvbXB1dGVMb2dpY2FsSGVpZ2h0KGxvZ2ljYWxIZWlnaHQo KSwgbG9naWNhbFRvcCgpKTsKKyAgICAgICAgKm91dExvZ2ljYWxIZWlnaHQgPSBjb21wdXRlZFZh bHVlcy5tX2V4dGVudDsKKyAgICB9CisKKyAgICByZXR1cm4gdHJ1ZTsKK30KKwogYm9vbCBSZW5k ZXJCb3g6OnNob3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJvbUFzcGVjdFJhdGlvKCkgY29uc3QK IHsKICAgICBpZiAoIXN0eWxlKCkuaGFzQXNwZWN0UmF0aW8oKSkKQEAgLTQ5ODQsNiArNTAwOSwx OSBAQCBib29sIFJlbmRlckJveDo6c2hvdWxkQ29tcHV0ZUxvZ2ljYWxIZWlnaHRGcm9tQXNwZWN0 UmF0aW8oKSBjb25zdAogICAgIHJldHVybiBoLmlzQXV0bygpIHx8ICghaXNPdXRPZkZsb3dQb3Np dGlvbmVkKCkgJiYgaC5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSAmJiBwZXJjZW50YWdlTG9naWNh bEhlaWdodElzUmVzb2x2YWJsZSgpKTsKIH0KIAorYm9vbCBSZW5kZXJCb3g6OmNvbXB1dGVMb2dp Y2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oTGVuZ3RoJiBvdXRMb2dpY2FsV2lkdGgsIFJlbmRlckZy YWdtZW50Q29udGFpbmVyKiBmcmFnbWVudCkgY29uc3QKK3sKKyAgICBMYXlvdXRVbml0IGxvZ2lj YWxIZWlnaHRmb3JBc3BlY3RSYXRpbzsKKyAgICBpZiAoIXNob3VsZENvbXB1dGVMb2dpY2FsV2lk dGhGcm9tQXNwZWN0UmF0aW8oJmxvZ2ljYWxIZWlnaHRmb3JBc3BlY3RSYXRpbykpCisgICAgICAg IHJldHVybiBmYWxzZTsKKworICAgIExheW91dFVuaXQgY29udGFpbmVyV2lkdGhJbmlubGluZURp cmVjdGlvbiA9IHN0ZDo6bWF4PExheW91dFVuaXQ+KDAsIGNvbnRhaW5pbmdCbG9ja0xvZ2ljYWxX aWR0aEZvckNvbnRlbnRJbkZyYWdtZW50KGZyYWdtZW50KSk7CisKKyAgICBhdXRvIGxvZ2ljYWxX aWR0aCA9IGlubGluZVNpemVGcm9tQXNwZWN0UmF0aW8oaG9yaXpvbnRhbEJvcmRlckFuZFBhZGRp bmdFeHRlbnQoKSwgdmVydGljYWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCksIHN0eWxlKCkubG9n aWNhbEFzcGVjdFJhdGlvKCksIHN0eWxlKCkuYm94U2l6aW5nKCksIGxvZ2ljYWxIZWlnaHRmb3JB c3BlY3RSYXRpbyk7CisgICAgb3V0TG9naWNhbFdpZHRoID0gTGVuZ3RoKGNvbnN0cmFpbkxvZ2lj YWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heChsb2dpY2FsV2lkdGgsIGNvbnRhaW5lcldpZHRoSW5p bmxpbmVEaXJlY3Rpb24sICpjb250YWluaW5nQmxvY2soKSwgZnJhZ21lbnQpLCBGaXhlZCk7Cisg ICAgcmV0dXJuIHRydWU7Cit9CisKIGJvb2wgUmVuZGVyQm94OjpoYXNSZWxhdGl2ZURpbWVuc2lv bnMoKSBjb25zdAogewogICAgIHJldHVybiBzdHlsZSgpLmhlaWdodCgpLmlzUGVyY2VudE9yQ2Fs Y3VsYXRlZCgpIHx8IHN0eWxlKCkud2lkdGgoKS5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCmluZGV4IDIzYmI3ODE5YzIyODg2MjZjNTZjMDQ1 ZTEyMTY5YWQ3MWY4YjJjYjAuLjk0YzA4NGE2NzBiM2YwODAwNWE1ODhkZGNiNmQ5NWI1ZGY2YWIw OTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKQEAgLTc0Miw2ICs3NDIsOSBA QCBwcml2YXRlOgogICAgIHZvaWQgYXBwbHlUb3BMZWZ0TG9jYXRpb25PZmZzZXRXaXRoRmxpcHBp bmcoTGF5b3V0UG9pbnQmKSBjb25zdDsKIAogICAgIGJvb2wgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxI ZWlnaHRGcm9tQXNwZWN0UmF0aW8oKSBjb25zdDsKKyAgICBib29sIHNob3VsZENvbXB1dGVMb2dp Y2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oTGF5b3V0VW5pdCogbG9naWNhbEhlaWdodCA9IG51bGxw dHIpIGNvbnN0OworICAgIGJvb2wgY29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbyhM ZW5ndGgmIGxvZ2ljYWxXaWR0aCwgUmVuZGVyRnJhZ21lbnRDb250YWluZXIqID0gbnVsbHB0cikg Y29uc3Q7CisKIAogcHJpdmF0ZToKICAgICAvLyBUaGUgd2lkdGgvaGVpZ2h0IG9mIHRoZSBjb250 ZW50cyArIGJvcmRlcnMgKyBwYWRkaW5nLiAgVGhlIHgveSBsb2NhdGlvbiBpcyByZWxhdGl2ZSB0 byBvdXIgY29udGFpbmVyICh3aGljaCBpcyBub3QgYWx3YXlzIG91ciBwYXJlbnQpLgo= 415893 2020-12-10 10:16:36 -0800 2020-12-11 07:22:19 -0800 Patch bug-219741-20201210191633.patch text/plain 9153 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwNjI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmQxYjhiNzhhNDMzY2I2 YmZhYzAyODIxMWY0MzJlZmNhODI3YWEyNC4uYWFhYTA2MDJhNDdkNTJmMmEzYTE2NTAwNTdjOTMy YTRkYzRlOTE1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIwLTEyLTEwICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g b24gcG9zaXRpb25lZCBlbGVtZW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjE5NzQxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbFdp ZHRoVXNpbmcgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlUG9z aXRpb25lZExvZ2ljYWxIZWlnaHRVc2luZyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJCb3g6OnNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8gY29uc3QpOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVj dFJhdGlvIGNvbnN0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94Lmg6CisKIDIwMjAt MTItMTAgIEFkaXR5YSBLZWVydGhpICA8YWtlZXJ0aGlAYXBwbGUuY29tPgogCiAgICAgICAgIFtp T1NdW0ZDUl0gQWRkIG5ldyBsb29rIGZvciBpbnB1dCB0eXBlPXJhbmdlCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IDhkODUzYWEyYzhhYTRiNzBiMGIyYWJiNDE5MmNj YmIyOTk3Y2FjMjMuLjU1ZjA0YzUzZGQwNmVlYzkxOGU2Y2I4YjczMTFkMzY1MzQxMjlmZjYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC0zNjk2LDkgKzM2OTYsMTYg QEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbFdpZHRoVXNpbmcoU2l6 ZVR5cGUgd2lkdGhUeXBlLCBMZW5ndGggbG8KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIExvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHVlcyYgY29tcHV0 ZWRWYWx1ZXMpIGNvbnN0CiB7CiAgICAgQVNTRVJUKHdpZHRoVHlwZSA9PSBNaW5TaXplIHx8IHdp ZHRoVHlwZSA9PSBNYWluT3JQcmVmZXJyZWRTaXplIHx8ICFsb2dpY2FsV2lkdGguaXNBdXRvKCkp OwotICAgIGlmICh3aWR0aFR5cGUgPT0gTWluU2l6ZSAmJiBsb2dpY2FsV2lkdGguaXNBdXRvKCkp Ci0gICAgICAgIGxvZ2ljYWxXaWR0aCA9IExlbmd0aCgwLCBGaXhlZCk7Ci0gICAgZWxzZSBpZiAo bG9naWNhbFdpZHRoLmlzSW50cmluc2ljKCkpCisgICAgaWYgKHdpZHRoVHlwZSA9PSBNaW5TaXpl ICYmIGxvZ2ljYWxXaWR0aC5pc0F1dG8oKSkgeworICAgICAgICBpZiAoc2hvdWxkQ29tcHV0ZUxv Z2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpKSB7CisgICAgICAgICAgICBMYXlvdXRVbml0IG1p bkxvZ2ljYWxXaWR0aCwgbWF4TG9naWNhbFdpZHRoOworICAgICAgICAgICAgY29tcHV0ZUludHJp bnNpY0xvZ2ljYWxXaWR0aHMobWluTG9naWNhbFdpZHRoLCBtYXhMb2dpY2FsV2lkdGgpOworICAg ICAgICAgICAgbG9naWNhbFdpZHRoID0gTGVuZ3RoKG1pbkxvZ2ljYWxXaWR0aCwgRml4ZWQpOwor ICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgIGxvZ2ljYWxXaWR0aCA9IExlbmd0aCgwLCBGaXhl ZCk7CisgICAgfSBlbHNlIGlmICh3aWR0aFR5cGUgPT0gTWFpbk9yUHJlZmVycmVkU2l6ZSAmJiBs b2dpY2FsV2lkdGguaXNBdXRvKCkgJiYgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3Bl Y3RSYXRpbygpKSB7CisgICAgICAgIGNvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8o bG9naWNhbFdpZHRoKTsKKyAgICB9IGVsc2UgaWYgKGxvZ2ljYWxXaWR0aC5pc0ludHJpbnNpYygp KQogICAgICAgICBsb2dpY2FsV2lkdGggPSBMZW5ndGgoY29tcHV0ZUludHJpbnNpY0xvZ2ljYWxX aWR0aFVzaW5nKGxvZ2ljYWxXaWR0aCwgY29udGFpbmVyTG9naWNhbFdpZHRoLCBib3JkZXJzUGx1 c1BhZGRpbmcpIC0gYm9yZGVyc1BsdXNQYWRkaW5nLCBGaXhlZCk7CiAKICAgICAvLyAnbGVmdCcg YW5kICdyaWdodCcgY2Fubm90IGJvdGggYmUgJ2F1dG8nIGJlY2F1c2Ugb25lIHdvdWxkIG9mIGJl ZW4KQEAgLTM3MDksNyArMzcxNiw3IEBAIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25l ZExvZ2ljYWxXaWR0aFVzaW5nKFNpemVUeXBlIHdpZHRoVHlwZSwgTGVuZ3RoIGxvCiAKICAgICBj b25zdCBMYXlvdXRVbml0IGNvbnRhaW5lclJlbGF0aXZlTG9naWNhbFdpZHRoID0gY29udGFpbmlu Z0Jsb2NrTG9naWNhbFdpZHRoRm9yUG9zaXRpb25lZChjb250YWluZXJCbG9jaywgbnVsbHB0ciwg ZmFsc2UpOwogCi0gICAgYm9vbCBsb2dpY2FsV2lkdGhJc0F1dG8gPSBsb2dpY2FsV2lkdGguaXNJ bnRyaW5zaWNPckF1dG8oKTsKKyAgICBib29sIGxvZ2ljYWxXaWR0aElzQXV0byA9IGxvZ2ljYWxX aWR0aC5pc0ludHJpbnNpY09yQXV0bygpICYmICFzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJv bUFzcGVjdFJhdGlvKCk7CiAgICAgYm9vbCBsb2dpY2FsTGVmdElzQXV0byA9IGxvZ2ljYWxMZWZ0 LmlzQXV0bygpOwogICAgIGJvb2wgbG9naWNhbFJpZ2h0SXNBdXRvID0gbG9naWNhbFJpZ2h0Lmlz QXV0bygpOwogICAgIExheW91dFVuaXQmIG1hcmdpbkxvZ2ljYWxMZWZ0VmFsdWUgPSBzdHlsZSgp LmlzTGVmdFRvUmlnaHREaXJlY3Rpb24oKSA/IGNvbXB1dGVkVmFsdWVzLm1fbWFyZ2lucy5tX3N0 YXJ0IDogY29tcHV0ZWRWYWx1ZXMubV9tYXJnaW5zLm1fZW5kOwpAQCAtNDA0Niw3ICs0MDUzLDgg QEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbEhlaWdodFVzaW5nKFNp emVUeXBlIGhlaWdodFR5cGUsIExlbmd0aAogCiAgICAgTGF5b3V0VW5pdCBsb2dpY2FsVG9wVmFs dWU7CiAKLSAgICBib29sIGxvZ2ljYWxIZWlnaHRJc0F1dG8gPSBsb2dpY2FsSGVpZ2h0TGVuZ3Ro LmlzQXV0bygpOworICAgIGJvb2wgZnJvbUFzcGVjdFJhdGlvID0gaGVpZ2h0VHlwZSA9PSBNYWlu T3JQcmVmZXJyZWRTaXplICYmIHNob3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJvbUFzcGVjdFJh dGlvKCk7CisgICAgYm9vbCBsb2dpY2FsSGVpZ2h0SXNBdXRvID0gbG9naWNhbEhlaWdodExlbmd0 aC5pc0F1dG8oKSAmJiAhZnJvbUFzcGVjdFJhdGlvOwogICAgIGJvb2wgbG9naWNhbFRvcElzQXV0 byA9IGxvZ2ljYWxUb3AuaXNBdXRvKCk7CiAgICAgYm9vbCBsb2dpY2FsQm90dG9tSXNBdXRvID0g bG9naWNhbEJvdHRvbS5pc0F1dG8oKTsKIApAQCAtNDA1OCw2ICs0MDY2LDggQEAgdm9pZCBSZW5k ZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbEhlaWdodFVzaW5nKFNpemVUeXBlIGhlaWdo dFR5cGUsIExlbmd0aAogICAgIH0gZWxzZSB7CiAgICAgICAgIGlmIChsb2dpY2FsSGVpZ2h0TGVu Z3RoLmlzSW50cmluc2ljKCkpCiAgICAgICAgICAgICByZXNvbHZlZExvZ2ljYWxIZWlnaHQgPSBj b21wdXRlSW50cmluc2ljTG9naWNhbENvbnRlbnRIZWlnaHRVc2luZyhsb2dpY2FsSGVpZ2h0TGVu Z3RoLCBjb250ZW50TG9naWNhbEhlaWdodCwgYm9yZGVyc1BsdXNQYWRkaW5nKS52YWx1ZSgpOwor ICAgICAgICBlbHNlIGlmIChmcm9tQXNwZWN0UmF0aW8pCisgICAgICAgICAgICByZXNvbHZlZExv Z2ljYWxIZWlnaHQgPSBibG9ja1NpemVGcm9tQXNwZWN0UmF0aW8oaG9yaXpvbnRhbEJvcmRlckFu ZFBhZGRpbmdFeHRlbnQoKSwgdmVydGljYWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCksIHN0eWxl KCkubG9naWNhbEFzcGVjdFJhdGlvKCkgLCBzdHlsZSgpLmJveFNpemluZygpLCBsb2dpY2FsV2lk dGgoKSk7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIHJlc29sdmVkTG9naWNhbEhlaWdodCA9 IGFkanVzdENvbnRlbnRCb3hMb2dpY2FsSGVpZ2h0Rm9yQm94U2l6aW5nKHZhbHVlRm9yTGVuZ3Ro KGxvZ2ljYWxIZWlnaHRMZW5ndGgsIGNvbnRhaW5lckxvZ2ljYWxIZWlnaHQpKTsKICAgICB9CkBA IC00OTg0LDYgKzQ5OTQsMjkgQEAgYm9vbCBSZW5kZXJCb3g6OnNob3VsZENvbXB1dGVMb2dpY2Fs SGVpZ2h0RnJvbUFzcGVjdFJhdGlvKCkgY29uc3QKICAgICByZXR1cm4gaC5pc0F1dG8oKSB8fCAo IWlzT3V0T2ZGbG93UG9zaXRpb25lZCgpICYmIGguaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkgJiYg cGVyY2VudGFnZUxvZ2ljYWxIZWlnaHRJc1Jlc29sdmFibGUoKSk7CiB9CiAKK2Jvb2wgUmVuZGVy Qm94OjpzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkgY29uc3QKK3sK KyAgICBpZiAoIXN0eWxlKCkuaGFzQXNwZWN0UmF0aW8oKSkKKyAgICAgICAgcmV0dXJuIGZhbHNl OworCisgICAgaWYgKCFoYXNPdmVycmlkaW5nTG9naWNhbEhlaWdodCgpICYmICFzdHlsZSgpLmxv Z2ljYWxIZWlnaHQoKS5pc0ZpeGVkKCkgJiYgIXN0eWxlKCkubG9naWNhbEhlaWdodCgpLmlzUGVy Y2VudE9yQ2FsY3VsYXRlZCgpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICByZXR1cm4g dHJ1ZTsKK30KKwordm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0 UmF0aW8oTGVuZ3RoJiBvdXRMb2dpY2FsV2lkdGgsIFJlbmRlckZyYWdtZW50Q29udGFpbmVyKiBm cmFnbWVudCkgY29uc3QKK3sKKyAgICBBU1NFUlQoc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZy b21Bc3BlY3RSYXRpbygpKTsKKyAgICBhdXRvIGNvbXB1dGVkVmFsdWVzID0gY29tcHV0ZUxvZ2lj YWxIZWlnaHQobG9naWNhbEhlaWdodCgpLCBsb2dpY2FsVG9wKCkpOworICAgIExheW91dFVuaXQg bG9naWNhbEhlaWdodGZvckFzcGVjdFJhdGlvID0gY29tcHV0ZWRWYWx1ZXMubV9leHRlbnQ7CisK KyAgICBMYXlvdXRVbml0IGNvbnRhaW5lcldpZHRoSW5pbmxpbmVEaXJlY3Rpb24gPSBzdGQ6Om1h eDxMYXlvdXRVbml0PigwLCBjb250YWluaW5nQmxvY2tMb2dpY2FsV2lkdGhGb3JDb250ZW50SW5G cmFnbWVudChmcmFnbWVudCkpOworCisgICAgYXV0byBsb2dpY2FsV2lkdGggPSBpbmxpbmVTaXpl RnJvbUFzcGVjdFJhdGlvKGhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCksIHZlcnRp Y2FsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpLCBzdHlsZSgpLmxvZ2ljYWxBc3BlY3RSYXRpbygp LCBzdHlsZSgpLmJveFNpemluZygpLCBsb2dpY2FsSGVpZ2h0Zm9yQXNwZWN0UmF0aW8pOworICAg IG91dExvZ2ljYWxXaWR0aCA9IExlbmd0aChjb25zdHJhaW5Mb2dpY2FsV2lkdGhJbkZyYWdtZW50 QnlNaW5NYXgobG9naWNhbFdpZHRoLCBjb250YWluZXJXaWR0aEluaW5saW5lRGlyZWN0aW9uLCAq Y29udGFpbmluZ0Jsb2NrKCksIGZyYWdtZW50KSwgRml4ZWQpOworfQorCiBib29sIFJlbmRlckJv eDo6aGFzUmVsYXRpdmVEaW1lbnNpb25zKCkgY29uc3QKIHsKICAgICByZXR1cm4gc3R5bGUoKS5o ZWlnaHQoKS5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSB8fCBzdHlsZSgpLndpZHRoKCkuaXNQZXJj ZW50T3JDYWxjdWxhdGVkKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCb3guaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAppbmRleCAy M2JiNzgxOWMyMjg4NjI2YzU2YzA0NWUxMjE2OWFkNzFmOGIyY2IwLi5mZTE4N2U1NzM2NWU4NWRm YWQ2NmRmNTc3MjUzY2ZjZDgwNDk5ZjVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJv eC5oCkBAIC03NDIsNiArNzQyLDkgQEAgcHJpdmF0ZToKICAgICB2b2lkIGFwcGx5VG9wTGVmdExv Y2F0aW9uT2Zmc2V0V2l0aEZsaXBwaW5nKExheW91dFBvaW50JikgY29uc3Q7CiAKICAgICBib29s IHNob3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJvbUFzcGVjdFJhdGlvKCkgY29uc3Q7CisgICAg Ym9vbCBzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkgY29uc3Q7Cisg ICAgdm9pZCBjb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKExlbmd0aCYgbG9naWNh bFdpZHRoLCBSZW5kZXJGcmFnbWVudENvbnRhaW5lciogPSBudWxscHRyKSBjb25zdDsKKwogCiBw cml2YXRlOgogICAgIC8vIFRoZSB3aWR0aC9oZWlnaHQgb2YgdGhlIGNvbnRlbnRzICsgYm9yZGVy cyArIHBhZGRpbmcuICBUaGUgeC95IGxvY2F0aW9uIGlzIHJlbGF0aXZlIHRvIG91ciBjb250YWlu ZXIgKHdoaWNoIGlzIG5vdCBhbHdheXMgb3VyIHBhcmVudCkuCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwppbmRl eCBhOTRkMDEyZTBjYjc2YTI2OGNiMzgzMjBkMmRiMDBhZTVkMmMwZDhkLi41MTgxM2JiNjBkZTE5 NzJlYjNiYjA1ZmE3MWI3YzhlNGE3ZDU3ODNkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9UZXN0 RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTQ0MTUs MTcgKzQ0MTUsMTEgQEAgd2Via2l0Lm9yZy9iLzIxNDQ2MiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL2Nzcy9jc3Mtc2NvcGluZy9zaGFkb3ctZGlyZWMKIHdlYmtpdC5vcmcvYi8yMTQ0 NjIgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNjb3Bpbmcvc2hhZG93 LWRpcmVjdGlvbmFsaXR5LTAwMi50ZW50YXRpdmUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQog d2Via2l0Lm9yZy9iLzIxNDQ2MiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j c3Mtc2NvcGluZy9zbG90dGVkLXBsYWNlaG9sZGVyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K IAotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz cy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9hYnNwb3MtMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWls dXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0 cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYWJzcG9zLTAwMi5odG1sIFsgSW1hZ2VPbmx5 RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t dGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Fic3Bvcy0wMDMuaHRtbCBbIEltYWdl T25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9hYnNwb3MtMDA0Lmh0bWwgWyBJ bWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYWJzcG9zLTAwNS5odG1s IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93 ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Fic3Bvcy0wMDYu aHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93 M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9hYnNwb3Mt MDA3Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYWJz cG9zLTAwOC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGlt cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlv L2Fic3Bvcy0wMDkuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2 MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1y YXRpby9hYnNwb3MtMDEwLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8y MTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl Y3QtcmF0aW8vYWJzcG9zLTAxMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCit3ZWJraXQub3Jn L2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcv YXNwZWN0LXJhdGlvL2Fic3Bvcy0wMTIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQord2Via2l0 Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6 aW5nL2FzcGVjdC1yYXRpby9hYnNwb3MtMDEzLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdl YmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz LXNpemluZy9hc3BlY3QtcmF0aW8vYWJzcG9zLTAxNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd CiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz L2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMDkuaHRtbCBbIElt YWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0 aW8tMDE0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K 415994 2020-12-11 07:22:27 -0800 2020-12-11 11:58:59 -0800 Patch bug-219741-20201211162222.patch text/plain 10006 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwNjI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmQxYjhiNzhhNDMzY2I2 YmZhYzAyODIxMWY0MzJlZmNhODI3YWEyNC4uYWFhYTA2MDJhNDdkNTJmMmEzYTE2NTAwNTdjOTMy YTRkYzRlOTE1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIwLTEyLTEwICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g b24gcG9zaXRpb25lZCBlbGVtZW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjE5NzQxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbFdp ZHRoVXNpbmcgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlUG9z aXRpb25lZExvZ2ljYWxIZWlnaHRVc2luZyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJCb3g6OnNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8gY29uc3QpOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVj dFJhdGlvIGNvbnN0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94Lmg6CisKIDIwMjAt MTItMTAgIEFkaXR5YSBLZWVydGhpICA8YWtlZXJ0aGlAYXBwbGUuY29tPgogCiAgICAgICAgIFtp T1NdW0ZDUl0gQWRkIG5ldyBsb29rIGZvciBpbnB1dCB0eXBlPXJhbmdlCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IDhkODUzYWEyYzhhYTRiNzBiMGIyYWJiNDE5MmNj YmIyOTk3Y2FjMjMuLjZiYzk4YzBjZmZjNTAyNTJjMGJkMjliZTdlYmFlODU4ZjI0M2M3YjUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC0zNjk2LDkgKzM2OTYsMTYg QEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbFdpZHRoVXNpbmcoU2l6 ZVR5cGUgd2lkdGhUeXBlLCBMZW5ndGggbG8KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIExvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHVlcyYgY29tcHV0 ZWRWYWx1ZXMpIGNvbnN0CiB7CiAgICAgQVNTRVJUKHdpZHRoVHlwZSA9PSBNaW5TaXplIHx8IHdp ZHRoVHlwZSA9PSBNYWluT3JQcmVmZXJyZWRTaXplIHx8ICFsb2dpY2FsV2lkdGguaXNBdXRvKCkp OwotICAgIGlmICh3aWR0aFR5cGUgPT0gTWluU2l6ZSAmJiBsb2dpY2FsV2lkdGguaXNBdXRvKCkp Ci0gICAgICAgIGxvZ2ljYWxXaWR0aCA9IExlbmd0aCgwLCBGaXhlZCk7Ci0gICAgZWxzZSBpZiAo bG9naWNhbFdpZHRoLmlzSW50cmluc2ljKCkpCisgICAgaWYgKHdpZHRoVHlwZSA9PSBNaW5TaXpl ICYmIGxvZ2ljYWxXaWR0aC5pc0F1dG8oKSkgeworICAgICAgICBpZiAoc2hvdWxkQ29tcHV0ZUxv Z2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpKSB7CisgICAgICAgICAgICBMYXlvdXRVbml0IG1p bkxvZ2ljYWxXaWR0aCwgbWF4TG9naWNhbFdpZHRoOworICAgICAgICAgICAgY29tcHV0ZUludHJp bnNpY0xvZ2ljYWxXaWR0aHMobWluTG9naWNhbFdpZHRoLCBtYXhMb2dpY2FsV2lkdGgpOworICAg ICAgICAgICAgbG9naWNhbFdpZHRoID0gTGVuZ3RoKG1pbkxvZ2ljYWxXaWR0aCwgRml4ZWQpOwor ICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgIGxvZ2ljYWxXaWR0aCA9IExlbmd0aCgwLCBGaXhl ZCk7CisgICAgfSBlbHNlIGlmICh3aWR0aFR5cGUgPT0gTWFpbk9yUHJlZmVycmVkU2l6ZSAmJiBs b2dpY2FsV2lkdGguaXNBdXRvKCkgJiYgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3Bl Y3RSYXRpbygpKSB7CisgICAgICAgIGNvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8o bG9naWNhbFdpZHRoKTsKKyAgICB9IGVsc2UgaWYgKGxvZ2ljYWxXaWR0aC5pc0ludHJpbnNpYygp KQogICAgICAgICBsb2dpY2FsV2lkdGggPSBMZW5ndGgoY29tcHV0ZUludHJpbnNpY0xvZ2ljYWxX aWR0aFVzaW5nKGxvZ2ljYWxXaWR0aCwgY29udGFpbmVyTG9naWNhbFdpZHRoLCBib3JkZXJzUGx1 c1BhZGRpbmcpIC0gYm9yZGVyc1BsdXNQYWRkaW5nLCBGaXhlZCk7CiAKICAgICAvLyAnbGVmdCcg YW5kICdyaWdodCcgY2Fubm90IGJvdGggYmUgJ2F1dG8nIGJlY2F1c2Ugb25lIHdvdWxkIG9mIGJl ZW4KQEAgLTM3MDksNyArMzcxNiw3IEBAIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25l ZExvZ2ljYWxXaWR0aFVzaW5nKFNpemVUeXBlIHdpZHRoVHlwZSwgTGVuZ3RoIGxvCiAKICAgICBj b25zdCBMYXlvdXRVbml0IGNvbnRhaW5lclJlbGF0aXZlTG9naWNhbFdpZHRoID0gY29udGFpbmlu Z0Jsb2NrTG9naWNhbFdpZHRoRm9yUG9zaXRpb25lZChjb250YWluZXJCbG9jaywgbnVsbHB0ciwg ZmFsc2UpOwogCi0gICAgYm9vbCBsb2dpY2FsV2lkdGhJc0F1dG8gPSBsb2dpY2FsV2lkdGguaXNJ bnRyaW5zaWNPckF1dG8oKTsKKyAgICBib29sIGxvZ2ljYWxXaWR0aElzQXV0byA9IGxvZ2ljYWxX aWR0aC5pc0ludHJpbnNpY09yQXV0bygpICYmICFzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJv bUFzcGVjdFJhdGlvKCk7CiAgICAgYm9vbCBsb2dpY2FsTGVmdElzQXV0byA9IGxvZ2ljYWxMZWZ0 LmlzQXV0bygpOwogICAgIGJvb2wgbG9naWNhbFJpZ2h0SXNBdXRvID0gbG9naWNhbFJpZ2h0Lmlz QXV0bygpOwogICAgIExheW91dFVuaXQmIG1hcmdpbkxvZ2ljYWxMZWZ0VmFsdWUgPSBzdHlsZSgp LmlzTGVmdFRvUmlnaHREaXJlY3Rpb24oKSA/IGNvbXB1dGVkVmFsdWVzLm1fbWFyZ2lucy5tX3N0 YXJ0IDogY29tcHV0ZWRWYWx1ZXMubV9tYXJnaW5zLm1fZW5kOwpAQCAtNDA0Niw3ICs0MDUzLDgg QEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbEhlaWdodFVzaW5nKFNp emVUeXBlIGhlaWdodFR5cGUsIExlbmd0aAogCiAgICAgTGF5b3V0VW5pdCBsb2dpY2FsVG9wVmFs dWU7CiAKLSAgICBib29sIGxvZ2ljYWxIZWlnaHRJc0F1dG8gPSBsb2dpY2FsSGVpZ2h0TGVuZ3Ro LmlzQXV0bygpOworICAgIGJvb2wgZnJvbUFzcGVjdFJhdGlvID0gaGVpZ2h0VHlwZSA9PSBNYWlu T3JQcmVmZXJyZWRTaXplICYmIHNob3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJvbUFzcGVjdFJh dGlvKCk7CisgICAgYm9vbCBsb2dpY2FsSGVpZ2h0SXNBdXRvID0gbG9naWNhbEhlaWdodExlbmd0 aC5pc0F1dG8oKSAmJiAhZnJvbUFzcGVjdFJhdGlvOwogICAgIGJvb2wgbG9naWNhbFRvcElzQXV0 byA9IGxvZ2ljYWxUb3AuaXNBdXRvKCk7CiAgICAgYm9vbCBsb2dpY2FsQm90dG9tSXNBdXRvID0g bG9naWNhbEJvdHRvbS5pc0F1dG8oKTsKIApAQCAtNDA1OCw3ICs0MDY2LDEwIEBAIHZvaWQgUmVu ZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHRVc2luZyhTaXplVHlwZSBoZWln aHRUeXBlLCBMZW5ndGgKICAgICB9IGVsc2UgewogICAgICAgICBpZiAobG9naWNhbEhlaWdodExl bmd0aC5pc0ludHJpbnNpYygpKQogICAgICAgICAgICAgcmVzb2x2ZWRMb2dpY2FsSGVpZ2h0ID0g Y29tcHV0ZUludHJpbnNpY0xvZ2ljYWxDb250ZW50SGVpZ2h0VXNpbmcobG9naWNhbEhlaWdodExl bmd0aCwgY29udGVudExvZ2ljYWxIZWlnaHQsIGJvcmRlcnNQbHVzUGFkZGluZykudmFsdWUoKTsK LSAgICAgICAgZWxzZQorICAgICAgICBlbHNlIGlmIChmcm9tQXNwZWN0UmF0aW8pIHsKKyAgICAg ICAgICAgIHJlc29sdmVkTG9naWNhbEhlaWdodCA9IGJsb2NrU2l6ZUZyb21Bc3BlY3RSYXRpbyho b3Jpem9udGFsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpLCB2ZXJ0aWNhbEJvcmRlckFuZFBhZGRp bmdFeHRlbnQoKSwgc3R5bGUoKS5sb2dpY2FsQXNwZWN0UmF0aW8oKSAsIHN0eWxlKCkuYm94U2l6 aW5nKCksIGxvZ2ljYWxXaWR0aCgpKTsKKyAgICAgICAgICAgIHJlc29sdmVkTG9naWNhbEhlaWdo dCA9IHN0ZDo6bWF4KExheW91dFVuaXQoKSwgcmVzb2x2ZWRMb2dpY2FsSGVpZ2h0IC0gYm9yZGVy c1BsdXNQYWRkaW5nKTsKKyAgICAgICAgfSBlbHNlCiAgICAgICAgICAgICByZXNvbHZlZExvZ2lj YWxIZWlnaHQgPSBhZGp1c3RDb250ZW50Qm94TG9naWNhbEhlaWdodEZvckJveFNpemluZyh2YWx1 ZUZvckxlbmd0aChsb2dpY2FsSGVpZ2h0TGVuZ3RoLCBjb250YWluZXJMb2dpY2FsSGVpZ2h0KSk7 CiAgICAgfQogCkBAIC00OTgwLDEwICs0OTkxLDQ1IEBAIGJvb2wgUmVuZGVyQm94OjpzaG91bGRD b21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0CiAgICAgaWYgKCFzdHls ZSgpLmhhc0FzcGVjdFJhdGlvKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAorICAgIGlmIChz aG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvQW5kSW5zZXRzKCkpCisgICAg ICAgIHJldHVybiBmYWxzZTsKKwogICAgIGF1dG8gaCA9IHN0eWxlKCkubG9naWNhbEhlaWdodCgp OwogICAgIHJldHVybiBoLmlzQXV0bygpIHx8ICghaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkgJiYg aC5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSAmJiBwZXJjZW50YWdlTG9naWNhbEhlaWdodElzUmVz b2x2YWJsZSgpKTsKIH0KIAorYm9vbCBSZW5kZXJCb3g6OnNob3VsZENvbXB1dGVMb2dpY2FsV2lk dGhGcm9tQXNwZWN0UmF0aW8oKSBjb25zdAoreworICAgIGlmICghc3R5bGUoKS5oYXNBc3BlY3RS YXRpbygpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBpZiAoIWhhc092ZXJyaWRpbmdM b2dpY2FsSGVpZ2h0KCkgJiYgIXNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0 aW9BbmRJbnNldHMoKSAmJiAhc3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCkuaXNGaXhlZCgpICYmICFz dHlsZSgpLmxvZ2ljYWxIZWlnaHQoKS5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSkKKyAgICAgICAg cmV0dXJuIGZhbHNlOworCisgICAgcmV0dXJuIHRydWU7Cit9CisKK2Jvb2wgUmVuZGVyQm94Ojpz aG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvQW5kSW5zZXRzKCkgY29uc3QK K3sKKyAgICBpZiAoIXN0eWxlKCkuaGFzQXNwZWN0UmF0aW8oKSB8fCAhaXNPdXRPZkZsb3dQb3Np dGlvbmVkKCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAoc3R5bGUoKS53aWR0aCgp LmlzQXV0bygpICYmIHN0eWxlKCkuaGVpZ2h0KCkuaXNBdXRvKCkgJiYgIXN0eWxlKCkubG9naWNh bFRvcCgpLmlzQXV0bygpICYmICFzdHlsZSgpLmxvZ2ljYWxCb3R0b20oKS5pc0F1dG8oKSAmJiAo c3R5bGUoKS5sb2dpY2FsTGVmdCgpLmlzQXV0bygpIHx8IHN0eWxlKCkubG9naWNhbFJpZ2h0KCku aXNBdXRvKCkpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICByZXR1cm4gZmFsc2U7Cit9CisK K3ZvaWQgUmVuZGVyQm94Ojpjb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKExlbmd0 aCYgb3V0TG9naWNhbFdpZHRoLCBSZW5kZXJGcmFnbWVudENvbnRhaW5lciogZnJhZ21lbnQpIGNv bnN0Cit7CisgICAgQVNTRVJUKHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0 aW8oKSk7CisgICAgYXV0byBjb21wdXRlZFZhbHVlcyA9IGNvbXB1dGVMb2dpY2FsSGVpZ2h0KGxv Z2ljYWxIZWlnaHQoKSwgbG9naWNhbFRvcCgpKTsKKyAgICBMYXlvdXRVbml0IGxvZ2ljYWxIZWln aHRmb3JBc3BlY3RSYXRpbyA9IGNvbXB1dGVkVmFsdWVzLm1fZXh0ZW50OworCisgICAgTGF5b3V0 VW5pdCBjb250YWluZXJXaWR0aEluaW5saW5lRGlyZWN0aW9uID0gc3RkOjptYXg8TGF5b3V0VW5p dD4oMCwgY29udGFpbmluZ0Jsb2NrTG9naWNhbFdpZHRoRm9yQ29udGVudEluRnJhZ21lbnQoZnJh Z21lbnQpKTsKKworICAgIGF1dG8gbG9naWNhbFdpZHRoID0gaW5saW5lU2l6ZUZyb21Bc3BlY3RS YXRpbyhob3Jpem9udGFsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpLCB2ZXJ0aWNhbEJvcmRlckFu ZFBhZGRpbmdFeHRlbnQoKSwgc3R5bGUoKS5sb2dpY2FsQXNwZWN0UmF0aW8oKSwgc3R5bGUoKS5i b3hTaXppbmcoKSwgbG9naWNhbEhlaWdodGZvckFzcGVjdFJhdGlvKTsKKyAgICBvdXRMb2dpY2Fs V2lkdGggPSBMZW5ndGgoY29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4KGxv Z2ljYWxXaWR0aCwgY29udGFpbmVyV2lkdGhJbmlubGluZURpcmVjdGlvbiwgKmNvbnRhaW5pbmdC bG9jaygpLCBmcmFnbWVudCksIEZpeGVkKTsKK30KKwogYm9vbCBSZW5kZXJCb3g6Omhhc1JlbGF0 aXZlRGltZW5zaW9ucygpIGNvbnN0CiB7CiAgICAgcmV0dXJuIHN0eWxlKCkuaGVpZ2h0KCkuaXNQ ZXJjZW50T3JDYWxjdWxhdGVkKCkgfHwgc3R5bGUoKS53aWR0aCgpLmlzUGVyY2VudE9yQ2FsY3Vs YXRlZCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94Lmgg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKaW5kZXggMjNiYjc4MTljMjI4 ODYyNmM1NmMwNDVlMTIxNjlhZDcxZjhiMmNiMC4uNDNjMjg4Nzg1ZTExMWJmZjAxOTYwMGU5MjBi ZDk4YjE0NGFmZDE1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaApAQCAtNzQy LDYgKzc0Miw5IEBAIHByaXZhdGU6CiAgICAgdm9pZCBhcHBseVRvcExlZnRMb2NhdGlvbk9mZnNl dFdpdGhGbGlwcGluZyhMYXlvdXRQb2ludCYpIGNvbnN0OwogCiAgICAgYm9vbCBzaG91bGRDb21w dXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0OworICAgIGJvb2wgc2hvdWxk Q29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0OworICAgIGJvb2wgc2hv dWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpb0FuZEluc2V0cygpIGNvbnN0Owor ICAgIHZvaWQgY29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbyhMZW5ndGgmIGxvZ2lj YWxXaWR0aCwgUmVuZGVyRnJhZ21lbnRDb250YWluZXIqID0gbnVsbHB0cikgY29uc3Q7CiAKIHBy aXZhdGU6CiAgICAgLy8gVGhlIHdpZHRoL2hlaWdodCBvZiB0aGUgY29udGVudHMgKyBib3JkZXJz ICsgcGFkZGluZy4gIFRoZSB4L3kgbG9jYXRpb24gaXMgcmVsYXRpdmUgdG8gb3VyIGNvbnRhaW5l ciAod2hpY2ggaXMgbm90IGFsd2F5cyBvdXIgcGFyZW50KS4KZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4 IGE5NGQwMTJlMGNiNzZhMjY4Y2IzODMyMGQyZGIwMGFlNWQyYzBkOGQuLjA5ODlhYjU5YmM1NGU2 MjM2MTQyNzYzNWZkYzU2N2VkYjAwZmY5OWEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RF eHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNDQxNSwx NyArNDQxNSw5IEBAIHdlYmtpdC5vcmcvYi8yMTQ0NjIgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y bS10ZXN0cy9jc3MvY3NzLXNjb3Bpbmcvc2hhZG93LWRpcmVjCiB3ZWJraXQub3JnL2IvMjE0NDYy IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zY29waW5nL3NoYWRvdy1k aXJlY3Rpb25hbGl0eS0wMDIudGVudGF0aXZlLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdl YmtpdC5vcmcvYi8yMTQ0NjIgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz LXNjb3Bpbmcvc2xvdHRlZC1wbGFjZWhvbGRlci5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiAK LXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv Y3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYWJzcG9zLTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy ZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv Y3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Fic3Bvcy0wMDIuaHRtbCBbIEltYWdlT25seUZh aWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl c3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9hYnNwb3MtMDAzLmh0bWwgWyBJbWFnZU9u bHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYWJzcG9zLTAwNC5odG1sIFsgSW1h Z2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Fic3Bvcy0wMDUuaHRtbCBb IEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9hYnNwb3MtMDA2Lmh0 bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNj L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYWJzcG9zLTAw Ny5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVk L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Fic3Bv cy0wMDguaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBv cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9h YnNwb3MtMDA5Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMg aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0 aW8vYWJzcG9zLTAxMC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0 NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0 LXJhdGlvL2Fic3Bvcy0wMTEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQord2Via2l0Lm9yZy9i LzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2Fz cGVjdC1yYXRpby9hYnNwb3MtMDEyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KK3dlYmtpdC5v cmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu Zy9hc3BlY3QtcmF0aW8vYWJzcG9zLTAxMy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJr aXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1z aXppbmcvYXNwZWN0LXJhdGlvL2Fic3Bvcy0wMTQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQog d2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j c3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDA5Lmh0bWwgWyBJbWFn ZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0 Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlv LTAxNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCg== 416024 2020-12-11 11:59:11 -0800 2020-12-11 13:38:28 -0800 Patch bug-219741-20201211205907.patch text/plain 10357 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwNjI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmQxYjhiNzhhNDMzY2I2 YmZhYzAyODIxMWY0MzJlZmNhODI3YWEyNC4uMWZhNTkzZmEzNzZlNTdlYzcxNDEwM2E2MDNmZjIw MWRiYTc1NTMwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIwLTEyLTExICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g b24gcG9zaXRpb25lZCBlbGVtZW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjE5NzQxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbFdp ZHRoVXNpbmcgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlUG9z aXRpb25lZExvZ2ljYWxIZWlnaHRVc2luZyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJCb3g6OnNob3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJvbUFzcGVjdFJhdGlvIGNvbnN0KToK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6c2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZy b21Bc3BlY3RSYXRpbyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OnNob3Vs ZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW9BbmRJbnNldHMgY29uc3QpOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJh dGlvIGNvbnN0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94Lmg6CisKIDIwMjAtMTIt MTAgIEFkaXR5YSBLZWVydGhpICA8YWtlZXJ0aGlAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1Nd W0ZDUl0gQWRkIG5ldyBsb29rIGZvciBpbnB1dCB0eXBlPXJhbmdlCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCb3guY3BwCmluZGV4IDhkODUzYWEyYzhhYTRiNzBiMGIyYWJiNDE5MmNjYmIy OTk3Y2FjMjMuLmM2NWIyMDU3ZWU2Yjk5OTUxNDFjZTAxMjNmYWJiMjQwNjY1NTYxZDggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC0zNjk4LDcgKzM2OTgsMTEgQEAg dm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbFdpZHRoVXNpbmcoU2l6ZVR5 cGUgd2lkdGhUeXBlLCBMZW5ndGggbG8KICAgICBBU1NFUlQod2lkdGhUeXBlID09IE1pblNpemUg fHwgd2lkdGhUeXBlID09IE1haW5PclByZWZlcnJlZFNpemUgfHwgIWxvZ2ljYWxXaWR0aC5pc0F1 dG8oKSk7CiAgICAgaWYgKHdpZHRoVHlwZSA9PSBNaW5TaXplICYmIGxvZ2ljYWxXaWR0aC5pc0F1 dG8oKSkKICAgICAgICAgbG9naWNhbFdpZHRoID0gTGVuZ3RoKDAsIEZpeGVkKTsKLSAgICBlbHNl IGlmIChsb2dpY2FsV2lkdGguaXNJbnRyaW5zaWMoKSkKKyAgICBlbHNlIGlmICh3aWR0aFR5cGUg PT0gTWFpbk9yUHJlZmVycmVkU2l6ZSAmJiBsb2dpY2FsV2lkdGguaXNBdXRvKCkgJiYgc2hvdWxk Q29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpKSB7CisgICAgICAgIExheW91dFVu aXQgZHVtbXk7CisgICAgICAgIGNvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oZHVt bXkpOworICAgICAgICBsb2dpY2FsV2lkdGggPSBMZW5ndGgoZHVtbXksIEZpeGVkKTsKKyAgICB9 IGVsc2UgaWYgKGxvZ2ljYWxXaWR0aC5pc0ludHJpbnNpYygpKQogICAgICAgICBsb2dpY2FsV2lk dGggPSBMZW5ndGgoY29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aFVzaW5nKGxvZ2ljYWxXaWR0 aCwgY29udGFpbmVyTG9naWNhbFdpZHRoLCBib3JkZXJzUGx1c1BhZGRpbmcpIC0gYm9yZGVyc1Bs dXNQYWRkaW5nLCBGaXhlZCk7CiAKICAgICAvLyAnbGVmdCcgYW5kICdyaWdodCcgY2Fubm90IGJv dGggYmUgJ2F1dG8nIGJlY2F1c2Ugb25lIHdvdWxkIG9mIGJlZW4KQEAgLTM3MDksNyArMzcxMyw3 IEBAIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxXaWR0aFVzaW5nKFNp emVUeXBlIHdpZHRoVHlwZSwgTGVuZ3RoIGxvCiAKICAgICBjb25zdCBMYXlvdXRVbml0IGNvbnRh aW5lclJlbGF0aXZlTG9naWNhbFdpZHRoID0gY29udGFpbmluZ0Jsb2NrTG9naWNhbFdpZHRoRm9y UG9zaXRpb25lZChjb250YWluZXJCbG9jaywgbnVsbHB0ciwgZmFsc2UpOwogCi0gICAgYm9vbCBs b2dpY2FsV2lkdGhJc0F1dG8gPSBsb2dpY2FsV2lkdGguaXNJbnRyaW5zaWNPckF1dG8oKTsKKyAg ICBib29sIGxvZ2ljYWxXaWR0aElzQXV0byA9IGxvZ2ljYWxXaWR0aC5pc0ludHJpbnNpY09yQXV0 bygpICYmICFzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCk7CiAgICAg Ym9vbCBsb2dpY2FsTGVmdElzQXV0byA9IGxvZ2ljYWxMZWZ0LmlzQXV0bygpOwogICAgIGJvb2wg bG9naWNhbFJpZ2h0SXNBdXRvID0gbG9naWNhbFJpZ2h0LmlzQXV0bygpOwogICAgIExheW91dFVu aXQmIG1hcmdpbkxvZ2ljYWxMZWZ0VmFsdWUgPSBzdHlsZSgpLmlzTGVmdFRvUmlnaHREaXJlY3Rp b24oKSA/IGNvbXB1dGVkVmFsdWVzLm1fbWFyZ2lucy5tX3N0YXJ0IDogY29tcHV0ZWRWYWx1ZXMu bV9tYXJnaW5zLm1fZW5kOwpAQCAtNDA0Niw3ICs0MDUwLDggQEAgdm9pZCBSZW5kZXJCb3g6OmNv bXB1dGVQb3NpdGlvbmVkTG9naWNhbEhlaWdodFVzaW5nKFNpemVUeXBlIGhlaWdodFR5cGUsIExl bmd0aAogCiAgICAgTGF5b3V0VW5pdCBsb2dpY2FsVG9wVmFsdWU7CiAKLSAgICBib29sIGxvZ2lj YWxIZWlnaHRJc0F1dG8gPSBsb2dpY2FsSGVpZ2h0TGVuZ3RoLmlzQXV0bygpOworICAgIGJvb2wg ZnJvbUFzcGVjdFJhdGlvID0gaGVpZ2h0VHlwZSA9PSBNYWluT3JQcmVmZXJyZWRTaXplICYmIHNo b3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJvbUFzcGVjdFJhdGlvKCk7CisgICAgYm9vbCBsb2dp Y2FsSGVpZ2h0SXNBdXRvID0gbG9naWNhbEhlaWdodExlbmd0aC5pc0F1dG8oKSAmJiAhZnJvbUFz cGVjdFJhdGlvOwogICAgIGJvb2wgbG9naWNhbFRvcElzQXV0byA9IGxvZ2ljYWxUb3AuaXNBdXRv KCk7CiAgICAgYm9vbCBsb2dpY2FsQm90dG9tSXNBdXRvID0gbG9naWNhbEJvdHRvbS5pc0F1dG8o KTsKIApAQCAtNDA1OCw3ICs0MDYzLDEwIEBAIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlUG9zaXRp b25lZExvZ2ljYWxIZWlnaHRVc2luZyhTaXplVHlwZSBoZWlnaHRUeXBlLCBMZW5ndGgKICAgICB9 IGVsc2UgewogICAgICAgICBpZiAobG9naWNhbEhlaWdodExlbmd0aC5pc0ludHJpbnNpYygpKQog ICAgICAgICAgICAgcmVzb2x2ZWRMb2dpY2FsSGVpZ2h0ID0gY29tcHV0ZUludHJpbnNpY0xvZ2lj YWxDb250ZW50SGVpZ2h0VXNpbmcobG9naWNhbEhlaWdodExlbmd0aCwgY29udGVudExvZ2ljYWxI ZWlnaHQsIGJvcmRlcnNQbHVzUGFkZGluZykudmFsdWUoKTsKLSAgICAgICAgZWxzZQorICAgICAg ICBlbHNlIGlmIChmcm9tQXNwZWN0UmF0aW8pIHsKKyAgICAgICAgICAgIHJlc29sdmVkTG9naWNh bEhlaWdodCA9IGJsb2NrU2l6ZUZyb21Bc3BlY3RSYXRpbyhob3Jpem9udGFsQm9yZGVyQW5kUGFk ZGluZ0V4dGVudCgpLCB2ZXJ0aWNhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKSwgc3R5bGUoKS5s b2dpY2FsQXNwZWN0UmF0aW8oKSAsIHN0eWxlKCkuYm94U2l6aW5nKCksIGxvZ2ljYWxXaWR0aCgp KTsKKyAgICAgICAgICAgIHJlc29sdmVkTG9naWNhbEhlaWdodCA9IHN0ZDo6bWF4KExheW91dFVu aXQoKSwgcmVzb2x2ZWRMb2dpY2FsSGVpZ2h0IC0gYm9yZGVyc1BsdXNQYWRkaW5nKTsKKyAgICAg ICAgfSBlbHNlCiAgICAgICAgICAgICByZXNvbHZlZExvZ2ljYWxIZWlnaHQgPSBhZGp1c3RDb250 ZW50Qm94TG9naWNhbEhlaWdodEZvckJveFNpemluZyh2YWx1ZUZvckxlbmd0aChsb2dpY2FsSGVp Z2h0TGVuZ3RoLCBjb250YWluZXJMb2dpY2FsSGVpZ2h0KSk7CiAgICAgfQogCkBAIC00OTgwLDEw ICs0OTg4LDQ1IEBAIGJvb2wgUmVuZGVyQm94OjpzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZy b21Bc3BlY3RSYXRpbygpIGNvbnN0CiAgICAgaWYgKCFzdHlsZSgpLmhhc0FzcGVjdFJhdGlvKCkp CiAgICAgICAgIHJldHVybiBmYWxzZTsKIAorICAgIGlmIChzaG91bGRDb21wdXRlTG9naWNhbFdp ZHRoRnJvbUFzcGVjdFJhdGlvQW5kSW5zZXRzKCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKwog ICAgIGF1dG8gaCA9IHN0eWxlKCkubG9naWNhbEhlaWdodCgpOwogICAgIHJldHVybiBoLmlzQXV0 bygpIHx8ICghaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkgJiYgaC5pc1BlcmNlbnRPckNhbGN1bGF0 ZWQoKSAmJiBwZXJjZW50YWdlTG9naWNhbEhlaWdodElzUmVzb2x2YWJsZSgpKTsKIH0KIAorYm9v bCBSZW5kZXJCb3g6OnNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSBj b25zdAoreworICAgIGlmICghc3R5bGUoKS5oYXNBc3BlY3RSYXRpbygpKQorICAgICAgICByZXR1 cm4gZmFsc2U7CisKKyAgICBpZiAoLyohaGFzT3ZlcnJpZGluZ0xvZ2ljYWxIZWlnaHQoKSAmJiov ICFzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvQW5kSW5zZXRzKCkgJiYg IXN0eWxlKCkubG9naWNhbEhlaWdodCgpLmlzRml4ZWQoKSAmJiAhc3R5bGUoKS5sb2dpY2FsSGVp Z2h0KCkuaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKwor ICAgIHJldHVybiB0cnVlOworfQorCitib29sIFJlbmRlckJveDo6c2hvdWxkQ29tcHV0ZUxvZ2lj YWxXaWR0aEZyb21Bc3BlY3RSYXRpb0FuZEluc2V0cygpIGNvbnN0Cit7CisgICAgaWYgKCFzdHls ZSgpLmhhc0FzcGVjdFJhdGlvKCkgfHwgIWlzT3V0T2ZGbG93UG9zaXRpb25lZCgpKQorICAgICAg ICByZXR1cm4gZmFsc2U7CisgICAgaWYgKHN0eWxlKCkud2lkdGgoKS5pc0F1dG8oKSAmJiBzdHls ZSgpLmhlaWdodCgpLmlzQXV0bygpICYmICFzdHlsZSgpLmxvZ2ljYWxUb3AoKS5pc0F1dG8oKSAm JiAhc3R5bGUoKS5sb2dpY2FsQm90dG9tKCkuaXNBdXRvKCkgJiYgKHN0eWxlKCkubG9naWNhbExl ZnQoKS5pc0F1dG8oKSB8fCBzdHlsZSgpLmxvZ2ljYWxSaWdodCgpLmlzQXV0bygpKSkKKyAgICAg ICAgcmV0dXJuIHRydWU7CisgICAgcmV0dXJuIGZhbHNlOworfQorCit2b2lkIFJlbmRlckJveDo6 Y29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbyhMYXlvdXRVbml0JiBvdXRMb2dpY2Fs V2lkdGgsIFJlbmRlckZyYWdtZW50Q29udGFpbmVyKiBmcmFnbWVudCkgY29uc3QKK3sKKyAgICBB U1NFUlQoc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpKTsKKyAgICBh dXRvIGNvbXB1dGVkVmFsdWVzID0gY29tcHV0ZUxvZ2ljYWxIZWlnaHQobG9naWNhbEhlaWdodCgp LCBsb2dpY2FsVG9wKCkpOworICAgIExheW91dFVuaXQgbG9naWNhbEhlaWdodGZvckFzcGVjdFJh dGlvID0gY29tcHV0ZWRWYWx1ZXMubV9leHRlbnQ7CisKKyAgICBhdXRvIGxvZ2ljYWxXaWR0aCA9 IGlubGluZVNpemVGcm9tQXNwZWN0UmF0aW8oaG9yaXpvbnRhbEJvcmRlckFuZFBhZGRpbmdFeHRl bnQoKSwgdmVydGljYWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCksIHN0eWxlKCkubG9naWNhbEFz cGVjdFJhdGlvKCksIHN0eWxlKCkuYm94U2l6aW5nKCksIGxvZ2ljYWxIZWlnaHRmb3JBc3BlY3RS YXRpbyk7CisKKyAgICBMYXlvdXRVbml0IGNvbnRhaW5lcldpZHRoSW5pbmxpbmVEaXJlY3Rpb24g PSBzdGQ6Om1heDxMYXlvdXRVbml0PigwLCBjb250YWluaW5nQmxvY2tMb2dpY2FsV2lkdGhGb3JD b250ZW50SW5GcmFnbWVudChmcmFnbWVudCkpOworICAgIG91dExvZ2ljYWxXaWR0aCA9IGNvbnN0 cmFpbkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heChsb2dpY2FsV2lkdGgsIGNvbnRhaW5l cldpZHRoSW5pbmxpbmVEaXJlY3Rpb24sICpjb250YWluaW5nQmxvY2soKSwgZnJhZ21lbnQpOwor fQorCiBib29sIFJlbmRlckJveDo6aGFzUmVsYXRpdmVEaW1lbnNpb25zKCkgY29uc3QKIHsKICAg ICByZXR1cm4gc3R5bGUoKS5oZWlnaHQoKS5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSB8fCBzdHls ZSgpLndpZHRoKCkuaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCb3guaAppbmRleCAyM2JiNzgxOWMyMjg4NjI2YzU2YzA0NWUxMjE2OWFkNzFmOGIyY2Iw Li4zYWMzZjVhMWVmMDcwODZkNmRhMDIyMDljMGQ1NWM4ODIzMWUyOTA2IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJveC5oCkBAIC03NDIsNiArNzQyLDkgQEAgcHJpdmF0ZToKICAgICB2 b2lkIGFwcGx5VG9wTGVmdExvY2F0aW9uT2Zmc2V0V2l0aEZsaXBwaW5nKExheW91dFBvaW50Jikg Y29uc3Q7CiAKICAgICBib29sIHNob3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJvbUFzcGVjdFJh dGlvKCkgY29uc3Q7CisgICAgYm9vbCBzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVj dFJhdGlvKCkgY29uc3Q7CisgICAgYm9vbCBzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFz cGVjdFJhdGlvQW5kSW5zZXRzKCkgY29uc3Q7CisgICAgdm9pZCBjb21wdXRlTG9naWNhbFdpZHRo RnJvbUFzcGVjdFJhdGlvKExheW91dFVuaXQmIGxvZ2ljYWxXaWR0aCwgUmVuZGVyRnJhZ21lbnRD b250YWluZXIqID0gbnVsbHB0cikgY29uc3Q7CiAKIHByaXZhdGU6CiAgICAgLy8gVGhlIHdpZHRo L2hlaWdodCBvZiB0aGUgY29udGVudHMgKyBib3JkZXJzICsgcGFkZGluZy4gIFRoZSB4L3kgbG9j YXRpb24gaXMgcmVsYXRpdmUgdG8gb3VyIGNvbnRhaW5lciAod2hpY2ggaXMgbm90IGFsd2F5cyBv dXIgcGFyZW50KS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRl c3RzL0NoYW5nZUxvZwppbmRleCBhMzU4ZDhmZjhmYmM3ODcwMjQ0MDllMjgzYWVkOThmMjc5NWY1 ZjFkLi4xNWUyZGIyMDE5N2ZlMTcyZGMyZDVjYmNkMjNhODYwZGRiYWEyM2JhIDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTQgQEAKKzIwMjAtMTItMTEgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKwor ICAgICAgICBTdXBwb3J0IGFzcGVjdC1yYXRpbyBvbiBwb3NpdGlvbmVkIGVsZW1lbnRzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTk3NDEKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFbmFibGUgc29tZSB0 ZXN0cyB0aGF0IHBhc3Mgbm93LgorCisgICAgICAgICogVGVzdEV4cGVjdGF0aW9uczoKKwogMjAy MC0xMi0xMCAgQWRpdHlhIEtlZXJ0aGkgIDxha2VlcnRoaUBhcHBsZS5jb20+CiAKICAgICAgICAg W2lPU11bRkNSXSBBZGQgbmV3IGxvb2sgZm9yIGlucHV0IHR5cGU9cmFuZ2UKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRp b25zCmluZGV4IGE5NGQwMTJlMGNiNzZhMjY4Y2IzODMyMGQyZGIwMGFlNWQyYzBkOGQuLjA5ODlh YjU5YmM1NGU2MjM2MTQyNzYzNWZkYzU2N2VkYjAwZmY5OWEgMTAwNjQ0Ci0tLSBhL0xheW91dFRl c3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpA QCAtNDQxNSwxNyArNDQxNSw5IEBAIHdlYmtpdC5vcmcvYi8yMTQ0NjIgaW1wb3J0ZWQvdzNjL3dl Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNjb3Bpbmcvc2hhZG93LWRpcmVjCiB3ZWJraXQub3Jn L2IvMjE0NDYyIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zY29waW5n L3NoYWRvdy1kaXJlY3Rpb25hbGl0eS0wMDIudGVudGF0aXZlLmh0bWwgWyBJbWFnZU9ubHlGYWls dXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjIgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0 cy9jc3MvY3NzLXNjb3Bpbmcvc2xvdHRlZC1wbGFjZWhvbGRlci5odG1sIFsgSW1hZ2VPbmx5RmFp bHVyZSBdCiAKLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYWJzcG9zLTAwMS5odG1sIFsgSW1hZ2VP bmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZv cm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Fic3Bvcy0wMDIuaHRtbCBbIElt YWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9hYnNwb3MtMDAzLmh0bWwg WyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dl Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYWJzcG9zLTAwNC5o dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3cz Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Fic3Bvcy0w MDUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRl ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9hYnNw b3MtMDA2Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1w b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v YWJzcG9zLTAwNy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYz IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJh dGlvL2Fic3Bvcy0wMDguaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIx NDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVj dC1yYXRpby9hYnNwb3MtMDA5Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcv Yi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9h c3BlY3QtcmF0aW8vYWJzcG9zLTAxMC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQu b3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXpp bmcvYXNwZWN0LXJhdGlvL2Fic3Bvcy0wMTEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQord2Vi a2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt c2l6aW5nL2FzcGVjdC1yYXRpby9hYnNwb3MtMDEyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K K3dlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv Y3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYWJzcG9zLTAxMy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy ZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv Y3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Fic3Bvcy0wMTQuaHRtbCBbIEltYWdlT25seUZh aWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl c3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDA5Lmh0 bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNj L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNw ZWN0LXJhdGlvLTAxNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCg== 416038 2020-12-11 13:38:34 -0800 2020-12-22 11:40:26 -0800 Patch bug-219741-20201211223832.patch text/plain 10509 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwNjI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmQxYjhiNzhhNDMzY2I2 YmZhYzAyODIxMWY0MzJlZmNhODI3YWEyNC4uMmE5NmI2MDRhNjkwNDc1MTAzYzZmOGRhODc2N2Ux NGY4MGM3MGMzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIwLTEyLTExICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g b24gcG9zaXRpb25lZCBlbGVtZW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjE5NzQxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8gb24gcG9zaXRpb25lZCBlbGVtZW50 cyB0YWtpbmcgaW50byBhY2NvdW50CisgICAgICAgIGluc2V0cyBpbiB0aGUgY2FzZSB3aGVyZSBu byB3aWR0aC9oZWlnaHQgaXMgc3BlY2lmaWVkLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl ckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVk TG9naWNhbFdpZHRoVXNpbmcgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpj b21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHRVc2luZyBjb25zdCk6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJCb3g6OnNob3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJvbUFzcGVjdFJhdGlv IGNvbnN0KTogV2Ugc2hvdWxkIG5vdCBjb21wdXRlCisgICAgICAgIHRoZSBsb2dpY2FsIGhlaWdo dCBpZiB0aGVyZSBpcyBhbiBpbXBsaWVkIGhlaWdodCBkdWUgdG8gdG9wL2JvdHRvbS4KKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlckJveDo6c2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3Bl Y3RSYXRpbyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OnNob3VsZENvbXB1 dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW9BbmRJbnNldHMgY29uc3QpOiBIZWxwZXIgbWV0 aG9kCisgICAgICAgIHRvIGRldGVybWluZSB3aGV0aGVyIGxvZ2ljYWwgd2lkdGggY2FuIGJlIGNv bXB1dGVkIGZyb20gaW5zZXQgaW5mb3JtYXRpb24gaW4gdGhlIGNhc2Ugd2hlcmUKKyAgICAgICAg bm8gd2lkdGgvaGVpZ2h0IGFyZSBzcGVjaWZpZWQuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJC b3g6OmNvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8gY29uc3QpOiBjb21wdXRlIGxv Z2ljYWwgd2lkdGgKKyAgICAgICAgZnJvbSB0aGUgY29tcHV0ZWQgbG9naWNhbCBoZWlnaHQgY29u c3RyaWFpbmluZyBpdCBieSBtaW4gbWF4LgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3gu aDoKKwogMjAyMC0xMi0xMCAgQWRpdHlhIEtlZXJ0aGkgIDxha2VlcnRoaUBhcHBsZS5jb20+CiAK ICAgICAgICAgW2lPU11bRkNSXSBBZGQgbmV3IGxvb2sgZm9yIGlucHV0IHR5cGU9cmFuZ2UKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5kZXggOGQ4NTNhYTJjOGFhNGI3MGIw YjJhYmI0MTkyY2NiYjI5OTdjYWMyMy4uOTA5YTAwMzgzMzVjNWMyNWUwZGM2MGE5Yjg3MDVhZGU2 MjhhYjUxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKQEAgLTM2OTgs NiArMzY5OCw4IEBAIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxXaWR0 aFVzaW5nKFNpemVUeXBlIHdpZHRoVHlwZSwgTGVuZ3RoIGxvCiAgICAgQVNTRVJUKHdpZHRoVHlw ZSA9PSBNaW5TaXplIHx8IHdpZHRoVHlwZSA9PSBNYWluT3JQcmVmZXJyZWRTaXplIHx8ICFsb2dp Y2FsV2lkdGguaXNBdXRvKCkpOwogICAgIGlmICh3aWR0aFR5cGUgPT0gTWluU2l6ZSAmJiBsb2dp Y2FsV2lkdGguaXNBdXRvKCkpCiAgICAgICAgIGxvZ2ljYWxXaWR0aCA9IExlbmd0aCgwLCBGaXhl ZCk7CisgICAgZWxzZSBpZiAod2lkdGhUeXBlID09IE1haW5PclByZWZlcnJlZFNpemUgJiYgbG9n aWNhbFdpZHRoLmlzQXV0bygpICYmIHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0 UmF0aW8oKSkKKyAgICAgICAgbG9naWNhbFdpZHRoID0gTGVuZ3RoKGNvbXB1dGVMb2dpY2FsV2lk dGhGcm9tQXNwZWN0UmF0aW8oKSwgRml4ZWQpOwogICAgIGVsc2UgaWYgKGxvZ2ljYWxXaWR0aC5p c0ludHJpbnNpYygpKQogICAgICAgICBsb2dpY2FsV2lkdGggPSBMZW5ndGgoY29tcHV0ZUludHJp bnNpY0xvZ2ljYWxXaWR0aFVzaW5nKGxvZ2ljYWxXaWR0aCwgY29udGFpbmVyTG9naWNhbFdpZHRo LCBib3JkZXJzUGx1c1BhZGRpbmcpIC0gYm9yZGVyc1BsdXNQYWRkaW5nLCBGaXhlZCk7CiAKQEAg LTM3MDksNyArMzcxMSw3IEBAIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2lj YWxXaWR0aFVzaW5nKFNpemVUeXBlIHdpZHRoVHlwZSwgTGVuZ3RoIGxvCiAKICAgICBjb25zdCBM YXlvdXRVbml0IGNvbnRhaW5lclJlbGF0aXZlTG9naWNhbFdpZHRoID0gY29udGFpbmluZ0Jsb2Nr TG9naWNhbFdpZHRoRm9yUG9zaXRpb25lZChjb250YWluZXJCbG9jaywgbnVsbHB0ciwgZmFsc2Up OwogCi0gICAgYm9vbCBsb2dpY2FsV2lkdGhJc0F1dG8gPSBsb2dpY2FsV2lkdGguaXNJbnRyaW5z aWNPckF1dG8oKTsKKyAgICBib29sIGxvZ2ljYWxXaWR0aElzQXV0byA9IGxvZ2ljYWxXaWR0aC5p c0ludHJpbnNpY09yQXV0bygpICYmICFzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVj dFJhdGlvKCk7CiAgICAgYm9vbCBsb2dpY2FsTGVmdElzQXV0byA9IGxvZ2ljYWxMZWZ0LmlzQXV0 bygpOwogICAgIGJvb2wgbG9naWNhbFJpZ2h0SXNBdXRvID0gbG9naWNhbFJpZ2h0LmlzQXV0bygp OwogICAgIExheW91dFVuaXQmIG1hcmdpbkxvZ2ljYWxMZWZ0VmFsdWUgPSBzdHlsZSgpLmlzTGVm dFRvUmlnaHREaXJlY3Rpb24oKSA/IGNvbXB1dGVkVmFsdWVzLm1fbWFyZ2lucy5tX3N0YXJ0IDog Y29tcHV0ZWRWYWx1ZXMubV9tYXJnaW5zLm1fZW5kOwpAQCAtNDA0Niw3ICs0MDQ4LDggQEAgdm9p ZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbEhlaWdodFVzaW5nKFNpemVUeXBl IGhlaWdodFR5cGUsIExlbmd0aAogCiAgICAgTGF5b3V0VW5pdCBsb2dpY2FsVG9wVmFsdWU7CiAK LSAgICBib29sIGxvZ2ljYWxIZWlnaHRJc0F1dG8gPSBsb2dpY2FsSGVpZ2h0TGVuZ3RoLmlzQXV0 bygpOworICAgIGJvb2wgZnJvbUFzcGVjdFJhdGlvID0gaGVpZ2h0VHlwZSA9PSBNYWluT3JQcmVm ZXJyZWRTaXplICYmIHNob3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJvbUFzcGVjdFJhdGlvKCk7 CisgICAgYm9vbCBsb2dpY2FsSGVpZ2h0SXNBdXRvID0gbG9naWNhbEhlaWdodExlbmd0aC5pc0F1 dG8oKSAmJiAhZnJvbUFzcGVjdFJhdGlvOwogICAgIGJvb2wgbG9naWNhbFRvcElzQXV0byA9IGxv Z2ljYWxUb3AuaXNBdXRvKCk7CiAgICAgYm9vbCBsb2dpY2FsQm90dG9tSXNBdXRvID0gbG9naWNh bEJvdHRvbS5pc0F1dG8oKTsKIApAQCAtNDA1OCw3ICs0MDYxLDEwIEBAIHZvaWQgUmVuZGVyQm94 Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHRVc2luZyhTaXplVHlwZSBoZWlnaHRUeXBl LCBMZW5ndGgKICAgICB9IGVsc2UgewogICAgICAgICBpZiAobG9naWNhbEhlaWdodExlbmd0aC5p c0ludHJpbnNpYygpKQogICAgICAgICAgICAgcmVzb2x2ZWRMb2dpY2FsSGVpZ2h0ID0gY29tcHV0 ZUludHJpbnNpY0xvZ2ljYWxDb250ZW50SGVpZ2h0VXNpbmcobG9naWNhbEhlaWdodExlbmd0aCwg Y29udGVudExvZ2ljYWxIZWlnaHQsIGJvcmRlcnNQbHVzUGFkZGluZykudmFsdWUoKTsKLSAgICAg ICAgZWxzZQorICAgICAgICBlbHNlIGlmIChmcm9tQXNwZWN0UmF0aW8pIHsKKyAgICAgICAgICAg IHJlc29sdmVkTG9naWNhbEhlaWdodCA9IGJsb2NrU2l6ZUZyb21Bc3BlY3RSYXRpbyhob3Jpem9u dGFsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpLCB2ZXJ0aWNhbEJvcmRlckFuZFBhZGRpbmdFeHRl bnQoKSwgc3R5bGUoKS5sb2dpY2FsQXNwZWN0UmF0aW8oKSAsIHN0eWxlKCkuYm94U2l6aW5nKCks IGxvZ2ljYWxXaWR0aCgpKTsKKyAgICAgICAgICAgIHJlc29sdmVkTG9naWNhbEhlaWdodCA9IHN0 ZDo6bWF4KExheW91dFVuaXQoKSwgcmVzb2x2ZWRMb2dpY2FsSGVpZ2h0IC0gYm9yZGVyc1BsdXNQ YWRkaW5nKTsKKyAgICAgICAgfSBlbHNlCiAgICAgICAgICAgICByZXNvbHZlZExvZ2ljYWxIZWln aHQgPSBhZGp1c3RDb250ZW50Qm94TG9naWNhbEhlaWdodEZvckJveFNpemluZyh2YWx1ZUZvckxl bmd0aChsb2dpY2FsSGVpZ2h0TGVuZ3RoLCBjb250YWluZXJMb2dpY2FsSGVpZ2h0KSk7CiAgICAg fQogCkBAIC00OTgwLDEwICs0OTg2LDQ1IEBAIGJvb2wgUmVuZGVyQm94OjpzaG91bGRDb21wdXRl TG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0CiAgICAgaWYgKCFzdHlsZSgpLmhh c0FzcGVjdFJhdGlvKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAorICAgIGlmIChzaG91bGRD b21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvQW5kSW5zZXRzKCkpCisgICAgICAgIHJl dHVybiBmYWxzZTsKKwogICAgIGF1dG8gaCA9IHN0eWxlKCkubG9naWNhbEhlaWdodCgpOwogICAg IHJldHVybiBoLmlzQXV0bygpIHx8ICghaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkgJiYgaC5pc1Bl cmNlbnRPckNhbGN1bGF0ZWQoKSAmJiBwZXJjZW50YWdlTG9naWNhbEhlaWdodElzUmVzb2x2YWJs ZSgpKTsKIH0KIAorYm9vbCBSZW5kZXJCb3g6OnNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9t QXNwZWN0UmF0aW8oKSBjb25zdAoreworICAgIGlmICghc3R5bGUoKS5oYXNBc3BlY3RSYXRpbygp KQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBpZiAoIXNob3VsZENvbXB1dGVMb2dpY2Fs V2lkdGhGcm9tQXNwZWN0UmF0aW9BbmRJbnNldHMoKSAmJiAhc3R5bGUoKS5sb2dpY2FsSGVpZ2h0 KCkuaXNGaXhlZCgpICYmICFzdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKS5pc1BlcmNlbnRPckNhbGN1 bGF0ZWQoKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgcmV0dXJuIHRydWU7Cit9CisK K2Jvb2wgUmVuZGVyQm94OjpzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlv QW5kSW5zZXRzKCkgY29uc3QKK3sKKyAgICBpZiAoIWlzT3V0T2ZGbG93UG9zaXRpb25lZCgpKQor ICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgaWYgKHN0eWxlKCkud2lkdGgoKS5pc0F1dG8oKSAm JiBzdHlsZSgpLmhlaWdodCgpLmlzQXV0bygpICYmICFzdHlsZSgpLnRvcCgpLmlzQXV0bygpICYm ICFzdHlsZSgpLmJvdHRvbSgpLmlzQXV0bygpICYmIChzdHlsZSgpLmxlZnQoKS5pc0F1dG8oKSB8 fCBzdHlsZSgpLnJpZ2h0KCkuaXNBdXRvKCkpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICBy ZXR1cm4gZmFsc2U7Cit9CisKK0xheW91dFVuaXQgUmVuZGVyQm94Ojpjb21wdXRlTG9naWNhbFdp ZHRoRnJvbUFzcGVjdFJhdGlvKFJlbmRlckZyYWdtZW50Q29udGFpbmVyKiBmcmFnbWVudCkgY29u c3QKK3sKKyAgICBBU1NFUlQoc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRp bygpKTsKKyAgICBhdXRvIGNvbXB1dGVkVmFsdWVzID0gY29tcHV0ZUxvZ2ljYWxIZWlnaHQobG9n aWNhbEhlaWdodCgpLCBsb2dpY2FsVG9wKCkpOworICAgIExheW91dFVuaXQgbG9naWNhbEhlaWdo dGZvckFzcGVjdFJhdGlvID0gY29tcHV0ZWRWYWx1ZXMubV9leHRlbnQ7CisKKyAgICBhdXRvIGxv Z2ljYWxXaWR0aCA9IGlubGluZVNpemVGcm9tQXNwZWN0UmF0aW8oaG9yaXpvbnRhbEJvcmRlckFu ZFBhZGRpbmdFeHRlbnQoKSwgdmVydGljYWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCksIHN0eWxl KCkubG9naWNhbEFzcGVjdFJhdGlvKCksIHN0eWxlKCkuYm94U2l6aW5nKCksIGxvZ2ljYWxIZWln aHRmb3JBc3BlY3RSYXRpbyk7CisKKyAgICBMYXlvdXRVbml0IGNvbnRhaW5lcldpZHRoSW5pbmxp bmVEaXJlY3Rpb24gPSBzdGQ6Om1heDxMYXlvdXRVbml0PigwLCBjb250YWluaW5nQmxvY2tMb2dp Y2FsV2lkdGhGb3JDb250ZW50SW5GcmFnbWVudChmcmFnbWVudCkpOworICAgIHJldHVybiBjb25z dHJhaW5Mb2dpY2FsV2lkdGhJbkZyYWdtZW50QnlNaW5NYXgobG9naWNhbFdpZHRoLCBjb250YWlu ZXJXaWR0aEluaW5saW5lRGlyZWN0aW9uLCAqY29udGFpbmluZ0Jsb2NrKCksIGZyYWdtZW50KTsK K30KKwogYm9vbCBSZW5kZXJCb3g6Omhhc1JlbGF0aXZlRGltZW5zaW9ucygpIGNvbnN0CiB7CiAg ICAgcmV0dXJuIHN0eWxlKCkuaGVpZ2h0KCkuaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkgfHwgc3R5 bGUoKS53aWR0aCgpLmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyQm94LmgKaW5kZXggMjNiYjc4MTljMjI4ODYyNmM1NmMwNDVlMTIxNjlhZDcxZjhiMmNi MC4uYzQ2NTE1MTZmOTc0YmNmODUzMjJlOWQ5ZmFmZDlmNDFmMjY3ZGU3OSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCb3guaApAQCAtNzQyLDYgKzc0Miw5IEBAIHByaXZhdGU6CiAgICAg dm9pZCBhcHBseVRvcExlZnRMb2NhdGlvbk9mZnNldFdpdGhGbGlwcGluZyhMYXlvdXRQb2ludCYp IGNvbnN0OwogCiAgICAgYm9vbCBzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RS YXRpbygpIGNvbnN0OworICAgIGJvb2wgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3Bl Y3RSYXRpbygpIGNvbnN0OworICAgIGJvb2wgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21B c3BlY3RSYXRpb0FuZEluc2V0cygpIGNvbnN0OworICAgIExheW91dFVuaXQgY29tcHV0ZUxvZ2lj YWxXaWR0aEZyb21Bc3BlY3RSYXRpbyhSZW5kZXJGcmFnbWVudENvbnRhaW5lciogPSBudWxscHRy KSBjb25zdDsKIAogcHJpdmF0ZToKICAgICAvLyBUaGUgd2lkdGgvaGVpZ2h0IG9mIHRoZSBjb250 ZW50cyArIGJvcmRlcnMgKyBwYWRkaW5nLiAgVGhlIHgveSBsb2NhdGlvbiBpcyByZWxhdGl2ZSB0 byBvdXIgY29udGFpbmVyICh3aGljaCBpcyBub3QgYWx3YXlzIG91ciBwYXJlbnQpLgpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4 IGEzNThkOGZmOGZiYzc4NzAyNDQwOWUyODNhZWQ5OGYyNzk1ZjVmMWQuLjE1ZTJkYjIwMTk3ZmUx NzJkYzJkNWNiY2QyM2E4NjBkZGJhYTIzYmEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMC0x Mi0xMSAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIFN1cHBvcnQgYXNw ZWN0LXJhdGlvIG9uIHBvc2l0aW9uZWQgZWxlbWVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxOTc0MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEVuYWJsZSBzb21lIHRlc3RzIHRoYXQgcGFzcyBub3cu CisKKyAgICAgICAgKiBUZXN0RXhwZWN0YXRpb25zOgorCiAyMDIwLTEyLTEwICBBZGl0eWEgS2Vl cnRoaSAgPGFrZWVydGhpQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXVtGQ1JdIEFkZCBuZXcg bG9vayBmb3IgaW5wdXQgdHlwZT1yYW5nZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4 cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggYTk0ZDAxMmUw Y2I3NmEyNjhjYjM4MzIwZDJkYjAwYWU1ZDJjMGQ4ZC4uMDk4OWFiNTliYzU0ZTYyMzYxNDI3NjM1 ZmRjNTY3ZWRiMDBmZjk5YSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9u cworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00NDE1LDE3ICs0NDE1LDkg QEAgd2Via2l0Lm9yZy9iLzIxNDQ2MiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz cy9jc3Mtc2NvcGluZy9zaGFkb3ctZGlyZWMKIHdlYmtpdC5vcmcvYi8yMTQ0NjIgaW1wb3J0ZWQv dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNjb3Bpbmcvc2hhZG93LWRpcmVjdGlvbmFs aXR5LTAwMi50ZW50YXRpdmUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9i LzIxNDQ2MiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2NvcGluZy9z bG90dGVkLXBsYWNlaG9sZGVyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIAotd2Via2l0Lm9y Zy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5n L2FzcGVjdC1yYXRpby9hYnNwb3MtMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtp dC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp emluZy9hc3BlY3QtcmF0aW8vYWJzcG9zLTAwMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13 ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz cy1zaXppbmcvYXNwZWN0LXJhdGlvL2Fic3Bvcy0wMDMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUg XQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz cy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9hYnNwb3MtMDA0Lmh0bWwgWyBJbWFnZU9ubHlGYWls dXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0 cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYWJzcG9zLTAwNS5odG1sIFsgSW1hZ2VPbmx5 RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t dGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Fic3Bvcy0wMDYuaHRtbCBbIEltYWdl T25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9hYnNwb3MtMDA3Lmh0bWwgWyBJ bWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYWJzcG9zLTAwOC5odG1s IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93 ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Fic3Bvcy0wMDku aHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93 M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9hYnNwb3Mt MDEwLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYWJz cG9zLTAxMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCit3ZWJraXQub3JnL2IvMjE0NDYzIGlt cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlv L2Fic3Bvcy0wMTIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQord2Via2l0Lm9yZy9iLzIxNDQ2 MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1y YXRpby9hYnNwb3MtMDEzLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8y MTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl Y3QtcmF0aW8vYWJzcG9zLTAxNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3Jn L2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcv YXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMDkuaHRtbCBbIEltYWdlT25seUZhaWx1 cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz L2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDE0Lmh0bWwg WyBJbWFnZU9ubHlGYWlsdXJlIF0K 416678 2020-12-22 11:40:31 -0800 2020-12-22 12:30:50 -0800 Patch bug-219741-20201222204029.patch text/plain 10611 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMDU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2ZlMDcxZWNmOWI3MTBl NGE5ZTkxMjI3ZGE4ZTFlNGFhNjQ5ODk0NS4uZTVkNjAzZGQ4NmI0NTUwZDNmMzYzMGFlZmVjYTcz NDExZGQ4MWQ0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIwLTEyLTIyICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8g b24gcG9zaXRpb25lZCBlbGVtZW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjE5NzQxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2Vy LgorCisgICAgICAgIFN1cHBvcnQgYXNwZWN0LXJhdGlvIG9uIHBvc2l0aW9uZWQgZWxlbWVudHMg dGFraW5nIGludG8gYWNjb3VudAorICAgICAgICBpbnNldHMgaW4gdGhlIGNhc2Ugd2hlcmUgbm8g d2lkdGgvaGVpZ2h0IGlzIHNwZWNpZmllZC4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJC b3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExv Z2ljYWxXaWR0aFVzaW5nIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29t cHV0ZVBvc2l0aW9uZWRMb2dpY2FsSGVpZ2h0VXNpbmcgY29uc3QpOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyQm94OjpzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRpbyBj b25zdCk6IFdlIHNob3VsZCBub3QgY29tcHV0ZQorICAgICAgICB0aGUgbG9naWNhbCBoZWlnaHQg aWYgdGhlcmUgaXMgYW4gaW1wbGllZCBoZWlnaHQgZHVlIHRvIHRvcC9ib3R0b20uCisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJCb3g6OnNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0 UmF0aW8gY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjpzaG91bGRDb21wdXRl TG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvQW5kSW5zZXRzIGNvbnN0KTogSGVscGVyIG1ldGhv ZAorICAgICAgICB0byBkZXRlcm1pbmUgd2hldGhlciBsb2dpY2FsIHdpZHRoIGNhbiBiZSBjb21w dXRlZCBmcm9tIGluc2V0IGluZm9ybWF0aW9uIGluIHRoZSBjYXNlIHdoZXJlCisgICAgICAgIG5v IHdpZHRoL2hlaWdodCBhcmUgc3BlY2lmaWVkLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94 Ojpjb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvIGNvbnN0KTogY29tcHV0ZSBsb2dp Y2FsIHdpZHRoCisgICAgICAgIGZyb20gdGhlIGNvbXB1dGVkIGxvZ2ljYWwgaGVpZ2h0IGNvbnN0 cmlhaW5pbmcgaXQgYnkgbWluIG1heC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94Lmg6 CisKIDIwMjAtMTItMjIgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAg ICBbTEZDXVtJRkNdIEFkZCBmYXN0IHBhdGggZm9yIHRoZSBtb3N0IGNvbW1vbiAiaW5saW5lIGxl dmVsIGJveCBpcyB0aGUgY2hpbGQgb2YgdGhlIHJvb3QgaW5saW5lIGJveCIgY2FzZQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAppbmRleCBjNDk3NWQ5NGQyNzEyY2U5ZmQ2ZTI0 YmVlMWQwNzllOGZiNGYzZWMxLi5lZDlmYTM0OTg2MWY2ZWEwOWMxY2FlMDdhYjlmOGI0Y2VhY2Ji Y2I4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcApAQCAtMzcxNSw2ICsz NzE1LDggQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbFdpZHRoVXNp bmcoU2l6ZVR5cGUgd2lkdGhUeXBlLCBMZW5ndGggbG8KICAgICBhdXRvIG9yaWdpbmFsTG9naWNh bFdpZHRoVHlwZSA9IGxvZ2ljYWxXaWR0aC50eXBlKCk7CiAgICAgaWYgKHdpZHRoVHlwZSA9PSBN aW5TaXplICYmIGxvZ2ljYWxXaWR0aC5pc0F1dG8oKSkKICAgICAgICAgbG9naWNhbFdpZHRoID0g TGVuZ3RoKDAsIEZpeGVkKTsKKyAgICBlbHNlIGlmICh3aWR0aFR5cGUgPT0gTWFpbk9yUHJlZmVy cmVkU2l6ZSAmJiBsb2dpY2FsV2lkdGguaXNBdXRvKCkgJiYgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxX aWR0aEZyb21Bc3BlY3RSYXRpbygpKQorICAgICAgICBsb2dpY2FsV2lkdGggPSBMZW5ndGgoY29t cHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpLCBGaXhlZCk7CiAgICAgZWxzZSBpZiAo bG9naWNhbFdpZHRoLmlzSW50cmluc2ljKCkpCiAgICAgICAgIGxvZ2ljYWxXaWR0aCA9IExlbmd0 aChjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRoVXNpbmcobG9naWNhbFdpZHRoLCBjb250YWlu ZXJMb2dpY2FsV2lkdGgsIGJvcmRlcnNQbHVzUGFkZGluZykgLSBib3JkZXJzUGx1c1BhZGRpbmcs IEZpeGVkKTsKIApAQCAtMzcyNiw3ICszNzI4LDcgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQ b3NpdGlvbmVkTG9naWNhbFdpZHRoVXNpbmcoU2l6ZVR5cGUgd2lkdGhUeXBlLCBMZW5ndGggbG8K IAogICAgIGNvbnN0IExheW91dFVuaXQgY29udGFpbmVyUmVsYXRpdmVMb2dpY2FsV2lkdGggPSBj b250YWluaW5nQmxvY2tMb2dpY2FsV2lkdGhGb3JQb3NpdGlvbmVkKGNvbnRhaW5lckJsb2NrLCBu dWxscHRyLCBmYWxzZSk7CiAKLSAgICBib29sIGxvZ2ljYWxXaWR0aElzQXV0byA9IGxvZ2ljYWxX aWR0aC5pc0ludHJpbnNpY09yQXV0bygpOworICAgIGJvb2wgbG9naWNhbFdpZHRoSXNBdXRvID0g bG9naWNhbFdpZHRoLmlzSW50cmluc2ljT3JBdXRvKCkgJiYgIXNob3VsZENvbXB1dGVMb2dpY2Fs V2lkdGhGcm9tQXNwZWN0UmF0aW8oKTsKICAgICBib29sIGxvZ2ljYWxMZWZ0SXNBdXRvID0gbG9n aWNhbExlZnQuaXNBdXRvKCk7CiAgICAgYm9vbCBsb2dpY2FsUmlnaHRJc0F1dG8gPSBsb2dpY2Fs UmlnaHQuaXNBdXRvKCk7CiAgICAgTGF5b3V0VW5pdCYgbWFyZ2luTG9naWNhbExlZnRWYWx1ZSA9 IHN0eWxlKCkuaXNMZWZ0VG9SaWdodERpcmVjdGlvbigpID8gY29tcHV0ZWRWYWx1ZXMubV9tYXJn aW5zLm1fc3RhcnQgOiBjb21wdXRlZFZhbHVlcy5tX21hcmdpbnMubV9lbmQ7CkBAIC00MDYzLDcg KzQwNjUsOCBAQCB2b2lkIFJlbmRlckJveDo6Y29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsSGVpZ2h0 VXNpbmcoU2l6ZVR5cGUgaGVpZ2h0VHlwZSwgTGVuZ3RoCiAKICAgICBMYXlvdXRVbml0IGxvZ2lj YWxUb3BWYWx1ZTsKIAotICAgIGJvb2wgbG9naWNhbEhlaWdodElzQXV0byA9IGxvZ2ljYWxIZWln aHRMZW5ndGguaXNBdXRvKCk7CisgICAgYm9vbCBmcm9tQXNwZWN0UmF0aW8gPSBoZWlnaHRUeXBl ID09IE1haW5PclByZWZlcnJlZFNpemUgJiYgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxIZWlnaHRGcm9t QXNwZWN0UmF0aW8oKTsKKyAgICBib29sIGxvZ2ljYWxIZWlnaHRJc0F1dG8gPSBsb2dpY2FsSGVp Z2h0TGVuZ3RoLmlzQXV0bygpICYmICFmcm9tQXNwZWN0UmF0aW87CiAgICAgYm9vbCBsb2dpY2Fs VG9wSXNBdXRvID0gbG9naWNhbFRvcC5pc0F1dG8oKTsKICAgICBib29sIGxvZ2ljYWxCb3R0b21J c0F1dG8gPSBsb2dpY2FsQm90dG9tLmlzQXV0bygpOwogCkBAIC00MDc1LDcgKzQwNzgsMTAgQEAg dm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbEhlaWdodFVzaW5nKFNpemVU eXBlIGhlaWdodFR5cGUsIExlbmd0aAogICAgIH0gZWxzZSB7CiAgICAgICAgIGlmIChsb2dpY2Fs SGVpZ2h0TGVuZ3RoLmlzSW50cmluc2ljKCkpCiAgICAgICAgICAgICByZXNvbHZlZExvZ2ljYWxI ZWlnaHQgPSBjb21wdXRlSW50cmluc2ljTG9naWNhbENvbnRlbnRIZWlnaHRVc2luZyhsb2dpY2Fs SGVpZ2h0TGVuZ3RoLCBjb250ZW50TG9naWNhbEhlaWdodCwgYm9yZGVyc1BsdXNQYWRkaW5nKS52 YWx1ZSgpOwotICAgICAgICBlbHNlCisgICAgICAgIGVsc2UgaWYgKGZyb21Bc3BlY3RSYXRpbykg eworICAgICAgICAgICAgcmVzb2x2ZWRMb2dpY2FsSGVpZ2h0ID0gYmxvY2tTaXplRnJvbUFzcGVj dFJhdGlvKGhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCksIHZlcnRpY2FsQm9yZGVy QW5kUGFkZGluZ0V4dGVudCgpLCBzdHlsZSgpLmxvZ2ljYWxBc3BlY3RSYXRpbygpICwgc3R5bGUo KS5ib3hTaXppbmcoKSwgbG9naWNhbFdpZHRoKCkpOworICAgICAgICAgICAgcmVzb2x2ZWRMb2dp Y2FsSGVpZ2h0ID0gc3RkOjptYXgoTGF5b3V0VW5pdCgpLCByZXNvbHZlZExvZ2ljYWxIZWlnaHQg LSBib3JkZXJzUGx1c1BhZGRpbmcpOworICAgICAgICB9IGVsc2UKICAgICAgICAgICAgIHJlc29s dmVkTG9naWNhbEhlaWdodCA9IGFkanVzdENvbnRlbnRCb3hMb2dpY2FsSGVpZ2h0Rm9yQm94U2l6 aW5nKHZhbHVlRm9yTGVuZ3RoKGxvZ2ljYWxIZWlnaHRMZW5ndGgsIGNvbnRhaW5lckxvZ2ljYWxI ZWlnaHQpKTsKICAgICB9CiAKQEAgLTQ5OTcsMTAgKzUwMDMsNDYgQEAgYm9vbCBSZW5kZXJCb3g6 OnNob3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJvbUFzcGVjdFJhdGlvKCkgY29uc3QKICAgICBp ZiAoIXN0eWxlKCkuaGFzQXNwZWN0UmF0aW8oKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCisg ICAgaWYgKHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW9BbmRJbnNldHMo KSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCiAgICAgYXV0byBoID0gc3R5bGUoKS5sb2dpY2Fs SGVpZ2h0KCk7CiAgICAgcmV0dXJuIGguaXNBdXRvKCkgfHwgKCFpc091dE9mRmxvd1Bvc2l0aW9u ZWQoKSAmJiBoLmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpICYmIHBlcmNlbnRhZ2VMb2dpY2FsSGVp Z2h0SXNSZXNvbHZhYmxlKCkpOwogfQogCitib29sIFJlbmRlckJveDo6c2hvdWxkQ29tcHV0ZUxv Z2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0Cit7CisgICAgaWYgKCFzdHlsZSgpLmhh c0FzcGVjdFJhdGlvKCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIGlmICghc2hvdWxk Q29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpb0FuZEluc2V0cygpICYmICFzdHlsZSgp LmxvZ2ljYWxIZWlnaHQoKS5pc0ZpeGVkKCkgJiYgIXN0eWxlKCkubG9naWNhbEhlaWdodCgpLmlz UGVyY2VudE9yQ2FsY3VsYXRlZCgpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICByZXR1 cm4gdHJ1ZTsKK30KKworYm9vbCBSZW5kZXJCb3g6OnNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhG cm9tQXNwZWN0UmF0aW9BbmRJbnNldHMoKSBjb25zdAoreworICAgIGlmICghaXNPdXRPZkZsb3dQ b3NpdGlvbmVkKCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAvLyBGSVhNRTogc2VlIGlm IHRoaXMgY2FuIGJlY29tZSBhIGhlbHBlciBvbiBSZW5kZXJTdHlsZS4KKyAgICBpZiAoc3R5bGUo KS53aWR0aCgpLmlzQXV0bygpICYmIHN0eWxlKCkuaGVpZ2h0KCkuaXNBdXRvKCkgJiYgIXN0eWxl KCkudG9wKCkuaXNBdXRvKCkgJiYgIXN0eWxlKCkuYm90dG9tKCkuaXNBdXRvKCkgJiYgKHN0eWxl KCkubGVmdCgpLmlzQXV0bygpIHx8IHN0eWxlKCkucmlnaHQoKS5pc0F1dG8oKSkpCisgICAgICAg IHJldHVybiB0cnVlOworICAgIHJldHVybiBmYWxzZTsKK30KKworTGF5b3V0VW5pdCBSZW5kZXJC b3g6OmNvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oUmVuZGVyRnJhZ21lbnRDb250 YWluZXIqIGZyYWdtZW50KSBjb25zdAoreworICAgIEFTU0VSVChzaG91bGRDb21wdXRlTG9naWNh bFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkpOworICAgIGF1dG8gY29tcHV0ZWRWYWx1ZXMgPSBjb21w dXRlTG9naWNhbEhlaWdodChsb2dpY2FsSGVpZ2h0KCksIGxvZ2ljYWxUb3AoKSk7CisgICAgTGF5 b3V0VW5pdCBsb2dpY2FsSGVpZ2h0Zm9yQXNwZWN0UmF0aW8gPSBjb21wdXRlZFZhbHVlcy5tX2V4 dGVudDsKKworICAgIGF1dG8gbG9naWNhbFdpZHRoID0gaW5saW5lU2l6ZUZyb21Bc3BlY3RSYXRp byhob3Jpem9udGFsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpLCB2ZXJ0aWNhbEJvcmRlckFuZFBh ZGRpbmdFeHRlbnQoKSwgc3R5bGUoKS5sb2dpY2FsQXNwZWN0UmF0aW8oKSwgc3R5bGUoKS5ib3hT aXppbmcoKSwgbG9naWNhbEhlaWdodGZvckFzcGVjdFJhdGlvKTsKKworICAgIExheW91dFVuaXQg Y29udGFpbmVyV2lkdGhJbklubGluZURpcmVjdGlvbiA9IHN0ZDo6bWF4PExheW91dFVuaXQ+KDAs IGNvbnRhaW5pbmdCbG9ja0xvZ2ljYWxXaWR0aEZvckNvbnRlbnRJbkZyYWdtZW50KGZyYWdtZW50 KSk7CisgICAgcmV0dXJuIGNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heChs b2dpY2FsV2lkdGgsIGNvbnRhaW5lcldpZHRoSW5JbmxpbmVEaXJlY3Rpb24sICpjb250YWluaW5n QmxvY2soKSwgZnJhZ21lbnQpOworfQorCiBib29sIFJlbmRlckJveDo6aGFzUmVsYXRpdmVEaW1l bnNpb25zKCkgY29uc3QKIHsKICAgICByZXR1cm4gc3R5bGUoKS5oZWlnaHQoKS5pc1BlcmNlbnRP ckNhbGN1bGF0ZWQoKSB8fCBzdHlsZSgpLndpZHRoKCkuaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaCBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAppbmRleCA1NzE4ODBlNmZkZmU5ZjllMmNk NDgzYjc4NDEzOGU0YTBkYjljYzFjLi45NmU3MmQ0Zjg1YmM0OTNmYjQ3MjBiY2MyZTE4NTBlNDA4 YjQxYzg0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCkBAIC03NDUsNiArNzQ1 LDkgQEAgcHJpdmF0ZToKICAgICB2b2lkIGFwcGx5VG9wTGVmdExvY2F0aW9uT2Zmc2V0V2l0aEZs aXBwaW5nKExheW91dFBvaW50JikgY29uc3Q7CiAKICAgICBib29sIHNob3VsZENvbXB1dGVMb2dp Y2FsSGVpZ2h0RnJvbUFzcGVjdFJhdGlvKCkgY29uc3Q7CisgICAgYm9vbCBzaG91bGRDb21wdXRl TG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkgY29uc3Q7CisgICAgYm9vbCBzaG91bGRDb21w dXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvQW5kSW5zZXRzKCkgY29uc3Q7CisgICAgTGF5 b3V0VW5pdCBjb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKFJlbmRlckZyYWdtZW50 Q29udGFpbmVyKiA9IG51bGxwdHIpIGNvbnN0OwogCiBwcml2YXRlOgogICAgIC8vIFRoZSB3aWR0 aC9oZWlnaHQgb2YgdGhlIGNvbnRlbnRzICsgYm9yZGVycyArIHBhZGRpbmcuICBUaGUgeC95IGxv Y2F0aW9uIGlzIHJlbGF0aXZlIHRvIG91ciBjb250YWluZXIgKHdoaWNoIGlzIG5vdCBhbHdheXMg b3VyIHBhcmVudCkuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKaW5kZXggMGFjYTI5Y2M4Nzc5NTM2M2QxMTkzMjRlOGRlMjNlZjRhYWMz Njc4Yi4uMDBkNGY4MjUyNGY5YmRlMWRlMWUyNThhYmYzZmY2NjUwYTlkM2U4ZiAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE0IEBACisyMDIwLTEyLTIyICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisK KyAgICAgICAgU3VwcG9ydCBhc3BlY3QtcmF0aW8gb24gcG9zaXRpb25lZCBlbGVtZW50cworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE5NzQxCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgorCisgICAgICAgIEVuYWJsZSBzb21lIHRl c3RzIHRoYXQgcGFzcyBub3cuCisKKyAgICAgICAgKiBUZXN0RXhwZWN0YXRpb25zOgorCiAyMDIw LTEyLTIyICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KIAogICAgICAg ICBSRUdSRVNTSU9OKHIyNzA2MTIpIFtHU3RyZWFtZXJdW01TRV0gU29tZSBwbGF5L3NlZWsgcmVs YXRlZCBmYWlsdXJlcwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBi L0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggMzM1OTI4MmQyNzBkNTkxZDhkMTIz ZDg2OGZlY2I0NWJmOGQ5Y2UyZS4uYjdlMzJkYzE1N2I1NTEzNWFjNDkzYmI2ZDJhYzg5MDY5YzQx ZGZlMyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlv dXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00NDI0LDE3ICs0NDI0LDkgQEAgd2Via2l0Lm9y Zy9iLzIxNDQ2MiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2NvcGlu Zy9zaGFkb3ctZGlyZWMKIHdlYmtpdC5vcmcvYi8yMTQ0NjIgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0 Zm9ybS10ZXN0cy9jc3MvY3NzLXNjb3Bpbmcvc2hhZG93LWRpcmVjdGlvbmFsaXR5LTAwMi50ZW50 YXRpdmUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MiBpbXBv cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2NvcGluZy9zbG90dGVkLXBsYWNl aG9sZGVyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIAotd2Via2l0Lm9yZy9iLzIxNDQ2MyBp bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRp by9hYnNwb3MtMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0 NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3Qt cmF0aW8vYWJzcG9zLTAwMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2Iv MjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNw ZWN0LXJhdGlvL2Fic3Bvcy0wMDMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9y Zy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5n L2FzcGVjdC1yYXRpby9hYnNwb3MtMDA0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtp dC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp emluZy9hc3BlY3QtcmF0aW8vYWJzcG9zLTAwNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13 ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz cy1zaXppbmcvYXNwZWN0LXJhdGlvL2Fic3Bvcy0wMDYuaHRtbCBbIEltYWdlT25seUZhaWx1cmUg XQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz cy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9hYnNwb3MtMDA3Lmh0bWwgWyBJbWFnZU9ubHlGYWls dXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0 cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYWJzcG9zLTAwOC5odG1sIFsgSW1hZ2VPbmx5 RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t dGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Fic3Bvcy0wMDkuaHRtbCBbIEltYWdl T25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9hYnNwb3MtMDEwLmh0bWwgWyBJ bWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYWJzcG9zLTAxMS5odG1s IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCit3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93 ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Fic3Bvcy0wMTIu aHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQord2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93 M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9hYnNwb3Mt MDEzLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYWJz cG9zLTAxNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGlt cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlv L2Jsb2NrLWFzcGVjdC1yYXRpby0wMDkuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0 Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6 aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDE0Lmh0bWwgWyBJbWFnZU9ubHlG YWlsdXJlIF0K