214291 2020-07-13 19:40:00 -0700 [css-writing-modes] New failures on WPT ref-tests after updating WPT import 2024-01-22 15:42:50 -0800 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED CONFIGURATION CHANGED https://bugs.webkit.org/show_bug.cgi?id=209080 https://bugs.webkit.org/show_bug.cgi?id=214278 https://bugs.webkit.org/show_bug.cgi?id=236481 InRadar P2 Normal --- 1 clopez webkit-unassigned ahmad.saleem792 bfulgham cdumez changseok cmarcelo dino esprehn+autocc ews-watchlist fmalita glenn gyuyoung.kim kangil.han koivisto kondapallykalyan lmoura macpherson menard pdr rbuis sabouhallawa schenney sergio webkit-bug-importer oldest_to_newest 1671265 0 clopez 2020-07-13 19:40:00 -0700 On bug 214278 the WPT import for css/css-writing-modes tests was updated to WPT e3698c7bb3. This are the new failures on ref-tests detected: imported/w3c/web-platform-tests/css/css-writing-modes/abs-pos-with-replaced-child.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-writing-modes/available-size-004.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-writing-modes/available-size-018.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-writing-modes/baseline-with-orthogonal-flow-001.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-writing-modes/direction-upright-001.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-writing-modes/direction-upright-002.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-writing-modes/img-intrinsic-size-contribution-001.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-writing-modes/img-intrinsic-size-contribution-002.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-writing-modes/inline-box-border-vlr-001.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-writing-modes/slr-alongside-vlr-floats.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-writing-modes/srl-alongside-vrl-floats.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-writing-modes/tcy-white-space-processing-001.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-writing-modes/text-orientation-initial.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-writing-modes/wm-propagation-001.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-writing-modes/wm-propagation-body-032.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-writing-modes/wm-propagation-body-033.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-writing-modes/wm-propagation-body-034.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-writing-modes/wm-propagation-body-035.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-writing-modes/wm-propagation-body-036.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-writing-modes/wm-propagation-body-037.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-writing-modes/wm-propagation-body-038.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-writing-modes/wm-propagation-body-039.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-writing-modes/wm-propagation-body-040.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-writing-modes/wm-propagation-body-041.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-writing-modes/wm-propagation-body-042.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-writing-modes/wm-propagation-body-043.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-writing-modes/wm-propagation-body-044.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-writing-modes/wm-propagation-body-045.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-writing-modes/wm-propagation-body-046.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-writing-modes/wm-propagation-body-047.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-writing-modes/wm-propagation-body-048.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-writing-modes/wm-propagation-body-049.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-writing-modes/wm-propagation-body-050.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-writing-modes/wm-propagation-body-051.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-writing-modes/wm-propagation-body-052.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-writing-modes/wm-propagation-body-053.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-writing-modes/wm-propagation-body-054.html [ ImageOnlyFailure ] imported/w3c/web-platform-tests/css/css-writing-modes/wm-propagation-body-055.html [ ImageOnlyFailure ] 1671273 1 clopez 2020-07-13 21:06:05 -0700 On top of that we have: * imported/w3c/web-platform-tests/css/css-writing-modes/normal-flow-overconstrained-vlr-005.xht was failing before for all platforms, now only seems to fail for iOS * imported/w3c/web-platform-tests/css/css-writing-modes/sizing-orthog-htb-in-vrl-013.xht was failing before for all platforms, now only seems to fail for Mac-wk1 And for platform glib (GTK/WPE): imported/w3c/web-platform-tests/css/css-writing-modes/available-size-004.html [ Pass ] imported/w3c/web-platform-tests/css/css-writing-modes/available-size-006.html [ Pass ] imported/w3c/web-platform-tests/css/css-writing-modes/available-size-008.html [ Pass ] imported/w3c/web-platform-tests/css/css-writing-modes/available-size-009.html [ Pass ] imported/w3c/web-platform-tests/css/css-writing-modes/available-size-013.html [ Pass ] imported/w3c/web-platform-tests/css/css-writing-modes/available-size-015.html [ Pass ] imported/w3c/web-platform-tests/css/css-writing-modes/available-size-016.html [ Pass ] imported/w3c/web-platform-tests/css/css-writing-modes/available-size-018.html [ Pass ] imported/w3c/web-platform-tests/css/css-writing-modes/available-size-019.html [ Pass ] imported/w3c/web-platform-tests/css/css-writing-modes/baseline-with-orthogonal-flow-001.html [ Pass ] imported/w3c/web-platform-tests/css/css-writing-modes/inline-box-border-vlr-001.html [ Pass ] For WPE: imported/w3c/web-platform-tests/css/css-writing-modes/normal-flow-overconstrained-vrl-004.xht [ Pass ] 1673353 2 webkit-bug-importer 2020-07-20 19:40:12 -0700 <rdar://problem/65861695> 1676714 3 lmoura 2020-07-30 21:37:24 -0700 (In reply to Carlos Alberto Lopez Perez from comment #1) snip. > imported/w3c/web-platform-tests/css/css-writing-modes/available-size-013. > html [ Pass ] Started image failing somewhere between r265018 (last good, WPE) and r265024 (first bad, both ports). Maybe related to r265020? 1755979 4 427508 rbuis 2021-05-01 11:24:35 -0700 Created attachment 427508 Patch 1756034 5 427522 rbuis 2021-05-02 03:21:57 -0700 Created attachment 427522 Patch 1756040 6 427524 rbuis 2021-05-02 06:44:05 -0700 Created attachment 427524 Patch 1756045 7 427527 rbuis 2021-05-02 08:27:02 -0700 Created attachment 427527 Patch 1756072 8 427532 rbuis 2021-05-02 13:14:36 -0700 Created attachment 427532 Patch 1757299 9 427532 koivisto 2021-05-06 01:42:47 -0700 Comment on attachment 427532 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=427532&action=review > Source/WebCore/dom/Element.cpp:3502 > + const RenderStyle* style = nullptr; > + if (allowRenderStyle == AllowRenderStyle::No && document().documentElement() == this) { > + if (hasRareData()) > + style = elementRareData()->computedStyle(); > + if (!style) > + setNodeFlag(NodeFlag::IsComputedStyleInvalidFlag); > + } else > + style = existingComputedStyle(); It is deeply wrong to insert this sort of hack into our core code to paper over a minor test failure. Pretty sure the actual issue here is not properly understood. 1958175 10 ahmad.saleem792 2023-05-26 06:10:34 -0700 Safari Technology Preview 170 is passing all three tests, which this patch was progressing, do we need this anymore? https://wpt.fyi/results/css/css-writing-modes?label=master&label=experimental&aligned=&q=css-writing-modes%2F 2006697 11 bfulgham 2024-01-22 15:42:50 -0800 Closing based on Ahmad's testing. 427508 2021-05-01 11:24:35 -0700 2021-05-02 03:21:51 -0700 Patch bug-214291-20210501202433.patch text/plain 4978 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2ODQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzExODQwZTQzYmIzZWM0 MmJkNDIwNGJhZTI5ZjBjYTZhNDk0M2I5NC4uZGQzY2VkMTU1NWY2NTMxMzI3NjAzYzVhYWU2ZDE0 MDJjOThhMzdmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTA1LTAxICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgW2Nzcy13cml0aW5nLW1vZGVzXSBO ZXcgZmFpbHVyZXMgb24gV1BUIHJlZi10ZXN0cyBhZnRlciB1cGRhdGluZyBXUFQgaW1wb3J0Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQyOTEKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXSVAuCisKKyAg ICAgICAgKiBkb20vRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50Ojpjb21w dXRlZFN0eWxlKToKKwogMjAyMS0wNC0zMCAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5j b20+CiAKICAgICAgICAgUkVHUkVTU0lPTiAoaU9TIDE0LjUpOiBQV0EncyAvIEhvbWUgU2NyZWVu IEFwcHMgd2l0aCBTZXJ2aWNlIFdvcmtlcnMgaW50ZXJtaXR0ZW5seSBmYWlsIHRvIG9wZW4gb2Zm bGluZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwIGIvU291cmNl L1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCmluZGV4IDBlZmVkNTIzYzBiZDA3NzQxY2IxYmVhZWRh NDg1YzA2NWE3MTU2ZWIuLmNlZGVhOTZmZDQ2ZDM5YTJiMDg5ZjhhNzEzY2U1MTQ5YTcxMTdhMzkg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9kb20vRWxlbWVudC5jcHAKQEAgLTM0OTMsNyArMzQ5Myw3IEBAIGNvbnN0IFJlbmRl clN0eWxlKiBFbGVtZW50Ojpjb21wdXRlZFN0eWxlKFBzZXVkb0lkIHBzZXVkb0VsZW1lbnRTcGVj aWZpZXIpCiAgICAgICAgIHJldHVybiBwc2V1ZG9FbGVtZW50LT5jb21wdXRlZFN0eWxlKCk7CiAK ICAgICBhdXRvKiBzdHlsZSA9IGV4aXN0aW5nQ29tcHV0ZWRTdHlsZSgpOwotICAgIGlmICghc3R5 bGUpCisgICAgaWYgKCFzdHlsZSB8fCBkb2N1bWVudCgpLmRvY3VtZW50RWxlbWVudCgpID09IHRo aXMpCiAgICAgICAgIHN0eWxlID0gcmVzb2x2ZUNvbXB1dGVkU3R5bGUoKTsKIAogICAgIGlmIChw c2V1ZG9FbGVtZW50U3BlY2lmaWVyICE9IFBzZXVkb0lkOjpOb25lKSB7CmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggN2U1MmQx OTBmMjBkY2QyOWUxNmVjNmY4ZjBhZDZkZmI2ZjMyYWUwNi4uYmQwYTQ0ZmM2MTc3MDE2MjFlMTU1 YTk2MjdhMWY1NTU4OWZlNjc1MyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisr KyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDIxLTA1LTAxICBS b2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgW2Nzcy13cml0aW5nLW1vZGVz XSBOZXcgZmFpbHVyZXMgb24gV1BUIHJlZi10ZXN0cyBhZnRlciB1cGRhdGluZyBXUFQgaW1wb3J0 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQyOTEK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RF eHBlY3RhdGlvbnM6CisKIDIwMjEtMDQtMzAgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUu Y29tPgogCiAgICAgICAgIFNoYXJlIHN0eWxlIHJlc29sdmVycyBiZXR3ZWVuIGF1dGhvciBzaGFk b3cgdHJlZXMgd2l0aG91dCBzdHlsZSBzaGVldHMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2lt cG9ydGVkL3czYy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9n CmluZGV4IGJlNWY2YTBjY2Y2YWZhNDVlODdiOWUxYTg5ZGJhNmE5MTc2Y2U3NjUuLjVkYTRiNGE3 YWZkMjE2ODRiODhiOWFhNTA4YjhjYjU2MTE2Y2FkNzIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0No YW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDIxLTA1LTAxICBSb2IgQnVpcyAgPHJidWlzQGln YWxpYS5jb20+CisKKyAgICAgICAgW2Nzcy13cml0aW5nLW1vZGVzXSBOZXcgZmFpbHVyZXMgb24g V1BUIHJlZi10ZXN0cyBhZnRlciB1cGRhdGluZyBXUFQgaW1wb3J0CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQyOTEKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv Y3NzLXdyaXRpbmctbW9kZXMvd20tcHJvcGFnYXRpb24tYm9keS1jb21wdXRlZC1yb290LWV4cGVj dGVkLnR4dDoKKwogMjAyMS0wNC0zMCAgT3Jpb2wgQnJ1ZmF1ICA8b2JydWZhdUBpZ2FsaWEuY29t PgogCiAgICAgICAgIFtjc3MtbG9naWNhbF0gRml4IGxvZ2ljYWwgc2hvcnRoYW5kcyB3aXRoIHZh cigpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVz dHMvVGVzdEV4cGVjdGF0aW9ucwppbmRleCA0MmU1YjMwYjI4ZTMwZGU5Y2RjZGVlYWFiM2U4YzYw ZTY4M2EzODY0Li5kY2IzM2EwYTg4MGQ3MzM0ZmUxM2FhMWM5ZmE3ZmRkYzU0YzAyOTNhIDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rl c3RFeHBlY3RhdGlvbnMKQEAgLTQxMDAsOCArNDEwMCw2IEBAIHdlYmtpdC5vcmcvYi8yMTQyOTEg aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvc3Js LWFsCiB3ZWJraXQub3JnL2IvMjE0MjkxIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv Y3NzL2Nzcy13cml0aW5nLW1vZGVzL3RjeS13aGl0ZS1zcGFjZS1wcm9jZXNzaW5nLTAwMS5odG1s IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0MjkxIGltcG9ydGVkL3czYy93 ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL3RleHQtb3JpZW50YXRpb24t aW5pdGlhbC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0MjkxIGlt cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL3dtLXBy b3BhZ2F0aW9uLTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0 MjkxIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVz L3dtLXByb3BhZ2F0aW9uLWJvZHktMDMyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtp dC5vcmcvYi8yMTQyOTEgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdy aXRpbmctbW9kZXMvd20tcHJvcGFnYXRpb24tYm9keS0wMzMuaHRtbCBbIEltYWdlT25seUZhaWx1 cmUgXQogd2Via2l0Lm9yZy9iLzIxNDI5MSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz L2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy93bS1wcm9wYWdhdGlvbi1ib2R5LTAzNC5odG1sIFsgSW1h Z2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0MjkxIGltcG9ydGVkL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL3dtLXByb3BhZ2F0aW9uLWJvZHktMDM1 Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQyOTEgaW1wb3J0ZWQv dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvd20tcHJvcGFnYXRp b24tYm9keS0wMzYuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9k ZXMvd20tcHJvcGFnYXRpb24tYm9keS1jb21wdXRlZC1yb290LWV4cGVjdGVkLnR4dCBiL0xheW91 dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1v ZGVzL3dtLXByb3BhZ2F0aW9uLWJvZHktY29tcHV0ZWQtcm9vdC1leHBlY3RlZC50eHQKaW5kZXgg NzUwZTJiOTA5NmE2ODk2MGJmODhhOWU5NGRkZGYxN2Y5MGYxZWU4My4uYTk3MjQwNWU5ZWM4MTQ3 Yjc1MDEyODg1NzNiMDZmMTEwNzE2M2UzNyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvd20tcHJvcGFn YXRpb24tYm9keS1jb21wdXRlZC1yb290LWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9p bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy93bS1w cm9wYWdhdGlvbi1ib2R5LWNvbXB1dGVkLXJvb3QtZXhwZWN0ZWQudHh0CkBAIC0xLDUgKzEsNSBA QAogCiBQQVNTIENoZWNrIGNvbXB1dGVkIHdyaXRpbmctbW9kZSBmb3IgYm9keSBlbGVtZW50Lgot RkFJTCBDaGVjayBjb21wdXRlZCB3cml0aW5nLW1vZGUgZm9yIGh0bWwgcm9vdCBlbGVtZW50LiBh c3NlcnRfbm90X2VxdWFsczogZ290IGRpc2FsbG93ZWQgdmFsdWUgInZlcnRpY2FsLWxyIgorUEFT UyBDaGVjayBjb21wdXRlZCB3cml0aW5nLW1vZGUgZm9yIGh0bWwgcm9vdCBlbGVtZW50LgogRkFJ TCBDaGVjayBjb21wdXRlZCB3cml0aW5nLW1vZGUgZm9yIGJvZHkgZWxlbWVudCB3aGVuIHN0eWxl IG5vIGxvbmdlciBhcHBsaWVzLiBhc3NlcnRfbm90X2VxdWFsczogZ290IGRpc2FsbG93ZWQgdmFs dWUgInZlcnRpY2FsLWxyIgogCg== 427522 2021-05-02 03:21:57 -0700 2021-05-02 07:44:07 -0700 Patch bug-214291-20210502122155.patch text/plain 10378 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2ODQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzExODQwZTQzYmIzZWM0 MmJkNDIwNGJhZTI5ZjBjYTZhNDk0M2I5NC4uZGQzY2VkMTU1NWY2NTMxMzI3NjAzYzVhYWU2ZDE0 MDJjOThhMzdmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTA1LTAxICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgW2Nzcy13cml0aW5nLW1vZGVzXSBO ZXcgZmFpbHVyZXMgb24gV1BUIHJlZi10ZXN0cyBhZnRlciB1cGRhdGluZyBXUFQgaW1wb3J0Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQyOTEKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXSVAuCisKKyAg ICAgICAgKiBkb20vRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50Ojpjb21w dXRlZFN0eWxlKToKKwogMjAyMS0wNC0zMCAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5j b20+CiAKICAgICAgICAgUkVHUkVTU0lPTiAoaU9TIDE0LjUpOiBQV0EncyAvIEhvbWUgU2NyZWVu IEFwcHMgd2l0aCBTZXJ2aWNlIFdvcmtlcnMgaW50ZXJtaXR0ZW5seSBmYWlsIHRvIG9wZW4gb2Zm bGluZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNs YXJhdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0 aW9uLmNwcAppbmRleCBiYWM1Mjk4NDEwMmViMDA0NWRjNjUzNWFlNjhlNjhiOWI0NjY4ZDAzLi42 NDg2YTAxYjg1ZjBkMTJjOTI4ZTY5MzZiYjZkZmRiMGVjYzM1MjQyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcApAQCAtMjMyOCw3 ICsyMzI4LDcgQEAgc3RhdGljIGlubGluZSBjb25zdCBSZW5kZXJTdHlsZSogY29tcHV0ZVJlbmRl clN0eWxlRm9yUHJvcGVydHkoRWxlbWVudCYgZWxlbWVudCwKICAgICAgICAgcmV0dXJuIG93bmVk U3R5bGUuZ2V0KCk7CiAgICAgfQogCi0gICAgcmV0dXJuIGVsZW1lbnQuY29tcHV0ZWRTdHlsZShl bGVtZW50LmlzUHNldWRvRWxlbWVudCgpID8gUHNldWRvSWQ6Ok5vbmUgOiBwc2V1ZG9FbGVtZW50 U3BlY2lmaWVyKTsKKyAgICByZXR1cm4gZWxlbWVudC5jb21wdXRlZFN0eWxlKGVsZW1lbnQuaXNQ c2V1ZG9FbGVtZW50KCkgPyBQc2V1ZG9JZDo6Tm9uZSA6IHBzZXVkb0VsZW1lbnRTcGVjaWZpZXIs IE5vZGU6OkFsbG93UmVuZGVyU3R5bGU6Ok5vKTsKIH0KIAogc3RhdGljIFJlZjxDU1NWYWx1ZT4g c2hhcGVQcm9wZXJ0eVZhbHVlKGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSwgY29uc3QgU2hhcGVW YWx1ZSogc2hhcGVWYWx1ZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcAppbmRleCAwZWZlZDUyM2MwYmQw Nzc0MWNiMWJlYWVkYTQ4NWMwNjVhNzE1NmViLi5hYTEyMWIwYzFhY2ZiNjg3MmQ1YTJmYmJiNmFj YmI2MDVkNmQxODcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCkBAIC0zNDg0LDcgKzM0ODQsNyBA QCBjb25zdCBSZW5kZXJTdHlsZSYgRWxlbWVudDo6cmVzb2x2ZVBzZXVkb0VsZW1lbnRTdHlsZShQ c2V1ZG9JZCBwc2V1ZG9FbGVtZW50U3BlYwogICAgIHJldHVybiAqY29tcHV0ZWRTdHlsZTsKIH0K IAotY29uc3QgUmVuZGVyU3R5bGUqIEVsZW1lbnQ6OmNvbXB1dGVkU3R5bGUoUHNldWRvSWQgcHNl dWRvRWxlbWVudFNwZWNpZmllcikKK2NvbnN0IFJlbmRlclN0eWxlKiBFbGVtZW50Ojpjb21wdXRl ZFN0eWxlKFBzZXVkb0lkIHBzZXVkb0VsZW1lbnRTcGVjaWZpZXIsIEFsbG93UmVuZGVyU3R5bGUg YWxsb3dSZW5kZXJTdHlsZSkKIHsKICAgICBpZiAoIWlzQ29ubmVjdGVkKCkpCiAgICAgICAgIHJl dHVybiBudWxscHRyOwpAQCAtMzQ5Miw3ICszNDkyLDE0IEBAIGNvbnN0IFJlbmRlclN0eWxlKiBF bGVtZW50Ojpjb21wdXRlZFN0eWxlKFBzZXVkb0lkIHBzZXVkb0VsZW1lbnRTcGVjaWZpZXIpCiAg ICAgaWYgKFBzZXVkb0VsZW1lbnQqIHBzZXVkb0VsZW1lbnQgPSBiZWZvcmVPckFmdGVyUHNldWRv RWxlbWVudCgqdGhpcywgcHNldWRvRWxlbWVudFNwZWNpZmllcikpCiAgICAgICAgIHJldHVybiBw c2V1ZG9FbGVtZW50LT5jb21wdXRlZFN0eWxlKCk7CiAKLSAgICBhdXRvKiBzdHlsZSA9IGV4aXN0 aW5nQ29tcHV0ZWRTdHlsZSgpOworICAgIGNvbnN0IFJlbmRlclN0eWxlKiBzdHlsZSA9IG51bGxw dHI7CisgICAgaWYgKGFsbG93UmVuZGVyU3R5bGUgPT0gQWxsb3dSZW5kZXJTdHlsZTo6Tm8gJiYg ZG9jdW1lbnQoKS5kb2N1bWVudEVsZW1lbnQoKSA9PSB0aGlzKSB7CisgICAgICAgIGlmIChoYXNS YXJlRGF0YSgpKQorICAgICAgICAgICAgc3R5bGUgPSBlbGVtZW50UmFyZURhdGEoKS0+Y29tcHV0 ZWRTdHlsZSgpOworICAgICAgICBlbHNlCisgICAgICAgICAgICBzZXROb2RlRmxhZyhOb2RlRmxh Zzo6SXNDb21wdXRlZFN0eWxlSW52YWxpZEZsYWcpOworICAgIH0gZWxzZQorICAgICAgICBzdHls ZSA9IGV4aXN0aW5nQ29tcHV0ZWRTdHlsZSgpOwogICAgIGlmICghc3R5bGUpCiAgICAgICAgIHN0 eWxlID0gcmVzb2x2ZUNvbXB1dGVkU3R5bGUoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvZG9tL0VsZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmgKaW5kZXggYzRh YTY2ODNjYmZhM2FkNzU1OGU1NTA4ZDhiYjRkODJmZWI2ZDQ3My4uYmU3NzQ3ZGMyNzA3ZTgxNTQ2 YWE0NDI2ZTc1MDMyNjc3Y2UyODUxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0Vs ZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5oCkBAIC0zNTEsNyArMzUx LDcgQEAgcHVibGljOgogICAgIFdFQkNPUkVfRVhQT1JUIEV4Y2VwdGlvbk9yPHZvaWQ+IGluc2Vy dEFkamFjZW50SFRNTChjb25zdCBTdHJpbmcmIHdoZXJlLCBjb25zdCBTdHJpbmcmIGh0bWwpOwog ICAgIFdFQkNPUkVfRVhQT1JUIEV4Y2VwdGlvbk9yPHZvaWQ+IGluc2VydEFkamFjZW50VGV4dChj b25zdCBTdHJpbmcmIHdoZXJlLCBjb25zdCBTdHJpbmcmIHRleHQpOwogCi0gICAgY29uc3QgUmVu ZGVyU3R5bGUqIGNvbXB1dGVkU3R5bGUoUHNldWRvSWQgPSBQc2V1ZG9JZDo6Tm9uZSkgb3ZlcnJp ZGU7CisgICAgY29uc3QgUmVuZGVyU3R5bGUqIGNvbXB1dGVkU3R5bGUoUHNldWRvSWQgPSBQc2V1 ZG9JZDo6Tm9uZSwgQWxsb3dSZW5kZXJTdHlsZSA9IEFsbG93UmVuZGVyU3R5bGU6Olllcykgb3Zl cnJpZGU7CiAKICAgICBib29sIG5lZWRzU3R5bGVJbnZhbGlkYXRpb24oKSBjb25zdDsKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL05vZGUuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9t L05vZGUuY3BwCmluZGV4IDc4ZjBlOTk1YTY2OTFhYmQ2YWRmNzlmYTkyZjA5Mjk2YThiMjMyZTMu LmZiMDE4MTg4MmQ4NmJlZDE5MDFkYjJkMWY4MmEyODViY2M5MDhlNWYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5j cHAKQEAgLTExMTEsMTIgKzExMTEsMTIgQEAgTm9kZSogTm9kZTo6cHNldWRvQXdhcmVMYXN0Q2hp bGQoKSBjb25zdAogICAgIHJldHVybiBsYXN0Q2hpbGQoKTsKIH0KIAotY29uc3QgUmVuZGVyU3R5 bGUqIE5vZGU6OmNvbXB1dGVkU3R5bGUoUHNldWRvSWQgcHNldWRvRWxlbWVudFNwZWNpZmllcikK K2NvbnN0IFJlbmRlclN0eWxlKiBOb2RlOjpjb21wdXRlZFN0eWxlKFBzZXVkb0lkIHBzZXVkb0Vs ZW1lbnRTcGVjaWZpZXIsIEFsbG93UmVuZGVyU3R5bGUgYWxsb3dSZW5kZXJTdHlsZSkKIHsKICAg ICBhdXRvKiBjb21wb3NlZFBhcmVudCA9IGNvbXBvc2VkVHJlZUFuY2VzdG9ycygqdGhpcykuZmly c3QoKTsKICAgICBpZiAoIWNvbXBvc2VkUGFyZW50KQogICAgICAgICByZXR1cm4gbnVsbHB0cjsK LSAgICByZXR1cm4gY29tcG9zZWRQYXJlbnQtPmNvbXB1dGVkU3R5bGUocHNldWRvRWxlbWVudFNw ZWNpZmllcik7CisgICAgcmV0dXJuIGNvbXBvc2VkUGFyZW50LT5jb21wdXRlZFN0eWxlKHBzZXVk b0VsZW1lbnRTcGVjaWZpZXIsIGFsbG93UmVuZGVyU3R5bGUpOwogfQogCiAvLyBGSVhNRTogU2hv dWxkbid0IHRoZXNlIGZ1bmN0aW9ucyBiZSBpbiB0aGUgZWRpdGluZyBjb2RlPyAgQ29kZSB0aGF0 IGFza3MgcXVlc3Rpb25zIGFib3V0IEhUTUwgaW4gdGhlIGNvcmUgRE9NIGNsYXNzCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5oIGIvU291cmNlL1dlYkNvcmUvZG9tL05vZGUu aAppbmRleCBkZGE2ZjhhYzJhY2FlOTc3N2FhZTk0ODdlNzZjN2JiOThmOTVmMTZjLi40ODk5NWUz MDcyMTU3NzE4MjNhNmUzYzY5MWZhZTUzYTU5ZDgzMzQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9kb20vTm9kZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmgKQEAgLTQwOCw3 ICs0MDgsOCBAQCBwdWJsaWM6CiAgICAgLy8gV3JhcHBlciBmb3Igbm9kZXMgdGhhdCBkb24ndCBo YXZlIGEgcmVuZGVyZXIsIGJ1dCBzdGlsbCBjYWNoZSB0aGUgc3R5bGUgKGxpa2UgSFRNTE9wdGlv bkVsZW1lbnQpLgogICAgIGNvbnN0IFJlbmRlclN0eWxlKiByZW5kZXJTdHlsZSgpIGNvbnN0Owog Ci0gICAgdmlydHVhbCBjb25zdCBSZW5kZXJTdHlsZSogY29tcHV0ZWRTdHlsZShQc2V1ZG9JZCBw c2V1ZG9FbGVtZW50U3BlY2lmaWVyID0gUHNldWRvSWQ6Ok5vbmUpOworICAgIGVudW0gY2xhc3Mg QWxsb3dSZW5kZXJTdHlsZSB7IFllcywgTm8gfTsKKyAgICB2aXJ0dWFsIGNvbnN0IFJlbmRlclN0 eWxlKiBjb21wdXRlZFN0eWxlKFBzZXVkb0lkIHBzZXVkb0VsZW1lbnRTcGVjaWZpZXIgPSBQc2V1 ZG9JZDo6Tm9uZSwgQWxsb3dSZW5kZXJTdHlsZSA9IEFsbG93UmVuZGVyU3R5bGU6Olllcyk7CiAK ICAgICBlbnVtIGNsYXNzIEluc2VydGVkSW50b0FuY2VzdG9yUmVzdWx0IHsKICAgICAgICAgRG9u ZSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdFbGVtZW50LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3N2Zy9TVkdFbGVtZW50LmNwcAppbmRleCA1YzJkZjJlOGQ5NThiOWI0ZGM2ZDYw YWZmNDFlN2NlNmQxMzJjZmY2Li4zMGVmMjQ2M2VhOWY3NmZiOWE5YzllYWZhNTYyZmJkMjBlZDVj ZjNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRWxlbWVudC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvc3ZnL1NWR0VsZW1lbnQuY3BwCkBAIC02MTQsNyArNjE0LDcgQEAgdm9p ZCBTVkdFbGVtZW50OjpzZXRVc2VPdmVycmlkZUNvbXB1dGVkU3R5bGUoYm9vbCB2YWx1ZSkKICAg ICAgICAgbV9zdmdSYXJlRGF0YS0+c2V0VXNlT3ZlcnJpZGVDb21wdXRlZFN0eWxlKHZhbHVlKTsK IH0KIAotY29uc3QgUmVuZGVyU3R5bGUqIFNWR0VsZW1lbnQ6OmNvbXB1dGVkU3R5bGUoUHNldWRv SWQgcHNldWRvRWxlbWVudFNwZWNpZmllcikKK2NvbnN0IFJlbmRlclN0eWxlKiBTVkdFbGVtZW50 Ojpjb21wdXRlZFN0eWxlKFBzZXVkb0lkIHBzZXVkb0VsZW1lbnRTcGVjaWZpZXIsIEFsbG93UmVu ZGVyU3R5bGUpCiB7CiAgICAgaWYgKCFtX3N2Z1JhcmVEYXRhIHx8ICFtX3N2Z1JhcmVEYXRhLT51 c2VPdmVycmlkZUNvbXB1dGVkU3R5bGUoKSkKICAgICAgICAgcmV0dXJuIEVsZW1lbnQ6OmNvbXB1 dGVkU3R5bGUocHNldWRvRWxlbWVudFNwZWNpZmllcik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9zdmcvU1ZHRWxlbWVudC5oIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0VsZW1lbnQuaApp bmRleCBhNmE0NjkyZWViNzI1YWYwYWFmODIxNzJiODA2NDJiYjhjYjU0MWM0Li44ZmRmNDU5NjRi NWIyYzEzYzZhMTAzOTljZjg5MDE0NmU5M2ZjN2ZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9zdmcvU1ZHRWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdFbGVtZW50LmgK QEAgLTE0MCw3ICsxNDAsNyBAQCBwdWJsaWM6CiAgICAgUmVmUHRyPFNWR0F0dHJpYnV0ZUFuaW1h dG9yPiBjcmVhdGVBbmltYXRvcihjb25zdCBRdWFsaWZpZWROYW1lJiwgQW5pbWF0aW9uTW9kZSwg Q2FsY01vZGUsIGJvb2wgaXNBY2N1bXVsYXRlZCwgYm9vbCBpc0FkZGl0aXZlKTsKICAgICB2b2lk IGFuaW1hdG9yV2lsbEJlRGVsZXRlZChjb25zdCBRdWFsaWZpZWROYW1lJik7CiAKLSAgICBjb25z dCBSZW5kZXJTdHlsZSogY29tcHV0ZWRTdHlsZShQc2V1ZG9JZCA9IFBzZXVkb0lkOjpOb25lKSBm aW5hbDsKKyAgICBjb25zdCBSZW5kZXJTdHlsZSogY29tcHV0ZWRTdHlsZShQc2V1ZG9JZCA9IFBz ZXVkb0lkOjpOb25lLCBBbGxvd1JlbmRlclN0eWxlID0gQWxsb3dSZW5kZXJTdHlsZTo6WWVzKSBm aW5hbDsKIAogICAgIC8vIFRoZXNlIGFyZSBuZWVkZWQgZm9yIHRoZSBSZW5kZXJUcmVlLCBhbmlt YXRpb24gYW5kIERPTS4KICAgICBTdHJpbmcgY2xhc3NOYW1lKCkgY29uc3QgeyByZXR1cm4gbV9j bGFzc05hbWUtPmN1cnJlbnRWYWx1ZSgpOyB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggN2U1MmQxOTBmMjBkY2QyOWUxNmVj NmY4ZjBhZDZkZmI2ZjMyYWUwNi4uYmQwYTQ0ZmM2MTc3MDE2MjFlMTU1YTk2MjdhMWY1NTU4OWZl Njc1MyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDIxLTA1LTAxICBSb2IgQnVpcyAgPHJidWlz QGlnYWxpYS5jb20+CisKKyAgICAgICAgW2Nzcy13cml0aW5nLW1vZGVzXSBOZXcgZmFpbHVyZXMg b24gV1BUIHJlZi10ZXN0cyBhZnRlciB1cGRhdGluZyBXUFQgaW1wb3J0CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQyOTEKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6CisK IDIwMjEtMDQtMzAgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAg IFNoYXJlIHN0eWxlIHJlc29sdmVycyBiZXR3ZWVuIGF1dGhvciBzaGFkb3cgdHJlZXMgd2l0aG91 dCBzdHlsZSBzaGVldHMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCmluZGV4IGJlNWY2YTBj Y2Y2YWZhNDVlODdiOWUxYTg5ZGJhNmE5MTc2Y2U3NjUuLjVkYTRiNGE3YWZkMjE2ODRiODhiOWFh NTA4YjhjYjU2MTE2Y2FkNzIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9D aGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDEyIEBACisyMDIxLTA1LTAxICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAg ICAgICAgW2Nzcy13cml0aW5nLW1vZGVzXSBOZXcgZmFpbHVyZXMgb24gV1BUIHJlZi10ZXN0cyBh ZnRlciB1cGRhdGluZyBXUFQgaW1wb3J0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMTQyOTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9k ZXMvd20tcHJvcGFnYXRpb24tYm9keS1jb21wdXRlZC1yb290LWV4cGVjdGVkLnR4dDoKKwogMjAy MS0wNC0zMCAgT3Jpb2wgQnJ1ZmF1ICA8b2JydWZhdUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtj c3MtbG9naWNhbF0gRml4IGxvZ2ljYWwgc2hvcnRoYW5kcyB3aXRoIHZhcigpCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0 aW9ucwppbmRleCA0MmU1YjMwYjI4ZTMwZGU5Y2RjZGVlYWFiM2U4YzYwZTY4M2EzODY0Li5kY2Iz M2EwYTg4MGQ3MzM0ZmUxM2FhMWM5ZmE3ZmRkYzU0YzAyOTNhIDEwMDY0NAotLS0gYS9MYXlvdXRU ZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMK QEAgLTQxMDAsOCArNDEwMCw2IEBAIHdlYmtpdC5vcmcvYi8yMTQyOTEgaW1wb3J0ZWQvdzNjL3dl Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvc3JsLWFsCiB3ZWJraXQub3Jn L2IvMjE0MjkxIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5n LW1vZGVzL3RjeS13aGl0ZS1zcGFjZS1wcm9jZXNzaW5nLTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFp bHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0MjkxIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz dHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL3RleHQtb3JpZW50YXRpb24taW5pdGlhbC5odG1sIFsg SW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0MjkxIGltcG9ydGVkL3czYy93ZWIt cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL3dtLXByb3BhZ2F0aW9uLTAwMS5o dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0MjkxIGltcG9ydGVkL3cz Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL3dtLXByb3BhZ2F0aW9u LWJvZHktMDMyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQyOTEg aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvd20t cHJvcGFnYXRpb24tYm9keS0wMzMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9y Zy9iLzIxNDI5MSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGlu Zy1tb2Rlcy93bS1wcm9wYWdhdGlvbi1ib2R5LTAzNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd CiB3ZWJraXQub3JnL2IvMjE0MjkxIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz L2Nzcy13cml0aW5nLW1vZGVzL3dtLXByb3BhZ2F0aW9uLWJvZHktMDM1Lmh0bWwgWyBJbWFnZU9u bHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQyOTEgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y bS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvd20tcHJvcGFnYXRpb24tYm9keS0wMzYuaHRt bCBbIEltYWdlT25seUZhaWx1cmUgXQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQv dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvd20tcHJvcGFnYXRp b24tYm9keS1jb21wdXRlZC1yb290LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2ltcG9ydGVk L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL3dtLXByb3BhZ2F0 aW9uLWJvZHktY29tcHV0ZWQtcm9vdC1leHBlY3RlZC50eHQKaW5kZXggNzUwZTJiOTA5NmE2ODk2 MGJmODhhOWU5NGRkZGYxN2Y5MGYxZWU4My4uYTk3MjQwNWU5ZWM4MTQ3Yjc1MDEyODg1NzNiMDZm MTEwNzE2M2UzNyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0 Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvd20tcHJvcGFnYXRpb24tYm9keS1jb21w dXRlZC1yb290LWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy93bS1wcm9wYWdhdGlvbi1ib2R5 LWNvbXB1dGVkLXJvb3QtZXhwZWN0ZWQudHh0CkBAIC0xLDUgKzEsNSBAQAogCiBQQVNTIENoZWNr IGNvbXB1dGVkIHdyaXRpbmctbW9kZSBmb3IgYm9keSBlbGVtZW50LgotRkFJTCBDaGVjayBjb21w dXRlZCB3cml0aW5nLW1vZGUgZm9yIGh0bWwgcm9vdCBlbGVtZW50LiBhc3NlcnRfbm90X2VxdWFs czogZ290IGRpc2FsbG93ZWQgdmFsdWUgInZlcnRpY2FsLWxyIgorUEFTUyBDaGVjayBjb21wdXRl ZCB3cml0aW5nLW1vZGUgZm9yIGh0bWwgcm9vdCBlbGVtZW50LgogRkFJTCBDaGVjayBjb21wdXRl ZCB3cml0aW5nLW1vZGUgZm9yIGJvZHkgZWxlbWVudCB3aGVuIHN0eWxlIG5vIGxvbmdlciBhcHBs aWVzLiBhc3NlcnRfbm90X2VxdWFsczogZ290IGRpc2FsbG93ZWQgdmFsdWUgInZlcnRpY2FsLWxy IgogCg== 427524 2021-05-02 06:44:05 -0700 2021-05-02 08:56:29 -0700 Patch bug-214291-20210502154402.patch text/plain 14535 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2ODQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzExODQwZTQzYmIzZWM0 MmJkNDIwNGJhZTI5ZjBjYTZhNDk0M2I5NC4uZGQzY2VkMTU1NWY2NTMxMzI3NjAzYzVhYWU2ZDE0 MDJjOThhMzdmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTA1LTAxICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgW2Nzcy13cml0aW5nLW1vZGVzXSBO ZXcgZmFpbHVyZXMgb24gV1BUIHJlZi10ZXN0cyBhZnRlciB1cGRhdGluZyBXUFQgaW1wb3J0Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQyOTEKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXSVAuCisKKyAg ICAgICAgKiBkb20vRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50Ojpjb21w dXRlZFN0eWxlKToKKwogMjAyMS0wNC0zMCAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5j b20+CiAKICAgICAgICAgUkVHUkVTU0lPTiAoaU9TIDE0LjUpOiBQV0EncyAvIEhvbWUgU2NyZWVu IEFwcHMgd2l0aCBTZXJ2aWNlIFdvcmtlcnMgaW50ZXJtaXR0ZW5seSBmYWlsIHRvIG9wZW4gb2Zm bGluZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNs YXJhdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0 aW9uLmNwcAppbmRleCBiYWM1Mjk4NDEwMmViMDA0NWRjNjUzNWFlNjhlNjhiOWI0NjY4ZDAzLi4z M2MxNGI3OTZjOTcxY2YxMjAzOTE1YTY4OGZmZmVmNDg5MDUyNDk3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcApAQCAtMjIzOSw3 ICsyMjM5LDcgQEAgc3RhdGljIGJvb2wgbm9uSW5oZXJpdGVkQ29sb3JQcm9wZXJ0eUhhc1ZhbHVl Q3VycmVudENvbG9yKENTU1Byb3BlcnR5SUQgcHJvcGVydHkKIC8vIGh0dHBzOi8vZGV2ZWxvcGVy Lm1vemlsbGEub3JnL2VuLVVTL2RvY3MvV2ViL0FQSS9XaW5kb3cvZ2V0Q29tcHV0ZWRTdHlsZSNO b3RlcwogUmVmUHRyPENTU1ZhbHVlPiBDU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb246OmdldFBy b3BlcnR5Q1NTVmFsdWUoQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eUlELCBFVXBkYXRlTGF5b3V0IHVw ZGF0ZUxheW91dCkgY29uc3QKIHsKLSAgICByZXR1cm4gQ29tcHV0ZWRTdHlsZUV4dHJhY3Rvciht X2VsZW1lbnQucHRyKCksIG1fYWxsb3dWaXNpdGVkU3R5bGUsIG1fcHNldWRvRWxlbWVudFNwZWNp ZmllcikucHJvcGVydHlWYWx1ZShwcm9wZXJ0eUlELCB1cGRhdGVMYXlvdXQpOworICAgIHJldHVy biBDb21wdXRlZFN0eWxlRXh0cmFjdG9yKG1fZWxlbWVudC5wdHIoKSwgbV9hbGxvd1Zpc2l0ZWRT dHlsZSwgbV9wc2V1ZG9FbGVtZW50U3BlY2lmaWVyKS5wcm9wZXJ0eVZhbHVlKHByb3BlcnR5SUQs IHVwZGF0ZUxheW91dCwgQWxsb3dSZW5kZXJTdHlsZTo6Tm8pOwogfQogCiBSZWY8TXV0YWJsZVN0 eWxlUHJvcGVydGllcz4gQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uOjpjb3B5UHJvcGVydGll cygpIGNvbnN0CkBAIC0yMzE1LDcgKzIzMTUsNyBAQCBzdGF0aWMgYm9vbCB1cGRhdGVTdHlsZUlm TmVlZGVkRm9yUHJvcGVydHkoRWxlbWVudCYgZWxlbWVudCwgQ1NTUHJvcGVydHlJRCBwcm9wZQog ICAgIHJldHVybiB0cnVlOwogfQogCi1zdGF0aWMgaW5saW5lIGNvbnN0IFJlbmRlclN0eWxlKiBj b21wdXRlUmVuZGVyU3R5bGVGb3JQcm9wZXJ0eShFbGVtZW50JiBlbGVtZW50LCBQc2V1ZG9JZCBw c2V1ZG9FbGVtZW50U3BlY2lmaWVyLCBDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SUQsIHN0ZDo6dW5p cXVlX3B0cjxSZW5kZXJTdHlsZT4mIG93bmVkU3R5bGUpCitzdGF0aWMgaW5saW5lIGNvbnN0IFJl bmRlclN0eWxlKiBjb21wdXRlUmVuZGVyU3R5bGVGb3JQcm9wZXJ0eShFbGVtZW50JiBlbGVtZW50 LCBQc2V1ZG9JZCBwc2V1ZG9FbGVtZW50U3BlY2lmaWVyLCBDU1NQcm9wZXJ0eUlEIHByb3BlcnR5 SUQsIHN0ZDo6dW5pcXVlX3B0cjxSZW5kZXJTdHlsZT4mIG93bmVkU3R5bGUsIEFsbG93UmVuZGVy U3R5bGUgYWxsb3dSZW5kZXJTdHlsZSA9IEFsbG93UmVuZGVyU3R5bGU6OlllcykKIHsKICAgICBh dXRvKiByZW5kZXJlciA9IGVsZW1lbnQucmVuZGVyZXIoKTsKIApAQCAtMjMyOCw3ICsyMzI4LDcg QEAgc3RhdGljIGlubGluZSBjb25zdCBSZW5kZXJTdHlsZSogY29tcHV0ZVJlbmRlclN0eWxlRm9y UHJvcGVydHkoRWxlbWVudCYgZWxlbWVudCwKICAgICAgICAgcmV0dXJuIG93bmVkU3R5bGUuZ2V0 KCk7CiAgICAgfQogCi0gICAgcmV0dXJuIGVsZW1lbnQuY29tcHV0ZWRTdHlsZShlbGVtZW50Lmlz UHNldWRvRWxlbWVudCgpID8gUHNldWRvSWQ6Ok5vbmUgOiBwc2V1ZG9FbGVtZW50U3BlY2lmaWVy KTsKKyAgICByZXR1cm4gZWxlbWVudC5jb21wdXRlZFN0eWxlKGVsZW1lbnQuaXNQc2V1ZG9FbGVt ZW50KCkgPyBQc2V1ZG9JZDo6Tm9uZSA6IHBzZXVkb0VsZW1lbnRTcGVjaWZpZXIsIGFsbG93UmVu ZGVyU3R5bGUpOwogfQogCiBzdGF0aWMgUmVmPENTU1ZhbHVlPiBzaGFwZVByb3BlcnR5VmFsdWUo Y29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlLCBjb25zdCBTaGFwZVZhbHVlKiBzaGFwZVZhbHVlKQpA QCAtMjUyOSw3ICsyNTI5LDcgQEAgc3RhdGljIFJlZjxDU1NGb250VmFsdWU+IGZvbnRTaG9ydGhh bmRWYWx1ZUZvclNlbGVjdGlvblByb3BlcnRpZXMoY29uc3QgRm9udERlc2MKICAgICByZXR1cm4g Y29tcHV0ZWRGb250OwogfQogCi1SZWZQdHI8Q1NTVmFsdWU+IENvbXB1dGVkU3R5bGVFeHRyYWN0 b3I6OnByb3BlcnR5VmFsdWUoQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eUlELCBFVXBkYXRlTGF5b3V0 IHVwZGF0ZUxheW91dCkKK1JlZlB0cjxDU1NWYWx1ZT4gQ29tcHV0ZWRTdHlsZUV4dHJhY3Rvcjo6 cHJvcGVydHlWYWx1ZShDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SUQsIEVVcGRhdGVMYXlvdXQgdXBk YXRlTGF5b3V0LCBBbGxvd1JlbmRlclN0eWxlIGFsbG93UmVuZGVyU3R5bGUpCiB7CiAgICAgYXV0 byogc3R5bGVkRWxlbWVudCA9IHRoaXMtPnN0eWxlZEVsZW1lbnQoKTsKICAgICBpZiAoIXN0eWxl ZEVsZW1lbnQpCkBAIC0yNTUxLDcgKzI1NTEsNyBAQCBSZWZQdHI8Q1NTVmFsdWU+IENvbXB1dGVk U3R5bGVFeHRyYWN0b3I6OnByb3BlcnR5VmFsdWUoQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eUlELAog ICAgICAgICBpZiAocHJvcGVydHlJRCA9PSBDU1NQcm9wZXJ0eURpc3BsYXkgJiYgIXJlbmRlcmVy ICYmIGlzPFNWR0VsZW1lbnQ+KCpzdHlsZWRFbGVtZW50KSAmJiAhZG93bmNhc3Q8U1ZHRWxlbWVu dD4oKnN0eWxlZEVsZW1lbnQpLmlzVmFsaWQoKSkKICAgICAgICAgICAgIHJldHVybiBudWxscHRy OwogCi0gICAgICAgIHN0eWxlID0gY29tcHV0ZVJlbmRlclN0eWxlRm9yUHJvcGVydHkoKnN0eWxl ZEVsZW1lbnQsIG1fcHNldWRvRWxlbWVudFNwZWNpZmllciwgcHJvcGVydHlJRCwgb3duZWRTdHls ZSk7CisgICAgICAgIHN0eWxlID0gY29tcHV0ZVJlbmRlclN0eWxlRm9yUHJvcGVydHkoKnN0eWxl ZEVsZW1lbnQsIG1fcHNldWRvRWxlbWVudFNwZWNpZmllciwgcHJvcGVydHlJRCwgb3duZWRTdHls ZSwgYWxsb3dSZW5kZXJTdHlsZSk7CiAKICAgICAgICAgLy8gRklYTUU6IFNvbWUgb2YgdGhlc2Ug Y2FzZXMgY291bGQgYmUgbmFycm93ZWQgZG93biBvciBvcHRpbWl6ZWQgYmV0dGVyLgogICAgICAg ICBmb3JjZUZ1bGxMYXlvdXQgPSBpc0xheW91dERlcGVuZGVudChwcm9wZXJ0eUlELCBzdHlsZSwg cmVuZGVyZXIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHls ZURlY2xhcmF0aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xh cmF0aW9uLmgKaW5kZXggNGNkNjQzNTVjOWI4NDM2MjljNDUyODQyNjNlN2Y1MzZiOWQ3YzE1ZC4u YmMwNDU4OTNmM2VhNmMzN2NkYTA4ZjU5ODk2NjQwMGM4MDM1NWQyZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uaApAQCAtNTYsNyArNTYs NyBAQCBwdWJsaWM6CiAgICAgQ29tcHV0ZWRTdHlsZUV4dHJhY3RvcihOb2RlKiwgYm9vbCBhbGxv d1Zpc2l0ZWRTdHlsZSA9IGZhbHNlLCBQc2V1ZG9JZCA9IFBzZXVkb0lkOjpOb25lKTsKICAgICBD b21wdXRlZFN0eWxlRXh0cmFjdG9yKEVsZW1lbnQqLCBib29sIGFsbG93VmlzaXRlZFN0eWxlID0g ZmFsc2UsIFBzZXVkb0lkID0gUHNldWRvSWQ6Ok5vbmUpOwogCi0gICAgUmVmUHRyPENTU1ZhbHVl PiBwcm9wZXJ0eVZhbHVlKENTU1Byb3BlcnR5SUQsIEVVcGRhdGVMYXlvdXQgPSBVcGRhdGVMYXlv dXQpOworICAgIFJlZlB0cjxDU1NWYWx1ZT4gcHJvcGVydHlWYWx1ZShDU1NQcm9wZXJ0eUlELCBF VXBkYXRlTGF5b3V0ID0gVXBkYXRlTGF5b3V0LCBBbGxvd1JlbmRlclN0eWxlID0gQWxsb3dSZW5k ZXJTdHlsZTo6WWVzKTsKICAgICBSZWZQdHI8Q1NTVmFsdWU+IHZhbHVlRm9yUHJvcGVydHlJblN0 eWxlKGNvbnN0IFJlbmRlclN0eWxlJiwgQ1NTUHJvcGVydHlJRCwgUmVuZGVyRWxlbWVudCogPSBu dWxscHRyKTsKICAgICBTdHJpbmcgY3VzdG9tUHJvcGVydHlUZXh0KGNvbnN0IFN0cmluZyYgcHJv cGVydHlOYW1lKTsKICAgICBSZWZQdHI8Q1NTVmFsdWU+IGN1c3RvbVByb3BlcnR5VmFsdWUoY29u c3QgU3RyaW5nJiBwcm9wZXJ0eU5hbWUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9t L0VsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCmluZGV4IDBlZmVk NTIzYzBiZDA3NzQxY2IxYmVhZWRhNDg1YzA2NWE3MTU2ZWIuLmFhMTIxYjBjMWFjZmI2ODcyZDVh MmZiYmI2YWNiYjYwNWQ2ZDE4NzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVt ZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAKQEAgLTM0ODQsNyAr MzQ4NCw3IEBAIGNvbnN0IFJlbmRlclN0eWxlJiBFbGVtZW50OjpyZXNvbHZlUHNldWRvRWxlbWVu dFN0eWxlKFBzZXVkb0lkIHBzZXVkb0VsZW1lbnRTcGVjCiAgICAgcmV0dXJuICpjb21wdXRlZFN0 eWxlOwogfQogCi1jb25zdCBSZW5kZXJTdHlsZSogRWxlbWVudDo6Y29tcHV0ZWRTdHlsZShQc2V1 ZG9JZCBwc2V1ZG9FbGVtZW50U3BlY2lmaWVyKQorY29uc3QgUmVuZGVyU3R5bGUqIEVsZW1lbnQ6 OmNvbXB1dGVkU3R5bGUoUHNldWRvSWQgcHNldWRvRWxlbWVudFNwZWNpZmllciwgQWxsb3dSZW5k ZXJTdHlsZSBhbGxvd1JlbmRlclN0eWxlKQogewogICAgIGlmICghaXNDb25uZWN0ZWQoKSkKICAg ICAgICAgcmV0dXJuIG51bGxwdHI7CkBAIC0zNDkyLDcgKzM0OTIsMTQgQEAgY29uc3QgUmVuZGVy U3R5bGUqIEVsZW1lbnQ6OmNvbXB1dGVkU3R5bGUoUHNldWRvSWQgcHNldWRvRWxlbWVudFNwZWNp ZmllcikKICAgICBpZiAoUHNldWRvRWxlbWVudCogcHNldWRvRWxlbWVudCA9IGJlZm9yZU9yQWZ0 ZXJQc2V1ZG9FbGVtZW50KCp0aGlzLCBwc2V1ZG9FbGVtZW50U3BlY2lmaWVyKSkKICAgICAgICAg cmV0dXJuIHBzZXVkb0VsZW1lbnQtPmNvbXB1dGVkU3R5bGUoKTsKIAotICAgIGF1dG8qIHN0eWxl ID0gZXhpc3RpbmdDb21wdXRlZFN0eWxlKCk7CisgICAgY29uc3QgUmVuZGVyU3R5bGUqIHN0eWxl ID0gbnVsbHB0cjsKKyAgICBpZiAoYWxsb3dSZW5kZXJTdHlsZSA9PSBBbGxvd1JlbmRlclN0eWxl OjpObyAmJiBkb2N1bWVudCgpLmRvY3VtZW50RWxlbWVudCgpID09IHRoaXMpIHsKKyAgICAgICAg aWYgKGhhc1JhcmVEYXRhKCkpCisgICAgICAgICAgICBzdHlsZSA9IGVsZW1lbnRSYXJlRGF0YSgp LT5jb21wdXRlZFN0eWxlKCk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHNldE5vZGVGbGFn KE5vZGVGbGFnOjpJc0NvbXB1dGVkU3R5bGVJbnZhbGlkRmxhZyk7CisgICAgfSBlbHNlCisgICAg ICAgIHN0eWxlID0gZXhpc3RpbmdDb21wdXRlZFN0eWxlKCk7CiAgICAgaWYgKCFzdHlsZSkKICAg ICAgICAgc3R5bGUgPSByZXNvbHZlQ29tcHV0ZWRTdHlsZSgpOwogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9kb20vRWxlbWVudC5oIGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuaApp bmRleCBjNGFhNjY4M2NiZmEzYWQ3NTU4ZTU1MDhkOGJiNGQ4MmZlYjZkNDczLi5iZTc3NDdkYzI3 MDdlODE1NDZhYTQ0MjZlNzUwMzI2NzdjZTI4NTExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9kb20vRWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmgKQEAgLTM1 MSw3ICszNTEsNyBAQCBwdWJsaWM6CiAgICAgV0VCQ09SRV9FWFBPUlQgRXhjZXB0aW9uT3I8dm9p ZD4gaW5zZXJ0QWRqYWNlbnRIVE1MKGNvbnN0IFN0cmluZyYgd2hlcmUsIGNvbnN0IFN0cmluZyYg aHRtbCk7CiAgICAgV0VCQ09SRV9FWFBPUlQgRXhjZXB0aW9uT3I8dm9pZD4gaW5zZXJ0QWRqYWNl bnRUZXh0KGNvbnN0IFN0cmluZyYgd2hlcmUsIGNvbnN0IFN0cmluZyYgdGV4dCk7CiAKLSAgICBj b25zdCBSZW5kZXJTdHlsZSogY29tcHV0ZWRTdHlsZShQc2V1ZG9JZCA9IFBzZXVkb0lkOjpOb25l KSBvdmVycmlkZTsKKyAgICBjb25zdCBSZW5kZXJTdHlsZSogY29tcHV0ZWRTdHlsZShQc2V1ZG9J ZCA9IFBzZXVkb0lkOjpOb25lLCBBbGxvd1JlbmRlclN0eWxlID0gQWxsb3dSZW5kZXJTdHlsZTo6 WWVzKSBvdmVycmlkZTsKIAogICAgIGJvb2wgbmVlZHNTdHlsZUludmFsaWRhdGlvbigpIGNvbnN0 OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9kb20vTm9kZS5jcHAKaW5kZXggNzhmMGU5OTVhNjY5MWFiZDZhZGY3OWZhOTJmMDkyOTZh OGIyMzJlMy4uZmIwMTgxODgyZDg2YmVkMTkwMWRiMmQxZjgyYTI4NWJjYzkwOGU1ZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL05vZGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Rv bS9Ob2RlLmNwcApAQCAtMTExMSwxMiArMTExMSwxMiBAQCBOb2RlKiBOb2RlOjpwc2V1ZG9Bd2Fy ZUxhc3RDaGlsZCgpIGNvbnN0CiAgICAgcmV0dXJuIGxhc3RDaGlsZCgpOwogfQogCi1jb25zdCBS ZW5kZXJTdHlsZSogTm9kZTo6Y29tcHV0ZWRTdHlsZShQc2V1ZG9JZCBwc2V1ZG9FbGVtZW50U3Bl Y2lmaWVyKQorY29uc3QgUmVuZGVyU3R5bGUqIE5vZGU6OmNvbXB1dGVkU3R5bGUoUHNldWRvSWQg cHNldWRvRWxlbWVudFNwZWNpZmllciwgQWxsb3dSZW5kZXJTdHlsZSBhbGxvd1JlbmRlclN0eWxl KQogewogICAgIGF1dG8qIGNvbXBvc2VkUGFyZW50ID0gY29tcG9zZWRUcmVlQW5jZXN0b3JzKCp0 aGlzKS5maXJzdCgpOwogICAgIGlmICghY29tcG9zZWRQYXJlbnQpCiAgICAgICAgIHJldHVybiBu dWxscHRyOwotICAgIHJldHVybiBjb21wb3NlZFBhcmVudC0+Y29tcHV0ZWRTdHlsZShwc2V1ZG9F bGVtZW50U3BlY2lmaWVyKTsKKyAgICByZXR1cm4gY29tcG9zZWRQYXJlbnQtPmNvbXB1dGVkU3R5 bGUocHNldWRvRWxlbWVudFNwZWNpZmllciwgYWxsb3dSZW5kZXJTdHlsZSk7CiB9CiAKIC8vIEZJ WE1FOiBTaG91bGRuJ3QgdGhlc2UgZnVuY3Rpb25zIGJlIGluIHRoZSBlZGl0aW5nIGNvZGU/ICBD b2RlIHRoYXQgYXNrcyBxdWVzdGlvbnMgYWJvdXQgSFRNTCBpbiB0aGUgY29yZSBET00gY2xhc3MK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmggYi9Tb3VyY2UvV2ViQ29yZS9k b20vTm9kZS5oCmluZGV4IGRkYTZmOGFjMmFjYWU5Nzc3YWFlOTQ4N2U3NmM3YmI5OGY5NWYxNmMu LjBmMmIyNjZiMTBkZDQ1OTdjNjI0NmU3MGY4N2Q5OWQwNTJlODJmN2MgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL05vZGUuaApA QCAtNjksNiArNjksOCBAQCBjbGFzcyBUb3VjaEV2ZW50OwogCiB1c2luZyBOb2RlT3JTdHJpbmcg PSBWYXJpYW50PFJlZlB0cjxOb2RlPiwgU3RyaW5nPjsKIAorZW51bSBjbGFzcyBBbGxvd1JlbmRl clN0eWxlOworCiBjbGFzcyBOb2RlIDogcHVibGljIEV2ZW50VGFyZ2V0IHsKICAgICBXVEZfTUFL RV9JU09fQUxMT0NBVEVEKE5vZGUpOwogCkBAIC00MDgsNyArNDEwLDcgQEAgcHVibGljOgogICAg IC8vIFdyYXBwZXIgZm9yIG5vZGVzIHRoYXQgZG9uJ3QgaGF2ZSBhIHJlbmRlcmVyLCBidXQgc3Rp bGwgY2FjaGUgdGhlIHN0eWxlIChsaWtlIEhUTUxPcHRpb25FbGVtZW50KS4KICAgICBjb25zdCBS ZW5kZXJTdHlsZSogcmVuZGVyU3R5bGUoKSBjb25zdDsKIAotICAgIHZpcnR1YWwgY29uc3QgUmVu ZGVyU3R5bGUqIGNvbXB1dGVkU3R5bGUoUHNldWRvSWQgcHNldWRvRWxlbWVudFNwZWNpZmllciA9 IFBzZXVkb0lkOjpOb25lKTsKKyAgICB2aXJ0dWFsIGNvbnN0IFJlbmRlclN0eWxlKiBjb21wdXRl ZFN0eWxlKFBzZXVkb0lkIHBzZXVkb0VsZW1lbnRTcGVjaWZpZXIgPSBQc2V1ZG9JZDo6Tm9uZSwg QWxsb3dSZW5kZXJTdHlsZSA9IEFsbG93UmVuZGVyU3R5bGU6Olllcyk7CiAKICAgICBlbnVtIGNs YXNzIEluc2VydGVkSW50b0FuY2VzdG9yUmVzdWx0IHsKICAgICAgICAgRG9uZSwKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZUNvbnN0YW50cy5o IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlQ29uc3RhbnRzLmgK aW5kZXggMzg0Mjc5YzEzNWJhMjFkNGEwZThhMzQ1YjE0ODVmYzY4MjJkYWRhNy4uMjQ1YzU5ODc2 MWIyNTZhYTkwNDZhYjM1YTdkNDJiOTU1NzA0OTQ4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlQ29uc3RhbnRzLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlQ29uc3RhbnRzLmgKQEAgLTEyMjcsNiAr MTIyNyw4IEBAIGVudW0gY2xhc3MgQ29udGFpbm1lbnQgOiB1aW50OF90IHsKICAgICBTaXplICAg ICA9IDEgPDwgMiwKIH07CiAKK2VudW0gY2xhc3MgQWxsb3dSZW5kZXJTdHlsZSB7IFllcywgTm8g fTsKKwogZXh0ZXJuIGNvbnN0IGZsb2F0IGRlZmF1bHRNaXRlckxpbWl0OwogCiBXVEY6OlRleHRT dHJlYW0mIG9wZXJhdG9yPDwoV1RGOjpUZXh0U3RyZWFtJiwgQW5pbWF0aW9uRmlsbE1vZGUpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0VsZW1lbnQuY3BwIGIvU291cmNlL1dl YkNvcmUvc3ZnL1NWR0VsZW1lbnQuY3BwCmluZGV4IDVjMmRmMmU4ZDk1OGI5YjRkYzZkNjBhZmY0 MWU3Y2U2ZDEzMmNmZjYuLjMwZWYyNDYzZWE5Zjc2ZmI5YTljOWVhZmE1NjJmYmQyMGVkNWNmM2Eg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdFbGVtZW50LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9zdmcvU1ZHRWxlbWVudC5jcHAKQEAgLTYxNCw3ICs2MTQsNyBAQCB2b2lkIFNW R0VsZW1lbnQ6OnNldFVzZU92ZXJyaWRlQ29tcHV0ZWRTdHlsZShib29sIHZhbHVlKQogICAgICAg ICBtX3N2Z1JhcmVEYXRhLT5zZXRVc2VPdmVycmlkZUNvbXB1dGVkU3R5bGUodmFsdWUpOwogfQog Ci1jb25zdCBSZW5kZXJTdHlsZSogU1ZHRWxlbWVudDo6Y29tcHV0ZWRTdHlsZShQc2V1ZG9JZCBw c2V1ZG9FbGVtZW50U3BlY2lmaWVyKQorY29uc3QgUmVuZGVyU3R5bGUqIFNWR0VsZW1lbnQ6OmNv bXB1dGVkU3R5bGUoUHNldWRvSWQgcHNldWRvRWxlbWVudFNwZWNpZmllciwgQWxsb3dSZW5kZXJT dHlsZSkKIHsKICAgICBpZiAoIW1fc3ZnUmFyZURhdGEgfHwgIW1fc3ZnUmFyZURhdGEtPnVzZU92 ZXJyaWRlQ29tcHV0ZWRTdHlsZSgpKQogICAgICAgICByZXR1cm4gRWxlbWVudDo6Y29tcHV0ZWRT dHlsZShwc2V1ZG9FbGVtZW50U3BlY2lmaWVyKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3N2Zy9TVkdFbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRWxlbWVudC5oCmluZGV4 IGE2YTQ2OTJlZWI3MjVhZjBhYWY4MjE3MmI4MDY0MmJiOGNiNTQxYzQuLjhmZGY0NTk2NGI1YjJj MTNjNmExMDM5OWNmODkwMTQ2ZTkzZmM3ZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N2 Zy9TVkdFbGVtZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0VsZW1lbnQuaApAQCAt MTQwLDcgKzE0MCw3IEBAIHB1YmxpYzoKICAgICBSZWZQdHI8U1ZHQXR0cmlidXRlQW5pbWF0b3I+ IGNyZWF0ZUFuaW1hdG9yKGNvbnN0IFF1YWxpZmllZE5hbWUmLCBBbmltYXRpb25Nb2RlLCBDYWxj TW9kZSwgYm9vbCBpc0FjY3VtdWxhdGVkLCBib29sIGlzQWRkaXRpdmUpOwogICAgIHZvaWQgYW5p bWF0b3JXaWxsQmVEZWxldGVkKGNvbnN0IFF1YWxpZmllZE5hbWUmKTsKIAotICAgIGNvbnN0IFJl bmRlclN0eWxlKiBjb21wdXRlZFN0eWxlKFBzZXVkb0lkID0gUHNldWRvSWQ6Ok5vbmUpIGZpbmFs OworICAgIGNvbnN0IFJlbmRlclN0eWxlKiBjb21wdXRlZFN0eWxlKFBzZXVkb0lkID0gUHNldWRv SWQ6Ok5vbmUsIEFsbG93UmVuZGVyU3R5bGUgPSBBbGxvd1JlbmRlclN0eWxlOjpZZXMpIGZpbmFs OwogCiAgICAgLy8gVGhlc2UgYXJlIG5lZWRlZCBmb3IgdGhlIFJlbmRlclRyZWUsIGFuaW1hdGlv biBhbmQgRE9NLgogICAgIFN0cmluZyBjbGFzc05hbWUoKSBjb25zdCB7IHJldHVybiBtX2NsYXNz TmFtZS0+Y3VycmVudFZhbHVlKCk7IH0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxv ZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA3ZTUyZDE5MGYyMGRjZDI5ZTE2ZWM2Zjhm MGFkNmRmYjZmMzJhZTA2Li5iZDBhNDRmYzYxNzcwMTYyMWUxNTVhOTYyN2ExZjU1NTg5ZmU2NzUz IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjEtMDUtMDEgIFJvYiBCdWlzICA8cmJ1aXNAaWdh bGlhLmNvbT4KKworICAgICAgICBbY3NzLXdyaXRpbmctbW9kZXNdIE5ldyBmYWlsdXJlcyBvbiBX UFQgcmVmLXRlc3RzIGFmdGVyIHVwZGF0aW5nIFdQVCBpbXBvcnQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNDI5MQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdEV4cGVjdGF0aW9uczoKKwogMjAy MS0wNC0zMCAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgU2hh cmUgc3R5bGUgcmVzb2x2ZXJzIGJldHdlZW4gYXV0aG9yIHNoYWRvdyB0cmVlcyB3aXRob3V0IHN0 eWxlIHNoZWV0cwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxv ZyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKaW5kZXggYmU1ZjZhMGNjZjZh ZmE0NWU4N2I5ZTFhODlkYmE2YTkxNzZjZTc2NS4uNWRhNGI0YTdhZmQyMTY4NGI4OGI5YWE1MDhi OGNiNTYxMTZjYWQ3MiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5n ZUxvZworKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTIgQEAKKzIwMjEtMDUtMDEgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAg ICBbY3NzLXdyaXRpbmctbW9kZXNdIE5ldyBmYWlsdXJlcyBvbiBXUFQgcmVmLXRlc3RzIGFmdGVy IHVwZGF0aW5nIFdQVCBpbXBvcnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIxNDI5MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy93 bS1wcm9wYWdhdGlvbi1ib2R5LWNvbXB1dGVkLXJvb3QtZXhwZWN0ZWQudHh0OgorCiAyMDIxLTA0 LTMwICBPcmlvbCBCcnVmYXUgIDxvYnJ1ZmF1QGlnYWxpYS5jb20+CiAKICAgICAgICAgW2Nzcy1s b2dpY2FsXSBGaXggbG9naWNhbCBzaG9ydGhhbmRzIHdpdGggdmFyKCkKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25z CmluZGV4IDQyZTViMzBiMjhlMzBkZTljZGNkZWVhYWIzZThjNjBlNjgzYTM4NjQuLmRjYjMzYTBh ODgwZDczMzRmZTEzYWExYzlmYTdmZGRjNTRjMDI5M2EgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAt NDEwMCw4ICs0MTAwLDYgQEAgd2Via2l0Lm9yZy9iLzIxNDI5MSBpbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy9zcmwtYWwKIHdlYmtpdC5vcmcvYi8y MTQyOTEgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9k ZXMvdGN5LXdoaXRlLXNwYWNlLXByb2Nlc3NpbmctMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl IF0KIHdlYmtpdC5vcmcvYi8yMTQyOTEgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j c3MvY3NzLXdyaXRpbmctbW9kZXMvdGV4dC1vcmllbnRhdGlvbi1pbml0aWFsLmh0bWwgWyBJbWFn ZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQyOTEgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0 Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvd20tcHJvcGFnYXRpb24tMDAxLmh0bWwg WyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQyOTEgaW1wb3J0ZWQvdzNjL3dl Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvd20tcHJvcGFnYXRpb24tYm9k eS0wMzIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDI5MSBpbXBv cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy93bS1wcm9w YWdhdGlvbi1ib2R5LTAzMy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2Iv MjE0MjkxIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1v ZGVzL3dtLXByb3BhZ2F0aW9uLWJvZHktMDM0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdl YmtpdC5vcmcvYi8yMTQyOTEgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz LXdyaXRpbmctbW9kZXMvd20tcHJvcGFnYXRpb24tYm9keS0wMzUuaHRtbCBbIEltYWdlT25seUZh aWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDI5MSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl c3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy93bS1wcm9wYWdhdGlvbi1ib2R5LTAzNi5odG1sIFsg SW1hZ2VPbmx5RmFpbHVyZSBdCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mv d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy93bS1wcm9wYWdhdGlvbi1i b2R5LWNvbXB1dGVkLXJvb3QtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNj L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvd20tcHJvcGFnYXRpb24t Ym9keS1jb21wdXRlZC1yb290LWV4cGVjdGVkLnR4dAppbmRleCA3NTBlMmI5MDk2YTY4OTYwYmY4 OGE5ZTk0ZGRkZjE3ZjkwZjFlZTgzLi5hOTcyNDA1ZTllYzgxNDdiNzUwMTI4ODU3M2IwNmYxMTA3 MTYzZTM3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy93bS1wcm9wYWdhdGlvbi1ib2R5LWNvbXB1dGVk LXJvb3QtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL3dtLXByb3BhZ2F0aW9uLWJvZHktY29t cHV0ZWQtcm9vdC1leHBlY3RlZC50eHQKQEAgLTEsNSArMSw1IEBACiAKIFBBU1MgQ2hlY2sgY29t cHV0ZWQgd3JpdGluZy1tb2RlIGZvciBib2R5IGVsZW1lbnQuCi1GQUlMIENoZWNrIGNvbXB1dGVk IHdyaXRpbmctbW9kZSBmb3IgaHRtbCByb290IGVsZW1lbnQuIGFzc2VydF9ub3RfZXF1YWxzOiBn b3QgZGlzYWxsb3dlZCB2YWx1ZSAidmVydGljYWwtbHIiCitQQVNTIENoZWNrIGNvbXB1dGVkIHdy aXRpbmctbW9kZSBmb3IgaHRtbCByb290IGVsZW1lbnQuCiBGQUlMIENoZWNrIGNvbXB1dGVkIHdy aXRpbmctbW9kZSBmb3IgYm9keSBlbGVtZW50IHdoZW4gc3R5bGUgbm8gbG9uZ2VyIGFwcGxpZXMu IGFzc2VydF9ub3RfZXF1YWxzOiBnb3QgZGlzYWxsb3dlZCB2YWx1ZSAidmVydGljYWwtbHIiCiAK 427527 2021-05-02 08:27:02 -0700 2021-05-02 13:14:29 -0700 Patch bug-214291-20210502172700.patch text/plain 14542 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2ODQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzExODQwZTQzYmIzZWM0 MmJkNDIwNGJhZTI5ZjBjYTZhNDk0M2I5NC4uZGQzY2VkMTU1NWY2NTMxMzI3NjAzYzVhYWU2ZDE0 MDJjOThhMzdmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTA1LTAxICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgW2Nzcy13cml0aW5nLW1vZGVzXSBO ZXcgZmFpbHVyZXMgb24gV1BUIHJlZi10ZXN0cyBhZnRlciB1cGRhdGluZyBXUFQgaW1wb3J0Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQyOTEKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXSVAuCisKKyAg ICAgICAgKiBkb20vRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50Ojpjb21w dXRlZFN0eWxlKToKKwogMjAyMS0wNC0zMCAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5j b20+CiAKICAgICAgICAgUkVHUkVTU0lPTiAoaU9TIDE0LjUpOiBQV0EncyAvIEhvbWUgU2NyZWVu IEFwcHMgd2l0aCBTZXJ2aWNlIFdvcmtlcnMgaW50ZXJtaXR0ZW5seSBmYWlsIHRvIG9wZW4gb2Zm bGluZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNs YXJhdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0 aW9uLmNwcAppbmRleCBiYWM1Mjk4NDEwMmViMDA0NWRjNjUzNWFlNjhlNjhiOWI0NjY4ZDAzLi4z M2MxNGI3OTZjOTcxY2YxMjAzOTE1YTY4OGZmZmVmNDg5MDUyNDk3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcApAQCAtMjIzOSw3 ICsyMjM5LDcgQEAgc3RhdGljIGJvb2wgbm9uSW5oZXJpdGVkQ29sb3JQcm9wZXJ0eUhhc1ZhbHVl Q3VycmVudENvbG9yKENTU1Byb3BlcnR5SUQgcHJvcGVydHkKIC8vIGh0dHBzOi8vZGV2ZWxvcGVy Lm1vemlsbGEub3JnL2VuLVVTL2RvY3MvV2ViL0FQSS9XaW5kb3cvZ2V0Q29tcHV0ZWRTdHlsZSNO b3RlcwogUmVmUHRyPENTU1ZhbHVlPiBDU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb246OmdldFBy b3BlcnR5Q1NTVmFsdWUoQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eUlELCBFVXBkYXRlTGF5b3V0IHVw ZGF0ZUxheW91dCkgY29uc3QKIHsKLSAgICByZXR1cm4gQ29tcHV0ZWRTdHlsZUV4dHJhY3Rvciht X2VsZW1lbnQucHRyKCksIG1fYWxsb3dWaXNpdGVkU3R5bGUsIG1fcHNldWRvRWxlbWVudFNwZWNp ZmllcikucHJvcGVydHlWYWx1ZShwcm9wZXJ0eUlELCB1cGRhdGVMYXlvdXQpOworICAgIHJldHVy biBDb21wdXRlZFN0eWxlRXh0cmFjdG9yKG1fZWxlbWVudC5wdHIoKSwgbV9hbGxvd1Zpc2l0ZWRT dHlsZSwgbV9wc2V1ZG9FbGVtZW50U3BlY2lmaWVyKS5wcm9wZXJ0eVZhbHVlKHByb3BlcnR5SUQs IHVwZGF0ZUxheW91dCwgQWxsb3dSZW5kZXJTdHlsZTo6Tm8pOwogfQogCiBSZWY8TXV0YWJsZVN0 eWxlUHJvcGVydGllcz4gQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uOjpjb3B5UHJvcGVydGll cygpIGNvbnN0CkBAIC0yMzE1LDcgKzIzMTUsNyBAQCBzdGF0aWMgYm9vbCB1cGRhdGVTdHlsZUlm TmVlZGVkRm9yUHJvcGVydHkoRWxlbWVudCYgZWxlbWVudCwgQ1NTUHJvcGVydHlJRCBwcm9wZQog ICAgIHJldHVybiB0cnVlOwogfQogCi1zdGF0aWMgaW5saW5lIGNvbnN0IFJlbmRlclN0eWxlKiBj b21wdXRlUmVuZGVyU3R5bGVGb3JQcm9wZXJ0eShFbGVtZW50JiBlbGVtZW50LCBQc2V1ZG9JZCBw c2V1ZG9FbGVtZW50U3BlY2lmaWVyLCBDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SUQsIHN0ZDo6dW5p cXVlX3B0cjxSZW5kZXJTdHlsZT4mIG93bmVkU3R5bGUpCitzdGF0aWMgaW5saW5lIGNvbnN0IFJl bmRlclN0eWxlKiBjb21wdXRlUmVuZGVyU3R5bGVGb3JQcm9wZXJ0eShFbGVtZW50JiBlbGVtZW50 LCBQc2V1ZG9JZCBwc2V1ZG9FbGVtZW50U3BlY2lmaWVyLCBDU1NQcm9wZXJ0eUlEIHByb3BlcnR5 SUQsIHN0ZDo6dW5pcXVlX3B0cjxSZW5kZXJTdHlsZT4mIG93bmVkU3R5bGUsIEFsbG93UmVuZGVy U3R5bGUgYWxsb3dSZW5kZXJTdHlsZSA9IEFsbG93UmVuZGVyU3R5bGU6OlllcykKIHsKICAgICBh dXRvKiByZW5kZXJlciA9IGVsZW1lbnQucmVuZGVyZXIoKTsKIApAQCAtMjMyOCw3ICsyMzI4LDcg QEAgc3RhdGljIGlubGluZSBjb25zdCBSZW5kZXJTdHlsZSogY29tcHV0ZVJlbmRlclN0eWxlRm9y UHJvcGVydHkoRWxlbWVudCYgZWxlbWVudCwKICAgICAgICAgcmV0dXJuIG93bmVkU3R5bGUuZ2V0 KCk7CiAgICAgfQogCi0gICAgcmV0dXJuIGVsZW1lbnQuY29tcHV0ZWRTdHlsZShlbGVtZW50Lmlz UHNldWRvRWxlbWVudCgpID8gUHNldWRvSWQ6Ok5vbmUgOiBwc2V1ZG9FbGVtZW50U3BlY2lmaWVy KTsKKyAgICByZXR1cm4gZWxlbWVudC5jb21wdXRlZFN0eWxlKGVsZW1lbnQuaXNQc2V1ZG9FbGVt ZW50KCkgPyBQc2V1ZG9JZDo6Tm9uZSA6IHBzZXVkb0VsZW1lbnRTcGVjaWZpZXIsIGFsbG93UmVu ZGVyU3R5bGUpOwogfQogCiBzdGF0aWMgUmVmPENTU1ZhbHVlPiBzaGFwZVByb3BlcnR5VmFsdWUo Y29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlLCBjb25zdCBTaGFwZVZhbHVlKiBzaGFwZVZhbHVlKQpA QCAtMjUyOSw3ICsyNTI5LDcgQEAgc3RhdGljIFJlZjxDU1NGb250VmFsdWU+IGZvbnRTaG9ydGhh bmRWYWx1ZUZvclNlbGVjdGlvblByb3BlcnRpZXMoY29uc3QgRm9udERlc2MKICAgICByZXR1cm4g Y29tcHV0ZWRGb250OwogfQogCi1SZWZQdHI8Q1NTVmFsdWU+IENvbXB1dGVkU3R5bGVFeHRyYWN0 b3I6OnByb3BlcnR5VmFsdWUoQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eUlELCBFVXBkYXRlTGF5b3V0 IHVwZGF0ZUxheW91dCkKK1JlZlB0cjxDU1NWYWx1ZT4gQ29tcHV0ZWRTdHlsZUV4dHJhY3Rvcjo6 cHJvcGVydHlWYWx1ZShDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SUQsIEVVcGRhdGVMYXlvdXQgdXBk YXRlTGF5b3V0LCBBbGxvd1JlbmRlclN0eWxlIGFsbG93UmVuZGVyU3R5bGUpCiB7CiAgICAgYXV0 byogc3R5bGVkRWxlbWVudCA9IHRoaXMtPnN0eWxlZEVsZW1lbnQoKTsKICAgICBpZiAoIXN0eWxl ZEVsZW1lbnQpCkBAIC0yNTUxLDcgKzI1NTEsNyBAQCBSZWZQdHI8Q1NTVmFsdWU+IENvbXB1dGVk U3R5bGVFeHRyYWN0b3I6OnByb3BlcnR5VmFsdWUoQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eUlELAog ICAgICAgICBpZiAocHJvcGVydHlJRCA9PSBDU1NQcm9wZXJ0eURpc3BsYXkgJiYgIXJlbmRlcmVy ICYmIGlzPFNWR0VsZW1lbnQ+KCpzdHlsZWRFbGVtZW50KSAmJiAhZG93bmNhc3Q8U1ZHRWxlbWVu dD4oKnN0eWxlZEVsZW1lbnQpLmlzVmFsaWQoKSkKICAgICAgICAgICAgIHJldHVybiBudWxscHRy OwogCi0gICAgICAgIHN0eWxlID0gY29tcHV0ZVJlbmRlclN0eWxlRm9yUHJvcGVydHkoKnN0eWxl ZEVsZW1lbnQsIG1fcHNldWRvRWxlbWVudFNwZWNpZmllciwgcHJvcGVydHlJRCwgb3duZWRTdHls ZSk7CisgICAgICAgIHN0eWxlID0gY29tcHV0ZVJlbmRlclN0eWxlRm9yUHJvcGVydHkoKnN0eWxl ZEVsZW1lbnQsIG1fcHNldWRvRWxlbWVudFNwZWNpZmllciwgcHJvcGVydHlJRCwgb3duZWRTdHls ZSwgYWxsb3dSZW5kZXJTdHlsZSk7CiAKICAgICAgICAgLy8gRklYTUU6IFNvbWUgb2YgdGhlc2Ug Y2FzZXMgY291bGQgYmUgbmFycm93ZWQgZG93biBvciBvcHRpbWl6ZWQgYmV0dGVyLgogICAgICAg ICBmb3JjZUZ1bGxMYXlvdXQgPSBpc0xheW91dERlcGVuZGVudChwcm9wZXJ0eUlELCBzdHlsZSwg cmVuZGVyZXIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHls ZURlY2xhcmF0aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xh cmF0aW9uLmgKaW5kZXggNGNkNjQzNTVjOWI4NDM2MjljNDUyODQyNjNlN2Y1MzZiOWQ3YzE1ZC4u YmMwNDU4OTNmM2VhNmMzN2NkYTA4ZjU5ODk2NjQwMGM4MDM1NWQyZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uaApAQCAtNTYsNyArNTYs NyBAQCBwdWJsaWM6CiAgICAgQ29tcHV0ZWRTdHlsZUV4dHJhY3RvcihOb2RlKiwgYm9vbCBhbGxv d1Zpc2l0ZWRTdHlsZSA9IGZhbHNlLCBQc2V1ZG9JZCA9IFBzZXVkb0lkOjpOb25lKTsKICAgICBD b21wdXRlZFN0eWxlRXh0cmFjdG9yKEVsZW1lbnQqLCBib29sIGFsbG93VmlzaXRlZFN0eWxlID0g ZmFsc2UsIFBzZXVkb0lkID0gUHNldWRvSWQ6Ok5vbmUpOwogCi0gICAgUmVmUHRyPENTU1ZhbHVl PiBwcm9wZXJ0eVZhbHVlKENTU1Byb3BlcnR5SUQsIEVVcGRhdGVMYXlvdXQgPSBVcGRhdGVMYXlv dXQpOworICAgIFJlZlB0cjxDU1NWYWx1ZT4gcHJvcGVydHlWYWx1ZShDU1NQcm9wZXJ0eUlELCBF VXBkYXRlTGF5b3V0ID0gVXBkYXRlTGF5b3V0LCBBbGxvd1JlbmRlclN0eWxlID0gQWxsb3dSZW5k ZXJTdHlsZTo6WWVzKTsKICAgICBSZWZQdHI8Q1NTVmFsdWU+IHZhbHVlRm9yUHJvcGVydHlJblN0 eWxlKGNvbnN0IFJlbmRlclN0eWxlJiwgQ1NTUHJvcGVydHlJRCwgUmVuZGVyRWxlbWVudCogPSBu dWxscHRyKTsKICAgICBTdHJpbmcgY3VzdG9tUHJvcGVydHlUZXh0KGNvbnN0IFN0cmluZyYgcHJv cGVydHlOYW1lKTsKICAgICBSZWZQdHI8Q1NTVmFsdWU+IGN1c3RvbVByb3BlcnR5VmFsdWUoY29u c3QgU3RyaW5nJiBwcm9wZXJ0eU5hbWUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9t L0VsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCmluZGV4IDBlZmVk NTIzYzBiZDA3NzQxY2IxYmVhZWRhNDg1YzA2NWE3MTU2ZWIuLjRhNThhYzc1NGU2MGJlOGQ2MmNk MDU4ZGZjN2UyNzYyYzM0MGU0NTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVt ZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAKQEAgLTM0ODQsNyAr MzQ4NCw3IEBAIGNvbnN0IFJlbmRlclN0eWxlJiBFbGVtZW50OjpyZXNvbHZlUHNldWRvRWxlbWVu dFN0eWxlKFBzZXVkb0lkIHBzZXVkb0VsZW1lbnRTcGVjCiAgICAgcmV0dXJuICpjb21wdXRlZFN0 eWxlOwogfQogCi1jb25zdCBSZW5kZXJTdHlsZSogRWxlbWVudDo6Y29tcHV0ZWRTdHlsZShQc2V1 ZG9JZCBwc2V1ZG9FbGVtZW50U3BlY2lmaWVyKQorY29uc3QgUmVuZGVyU3R5bGUqIEVsZW1lbnQ6 OmNvbXB1dGVkU3R5bGUoUHNldWRvSWQgcHNldWRvRWxlbWVudFNwZWNpZmllciwgQWxsb3dSZW5k ZXJTdHlsZSBhbGxvd1JlbmRlclN0eWxlKQogewogICAgIGlmICghaXNDb25uZWN0ZWQoKSkKICAg ICAgICAgcmV0dXJuIG51bGxwdHI7CkBAIC0zNDkyLDcgKzM0OTIsMTQgQEAgY29uc3QgUmVuZGVy U3R5bGUqIEVsZW1lbnQ6OmNvbXB1dGVkU3R5bGUoUHNldWRvSWQgcHNldWRvRWxlbWVudFNwZWNp ZmllcikKICAgICBpZiAoUHNldWRvRWxlbWVudCogcHNldWRvRWxlbWVudCA9IGJlZm9yZU9yQWZ0 ZXJQc2V1ZG9FbGVtZW50KCp0aGlzLCBwc2V1ZG9FbGVtZW50U3BlY2lmaWVyKSkKICAgICAgICAg cmV0dXJuIHBzZXVkb0VsZW1lbnQtPmNvbXB1dGVkU3R5bGUoKTsKIAotICAgIGF1dG8qIHN0eWxl ID0gZXhpc3RpbmdDb21wdXRlZFN0eWxlKCk7CisgICAgY29uc3QgUmVuZGVyU3R5bGUqIHN0eWxl ID0gbnVsbHB0cjsKKyAgICBpZiAoYWxsb3dSZW5kZXJTdHlsZSA9PSBBbGxvd1JlbmRlclN0eWxl OjpObyAmJiBkb2N1bWVudCgpLmRvY3VtZW50RWxlbWVudCgpID09IHRoaXMpIHsKKyAgICAgICAg aWYgKGhhc1JhcmVEYXRhKCkpCisgICAgICAgICAgICBzdHlsZSA9IGVsZW1lbnRSYXJlRGF0YSgp LT5jb21wdXRlZFN0eWxlKCk7CisgICAgICAgIGlmICghc3R5bGUpCisgICAgICAgICAgICBzZXRO b2RlRmxhZyhOb2RlRmxhZzo6SXNDb21wdXRlZFN0eWxlSW52YWxpZEZsYWcpOworICAgIH0gZWxz ZQorICAgICAgICBzdHlsZSA9IGV4aXN0aW5nQ29tcHV0ZWRTdHlsZSgpOwogICAgIGlmICghc3R5 bGUpCiAgICAgICAgIHN0eWxlID0gcmVzb2x2ZUNvbXB1dGVkU3R5bGUoKTsKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVt ZW50LmgKaW5kZXggYzRhYTY2ODNjYmZhM2FkNzU1OGU1NTA4ZDhiYjRkODJmZWI2ZDQ3My4uYmU3 NzQ3ZGMyNzA3ZTgxNTQ2YWE0NDI2ZTc1MDMyNjc3Y2UyODUxMSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvZG9tL0VsZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5o CkBAIC0zNTEsNyArMzUxLDcgQEAgcHVibGljOgogICAgIFdFQkNPUkVfRVhQT1JUIEV4Y2VwdGlv bk9yPHZvaWQ+IGluc2VydEFkamFjZW50SFRNTChjb25zdCBTdHJpbmcmIHdoZXJlLCBjb25zdCBT dHJpbmcmIGh0bWwpOwogICAgIFdFQkNPUkVfRVhQT1JUIEV4Y2VwdGlvbk9yPHZvaWQ+IGluc2Vy dEFkamFjZW50VGV4dChjb25zdCBTdHJpbmcmIHdoZXJlLCBjb25zdCBTdHJpbmcmIHRleHQpOwog Ci0gICAgY29uc3QgUmVuZGVyU3R5bGUqIGNvbXB1dGVkU3R5bGUoUHNldWRvSWQgPSBQc2V1ZG9J ZDo6Tm9uZSkgb3ZlcnJpZGU7CisgICAgY29uc3QgUmVuZGVyU3R5bGUqIGNvbXB1dGVkU3R5bGUo UHNldWRvSWQgPSBQc2V1ZG9JZDo6Tm9uZSwgQWxsb3dSZW5kZXJTdHlsZSA9IEFsbG93UmVuZGVy U3R5bGU6Olllcykgb3ZlcnJpZGU7CiAKICAgICBib29sIG5lZWRzU3R5bGVJbnZhbGlkYXRpb24o KSBjb25zdDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL05vZGUuY3BwIGIvU291 cmNlL1dlYkNvcmUvZG9tL05vZGUuY3BwCmluZGV4IDc4ZjBlOTk1YTY2OTFhYmQ2YWRmNzlmYTky ZjA5Mjk2YThiMjMyZTMuLmZiMDE4MTg4MmQ4NmJlZDE5MDFkYjJkMWY4MmEyODViY2M5MDhlNWYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9kb20vTm9kZS5jcHAKQEAgLTExMTEsMTIgKzExMTEsMTIgQEAgTm9kZSogTm9kZTo6cHNl dWRvQXdhcmVMYXN0Q2hpbGQoKSBjb25zdAogICAgIHJldHVybiBsYXN0Q2hpbGQoKTsKIH0KIAot Y29uc3QgUmVuZGVyU3R5bGUqIE5vZGU6OmNvbXB1dGVkU3R5bGUoUHNldWRvSWQgcHNldWRvRWxl bWVudFNwZWNpZmllcikKK2NvbnN0IFJlbmRlclN0eWxlKiBOb2RlOjpjb21wdXRlZFN0eWxlKFBz ZXVkb0lkIHBzZXVkb0VsZW1lbnRTcGVjaWZpZXIsIEFsbG93UmVuZGVyU3R5bGUgYWxsb3dSZW5k ZXJTdHlsZSkKIHsKICAgICBhdXRvKiBjb21wb3NlZFBhcmVudCA9IGNvbXBvc2VkVHJlZUFuY2Vz dG9ycygqdGhpcykuZmlyc3QoKTsKICAgICBpZiAoIWNvbXBvc2VkUGFyZW50KQogICAgICAgICBy ZXR1cm4gbnVsbHB0cjsKLSAgICByZXR1cm4gY29tcG9zZWRQYXJlbnQtPmNvbXB1dGVkU3R5bGUo cHNldWRvRWxlbWVudFNwZWNpZmllcik7CisgICAgcmV0dXJuIGNvbXBvc2VkUGFyZW50LT5jb21w dXRlZFN0eWxlKHBzZXVkb0VsZW1lbnRTcGVjaWZpZXIsIGFsbG93UmVuZGVyU3R5bGUpOwogfQog CiAvLyBGSVhNRTogU2hvdWxkbid0IHRoZXNlIGZ1bmN0aW9ucyBiZSBpbiB0aGUgZWRpdGluZyBj b2RlPyAgQ29kZSB0aGF0IGFza3MgcXVlc3Rpb25zIGFib3V0IEhUTUwgaW4gdGhlIGNvcmUgRE9N IGNsYXNzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5oIGIvU291cmNlL1dl YkNvcmUvZG9tL05vZGUuaAppbmRleCBkZGE2ZjhhYzJhY2FlOTc3N2FhZTk0ODdlNzZjN2JiOThm OTVmMTZjLi4wZjJiMjY2YjEwZGQ0NTk3YzYyNDZlNzBmODdkOTlkMDUyZTgyZjdjIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9O b2RlLmgKQEAgLTY5LDYgKzY5LDggQEAgY2xhc3MgVG91Y2hFdmVudDsKIAogdXNpbmcgTm9kZU9y U3RyaW5nID0gVmFyaWFudDxSZWZQdHI8Tm9kZT4sIFN0cmluZz47CiAKK2VudW0gY2xhc3MgQWxs b3dSZW5kZXJTdHlsZTsKKwogY2xhc3MgTm9kZSA6IHB1YmxpYyBFdmVudFRhcmdldCB7CiAgICAg V1RGX01BS0VfSVNPX0FMTE9DQVRFRChOb2RlKTsKIApAQCAtNDA4LDcgKzQxMCw3IEBAIHB1Ymxp YzoKICAgICAvLyBXcmFwcGVyIGZvciBub2RlcyB0aGF0IGRvbid0IGhhdmUgYSByZW5kZXJlciwg YnV0IHN0aWxsIGNhY2hlIHRoZSBzdHlsZSAobGlrZSBIVE1MT3B0aW9uRWxlbWVudCkuCiAgICAg Y29uc3QgUmVuZGVyU3R5bGUqIHJlbmRlclN0eWxlKCkgY29uc3Q7CiAKLSAgICB2aXJ0dWFsIGNv bnN0IFJlbmRlclN0eWxlKiBjb21wdXRlZFN0eWxlKFBzZXVkb0lkIHBzZXVkb0VsZW1lbnRTcGVj aWZpZXIgPSBQc2V1ZG9JZDo6Tm9uZSk7CisgICAgdmlydHVhbCBjb25zdCBSZW5kZXJTdHlsZSog Y29tcHV0ZWRTdHlsZShQc2V1ZG9JZCBwc2V1ZG9FbGVtZW50U3BlY2lmaWVyID0gUHNldWRvSWQ6 Ok5vbmUsIEFsbG93UmVuZGVyU3R5bGUgPSBBbGxvd1JlbmRlclN0eWxlOjpZZXMpOwogCiAgICAg ZW51bSBjbGFzcyBJbnNlcnRlZEludG9BbmNlc3RvclJlc3VsdCB7CiAgICAgICAgIERvbmUsCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGVDb25z dGFudHMuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZUNvbnN0 YW50cy5oCmluZGV4IDM4NDI3OWMxMzViYTIxZDRhMGU4YTM0NWIxNDg1ZmM2ODIyZGFkYTcuLjI0 NWM1OTg3NjFiMjU2YWE5MDQ2YWIzNWE3ZDQyYjk1NTcwNDk0ODEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZUNvbnN0YW50cy5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZUNvbnN0YW50cy5oCkBAIC0x MjI3LDYgKzEyMjcsOCBAQCBlbnVtIGNsYXNzIENvbnRhaW5tZW50IDogdWludDhfdCB7CiAgICAg U2l6ZSAgICAgPSAxIDw8IDIsCiB9OwogCitlbnVtIGNsYXNzIEFsbG93UmVuZGVyU3R5bGUgeyBZ ZXMsIE5vIH07CisKIGV4dGVybiBjb25zdCBmbG9hdCBkZWZhdWx0TWl0ZXJMaW1pdDsKIAogV1RG OjpUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFdURjo6VGV4dFN0cmVhbSYsIEFuaW1hdGlvbkZpbGxN b2RlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdFbGVtZW50LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3N2Zy9TVkdFbGVtZW50LmNwcAppbmRleCA1YzJkZjJlOGQ5NThiOWI0ZGM2 ZDYwYWZmNDFlN2NlNmQxMzJjZmY2Li4zMGVmMjQ2M2VhOWY3NmZiOWE5YzllYWZhNTYyZmJkMjBl ZDVjZjNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRWxlbWVudC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0VsZW1lbnQuY3BwCkBAIC02MTQsNyArNjE0LDcgQEAg dm9pZCBTVkdFbGVtZW50OjpzZXRVc2VPdmVycmlkZUNvbXB1dGVkU3R5bGUoYm9vbCB2YWx1ZSkK ICAgICAgICAgbV9zdmdSYXJlRGF0YS0+c2V0VXNlT3ZlcnJpZGVDb21wdXRlZFN0eWxlKHZhbHVl KTsKIH0KIAotY29uc3QgUmVuZGVyU3R5bGUqIFNWR0VsZW1lbnQ6OmNvbXB1dGVkU3R5bGUoUHNl dWRvSWQgcHNldWRvRWxlbWVudFNwZWNpZmllcikKK2NvbnN0IFJlbmRlclN0eWxlKiBTVkdFbGVt ZW50Ojpjb21wdXRlZFN0eWxlKFBzZXVkb0lkIHBzZXVkb0VsZW1lbnRTcGVjaWZpZXIsIEFsbG93 UmVuZGVyU3R5bGUpCiB7CiAgICAgaWYgKCFtX3N2Z1JhcmVEYXRhIHx8ICFtX3N2Z1JhcmVEYXRh LT51c2VPdmVycmlkZUNvbXB1dGVkU3R5bGUoKSkKICAgICAgICAgcmV0dXJuIEVsZW1lbnQ6OmNv bXB1dGVkU3R5bGUocHNldWRvRWxlbWVudFNwZWNpZmllcik7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9zdmcvU1ZHRWxlbWVudC5oIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0VsZW1lbnQu aAppbmRleCBhNmE0NjkyZWViNzI1YWYwYWFmODIxNzJiODA2NDJiYjhjYjU0MWM0Li44ZmRmNDU5 NjRiNWIyYzEzYzZhMTAzOTljZjg5MDE0NmU5M2ZjN2ZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9zdmcvU1ZHRWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdFbGVtZW50 LmgKQEAgLTE0MCw3ICsxNDAsNyBAQCBwdWJsaWM6CiAgICAgUmVmUHRyPFNWR0F0dHJpYnV0ZUFu aW1hdG9yPiBjcmVhdGVBbmltYXRvcihjb25zdCBRdWFsaWZpZWROYW1lJiwgQW5pbWF0aW9uTW9k ZSwgQ2FsY01vZGUsIGJvb2wgaXNBY2N1bXVsYXRlZCwgYm9vbCBpc0FkZGl0aXZlKTsKICAgICB2 b2lkIGFuaW1hdG9yV2lsbEJlRGVsZXRlZChjb25zdCBRdWFsaWZpZWROYW1lJik7CiAKLSAgICBj b25zdCBSZW5kZXJTdHlsZSogY29tcHV0ZWRTdHlsZShQc2V1ZG9JZCA9IFBzZXVkb0lkOjpOb25l KSBmaW5hbDsKKyAgICBjb25zdCBSZW5kZXJTdHlsZSogY29tcHV0ZWRTdHlsZShQc2V1ZG9JZCA9 IFBzZXVkb0lkOjpOb25lLCBBbGxvd1JlbmRlclN0eWxlID0gQWxsb3dSZW5kZXJTdHlsZTo6WWVz KSBmaW5hbDsKIAogICAgIC8vIFRoZXNlIGFyZSBuZWVkZWQgZm9yIHRoZSBSZW5kZXJUcmVlLCBh bmltYXRpb24gYW5kIERPTS4KICAgICBTdHJpbmcgY2xhc3NOYW1lKCkgY29uc3QgeyByZXR1cm4g bV9jbGFzc05hbWUtPmN1cnJlbnRWYWx1ZSgpOyB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggN2U1MmQxOTBmMjBkY2QyOWUx NmVjNmY4ZjBhZDZkZmI2ZjMyYWUwNi4uYmQwYTQ0ZmM2MTc3MDE2MjFlMTU1YTk2MjdhMWY1NTU4 OWZlNjc1MyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRl c3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDIxLTA1LTAxICBSb2IgQnVpcyAgPHJi dWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgW2Nzcy13cml0aW5nLW1vZGVzXSBOZXcgZmFpbHVy ZXMgb24gV1BUIHJlZi10ZXN0cyBhZnRlciB1cGRhdGluZyBXUFQgaW1wb3J0CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQyOTEKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6 CisKIDIwMjEtMDQtMzAgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAg ICAgIFNoYXJlIHN0eWxlIHJlc29sdmVycyBiZXR3ZWVuIGF1dGhvciBzaGFkb3cgdHJlZXMgd2l0 aG91dCBzdHlsZSBzaGVldHMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9D aGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCmluZGV4IGJlNWY2 YTBjY2Y2YWZhNDVlODdiOWUxYTg5ZGJhNmE5MTc2Y2U3NjUuLjVkYTRiNGE3YWZkMjE2ODRiODhi OWFhNTA4YjhjYjU2MTE2Y2FkNzIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3cz Yy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwpAQCAt MSwzICsxLDEyIEBACisyMDIxLTA1LTAxICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisK KyAgICAgICAgW2Nzcy13cml0aW5nLW1vZGVzXSBOZXcgZmFpbHVyZXMgb24gV1BUIHJlZi10ZXN0 cyBhZnRlciB1cGRhdGluZyBXUFQgaW1wb3J0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQyOTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmct bW9kZXMvd20tcHJvcGFnYXRpb24tYm9keS1jb21wdXRlZC1yb290LWV4cGVjdGVkLnR4dDoKKwog MjAyMS0wNC0zMCAgT3Jpb2wgQnJ1ZmF1ICA8b2JydWZhdUBpZ2FsaWEuY29tPgogCiAgICAgICAg IFtjc3MtbG9naWNhbF0gRml4IGxvZ2ljYWwgc2hvcnRoYW5kcyB3aXRoIHZhcigpCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVj dGF0aW9ucwppbmRleCA0MmU1YjMwYjI4ZTMwZGU5Y2RjZGVlYWFiM2U4YzYwZTY4M2EzODY0Li5k Y2IzM2EwYTg4MGQ3MzM0ZmUxM2FhMWM5ZmE3ZmRkYzU0YzAyOTNhIDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlv bnMKQEAgLTQxMDAsOCArNDEwMCw2IEBAIHdlYmtpdC5vcmcvYi8yMTQyOTEgaW1wb3J0ZWQvdzNj L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvc3JsLWFsCiB3ZWJraXQu b3JnL2IvMjE0MjkxIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0 aW5nLW1vZGVzL3RjeS13aGl0ZS1zcGFjZS1wcm9jZXNzaW5nLTAwMS5odG1sIFsgSW1hZ2VPbmx5 RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0MjkxIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t dGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL3RleHQtb3JpZW50YXRpb24taW5pdGlhbC5odG1s IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0MjkxIGltcG9ydGVkL3czYy93 ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL3dtLXByb3BhZ2F0aW9uLTAw MS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0MjkxIGltcG9ydGVk L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL3dtLXByb3BhZ2F0 aW9uLWJvZHktMDMyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQy OTEgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMv d20tcHJvcGFnYXRpb24tYm9keS0wMzMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0 Lm9yZy9iLzIxNDI5MSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3Jp dGluZy1tb2Rlcy93bS1wcm9wYWdhdGlvbi1ib2R5LTAzNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy ZSBdCiB3ZWJraXQub3JnL2IvMjE0MjkxIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv Y3NzL2Nzcy13cml0aW5nLW1vZGVzL3dtLXByb3BhZ2F0aW9uLWJvZHktMDM1Lmh0bWwgWyBJbWFn ZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQyOTEgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0 Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvd20tcHJvcGFnYXRpb24tYm9keS0wMzYu aHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvd20tcHJvcGFn YXRpb24tYm9keS1jb21wdXRlZC1yb290LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2ltcG9y dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL3dtLXByb3Bh Z2F0aW9uLWJvZHktY29tcHV0ZWQtcm9vdC1leHBlY3RlZC50eHQKaW5kZXggNzUwZTJiOTA5NmE2 ODk2MGJmODhhOWU5NGRkZGYxN2Y5MGYxZWU4My4uYTk3MjQwNWU5ZWM4MTQ3Yjc1MDEyODg1NzNi MDZmMTEwNzE2M2UzNyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvd20tcHJvcGFnYXRpb24tYm9keS1j b21wdXRlZC1yb290LWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mv d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy93bS1wcm9wYWdhdGlvbi1i b2R5LWNvbXB1dGVkLXJvb3QtZXhwZWN0ZWQudHh0CkBAIC0xLDUgKzEsNSBAQAogCiBQQVNTIENo ZWNrIGNvbXB1dGVkIHdyaXRpbmctbW9kZSBmb3IgYm9keSBlbGVtZW50LgotRkFJTCBDaGVjayBj b21wdXRlZCB3cml0aW5nLW1vZGUgZm9yIGh0bWwgcm9vdCBlbGVtZW50LiBhc3NlcnRfbm90X2Vx dWFsczogZ290IGRpc2FsbG93ZWQgdmFsdWUgInZlcnRpY2FsLWxyIgorUEFTUyBDaGVjayBjb21w dXRlZCB3cml0aW5nLW1vZGUgZm9yIGh0bWwgcm9vdCBlbGVtZW50LgogRkFJTCBDaGVjayBjb21w dXRlZCB3cml0aW5nLW1vZGUgZm9yIGJvZHkgZWxlbWVudCB3aGVuIHN0eWxlIG5vIGxvbmdlciBh cHBsaWVzLiBhc3NlcnRfbm90X2VxdWFsczogZ290IGRpc2FsbG93ZWQgdmFsdWUgInZlcnRpY2Fs LWxyIgogCg== 427532 2021-05-02 13:14:36 -0700 2021-05-06 01:42:47 -0700 Patch bug-214291-20210502221434.patch text/plain 15389 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2ODQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzExODQwZTQzYmIzZWM0 MmJkNDIwNGJhZTI5ZjBjYTZhNDk0M2I5NC4uZWEwNjNhNjliMzhlMGM5MzA2NDNkNDEwZWJmZWYx ZjNiNTFjMjg0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDIxLTA1LTAyICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgW2Nzcy13cml0aW5nLW1vZGVzXSBO ZXcgZmFpbHVyZXMgb24gV1BUIHJlZi10ZXN0cyBhZnRlciB1cGRhdGluZyBXUFQgaW1wb3J0Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQyOTEKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbGxvdyBhIG1v ZGUgd2hlcmUgc3R5bGUgZXh0cmFjdGluZyBhdm9pZHMgdGhlIGN1cnJlbnRseQorICAgICAgICB1 c2VkIFJlbmRlclN0eWxlIGFuZCB1c2UgdGhhdCBpbiBDU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRp b246OmdldFByb3BlcnR5Q1NTVmFsdWUuCisKKyAgICAgICAgVGhpcyBpcyBuZWVkZWQgYmVjYXVz ZSBmb3IgZXhhbXBsZSB3cml0aW5nLW1vZGUgYW5kIGRpcmVjdGlvbiBtYXkgcHJvcGFnYXRlIGZy b20gaHRtbAorICAgICAgICBib2R5IHRvIGRvY3VtZW50IHN0eWxlIGFuZCB0aHVzIGNhbiBiZSBp bmhlcml0ZWQgdG8gdGhlIGRvY3VtZW50IGVsZW1lbnQsIGJ1dAorICAgICAgICBjb21wdXRlZCBz dHlsZSBwcmVzZW50ZWQgYXMgd2ViIEFQSSBzaG91bGQgbm90IHJlZmxlY3QgdGhhdC4KKworICAg ICAgICAqIGNzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwOgorICAgICAgICAoV2Vi Q29yZTo6Q1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uOjpnZXRQcm9wZXJ0eUNTU1ZhbHVlIGNv bnN0KToKKyAgICAgICAgKFdlYkNvcmU6OmNvbXB1dGVSZW5kZXJTdHlsZUZvclByb3BlcnR5KToK KyAgICAgICAgKFdlYkNvcmU6OkNvbXB1dGVkU3R5bGVFeHRyYWN0b3I6OnByb3BlcnR5VmFsdWUp OgorICAgICAgICAqIGNzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uaDoKKyAgICAgICAg KiBkb20vRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50Ojpjb21wdXRlZFN0 eWxlKToKKyAgICAgICAgKiBkb20vRWxlbWVudC5oOgorICAgICAgICAqIGRvbS9Ob2RlLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6Ok5vZGU6OmNvbXB1dGVkU3R5bGUpOgorICAgICAgICAqIGRvbS9O b2RlLmg6CisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlQ29uc3RhbnRzLmg6 CisgICAgICAgICogc3ZnL1NWR0VsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U1ZHRWxl bWVudDo6Y29tcHV0ZWRTdHlsZSk6CisgICAgICAgICogc3ZnL1NWR0VsZW1lbnQuaDoKKwogMjAy MS0wNC0zMCAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgUkVH UkVTU0lPTiAoaU9TIDE0LjUpOiBQV0EncyAvIEhvbWUgU2NyZWVuIEFwcHMgd2l0aCBTZXJ2aWNl IFdvcmtlcnMgaW50ZXJtaXR0ZW5seSBmYWlsIHRvIG9wZW4gb2ZmbGluZQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcAppbmRleCBiYWM1 Mjk4NDEwMmViMDA0NWRjNjUzNWFlNjhlNjhiOWI0NjY4ZDAzLi4zM2MxNGI3OTZjOTcxY2YxMjAz OTE1YTY4OGZmZmVmNDg5MDUyNDk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NT Q29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NT Q29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcApAQCAtMjIzOSw3ICsyMjM5LDcgQEAgc3RhdGlj IGJvb2wgbm9uSW5oZXJpdGVkQ29sb3JQcm9wZXJ0eUhhc1ZhbHVlQ3VycmVudENvbG9yKENTU1By b3BlcnR5SUQgcHJvcGVydHkKIC8vIGh0dHBzOi8vZGV2ZWxvcGVyLm1vemlsbGEub3JnL2VuLVVT L2RvY3MvV2ViL0FQSS9XaW5kb3cvZ2V0Q29tcHV0ZWRTdHlsZSNOb3RlcwogUmVmUHRyPENTU1Zh bHVlPiBDU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb246OmdldFByb3BlcnR5Q1NTVmFsdWUoQ1NT UHJvcGVydHlJRCBwcm9wZXJ0eUlELCBFVXBkYXRlTGF5b3V0IHVwZGF0ZUxheW91dCkgY29uc3QK IHsKLSAgICByZXR1cm4gQ29tcHV0ZWRTdHlsZUV4dHJhY3RvcihtX2VsZW1lbnQucHRyKCksIG1f YWxsb3dWaXNpdGVkU3R5bGUsIG1fcHNldWRvRWxlbWVudFNwZWNpZmllcikucHJvcGVydHlWYWx1 ZShwcm9wZXJ0eUlELCB1cGRhdGVMYXlvdXQpOworICAgIHJldHVybiBDb21wdXRlZFN0eWxlRXh0 cmFjdG9yKG1fZWxlbWVudC5wdHIoKSwgbV9hbGxvd1Zpc2l0ZWRTdHlsZSwgbV9wc2V1ZG9FbGVt ZW50U3BlY2lmaWVyKS5wcm9wZXJ0eVZhbHVlKHByb3BlcnR5SUQsIHVwZGF0ZUxheW91dCwgQWxs b3dSZW5kZXJTdHlsZTo6Tm8pOwogfQogCiBSZWY8TXV0YWJsZVN0eWxlUHJvcGVydGllcz4gQ1NT Q29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uOjpjb3B5UHJvcGVydGllcygpIGNvbnN0CkBAIC0yMzE1 LDcgKzIzMTUsNyBAQCBzdGF0aWMgYm9vbCB1cGRhdGVTdHlsZUlmTmVlZGVkRm9yUHJvcGVydHko RWxlbWVudCYgZWxlbWVudCwgQ1NTUHJvcGVydHlJRCBwcm9wZQogICAgIHJldHVybiB0cnVlOwog fQogCi1zdGF0aWMgaW5saW5lIGNvbnN0IFJlbmRlclN0eWxlKiBjb21wdXRlUmVuZGVyU3R5bGVG b3JQcm9wZXJ0eShFbGVtZW50JiBlbGVtZW50LCBQc2V1ZG9JZCBwc2V1ZG9FbGVtZW50U3BlY2lm aWVyLCBDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SUQsIHN0ZDo6dW5pcXVlX3B0cjxSZW5kZXJTdHls ZT4mIG93bmVkU3R5bGUpCitzdGF0aWMgaW5saW5lIGNvbnN0IFJlbmRlclN0eWxlKiBjb21wdXRl UmVuZGVyU3R5bGVGb3JQcm9wZXJ0eShFbGVtZW50JiBlbGVtZW50LCBQc2V1ZG9JZCBwc2V1ZG9F bGVtZW50U3BlY2lmaWVyLCBDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SUQsIHN0ZDo6dW5pcXVlX3B0 cjxSZW5kZXJTdHlsZT4mIG93bmVkU3R5bGUsIEFsbG93UmVuZGVyU3R5bGUgYWxsb3dSZW5kZXJT dHlsZSA9IEFsbG93UmVuZGVyU3R5bGU6OlllcykKIHsKICAgICBhdXRvKiByZW5kZXJlciA9IGVs ZW1lbnQucmVuZGVyZXIoKTsKIApAQCAtMjMyOCw3ICsyMzI4LDcgQEAgc3RhdGljIGlubGluZSBj b25zdCBSZW5kZXJTdHlsZSogY29tcHV0ZVJlbmRlclN0eWxlRm9yUHJvcGVydHkoRWxlbWVudCYg ZWxlbWVudCwKICAgICAgICAgcmV0dXJuIG93bmVkU3R5bGUuZ2V0KCk7CiAgICAgfQogCi0gICAg cmV0dXJuIGVsZW1lbnQuY29tcHV0ZWRTdHlsZShlbGVtZW50LmlzUHNldWRvRWxlbWVudCgpID8g UHNldWRvSWQ6Ok5vbmUgOiBwc2V1ZG9FbGVtZW50U3BlY2lmaWVyKTsKKyAgICByZXR1cm4gZWxl bWVudC5jb21wdXRlZFN0eWxlKGVsZW1lbnQuaXNQc2V1ZG9FbGVtZW50KCkgPyBQc2V1ZG9JZDo6 Tm9uZSA6IHBzZXVkb0VsZW1lbnRTcGVjaWZpZXIsIGFsbG93UmVuZGVyU3R5bGUpOwogfQogCiBz dGF0aWMgUmVmPENTU1ZhbHVlPiBzaGFwZVByb3BlcnR5VmFsdWUoY29uc3QgUmVuZGVyU3R5bGUm IHN0eWxlLCBjb25zdCBTaGFwZVZhbHVlKiBzaGFwZVZhbHVlKQpAQCAtMjUyOSw3ICsyNTI5LDcg QEAgc3RhdGljIFJlZjxDU1NGb250VmFsdWU+IGZvbnRTaG9ydGhhbmRWYWx1ZUZvclNlbGVjdGlv blByb3BlcnRpZXMoY29uc3QgRm9udERlc2MKICAgICByZXR1cm4gY29tcHV0ZWRGb250OwogfQog Ci1SZWZQdHI8Q1NTVmFsdWU+IENvbXB1dGVkU3R5bGVFeHRyYWN0b3I6OnByb3BlcnR5VmFsdWUo Q1NTUHJvcGVydHlJRCBwcm9wZXJ0eUlELCBFVXBkYXRlTGF5b3V0IHVwZGF0ZUxheW91dCkKK1Jl ZlB0cjxDU1NWYWx1ZT4gQ29tcHV0ZWRTdHlsZUV4dHJhY3Rvcjo6cHJvcGVydHlWYWx1ZShDU1NQ cm9wZXJ0eUlEIHByb3BlcnR5SUQsIEVVcGRhdGVMYXlvdXQgdXBkYXRlTGF5b3V0LCBBbGxvd1Jl bmRlclN0eWxlIGFsbG93UmVuZGVyU3R5bGUpCiB7CiAgICAgYXV0byogc3R5bGVkRWxlbWVudCA9 IHRoaXMtPnN0eWxlZEVsZW1lbnQoKTsKICAgICBpZiAoIXN0eWxlZEVsZW1lbnQpCkBAIC0yNTUx LDcgKzI1NTEsNyBAQCBSZWZQdHI8Q1NTVmFsdWU+IENvbXB1dGVkU3R5bGVFeHRyYWN0b3I6OnBy b3BlcnR5VmFsdWUoQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eUlELAogICAgICAgICBpZiAocHJvcGVy dHlJRCA9PSBDU1NQcm9wZXJ0eURpc3BsYXkgJiYgIXJlbmRlcmVyICYmIGlzPFNWR0VsZW1lbnQ+ KCpzdHlsZWRFbGVtZW50KSAmJiAhZG93bmNhc3Q8U1ZHRWxlbWVudD4oKnN0eWxlZEVsZW1lbnQp LmlzVmFsaWQoKSkKICAgICAgICAgICAgIHJldHVybiBudWxscHRyOwogCi0gICAgICAgIHN0eWxl ID0gY29tcHV0ZVJlbmRlclN0eWxlRm9yUHJvcGVydHkoKnN0eWxlZEVsZW1lbnQsIG1fcHNldWRv RWxlbWVudFNwZWNpZmllciwgcHJvcGVydHlJRCwgb3duZWRTdHlsZSk7CisgICAgICAgIHN0eWxl ID0gY29tcHV0ZVJlbmRlclN0eWxlRm9yUHJvcGVydHkoKnN0eWxlZEVsZW1lbnQsIG1fcHNldWRv RWxlbWVudFNwZWNpZmllciwgcHJvcGVydHlJRCwgb3duZWRTdHlsZSwgYWxsb3dSZW5kZXJTdHls ZSk7CiAKICAgICAgICAgLy8gRklYTUU6IFNvbWUgb2YgdGhlc2UgY2FzZXMgY291bGQgYmUgbmFy cm93ZWQgZG93biBvciBvcHRpbWl6ZWQgYmV0dGVyLgogICAgICAgICBmb3JjZUZ1bGxMYXlvdXQg PSBpc0xheW91dERlcGVuZGVudChwcm9wZXJ0eUlELCBzdHlsZSwgcmVuZGVyZXIpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmggYi9T b3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmgKaW5kZXggNGNk NjQzNTVjOWI4NDM2MjljNDUyODQyNjNlN2Y1MzZiOWQ3YzE1ZC4uYmMwNDU4OTNmM2VhNmMzN2Nk YTA4ZjU5ODk2NjQwMGM4MDM1NWQyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NT U0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1ND b21wdXRlZFN0eWxlRGVjbGFyYXRpb24uaApAQCAtNTYsNyArNTYsNyBAQCBwdWJsaWM6CiAgICAg Q29tcHV0ZWRTdHlsZUV4dHJhY3RvcihOb2RlKiwgYm9vbCBhbGxvd1Zpc2l0ZWRTdHlsZSA9IGZh bHNlLCBQc2V1ZG9JZCA9IFBzZXVkb0lkOjpOb25lKTsKICAgICBDb21wdXRlZFN0eWxlRXh0cmFj dG9yKEVsZW1lbnQqLCBib29sIGFsbG93VmlzaXRlZFN0eWxlID0gZmFsc2UsIFBzZXVkb0lkID0g UHNldWRvSWQ6Ok5vbmUpOwogCi0gICAgUmVmUHRyPENTU1ZhbHVlPiBwcm9wZXJ0eVZhbHVlKENT U1Byb3BlcnR5SUQsIEVVcGRhdGVMYXlvdXQgPSBVcGRhdGVMYXlvdXQpOworICAgIFJlZlB0cjxD U1NWYWx1ZT4gcHJvcGVydHlWYWx1ZShDU1NQcm9wZXJ0eUlELCBFVXBkYXRlTGF5b3V0ID0gVXBk YXRlTGF5b3V0LCBBbGxvd1JlbmRlclN0eWxlID0gQWxsb3dSZW5kZXJTdHlsZTo6WWVzKTsKICAg ICBSZWZQdHI8Q1NTVmFsdWU+IHZhbHVlRm9yUHJvcGVydHlJblN0eWxlKGNvbnN0IFJlbmRlclN0 eWxlJiwgQ1NTUHJvcGVydHlJRCwgUmVuZGVyRWxlbWVudCogPSBudWxscHRyKTsKICAgICBTdHJp bmcgY3VzdG9tUHJvcGVydHlUZXh0KGNvbnN0IFN0cmluZyYgcHJvcGVydHlOYW1lKTsKICAgICBS ZWZQdHI8Q1NTVmFsdWU+IGN1c3RvbVByb3BlcnR5VmFsdWUoY29uc3QgU3RyaW5nJiBwcm9wZXJ0 eU5hbWUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwIGIvU291 cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCmluZGV4IDBlZmVkNTIzYzBiZDA3NzQxY2IxYmVh ZWRhNDg1YzA2NWE3MTU2ZWIuLjRhNThhYzc1NGU2MGJlOGQ2MmNkMDU4ZGZjN2UyNzYyYzM0MGU0 NTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAKQEAgLTM0ODQsNyArMzQ4NCw3IEBAIGNvbnN0IFJl bmRlclN0eWxlJiBFbGVtZW50OjpyZXNvbHZlUHNldWRvRWxlbWVudFN0eWxlKFBzZXVkb0lkIHBz ZXVkb0VsZW1lbnRTcGVjCiAgICAgcmV0dXJuICpjb21wdXRlZFN0eWxlOwogfQogCi1jb25zdCBS ZW5kZXJTdHlsZSogRWxlbWVudDo6Y29tcHV0ZWRTdHlsZShQc2V1ZG9JZCBwc2V1ZG9FbGVtZW50 U3BlY2lmaWVyKQorY29uc3QgUmVuZGVyU3R5bGUqIEVsZW1lbnQ6OmNvbXB1dGVkU3R5bGUoUHNl dWRvSWQgcHNldWRvRWxlbWVudFNwZWNpZmllciwgQWxsb3dSZW5kZXJTdHlsZSBhbGxvd1JlbmRl clN0eWxlKQogewogICAgIGlmICghaXNDb25uZWN0ZWQoKSkKICAgICAgICAgcmV0dXJuIG51bGxw dHI7CkBAIC0zNDkyLDcgKzM0OTIsMTQgQEAgY29uc3QgUmVuZGVyU3R5bGUqIEVsZW1lbnQ6OmNv bXB1dGVkU3R5bGUoUHNldWRvSWQgcHNldWRvRWxlbWVudFNwZWNpZmllcikKICAgICBpZiAoUHNl dWRvRWxlbWVudCogcHNldWRvRWxlbWVudCA9IGJlZm9yZU9yQWZ0ZXJQc2V1ZG9FbGVtZW50KCp0 aGlzLCBwc2V1ZG9FbGVtZW50U3BlY2lmaWVyKSkKICAgICAgICAgcmV0dXJuIHBzZXVkb0VsZW1l bnQtPmNvbXB1dGVkU3R5bGUoKTsKIAotICAgIGF1dG8qIHN0eWxlID0gZXhpc3RpbmdDb21wdXRl ZFN0eWxlKCk7CisgICAgY29uc3QgUmVuZGVyU3R5bGUqIHN0eWxlID0gbnVsbHB0cjsKKyAgICBp ZiAoYWxsb3dSZW5kZXJTdHlsZSA9PSBBbGxvd1JlbmRlclN0eWxlOjpObyAmJiBkb2N1bWVudCgp LmRvY3VtZW50RWxlbWVudCgpID09IHRoaXMpIHsKKyAgICAgICAgaWYgKGhhc1JhcmVEYXRhKCkp CisgICAgICAgICAgICBzdHlsZSA9IGVsZW1lbnRSYXJlRGF0YSgpLT5jb21wdXRlZFN0eWxlKCk7 CisgICAgICAgIGlmICghc3R5bGUpCisgICAgICAgICAgICBzZXROb2RlRmxhZyhOb2RlRmxhZzo6 SXNDb21wdXRlZFN0eWxlSW52YWxpZEZsYWcpOworICAgIH0gZWxzZQorICAgICAgICBzdHlsZSA9 IGV4aXN0aW5nQ29tcHV0ZWRTdHlsZSgpOwogICAgIGlmICghc3R5bGUpCiAgICAgICAgIHN0eWxl ID0gcmVzb2x2ZUNvbXB1dGVkU3R5bGUoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv ZG9tL0VsZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmgKaW5kZXggYzRhYTY2 ODNjYmZhM2FkNzU1OGU1NTA4ZDhiYjRkODJmZWI2ZDQ3My4uYmU3NzQ3ZGMyNzA3ZTgxNTQ2YWE0 NDI2ZTc1MDMyNjc3Y2UyODUxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1l bnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5oCkBAIC0zNTEsNyArMzUxLDcg QEAgcHVibGljOgogICAgIFdFQkNPUkVfRVhQT1JUIEV4Y2VwdGlvbk9yPHZvaWQ+IGluc2VydEFk amFjZW50SFRNTChjb25zdCBTdHJpbmcmIHdoZXJlLCBjb25zdCBTdHJpbmcmIGh0bWwpOwogICAg IFdFQkNPUkVfRVhQT1JUIEV4Y2VwdGlvbk9yPHZvaWQ+IGluc2VydEFkamFjZW50VGV4dChjb25z dCBTdHJpbmcmIHdoZXJlLCBjb25zdCBTdHJpbmcmIHRleHQpOwogCi0gICAgY29uc3QgUmVuZGVy U3R5bGUqIGNvbXB1dGVkU3R5bGUoUHNldWRvSWQgPSBQc2V1ZG9JZDo6Tm9uZSkgb3ZlcnJpZGU7 CisgICAgY29uc3QgUmVuZGVyU3R5bGUqIGNvbXB1dGVkU3R5bGUoUHNldWRvSWQgPSBQc2V1ZG9J ZDo6Tm9uZSwgQWxsb3dSZW5kZXJTdHlsZSA9IEFsbG93UmVuZGVyU3R5bGU6Olllcykgb3ZlcnJp ZGU7CiAKICAgICBib29sIG5lZWRzU3R5bGVJbnZhbGlkYXRpb24oKSBjb25zdDsKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL05vZGUuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL05v ZGUuY3BwCmluZGV4IDc4ZjBlOTk1YTY2OTFhYmQ2YWRmNzlmYTkyZjA5Mjk2YThiMjMyZTMuLmZi MDE4MTg4MmQ4NmJlZDE5MDFkYjJkMWY4MmEyODViY2M5MDhlNWYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5jcHAK QEAgLTExMTEsMTIgKzExMTEsMTIgQEAgTm9kZSogTm9kZTo6cHNldWRvQXdhcmVMYXN0Q2hpbGQo KSBjb25zdAogICAgIHJldHVybiBsYXN0Q2hpbGQoKTsKIH0KIAotY29uc3QgUmVuZGVyU3R5bGUq IE5vZGU6OmNvbXB1dGVkU3R5bGUoUHNldWRvSWQgcHNldWRvRWxlbWVudFNwZWNpZmllcikKK2Nv bnN0IFJlbmRlclN0eWxlKiBOb2RlOjpjb21wdXRlZFN0eWxlKFBzZXVkb0lkIHBzZXVkb0VsZW1l bnRTcGVjaWZpZXIsIEFsbG93UmVuZGVyU3R5bGUgYWxsb3dSZW5kZXJTdHlsZSkKIHsKICAgICBh dXRvKiBjb21wb3NlZFBhcmVudCA9IGNvbXBvc2VkVHJlZUFuY2VzdG9ycygqdGhpcykuZmlyc3Qo KTsKICAgICBpZiAoIWNvbXBvc2VkUGFyZW50KQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKLSAg ICByZXR1cm4gY29tcG9zZWRQYXJlbnQtPmNvbXB1dGVkU3R5bGUocHNldWRvRWxlbWVudFNwZWNp Zmllcik7CisgICAgcmV0dXJuIGNvbXBvc2VkUGFyZW50LT5jb21wdXRlZFN0eWxlKHBzZXVkb0Vs ZW1lbnRTcGVjaWZpZXIsIGFsbG93UmVuZGVyU3R5bGUpOwogfQogCiAvLyBGSVhNRTogU2hvdWxk bid0IHRoZXNlIGZ1bmN0aW9ucyBiZSBpbiB0aGUgZWRpdGluZyBjb2RlPyAgQ29kZSB0aGF0IGFz a3MgcXVlc3Rpb25zIGFib3V0IEhUTUwgaW4gdGhlIGNvcmUgRE9NIGNsYXNzCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5oIGIvU291cmNlL1dlYkNvcmUvZG9tL05vZGUuaApp bmRleCBkZGE2ZjhhYzJhY2FlOTc3N2FhZTk0ODdlNzZjN2JiOThmOTVmMTZjLi43ZTQwNTI3MDdi ZWQ2YjQxOTJkYTQwOGYzNTFiOGQ2OTkxMmIxMjEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9kb20vTm9kZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmgKQEAgLTQwOCw3ICs0 MDgsNyBAQCBwdWJsaWM6CiAgICAgLy8gV3JhcHBlciBmb3Igbm9kZXMgdGhhdCBkb24ndCBoYXZl IGEgcmVuZGVyZXIsIGJ1dCBzdGlsbCBjYWNoZSB0aGUgc3R5bGUgKGxpa2UgSFRNTE9wdGlvbkVs ZW1lbnQpLgogICAgIGNvbnN0IFJlbmRlclN0eWxlKiByZW5kZXJTdHlsZSgpIGNvbnN0OwogCi0g ICAgdmlydHVhbCBjb25zdCBSZW5kZXJTdHlsZSogY29tcHV0ZWRTdHlsZShQc2V1ZG9JZCBwc2V1 ZG9FbGVtZW50U3BlY2lmaWVyID0gUHNldWRvSWQ6Ok5vbmUpOworICAgIHZpcnR1YWwgY29uc3Qg UmVuZGVyU3R5bGUqIGNvbXB1dGVkU3R5bGUoUHNldWRvSWQgcHNldWRvRWxlbWVudFNwZWNpZmll ciA9IFBzZXVkb0lkOjpOb25lLCBBbGxvd1JlbmRlclN0eWxlID0gQWxsb3dSZW5kZXJTdHlsZTo6 WWVzKTsKIAogICAgIGVudW0gY2xhc3MgSW5zZXJ0ZWRJbnRvQW5jZXN0b3JSZXN1bHQgewogICAg ICAgICBEb25lLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1Jl bmRlclN0eWxlQ29uc3RhbnRzLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVu ZGVyU3R5bGVDb25zdGFudHMuaAppbmRleCAzODQyNzljMTM1YmEyMWQ0YTBlOGEzNDViMTQ4NWZj NjgyMmRhZGE3Li4yNDVjNTk4NzYxYjI1NmFhOTA0NmFiMzVhN2Q0MmI5NTU3MDQ5NDgxIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGVDb25zdGFu dHMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGVDb25z dGFudHMuaApAQCAtMTIyNyw2ICsxMjI3LDggQEAgZW51bSBjbGFzcyBDb250YWlubWVudCA6IHVp bnQ4X3QgewogICAgIFNpemUgICAgID0gMSA8PCAyLAogfTsKIAorZW51bSBjbGFzcyBBbGxvd1Jl bmRlclN0eWxlIHsgWWVzLCBObyB9OworCiBleHRlcm4gY29uc3QgZmxvYXQgZGVmYXVsdE1pdGVy TGltaXQ7CiAKIFdURjo6VGV4dFN0cmVhbSYgb3BlcmF0b3I8PChXVEY6OlRleHRTdHJlYW0mLCBB bmltYXRpb25GaWxsTW9kZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRWxl bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRWxlbWVudC5jcHAKaW5kZXggNWMyZGYy ZThkOTU4YjliNGRjNmQ2MGFmZjQxZTdjZTZkMTMyY2ZmNi4uMzBlZjI0NjNlYTlmNzZmYjlhOWM5 ZWFmYTU2MmZiZDIwZWQ1Y2YzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0Vs ZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdFbGVtZW50LmNwcApAQCAtNjE0 LDcgKzYxNCw3IEBAIHZvaWQgU1ZHRWxlbWVudDo6c2V0VXNlT3ZlcnJpZGVDb21wdXRlZFN0eWxl KGJvb2wgdmFsdWUpCiAgICAgICAgIG1fc3ZnUmFyZURhdGEtPnNldFVzZU92ZXJyaWRlQ29tcHV0 ZWRTdHlsZSh2YWx1ZSk7CiB9CiAKLWNvbnN0IFJlbmRlclN0eWxlKiBTVkdFbGVtZW50Ojpjb21w dXRlZFN0eWxlKFBzZXVkb0lkIHBzZXVkb0VsZW1lbnRTcGVjaWZpZXIpCitjb25zdCBSZW5kZXJT dHlsZSogU1ZHRWxlbWVudDo6Y29tcHV0ZWRTdHlsZShQc2V1ZG9JZCBwc2V1ZG9FbGVtZW50U3Bl Y2lmaWVyLCBBbGxvd1JlbmRlclN0eWxlKQogewogICAgIGlmICghbV9zdmdSYXJlRGF0YSB8fCAh bV9zdmdSYXJlRGF0YS0+dXNlT3ZlcnJpZGVDb21wdXRlZFN0eWxlKCkpCiAgICAgICAgIHJldHVy biBFbGVtZW50Ojpjb21wdXRlZFN0eWxlKHBzZXVkb0VsZW1lbnRTcGVjaWZpZXIpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0VsZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL3N2 Zy9TVkdFbGVtZW50LmgKaW5kZXggYTZhNDY5MmVlYjcyNWFmMGFhZjgyMTcyYjgwNjQyYmI4Y2I1 NDFjNC4uOGZkZjQ1OTY0YjViMmMxM2M2YTEwMzk5Y2Y4OTAxNDZlOTNmYzdmZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0VsZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9z dmcvU1ZHRWxlbWVudC5oCkBAIC0xNDAsNyArMTQwLDcgQEAgcHVibGljOgogICAgIFJlZlB0cjxT VkdBdHRyaWJ1dGVBbmltYXRvcj4gY3JlYXRlQW5pbWF0b3IoY29uc3QgUXVhbGlmaWVkTmFtZSYs IEFuaW1hdGlvbk1vZGUsIENhbGNNb2RlLCBib29sIGlzQWNjdW11bGF0ZWQsIGJvb2wgaXNBZGRp dGl2ZSk7CiAgICAgdm9pZCBhbmltYXRvcldpbGxCZURlbGV0ZWQoY29uc3QgUXVhbGlmaWVkTmFt ZSYpOwogCi0gICAgY29uc3QgUmVuZGVyU3R5bGUqIGNvbXB1dGVkU3R5bGUoUHNldWRvSWQgPSBQ c2V1ZG9JZDo6Tm9uZSkgZmluYWw7CisgICAgY29uc3QgUmVuZGVyU3R5bGUqIGNvbXB1dGVkU3R5 bGUoUHNldWRvSWQgPSBQc2V1ZG9JZDo6Tm9uZSwgQWxsb3dSZW5kZXJTdHlsZSA9IEFsbG93UmVu ZGVyU3R5bGU6OlllcykgZmluYWw7CiAKICAgICAvLyBUaGVzZSBhcmUgbmVlZGVkIGZvciB0aGUg UmVuZGVyVHJlZSwgYW5pbWF0aW9uIGFuZCBET00uCiAgICAgU3RyaW5nIGNsYXNzTmFtZSgpIGNv bnN0IHsgcmV0dXJuIG1fY2xhc3NOYW1lLT5jdXJyZW50VmFsdWUoKTsgfQpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDdlNTJk MTkwZjIwZGNkMjllMTZlYzZmOGYwYWQ2ZGZiNmYzMmFlMDYuLjMyYWFiYjliYzJhMzMzOTc3ZDg4 NTliYjAwNGU2ZjFmZDMxYTZkMGUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZwor KysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMS0wNS0wMiAg Um9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIFtjc3Mtd3JpdGluZy1tb2Rl c10gTmV3IGZhaWx1cmVzIG9uIFdQVCByZWYtdGVzdHMgYWZ0ZXIgdXBkYXRpbmcgV1BUIGltcG9y dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE0Mjkx CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVW5za2lw IHNvbWUgdGVzdHMgdGhhdCBwYXNzIG5vdy4KKworICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6 CisKIDIwMjEtMDQtMzAgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAg ICAgIFNoYXJlIHN0eWxlIHJlc29sdmVycyBiZXR3ZWVuIGF1dGhvciBzaGFkb3cgdHJlZXMgd2l0 aG91dCBzdHlsZSBzaGVldHMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9D aGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCmluZGV4IGJlNWY2 YTBjY2Y2YWZhNDVlODdiOWUxYTg5ZGJhNmE5MTc2Y2U3NjUuLmFkNjdhOTc0MjgzY2NhNDVkOTIy N2UxYzE2ZWEzMGE3YTg3NGNlYjkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3cz Yy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE0IEBACisyMDIxLTA1LTAyICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisK KyAgICAgICAgW2Nzcy13cml0aW5nLW1vZGVzXSBOZXcgZmFpbHVyZXMgb24gV1BUIHJlZi10ZXN0 cyBhZnRlciB1cGRhdGluZyBXUFQgaW1wb3J0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQyOTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBZGFwdCB0ZXN0IGV4cGVjdGF0aW9uIChpbXByb3ZlbWVudCku CisKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL3dt LXByb3BhZ2F0aW9uLWJvZHktY29tcHV0ZWQtcm9vdC1leHBlY3RlZC50eHQ6CisKIDIwMjEtMDQt MzAgIE9yaW9sIEJydWZhdSAgPG9icnVmYXVAaWdhbGlhLmNvbT4KIAogICAgICAgICBbY3NzLWxv Z2ljYWxdIEZpeCBsb2dpY2FsIHNob3J0aGFuZHMgd2l0aCB2YXIoKQpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMK aW5kZXggNDJlNWIzMGIyOGUzMGRlOWNkY2RlZWFhYjNlOGM2MGU2ODNhMzg2NC4uZGNiMzNhMGE4 ODBkNzMzNGZlMTNhYTFjOWZhN2ZkZGM1NGMwMjkzYSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv VGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00 MTAwLDggKzQxMDAsNiBAQCB3ZWJraXQub3JnL2IvMjE0MjkxIGltcG9ydGVkL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL3NybC1hbAogd2Via2l0Lm9yZy9iLzIx NDI5MSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rl cy90Y3ktd2hpdGUtc3BhY2UtcHJvY2Vzc2luZy0wMDEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUg XQogd2Via2l0Lm9yZy9iLzIxNDI5MSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz cy9jc3Mtd3JpdGluZy1tb2Rlcy90ZXh0LW9yaWVudGF0aW9uLWluaXRpYWwuaHRtbCBbIEltYWdl T25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDI5MSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy93bS1wcm9wYWdhdGlvbi0wMDEuaHRtbCBb IEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDI5MSBpbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy93bS1wcm9wYWdhdGlvbi1ib2R5 LTAzMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0MjkxIGltcG9y dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL3dtLXByb3Bh Z2F0aW9uLWJvZHktMDMzLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8y MTQyOTEgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9k ZXMvd20tcHJvcGFnYXRpb24tYm9keS0wMzQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Vi a2l0Lm9yZy9iLzIxNDI5MSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt d3JpdGluZy1tb2Rlcy93bS1wcm9wYWdhdGlvbi1ib2R5LTAzNS5odG1sIFsgSW1hZ2VPbmx5RmFp bHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0MjkxIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz dHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL3dtLXByb3BhZ2F0aW9uLWJvZHktMDM2Lmh0bWwgWyBJ bWFnZU9ubHlGYWlsdXJlIF0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93 ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL3dtLXByb3BhZ2F0aW9uLWJv ZHktY29tcHV0ZWQtcm9vdC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mv d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy93bS1wcm9wYWdhdGlvbi1i b2R5LWNvbXB1dGVkLXJvb3QtZXhwZWN0ZWQudHh0CmluZGV4IDc1MGUyYjkwOTZhNjg5NjBiZjg4 YTllOTRkZGRmMTdmOTBmMWVlODMuLmE5NzI0MDVlOWVjODE0N2I3NTAxMjg4NTczYjA2ZjExMDcx NjNlMzcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t dGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL3dtLXByb3BhZ2F0aW9uLWJvZHktY29tcHV0ZWQt cm9vdC1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0 Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvd20tcHJvcGFnYXRpb24tYm9keS1jb21w dXRlZC1yb290LWV4cGVjdGVkLnR4dApAQCAtMSw1ICsxLDUgQEAKIAogUEFTUyBDaGVjayBjb21w dXRlZCB3cml0aW5nLW1vZGUgZm9yIGJvZHkgZWxlbWVudC4KLUZBSUwgQ2hlY2sgY29tcHV0ZWQg d3JpdGluZy1tb2RlIGZvciBodG1sIHJvb3QgZWxlbWVudC4gYXNzZXJ0X25vdF9lcXVhbHM6IGdv dCBkaXNhbGxvd2VkIHZhbHVlICJ2ZXJ0aWNhbC1sciIKK1BBU1MgQ2hlY2sgY29tcHV0ZWQgd3Jp dGluZy1tb2RlIGZvciBodG1sIHJvb3QgZWxlbWVudC4KIEZBSUwgQ2hlY2sgY29tcHV0ZWQgd3Jp dGluZy1tb2RlIGZvciBib2R5IGVsZW1lbnQgd2hlbiBzdHlsZSBubyBsb25nZXIgYXBwbGllcy4g YXNzZXJ0X25vdF9lcXVhbHM6IGdvdCBkaXNhbGxvd2VkIHZhbHVlICJ2ZXJ0aWNhbC1sciIKIAo=