231128 2021-10-02 18:55:21 -0700 [LFC][IFC] HangingTrailingContent should cache width/length 2021-10-03 18:08:29 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1799792 0 zalan 2021-10-02 18:55:21 -0700 instead of re-computing 1799793 1 439982 zalan 2021-10-02 18:57:09 -0700 Created attachment 439982 Patch 1799815 2 439988 zalan 2021-10-02 20:26:55 -0700 Created attachment 439988 Patch 1799816 3 439989 zalan 2021-10-02 20:29:28 -0700 Created attachment 439989 Patch 1799933 4 440025 zalan 2021-10-03 16:46:31 -0700 Created attachment 440025 Patch 1799941 5 ews-feeder 2021-10-03 18:07:33 -0700 Committed r283485 (242458@main): <https://commits.webkit.org/242458@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 440025. 1799942 6 webkit-bug-importer 2021-10-03 18:08:29 -0700 <rdar://problem/83819509> 439982 2021-10-02 18:57:09 -0700 2021-10-02 20:26:53 -0700 Patch bug-231128-20211002185708.patch text/plain 8495 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzNDQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjMzN2FjYWMwZDFhNzlj NzM0YWYxNjA5ZDk5ZGEzNTA3MGYyOTdkNC4uZDk2NGFkYjJhNzQ1YjE1NzNkYTg0ZDFlODdlMTJk NmI5YzZmMzEwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIxLTEwLTAyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBIYW5naW5n VHJhaWxpbmdDb250ZW50IHNob3VsZCBjYWNoZSB3aWR0aC9sZW5ndGgKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMTEyOAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENvbXB1dGUgdGhlIGxlbmd0aCBvZiB0 aGUgaGFuZ2luZyB0cmFpbGluZyB3aGl0ZXNwYWNlIHNlcXVlbmNlLgorICAgICAgICBUaGlzIGlz IGluIHByZXBhcmF0aW9uIGZvciBmaXhpbmcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0 cy9jc3MvY3NzLXRleHQvd2hpdGUtc3BhY2UvdGV4dGFyZWEtcHJlLXdyYXAtMDE0Lmh0bWwKKwor ICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjpMaW5lKToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6TGluZTo6aW5pdGlhbGl6ZSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6 OkxpbmU6OnJlc2V0VHJhaWxpbmdDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 TGluZTo6YXBwZW5kVGV4dENvbnRlbnQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5l OjphcHBlbmROb25SZXBsYWNlZElubGluZUxldmVsQm94KToKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6TGluZTo6SGFuZ2luZ1RyYWlsaW5nQ29udGVudDo6YWRkKToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6TGluZTo6SGFuZ2luZ1RyYWlsaW5nQ29udGVudDo6SGFuZ2luZ1RyYWlsaW5n Q29udGVudCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6Okhhbmdp bmdUcmFpbGluZ0NvbnRlbnQ6OndpZHRoIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKiBsYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lLmg6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OkxpbmU6OkhhbmdpbmdUcmFpbGluZ0NvbnRlbnQ6Omxlbmd0aCBjb25zdCk6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OkhhbmdpbmdUcmFpbGluZ0NvbnRlbnQ6 OndpZHRoIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6SGFuZ2luZ1Ry YWlsaW5nQ29udGVudDo6cmVzZXQpOgorCiAyMDIxLTEwLTAyICBBbGFuIEJ1anRhcyAgPHphbGFu QGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIExpbmUgZnVuY3Rpb25zIGNhbiBjb21w dXRlIHRoZSAiZXh0cmEgaG9yaXpvbnRhbCBzcGFjZSIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuY3BwIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5j cHAKaW5kZXggMWE0NTExZDI1ODU1MjY0MzRjMjQxNTI1ODY2ODVlYThlOWNkMzhmYS4uODE3MjQz ODAzZjg4Yzk3ZWQ3YjdjYWYyYjZlMTU2NzAwMDI4ZjgzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l TGluZS5jcHAKQEAgLTQzLDcgKzQzLDYgQEAgbmFtZXNwYWNlIExheW91dCB7CiBMaW5lOjpMaW5l KGNvbnN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0JiBpbmxpbmVGb3JtYXR0aW5nQ29udGV4dCkK ICAgICA6IG1faW5saW5lRm9ybWF0dGluZ0NvbnRleHQoaW5saW5lRm9ybWF0dGluZ0NvbnRleHQp CiAgICAgLCBtX3RyaW1tYWJsZVRyYWlsaW5nQ29udGVudChtX3J1bnMpCi0gICAgLCBtX2hhbmdp bmdUcmFpbGluZ0NvbnRlbnQobV9ydW5zKQogewogfQogCkBAIC01Niw4ICs1NSwxNCBAQCB2b2lk IExpbmU6OmluaXRpYWxpemUoKQogICAgIG1fbm9uU3Bhbm5pbmdJbmxpbmVMZXZlbEJveENvdW50 ID0gMDsKICAgICBtX2NvbnRlbnRMb2dpY2FsV2lkdGggPSB7IH07CiAgICAgbV9ydW5zLmNsZWFy KCk7Ci0gICAgbV90cmFpbGluZ1NvZnRIeXBoZW5XaWR0aCA9IHsgfTsKKyAgICByZXNldFRyYWls aW5nQ29udGVudCgpOworfQorCit2b2lkIExpbmU6OnJlc2V0VHJhaWxpbmdDb250ZW50KCkKK3sK ICAgICBtX3RyaW1tYWJsZVRyYWlsaW5nQ29udGVudC5yZXNldCgpOworICAgIG1faGFuZ2luZ1Ry YWlsaW5nQ29udGVudC5yZXNldCgpOworICAgIG1fdHJhaWxpbmdTb2Z0SHlwaGVuV2lkdGggPSB7 IH07CiB9CiAKIHZvaWQgTGluZTo6cmVtb3ZlQ29sbGFwc2libGVDb250ZW50KElubGluZUxheW91 dFVuaXQgaG9yaXpvbnRhbEF2YWlsYWJsZVNwYWNlKQpAQCAtMzAzLDIyICszMDgsMzEgQEAgdm9p ZCBMaW5lOjphcHBlbmRUZXh0Q29udGVudChjb25zdCBJbmxpbmVUZXh0SXRlbSYgaW5saW5lVGV4 dEl0ZW0sIGNvbnN0IFJlbmRlclMKICAgICAgICAgLy8gRG8gbm90IGxldCBuZWdhdGl2ZSBsZXR0 ZXIgc3BhY2luZyBtYWtlIHRoZSBjb250ZW50IHNob3J0ZXIgdGhhbiBpdCBhbHJlYWR5IGlzLgog ICAgICAgICBtX2NvbnRlbnRMb2dpY2FsV2lkdGggKz0gc3RkOjptYXgoMC4wZiwgbG9naWNhbFdp ZHRoKTsKICAgICB9Ci0gICAgLy8gU2V0IHRoZSB0cmFpbGluZyB0cmltbWFibGUgY29udGVudC4K LSAgICBpZiAoaW5saW5lVGV4dEl0ZW0uaXNXaGl0ZXNwYWNlKCkgJiYgIUlubGluZVRleHRJdGVt OjpzaG91bGRQcmVzZXJ2ZVNwYWNlc0FuZFRhYnMoaW5saW5lVGV4dEl0ZW0pKSB7Ci0gICAgICAg IG1fdHJpbW1hYmxlVHJhaWxpbmdDb250ZW50LmFkZEZ1bGx5VHJpbW1hYmxlQ29udGVudChtX3J1 bnMuc2l6ZSgpIC0gMSwgY29udGVudExvZ2ljYWxXaWR0aCgpIC0gb2xkQ29udGVudExvZ2ljYWxX aWR0aCk7Ci0gICAgICAgIHJldHVybjsKKworICAgIC8vIEhhbmRsZSB0cmFpbGluZyBjb250ZW50 LCBzcGVjaWZpY2FsbHkgd2hpdGVzcGFjZSBhbmQgbGV0dGVyIHNwYWNpbmcuCisgICAgYXV0byBs YXN0UnVuSW5kZXggPSBtX3J1bnMuc2l6ZSgpIC0gMTsKKyAgICBpZiAoaW5saW5lVGV4dEl0ZW0u aXNXaGl0ZXNwYWNlKCkpIHsKKyAgICAgICAgaWYgKElubGluZVRleHRJdGVtOjpzaG91bGRQcmVz ZXJ2ZVNwYWNlc0FuZFRhYnMoaW5saW5lVGV4dEl0ZW0pKSB7CisgICAgICAgICAgICBtX3RyaW1t YWJsZVRyYWlsaW5nQ29udGVudC5yZXNldCgpOworICAgICAgICAgICAgaWYgKG1fcnVuc1tsYXN0 UnVuSW5kZXhdLnNob3VsZFRyYWlsaW5nV2hpdGVzcGFjZUhhbmcoKSkKKyAgICAgICAgICAgICAg ICBtX2hhbmdpbmdUcmFpbGluZ0NvbnRlbnQuYWRkKGlubGluZVRleHRJdGVtLCBsb2dpY2FsV2lk dGgpOworICAgICAgICB9IGVsc2UgIHsKKyAgICAgICAgICAgIG1faGFuZ2luZ1RyYWlsaW5nQ29u dGVudC5yZXNldCgpOworICAgICAgICAgICAgbV90cmltbWFibGVUcmFpbGluZ0NvbnRlbnQuYWRk RnVsbHlUcmltbWFibGVDb250ZW50KGxhc3RSdW5JbmRleCwgY29udGVudExvZ2ljYWxXaWR0aCgp IC0gb2xkQ29udGVudExvZ2ljYWxXaWR0aCk7CisgICAgICAgIH0KKyAgICAgICAgbV90cmFpbGlu Z1NvZnRIeXBoZW5XaWR0aCA9IHsgfTsKKyAgICB9IGVsc2UgeworICAgICAgICByZXNldFRyYWls aW5nQ29udGVudCgpOworICAgICAgICBpZiAoc3R5bGUubGV0dGVyU3BhY2luZygpID4gMCAmJiAh Zm9ybWF0dGluZ0NvbnRleHQoKS5sYXlvdXRTdGF0ZSgpLnNob3VsZElnbm9yZVRyYWlsaW5nTGV0 dGVyU3BhY2luZygpKQorICAgICAgICAgICAgbV90cmltbWFibGVUcmFpbGluZ0NvbnRlbnQuYWRk UGFydGlhbGx5VHJpbW1hYmxlQ29udGVudChsYXN0UnVuSW5kZXgsIHN0eWxlLmxldHRlclNwYWNp bmcoKSk7CisgICAgICAgIGlmIChpbmxpbmVUZXh0SXRlbS5oYXNUcmFpbGluZ1NvZnRIeXBoZW4o KSkKKyAgICAgICAgICAgIG1fdHJhaWxpbmdTb2Z0SHlwaGVuV2lkdGggPSBzdHlsZS5mb250Q2Fz Y2FkZSgpLndpZHRoKFRleHRSdW4geyBTdHJpbmdWaWV3IHsgc3R5bGUuaHlwaGVuU3RyaW5nKCkg fSB9KTsKICAgICB9Ci0gICAgLy8gQW55IG5vbi13aGl0ZXNwYWNlLCBuby10cmltbWFibGUgY29u dGVudCByZXNldHMgdGhlIGV4aXN0aW5nIHRyaW1tYWJsZS4KLSAgICBtX3RyaW1tYWJsZVRyYWls aW5nQ29udGVudC5yZXNldCgpOwotICAgIGlmICghZm9ybWF0dGluZ0NvbnRleHQoKS5sYXlvdXRT dGF0ZSgpLnNob3VsZElnbm9yZVRyYWlsaW5nTGV0dGVyU3BhY2luZygpICYmICFpbmxpbmVUZXh0 SXRlbS5pc1doaXRlc3BhY2UoKSAmJiBzdHlsZS5sZXR0ZXJTcGFjaW5nKCkgPiAwKQotICAgICAg ICBtX3RyaW1tYWJsZVRyYWlsaW5nQ29udGVudC5hZGRQYXJ0aWFsbHlUcmltbWFibGVDb250ZW50 KG1fcnVucy5zaXplKCkgLSAxLCBzdHlsZS5sZXR0ZXJTcGFjaW5nKCkpOwotICAgIG1fdHJhaWxp bmdTb2Z0SHlwaGVuV2lkdGggPSBpbmxpbmVUZXh0SXRlbS5oYXNUcmFpbGluZ1NvZnRIeXBoZW4o KSA/IHN0ZDo6bWFrZV9vcHRpb25hbChzdHlsZS5mb250Q2FzY2FkZSgpLndpZHRoKFRleHRSdW4g eyBTdHJpbmdWaWV3IHsgc3R5bGUuaHlwaGVuU3RyaW5nKCkgfSB9KSkgOiBzdGQ6Om51bGxvcHQ7 CiB9CiAKIHZvaWQgTGluZTo6YXBwZW5kTm9uUmVwbGFjZWRJbmxpbmVMZXZlbEJveChjb25zdCBJ bmxpbmVJdGVtJiBpbmxpbmVJdGVtLCBjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUsIElubGluZUxh eW91dFVuaXQgbWFyZ2luQm94TG9naWNhbFdpZHRoKQogewotICAgIG1fdHJpbW1hYmxlVHJhaWxp bmdDb250ZW50LnJlc2V0KCk7Ci0gICAgbV90cmFpbGluZ1NvZnRIeXBoZW5XaWR0aCA9IHsgfTsK KyAgICByZXNldFRyYWlsaW5nQ29udGVudCgpOwogICAgIG1fY29udGVudExvZ2ljYWxXaWR0aCAr PSBtYXJnaW5Cb3hMb2dpY2FsV2lkdGg7CiAgICAgKyttX25vblNwYW5uaW5nSW5saW5lTGV2ZWxC b3hDb3VudDsKICAgICBhdXRvIG1hcmdpblN0YXJ0ID0gZm9ybWF0dGluZ0NvbnRleHQoKS5nZW9t ZXRyeUZvckJveChpbmxpbmVJdGVtLmxheW91dEJveCgpKS5tYXJnaW5TdGFydCgpOwpAQCAtNDQz LDI3ICs0NTcsMTQgQEAgSW5saW5lTGF5b3V0VW5pdCBMaW5lOjpUcmltbWFibGVUcmFpbGluZ0Nv bnRlbnQ6OnJlbW92ZVBhcnRpYWxseVRyaW1tYWJsZUNvbnRlbnQKICAgICByZXR1cm4gcmVtb3Zl KCk7CiB9CiAKLUxpbmU6OkhhbmdpbmdUcmFpbGluZ0NvbnRlbnQ6OkhhbmdpbmdUcmFpbGluZ0Nv bnRlbnQoY29uc3QgUnVuTGlzdCYgcnVucykKLSAgICA6IG1fcnVucyhydW5zKQotewotfQotCi1J bmxpbmVMYXlvdXRVbml0IExpbmU6OkhhbmdpbmdUcmFpbGluZ0NvbnRlbnQ6OndpZHRoKCkgY29u c3QKK3ZvaWQgTGluZTo6SGFuZ2luZ1RyYWlsaW5nQ29udGVudDo6YWRkKGNvbnN0IElubGluZVRl eHRJdGVtJiB0cmFpbGluZ1doaXRlc3BhY2UsIElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRo KQogewogICAgIC8vIFdoZW4gYSBnbHlwaCBhdCB0aGUgc3RhcnQgb3IgZW5kIGVkZ2Ugb2YgYSBs aW5lIGhhbmdzLCBpdCBpcyBub3QgY29uc2lkZXJlZCB3aGVuIG1lYXN1cmluZyB0aGUgbGluZeKA mXMgY29udGVudHMgZm9yIGZpdCwgYWxpZ25tZW50LCBvciBqdXN0aWZpY2F0aW9uLgogICAgIC8v IERlcGVuZGluZyBvbiB0aGUgbGluZeKAmXMgYWxpZ25tZW50L2p1c3RpZmljYXRpb24sIHRoaXMg Y2FuIHJlc3VsdCBpbiB0aGUgbWFyayBiZWluZyBwbGFjZWQgb3V0c2lkZSB0aGUgbGluZSBib3gu CiAgICAgLy8gaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy10ZXh0LTMvI2hhbmdpbmcKLSAg ICBhdXRvIGhhbmdpbmdXaWR0aCA9IElubGluZUxheW91dFVuaXQgeyB9OwotICAgIGZvciAoYXV0 byYgcnVuIDogV1RGOjptYWtlUmV2ZXJzZWRSYW5nZShtX3J1bnMpKSB7Ci0gICAgICAgIGlmIChy dW4uaXNCb3goKSB8fCBydW4uaXNMaW5lQnJlYWsoKSkKLSAgICAgICAgICAgIGJyZWFrOwotICAg ICAgICBpZiAocnVuLmlzSW5saW5lQm94U3RhcnQoKSB8fCBydW4uaXNJbmxpbmVCb3hFbmQoKSkK LSAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICBpZiAoIXJ1bi5oYXNUcmFpbGluZ1doaXRl c3BhY2UoKSB8fCAhcnVuLnNob3VsZFRyYWlsaW5nV2hpdGVzcGFjZUhhbmcoKSkKLSAgICAgICAg ICAgIGJyZWFrOwotICAgICAgICBoYW5naW5nV2lkdGggKz0gcnVuLnRyYWlsaW5nV2hpdGVzcGFj ZVdpZHRoKCk7Ci0gICAgfQotICAgIHJldHVybiBoYW5naW5nV2lkdGg7CisgICAgQVNTRVJUKHRy YWlsaW5nV2hpdGVzcGFjZS5pc1doaXRlc3BhY2UoKSk7CisgICAgbV93aWR0aCArPSBsb2dpY2Fs V2lkdGg7CisgICAgbV9sZW5ndGggKz0gdHJhaWxpbmdXaGl0ZXNwYWNlLmxlbmd0aCgpOwogfQog CiBMaW5lOjpSdW46OlJ1bihjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtLCBjb25zdCBSZW5k ZXJTdHlsZSYgc3R5bGUsIElubGluZUxheW91dFVuaXQgbG9naWNhbExlZnQsIElubGluZUxheW91 dFVuaXQgbG9naWNhbFdpZHRoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5oIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5oCmluZGV4IDhiZjlhOGMx ZjBiZDA4OTE2NmUzODA4MDYwOWJjMTBhODg4OTU2MTIuLjgyZmUxOTM5YTM5MjhhM2IxYzViZjUy YTNjMTQ5NDE5ZGE4YmYwMTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lLmgKQEAgLTE1Niw2ICsx NTYsOCBAQCBwcml2YXRlOgogICAgIHZvaWQgcmVtb3ZlVHJhaWxpbmdUcmltbWFibGVDb250ZW50 KCk7CiAgICAgdm9pZCB2aXN1YWxseUNvbGxhcHNlSGFuZ2luZ092ZXJmbG93KElubGluZUxheW91 dFVuaXQgaG9yaXpvbnRhbEF2YWlsYWJsZVNwYWNlKTsKIAorICAgIHZvaWQgcmVzZXRUcmFpbGlu Z0NvbnRlbnQoKTsKKwogICAgIGNvbnN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0JiBmb3JtYXR0 aW5nQ29udGV4dCgpIGNvbnN0OwogCiAgICAgc3RydWN0IFRyaW1tYWJsZVRyYWlsaW5nQ29udGVu dCB7CkBAIC0xODIsMTIgKzE4NCwxNSBAQCBwcml2YXRlOgogICAgIH07CiAKICAgICBzdHJ1Y3Qg SGFuZ2luZ1RyYWlsaW5nQ29udGVudCB7Ci0gICAgICAgIEhhbmdpbmdUcmFpbGluZ0NvbnRlbnQo Y29uc3QgUnVuTGlzdCYpOworICAgICAgICB2b2lkIGFkZChjb25zdCBJbmxpbmVUZXh0SXRlbSYg dHJhaWxpbmdXaGl0ZXNwYWNlLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCk7CisgICAg ICAgIHZvaWQgcmVzZXQoKTsKIAotICAgICAgICBJbmxpbmVMYXlvdXRVbml0IHdpZHRoKCkgY29u c3Q7CisgICAgICAgIHNpemVfdCBsZW5ndGgoKSBjb25zdCB7IHJldHVybiBtX2xlbmd0aDsgfQor ICAgICAgICBJbmxpbmVMYXlvdXRVbml0IHdpZHRoKCkgY29uc3QgeyByZXR1cm4gbV93aWR0aDsg fQogCiAgICAgcHJpdmF0ZToKLSAgICAgICAgY29uc3QgUnVuTGlzdCYgbV9ydW5zOworICAgICAg ICBzaXplX3QgbV9sZW5ndGggeyAwIH07CisgICAgICAgIElubGluZUxheW91dFVuaXQgbV93aWR0 aCB7IDAgfTsKICAgICB9OwogCiAgICAgY29uc3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIG1f aW5saW5lRm9ybWF0dGluZ0NvbnRleHQ7CkBAIC0yMDcsNiArMjEyLDEyIEBAIGlubGluZSB2b2lk IExpbmU6OlRyaW1tYWJsZVRyYWlsaW5nQ29udGVudDo6cmVzZXQoKQogICAgIG1fcGFydGlhbGx5 VHJpbW1hYmxlV2lkdGggPSB7IH07CiB9CiAKK2lubGluZSB2b2lkIExpbmU6OkhhbmdpbmdUcmFp bGluZ0NvbnRlbnQ6OnJlc2V0KCkKK3sKKyAgICBtX3dpZHRoID0geyB9OworICAgIG1fbGVuZ3Ro ID0geyB9OworfQorCiBpbmxpbmUgTGluZTo6UnVuOjpUcmFpbGluZ1doaXRlc3BhY2UgTGluZTo6 UnVuOjp0cmFpbGluZ1doaXRlc3BhY2VUeXBlKGNvbnN0IElubGluZVRleHRJdGVtJiBpbmxpbmVU ZXh0SXRlbSkgY29uc3QKIHsKICAgICBpZiAoIWlubGluZVRleHRJdGVtLmlzV2hpdGVzcGFjZSgp KQo= 439988 2021-10-02 20:26:55 -0700 2021-10-02 20:29:26 -0700 Patch bug-231128-20211002202655.patch text/plain 8495 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzNDQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2E5NTMwMzFhODEyNjUz YTVjMjM3NjJkNzA1NmQ1MGVmZGIxY2MyOS4uMzZhNmJhNDhkNzYwOTBkYzYwNTZlYTdlMzJmMDQw NjkyYWJkMDdkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIxLTEwLTAyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBIYW5naW5n VHJhaWxpbmdDb250ZW50IHNob3VsZCBjYWNoZSB3aWR0aC9sZW5ndGgKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMTEyOAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENvbXB1dGUgdGhlIGxlbmd0aCBvZiB0 aGUgaGFuZ2luZyB0cmFpbGluZyB3aGl0ZXNwYWNlIHNlcXVlbmNlLgorICAgICAgICBUaGlzIGlz IGluIHByZXBhcmF0aW9uIGZvciBmaXhpbmcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0 cy9jc3MvY3NzLXRleHQvd2hpdGUtc3BhY2UvdGV4dGFyZWEtcHJlLXdyYXAtMDE0Lmh0bWwKKwor ICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjpMaW5lKToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6TGluZTo6aW5pdGlhbGl6ZSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6 OkxpbmU6OnJlc2V0VHJhaWxpbmdDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 TGluZTo6YXBwZW5kVGV4dENvbnRlbnQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5l OjphcHBlbmROb25SZXBsYWNlZElubGluZUxldmVsQm94KToKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6TGluZTo6SGFuZ2luZ1RyYWlsaW5nQ29udGVudDo6YWRkKToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6TGluZTo6SGFuZ2luZ1RyYWlsaW5nQ29udGVudDo6SGFuZ2luZ1RyYWlsaW5n Q29udGVudCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6Okhhbmdp bmdUcmFpbGluZ0NvbnRlbnQ6OndpZHRoIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKiBsYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lLmg6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OkxpbmU6OkhhbmdpbmdUcmFpbGluZ0NvbnRlbnQ6Omxlbmd0aCBjb25zdCk6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OkhhbmdpbmdUcmFpbGluZ0NvbnRlbnQ6 OndpZHRoIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6SGFuZ2luZ1Ry YWlsaW5nQ29udGVudDo6cmVzZXQpOgorCiAyMDIxLTEwLTAyICBBbGFuIEJ1anRhcyAgPHphbGFu QGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIExpbmUgZnVuY3Rpb25zIGNhbiBjb21w dXRlIHRoZSAiZXh0cmEgaG9yaXpvbnRhbCBzcGFjZSIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuY3BwIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5j cHAKaW5kZXggN2MzM2I4N2JlZTY0ZTExMjBjZDM1MzhmZWM5NTA5NzYwNTY3MDEyOC4uZTc0MjAw OGQ3MWNjMjJjY2E0NDAxNWIzODFiZGQ1NGE4ZWIyNTFmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l TGluZS5jcHAKQEAgLTQzLDcgKzQzLDYgQEAgbmFtZXNwYWNlIExheW91dCB7CiBMaW5lOjpMaW5l KGNvbnN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0JiBpbmxpbmVGb3JtYXR0aW5nQ29udGV4dCkK ICAgICA6IG1faW5saW5lRm9ybWF0dGluZ0NvbnRleHQoaW5saW5lRm9ybWF0dGluZ0NvbnRleHQp CiAgICAgLCBtX3RyaW1tYWJsZVRyYWlsaW5nQ29udGVudChtX3J1bnMpCi0gICAgLCBtX2hhbmdp bmdUcmFpbGluZ0NvbnRlbnQobV9ydW5zKQogewogfQogCkBAIC01Niw4ICs1NSwxNCBAQCB2b2lk IExpbmU6OmluaXRpYWxpemUoKQogICAgIG1fbm9uU3Bhbm5pbmdJbmxpbmVMZXZlbEJveENvdW50 ID0gMDsKICAgICBtX2NvbnRlbnRMb2dpY2FsV2lkdGggPSB7IH07CiAgICAgbV9ydW5zLmNsZWFy KCk7Ci0gICAgbV90cmFpbGluZ1NvZnRIeXBoZW5XaWR0aCA9IHsgfTsKKyAgICByZXNldFRyYWls aW5nQ29udGVudCgpOworfQorCit2b2lkIExpbmU6OnJlc2V0VHJhaWxpbmdDb250ZW50KCkKK3sK ICAgICBtX3RyaW1tYWJsZVRyYWlsaW5nQ29udGVudC5yZXNldCgpOworICAgIG1faGFuZ2luZ1Ry YWlsaW5nQ29udGVudC5yZXNldCgpOworICAgIG1fdHJhaWxpbmdTb2Z0SHlwaGVuV2lkdGggPSB7 IH07CiB9CiAKIHZvaWQgTGluZTo6cmVtb3ZlQ29sbGFwc2libGVDb250ZW50KElubGluZUxheW91 dFVuaXQgaG9yaXpvbnRhbEF2YWlsYWJsZVNwYWNlKQpAQCAtMzAyLDIyICszMDcsMzEgQEAgdm9p ZCBMaW5lOjphcHBlbmRUZXh0Q29udGVudChjb25zdCBJbmxpbmVUZXh0SXRlbSYgaW5saW5lVGV4 dEl0ZW0sIGNvbnN0IFJlbmRlclMKICAgICAgICAgLy8gRG8gbm90IGxldCBuZWdhdGl2ZSBsZXR0 ZXIgc3BhY2luZyBtYWtlIHRoZSBjb250ZW50IHNob3J0ZXIgdGhhbiBpdCBhbHJlYWR5IGlzLgog ICAgICAgICBtX2NvbnRlbnRMb2dpY2FsV2lkdGggKz0gc3RkOjptYXgoMC4wZiwgbG9naWNhbFdp ZHRoKTsKICAgICB9Ci0gICAgLy8gU2V0IHRoZSB0cmFpbGluZyB0cmltbWFibGUgY29udGVudC4K LSAgICBpZiAoaW5saW5lVGV4dEl0ZW0uaXNXaGl0ZXNwYWNlKCkgJiYgIUlubGluZVRleHRJdGVt OjpzaG91bGRQcmVzZXJ2ZVNwYWNlc0FuZFRhYnMoaW5saW5lVGV4dEl0ZW0pKSB7Ci0gICAgICAg IG1fdHJpbW1hYmxlVHJhaWxpbmdDb250ZW50LmFkZEZ1bGx5VHJpbW1hYmxlQ29udGVudChtX3J1 bnMuc2l6ZSgpIC0gMSwgY29udGVudExvZ2ljYWxXaWR0aCgpIC0gb2xkQ29udGVudExvZ2ljYWxX aWR0aCk7Ci0gICAgICAgIHJldHVybjsKKworICAgIC8vIEhhbmRsZSB0cmFpbGluZyBjb250ZW50 LCBzcGVjaWZpY2FsbHkgd2hpdGVzcGFjZSBhbmQgbGV0dGVyIHNwYWNpbmcuCisgICAgYXV0byBs YXN0UnVuSW5kZXggPSBtX3J1bnMuc2l6ZSgpIC0gMTsKKyAgICBpZiAoaW5saW5lVGV4dEl0ZW0u aXNXaGl0ZXNwYWNlKCkpIHsKKyAgICAgICAgaWYgKElubGluZVRleHRJdGVtOjpzaG91bGRQcmVz ZXJ2ZVNwYWNlc0FuZFRhYnMoaW5saW5lVGV4dEl0ZW0pKSB7CisgICAgICAgICAgICBtX3RyaW1t YWJsZVRyYWlsaW5nQ29udGVudC5yZXNldCgpOworICAgICAgICAgICAgaWYgKG1fcnVuc1tsYXN0 UnVuSW5kZXhdLnNob3VsZFRyYWlsaW5nV2hpdGVzcGFjZUhhbmcoKSkKKyAgICAgICAgICAgICAg ICBtX2hhbmdpbmdUcmFpbGluZ0NvbnRlbnQuYWRkKGlubGluZVRleHRJdGVtLCBsb2dpY2FsV2lk dGgpOworICAgICAgICB9IGVsc2UgIHsKKyAgICAgICAgICAgIG1faGFuZ2luZ1RyYWlsaW5nQ29u dGVudC5yZXNldCgpOworICAgICAgICAgICAgbV90cmltbWFibGVUcmFpbGluZ0NvbnRlbnQuYWRk RnVsbHlUcmltbWFibGVDb250ZW50KGxhc3RSdW5JbmRleCwgY29udGVudExvZ2ljYWxXaWR0aCgp IC0gb2xkQ29udGVudExvZ2ljYWxXaWR0aCk7CisgICAgICAgIH0KKyAgICAgICAgbV90cmFpbGlu Z1NvZnRIeXBoZW5XaWR0aCA9IHsgfTsKKyAgICB9IGVsc2UgeworICAgICAgICByZXNldFRyYWls aW5nQ29udGVudCgpOworICAgICAgICBpZiAoc3R5bGUubGV0dGVyU3BhY2luZygpID4gMCAmJiAh Zm9ybWF0dGluZ0NvbnRleHQoKS5sYXlvdXRTdGF0ZSgpLnNob3VsZElnbm9yZVRyYWlsaW5nTGV0 dGVyU3BhY2luZygpKQorICAgICAgICAgICAgbV90cmltbWFibGVUcmFpbGluZ0NvbnRlbnQuYWRk UGFydGlhbGx5VHJpbW1hYmxlQ29udGVudChsYXN0UnVuSW5kZXgsIHN0eWxlLmxldHRlclNwYWNp bmcoKSk7CisgICAgICAgIGlmIChpbmxpbmVUZXh0SXRlbS5oYXNUcmFpbGluZ1NvZnRIeXBoZW4o KSkKKyAgICAgICAgICAgIG1fdHJhaWxpbmdTb2Z0SHlwaGVuV2lkdGggPSBzdHlsZS5mb250Q2Fz Y2FkZSgpLndpZHRoKFRleHRSdW4geyBTdHJpbmdWaWV3IHsgc3R5bGUuaHlwaGVuU3RyaW5nKCkg fSB9KTsKICAgICB9Ci0gICAgLy8gQW55IG5vbi13aGl0ZXNwYWNlLCBuby10cmltbWFibGUgY29u dGVudCByZXNldHMgdGhlIGV4aXN0aW5nIHRyaW1tYWJsZS4KLSAgICBtX3RyaW1tYWJsZVRyYWls aW5nQ29udGVudC5yZXNldCgpOwotICAgIGlmICghZm9ybWF0dGluZ0NvbnRleHQoKS5sYXlvdXRT dGF0ZSgpLnNob3VsZElnbm9yZVRyYWlsaW5nTGV0dGVyU3BhY2luZygpICYmICFpbmxpbmVUZXh0 SXRlbS5pc1doaXRlc3BhY2UoKSAmJiBzdHlsZS5sZXR0ZXJTcGFjaW5nKCkgPiAwKQotICAgICAg ICBtX3RyaW1tYWJsZVRyYWlsaW5nQ29udGVudC5hZGRQYXJ0aWFsbHlUcmltbWFibGVDb250ZW50 KG1fcnVucy5zaXplKCkgLSAxLCBzdHlsZS5sZXR0ZXJTcGFjaW5nKCkpOwotICAgIG1fdHJhaWxp bmdTb2Z0SHlwaGVuV2lkdGggPSBpbmxpbmVUZXh0SXRlbS5oYXNUcmFpbGluZ1NvZnRIeXBoZW4o KSA/IHN0ZDo6bWFrZV9vcHRpb25hbChzdHlsZS5mb250Q2FzY2FkZSgpLndpZHRoKFRleHRSdW4g eyBTdHJpbmdWaWV3IHsgc3R5bGUuaHlwaGVuU3RyaW5nKCkgfSB9KSkgOiBzdGQ6Om51bGxvcHQ7 CiB9CiAKIHZvaWQgTGluZTo6YXBwZW5kTm9uUmVwbGFjZWRJbmxpbmVMZXZlbEJveChjb25zdCBJ bmxpbmVJdGVtJiBpbmxpbmVJdGVtLCBjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUsIElubGluZUxh eW91dFVuaXQgbWFyZ2luQm94TG9naWNhbFdpZHRoKQogewotICAgIG1fdHJpbW1hYmxlVHJhaWxp bmdDb250ZW50LnJlc2V0KCk7Ci0gICAgbV90cmFpbGluZ1NvZnRIeXBoZW5XaWR0aCA9IHsgfTsK KyAgICByZXNldFRyYWlsaW5nQ29udGVudCgpOwogICAgIG1fY29udGVudExvZ2ljYWxXaWR0aCAr PSBtYXJnaW5Cb3hMb2dpY2FsV2lkdGg7CiAgICAgKyttX25vblNwYW5uaW5nSW5saW5lTGV2ZWxC b3hDb3VudDsKICAgICBhdXRvIG1hcmdpblN0YXJ0ID0gZm9ybWF0dGluZ0NvbnRleHQoKS5nZW9t ZXRyeUZvckJveChpbmxpbmVJdGVtLmxheW91dEJveCgpKS5tYXJnaW5TdGFydCgpOwpAQCAtNDQy LDI3ICs0NTYsMTQgQEAgSW5saW5lTGF5b3V0VW5pdCBMaW5lOjpUcmltbWFibGVUcmFpbGluZ0Nv bnRlbnQ6OnJlbW92ZVBhcnRpYWxseVRyaW1tYWJsZUNvbnRlbnQKICAgICByZXR1cm4gcmVtb3Zl KCk7CiB9CiAKLUxpbmU6OkhhbmdpbmdUcmFpbGluZ0NvbnRlbnQ6OkhhbmdpbmdUcmFpbGluZ0Nv bnRlbnQoY29uc3QgUnVuTGlzdCYgcnVucykKLSAgICA6IG1fcnVucyhydW5zKQotewotfQotCi1J bmxpbmVMYXlvdXRVbml0IExpbmU6OkhhbmdpbmdUcmFpbGluZ0NvbnRlbnQ6OndpZHRoKCkgY29u c3QKK3ZvaWQgTGluZTo6SGFuZ2luZ1RyYWlsaW5nQ29udGVudDo6YWRkKGNvbnN0IElubGluZVRl eHRJdGVtJiB0cmFpbGluZ1doaXRlc3BhY2UsIElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRo KQogewogICAgIC8vIFdoZW4gYSBnbHlwaCBhdCB0aGUgc3RhcnQgb3IgZW5kIGVkZ2Ugb2YgYSBs aW5lIGhhbmdzLCBpdCBpcyBub3QgY29uc2lkZXJlZCB3aGVuIG1lYXN1cmluZyB0aGUgbGluZeKA mXMgY29udGVudHMgZm9yIGZpdCwgYWxpZ25tZW50LCBvciBqdXN0aWZpY2F0aW9uLgogICAgIC8v IERlcGVuZGluZyBvbiB0aGUgbGluZeKAmXMgYWxpZ25tZW50L2p1c3RpZmljYXRpb24sIHRoaXMg Y2FuIHJlc3VsdCBpbiB0aGUgbWFyayBiZWluZyBwbGFjZWQgb3V0c2lkZSB0aGUgbGluZSBib3gu CiAgICAgLy8gaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy10ZXh0LTMvI2hhbmdpbmcKLSAg ICBhdXRvIGhhbmdpbmdXaWR0aCA9IElubGluZUxheW91dFVuaXQgeyB9OwotICAgIGZvciAoYXV0 byYgcnVuIDogV1RGOjptYWtlUmV2ZXJzZWRSYW5nZShtX3J1bnMpKSB7Ci0gICAgICAgIGlmIChy dW4uaXNCb3goKSB8fCBydW4uaXNMaW5lQnJlYWsoKSkKLSAgICAgICAgICAgIGJyZWFrOwotICAg ICAgICBpZiAocnVuLmlzSW5saW5lQm94U3RhcnQoKSB8fCBydW4uaXNJbmxpbmVCb3hFbmQoKSkK LSAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICBpZiAoIXJ1bi5oYXNUcmFpbGluZ1doaXRl c3BhY2UoKSB8fCAhcnVuLnNob3VsZFRyYWlsaW5nV2hpdGVzcGFjZUhhbmcoKSkKLSAgICAgICAg ICAgIGJyZWFrOwotICAgICAgICBoYW5naW5nV2lkdGggKz0gcnVuLnRyYWlsaW5nV2hpdGVzcGFj ZVdpZHRoKCk7Ci0gICAgfQotICAgIHJldHVybiBoYW5naW5nV2lkdGg7CisgICAgQVNTRVJUKHRy YWlsaW5nV2hpdGVzcGFjZS5pc1doaXRlc3BhY2UoKSk7CisgICAgbV93aWR0aCArPSBsb2dpY2Fs V2lkdGg7CisgICAgbV9sZW5ndGggKz0gdHJhaWxpbmdXaGl0ZXNwYWNlLmxlbmd0aCgpOwogfQog CiBMaW5lOjpSdW46OlJ1bihjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtLCBjb25zdCBSZW5k ZXJTdHlsZSYgc3R5bGUsIElubGluZUxheW91dFVuaXQgbG9naWNhbExlZnQsIElubGluZUxheW91 dFVuaXQgbG9naWNhbFdpZHRoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5oIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5oCmluZGV4IDhiZjlhOGMx ZjBiZDA4OTE2NmUzODA4MDYwOWJjMTBhODg4OTU2MTIuLjgyZmUxOTM5YTM5MjhhM2IxYzViZjUy YTNjMTQ5NDE5ZGE4YmYwMTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lLmgKQEAgLTE1Niw2ICsx NTYsOCBAQCBwcml2YXRlOgogICAgIHZvaWQgcmVtb3ZlVHJhaWxpbmdUcmltbWFibGVDb250ZW50 KCk7CiAgICAgdm9pZCB2aXN1YWxseUNvbGxhcHNlSGFuZ2luZ092ZXJmbG93KElubGluZUxheW91 dFVuaXQgaG9yaXpvbnRhbEF2YWlsYWJsZVNwYWNlKTsKIAorICAgIHZvaWQgcmVzZXRUcmFpbGlu Z0NvbnRlbnQoKTsKKwogICAgIGNvbnN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0JiBmb3JtYXR0 aW5nQ29udGV4dCgpIGNvbnN0OwogCiAgICAgc3RydWN0IFRyaW1tYWJsZVRyYWlsaW5nQ29udGVu dCB7CkBAIC0xODIsMTIgKzE4NCwxNSBAQCBwcml2YXRlOgogICAgIH07CiAKICAgICBzdHJ1Y3Qg SGFuZ2luZ1RyYWlsaW5nQ29udGVudCB7Ci0gICAgICAgIEhhbmdpbmdUcmFpbGluZ0NvbnRlbnQo Y29uc3QgUnVuTGlzdCYpOworICAgICAgICB2b2lkIGFkZChjb25zdCBJbmxpbmVUZXh0SXRlbSYg dHJhaWxpbmdXaGl0ZXNwYWNlLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCk7CisgICAg ICAgIHZvaWQgcmVzZXQoKTsKIAotICAgICAgICBJbmxpbmVMYXlvdXRVbml0IHdpZHRoKCkgY29u c3Q7CisgICAgICAgIHNpemVfdCBsZW5ndGgoKSBjb25zdCB7IHJldHVybiBtX2xlbmd0aDsgfQor ICAgICAgICBJbmxpbmVMYXlvdXRVbml0IHdpZHRoKCkgY29uc3QgeyByZXR1cm4gbV93aWR0aDsg fQogCiAgICAgcHJpdmF0ZToKLSAgICAgICAgY29uc3QgUnVuTGlzdCYgbV9ydW5zOworICAgICAg ICBzaXplX3QgbV9sZW5ndGggeyAwIH07CisgICAgICAgIElubGluZUxheW91dFVuaXQgbV93aWR0 aCB7IDAgfTsKICAgICB9OwogCiAgICAgY29uc3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIG1f aW5saW5lRm9ybWF0dGluZ0NvbnRleHQ7CkBAIC0yMDcsNiArMjEyLDEyIEBAIGlubGluZSB2b2lk IExpbmU6OlRyaW1tYWJsZVRyYWlsaW5nQ29udGVudDo6cmVzZXQoKQogICAgIG1fcGFydGlhbGx5 VHJpbW1hYmxlV2lkdGggPSB7IH07CiB9CiAKK2lubGluZSB2b2lkIExpbmU6OkhhbmdpbmdUcmFp bGluZ0NvbnRlbnQ6OnJlc2V0KCkKK3sKKyAgICBtX3dpZHRoID0geyB9OworICAgIG1fbGVuZ3Ro ID0geyB9OworfQorCiBpbmxpbmUgTGluZTo6UnVuOjpUcmFpbGluZ1doaXRlc3BhY2UgTGluZTo6 UnVuOjp0cmFpbGluZ1doaXRlc3BhY2VUeXBlKGNvbnN0IElubGluZVRleHRJdGVtJiBpbmxpbmVU ZXh0SXRlbSkgY29uc3QKIHsKICAgICBpZiAoIWlubGluZVRleHRJdGVtLmlzV2hpdGVzcGFjZSgp KQo= 439989 2021-10-02 20:29:28 -0700 2021-10-03 16:46:29 -0700 Patch bug-231128-20211002202927.patch text/plain 8494 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzNDQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2E5NTMwMzFhODEyNjUz YTVjMjM3NjJkNzA1NmQ1MGVmZGIxY2MyOS4uOGRlNzAwNTdkN2JmZjExM2ZiZjE4NWNjOWZmZTc4 MTdiNzM1OWY2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIxLTEwLTAyICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIEhhbmdpbmdU cmFpbGluZ0NvbnRlbnQgc2hvdWxkIGNhY2hlIHdpZHRoL2xlbmd0aAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMxMTI4CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ29tcHV0ZSB0aGUgbGVuZ3RoIG9mIHRo ZSBoYW5naW5nIHRyYWlsaW5nIHdoaXRlc3BhY2Ugc2VxdWVuY2UuCisgICAgICAgIFRoaXMgaXMg aW4gcHJlcGFyYXRpb24gZm9yIGZpeGluZyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz L2Nzcy9jc3MtdGV4dC93aGl0ZS1zcGFjZS90ZXh0YXJlYS1wcmUtd3JhcC0wMTQuaHRtbAorCisg ICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OkxpbmUpOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpMaW5lOjppbml0aWFsaXplKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 TGluZTo6cmVzZXRUcmFpbGluZ0NvbnRlbnQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpM aW5lOjphcHBlbmRUZXh0Q29udGVudCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6 OmFwcGVuZE5vblJlcGxhY2VkSW5saW5lTGV2ZWxCb3gpOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpMaW5lOjpIYW5naW5nVHJhaWxpbmdDb250ZW50OjphZGQpOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpMaW5lOjpIYW5naW5nVHJhaWxpbmdDb250ZW50OjpIYW5naW5nVHJhaWxpbmdD b250ZW50KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6SGFuZ2lu Z1RyYWlsaW5nQ29udGVudDo6d2lkdGggY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIGxheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuaDoKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6TGluZTo6SGFuZ2luZ1RyYWlsaW5nQ29udGVudDo6bGVuZ3RoIGNvbnN0KToK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6SGFuZ2luZ1RyYWlsaW5nQ29udGVudDo6 d2lkdGggY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjpIYW5naW5nVHJh aWxpbmdDb250ZW50OjpyZXNldCk6CisKIDIwMjEtMTAtMDIgIEFsYW4gQnVqdGFzICA8emFsYW5A YXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gTGluZSBmdW5jdGlvbnMgY2FuIGNvbXB1 dGUgdGhlICJleHRyYSBob3Jpem9udGFsIHNwYWNlIgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lLmNw cAppbmRleCA3YzMzYjg3YmVlNjRlMTEyMGNkMzUzOGZlYzk1MDk3NjA1NjcwMTI4Li5lNzQyMDA4 ZDcxY2MyMmNjYTQ0MDE1YjM4MWJkZDU0YThlYjI1MWYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVM aW5lLmNwcApAQCAtNDMsNyArNDMsNiBAQCBuYW1lc3BhY2UgTGF5b3V0IHsKIExpbmU6OkxpbmUo Y29uc3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIGlubGluZUZvcm1hdHRpbmdDb250ZXh0KQog ICAgIDogbV9pbmxpbmVGb3JtYXR0aW5nQ29udGV4dChpbmxpbmVGb3JtYXR0aW5nQ29udGV4dCkK ICAgICAsIG1fdHJpbW1hYmxlVHJhaWxpbmdDb250ZW50KG1fcnVucykKLSAgICAsIG1faGFuZ2lu Z1RyYWlsaW5nQ29udGVudChtX3J1bnMpCiB7CiB9CiAKQEAgLTU2LDggKzU1LDE0IEBAIHZvaWQg TGluZTo6aW5pdGlhbGl6ZSgpCiAgICAgbV9ub25TcGFubmluZ0lubGluZUxldmVsQm94Q291bnQg PSAwOwogICAgIG1fY29udGVudExvZ2ljYWxXaWR0aCA9IHsgfTsKICAgICBtX3J1bnMuY2xlYXIo KTsKLSAgICBtX3RyYWlsaW5nU29mdEh5cGhlbldpZHRoID0geyB9OworICAgIHJlc2V0VHJhaWxp bmdDb250ZW50KCk7Cit9CisKK3ZvaWQgTGluZTo6cmVzZXRUcmFpbGluZ0NvbnRlbnQoKQorewog ICAgIG1fdHJpbW1hYmxlVHJhaWxpbmdDb250ZW50LnJlc2V0KCk7CisgICAgbV9oYW5naW5nVHJh aWxpbmdDb250ZW50LnJlc2V0KCk7CisgICAgbV90cmFpbGluZ1NvZnRIeXBoZW5XaWR0aCA9IHsg fTsKIH0KIAogdm9pZCBMaW5lOjpyZW1vdmVDb2xsYXBzaWJsZUNvbnRlbnQoSW5saW5lTGF5b3V0 VW5pdCBob3Jpem9udGFsQXZhaWxhYmxlU3BhY2UpCkBAIC0zMDIsMjIgKzMwNywzMSBAQCB2b2lk IExpbmU6OmFwcGVuZFRleHRDb250ZW50KGNvbnN0IElubGluZVRleHRJdGVtJiBpbmxpbmVUZXh0 SXRlbSwgY29uc3QgUmVuZGVyUwogICAgICAgICAvLyBEbyBub3QgbGV0IG5lZ2F0aXZlIGxldHRl ciBzcGFjaW5nIG1ha2UgdGhlIGNvbnRlbnQgc2hvcnRlciB0aGFuIGl0IGFscmVhZHkgaXMuCiAg ICAgICAgIG1fY29udGVudExvZ2ljYWxXaWR0aCArPSBzdGQ6Om1heCgwLjBmLCBsb2dpY2FsV2lk dGgpOwogICAgIH0KLSAgICAvLyBTZXQgdGhlIHRyYWlsaW5nIHRyaW1tYWJsZSBjb250ZW50Lgot ICAgIGlmIChpbmxpbmVUZXh0SXRlbS5pc1doaXRlc3BhY2UoKSAmJiAhSW5saW5lVGV4dEl0ZW06 OnNob3VsZFByZXNlcnZlU3BhY2VzQW5kVGFicyhpbmxpbmVUZXh0SXRlbSkpIHsKLSAgICAgICAg bV90cmltbWFibGVUcmFpbGluZ0NvbnRlbnQuYWRkRnVsbHlUcmltbWFibGVDb250ZW50KG1fcnVu cy5zaXplKCkgLSAxLCBjb250ZW50TG9naWNhbFdpZHRoKCkgLSBvbGRDb250ZW50TG9naWNhbFdp ZHRoKTsKLSAgICAgICAgcmV0dXJuOworCisgICAgLy8gSGFuZGxlIHRyYWlsaW5nIGNvbnRlbnQs IHNwZWNpZmljYWxseSB3aGl0ZXNwYWNlIGFuZCBsZXR0ZXIgc3BhY2luZy4KKyAgICBhdXRvIGxh c3RSdW5JbmRleCA9IG1fcnVucy5zaXplKCkgLSAxOworICAgIGlmIChpbmxpbmVUZXh0SXRlbS5p c1doaXRlc3BhY2UoKSkgeworICAgICAgICBpZiAoSW5saW5lVGV4dEl0ZW06OnNob3VsZFByZXNl cnZlU3BhY2VzQW5kVGFicyhpbmxpbmVUZXh0SXRlbSkpIHsKKyAgICAgICAgICAgIG1fdHJpbW1h YmxlVHJhaWxpbmdDb250ZW50LnJlc2V0KCk7CisgICAgICAgICAgICBpZiAobV9ydW5zW2xhc3RS dW5JbmRleF0uc2hvdWxkVHJhaWxpbmdXaGl0ZXNwYWNlSGFuZygpKQorICAgICAgICAgICAgICAg IG1faGFuZ2luZ1RyYWlsaW5nQ29udGVudC5hZGQoaW5saW5lVGV4dEl0ZW0sIGxvZ2ljYWxXaWR0 aCk7CisgICAgICAgIH0gZWxzZSAgeworICAgICAgICAgICAgbV9oYW5naW5nVHJhaWxpbmdDb250 ZW50LnJlc2V0KCk7CisgICAgICAgICAgICBtX3RyaW1tYWJsZVRyYWlsaW5nQ29udGVudC5hZGRG dWxseVRyaW1tYWJsZUNvbnRlbnQobGFzdFJ1bkluZGV4LCBjb250ZW50TG9naWNhbFdpZHRoKCkg LSBvbGRDb250ZW50TG9naWNhbFdpZHRoKTsKKyAgICAgICAgfQorICAgICAgICBtX3RyYWlsaW5n U29mdEh5cGhlbldpZHRoID0geyB9OworICAgIH0gZWxzZSB7CisgICAgICAgIHJlc2V0VHJhaWxp bmdDb250ZW50KCk7CisgICAgICAgIGlmIChzdHlsZS5sZXR0ZXJTcGFjaW5nKCkgPiAwICYmICFm b3JtYXR0aW5nQ29udGV4dCgpLmxheW91dFN0YXRlKCkuc2hvdWxkSWdub3JlVHJhaWxpbmdMZXR0 ZXJTcGFjaW5nKCkpCisgICAgICAgICAgICBtX3RyaW1tYWJsZVRyYWlsaW5nQ29udGVudC5hZGRQ YXJ0aWFsbHlUcmltbWFibGVDb250ZW50KGxhc3RSdW5JbmRleCwgc3R5bGUubGV0dGVyU3BhY2lu ZygpKTsKKyAgICAgICAgaWYgKGlubGluZVRleHRJdGVtLmhhc1RyYWlsaW5nU29mdEh5cGhlbigp KQorICAgICAgICAgICAgbV90cmFpbGluZ1NvZnRIeXBoZW5XaWR0aCA9IHN0eWxlLmZvbnRDYXNj YWRlKCkud2lkdGgoVGV4dFJ1biB7IFN0cmluZ1ZpZXcgeyBzdHlsZS5oeXBoZW5TdHJpbmcoKSB9 IH0pOwogICAgIH0KLSAgICAvLyBBbnkgbm9uLXdoaXRlc3BhY2UsIG5vLXRyaW1tYWJsZSBjb250 ZW50IHJlc2V0cyB0aGUgZXhpc3RpbmcgdHJpbW1hYmxlLgotICAgIG1fdHJpbW1hYmxlVHJhaWxp bmdDb250ZW50LnJlc2V0KCk7Ci0gICAgaWYgKCFmb3JtYXR0aW5nQ29udGV4dCgpLmxheW91dFN0 YXRlKCkuc2hvdWxkSWdub3JlVHJhaWxpbmdMZXR0ZXJTcGFjaW5nKCkgJiYgIWlubGluZVRleHRJ dGVtLmlzV2hpdGVzcGFjZSgpICYmIHN0eWxlLmxldHRlclNwYWNpbmcoKSA+IDApCi0gICAgICAg IG1fdHJpbW1hYmxlVHJhaWxpbmdDb250ZW50LmFkZFBhcnRpYWxseVRyaW1tYWJsZUNvbnRlbnQo bV9ydW5zLnNpemUoKSAtIDEsIHN0eWxlLmxldHRlclNwYWNpbmcoKSk7Ci0gICAgbV90cmFpbGlu Z1NvZnRIeXBoZW5XaWR0aCA9IGlubGluZVRleHRJdGVtLmhhc1RyYWlsaW5nU29mdEh5cGhlbigp ID8gc3RkOjptYWtlX29wdGlvbmFsKHN0eWxlLmZvbnRDYXNjYWRlKCkud2lkdGgoVGV4dFJ1biB7 IFN0cmluZ1ZpZXcgeyBzdHlsZS5oeXBoZW5TdHJpbmcoKSB9IH0pKSA6IHN0ZDo6bnVsbG9wdDsK IH0KIAogdm9pZCBMaW5lOjphcHBlbmROb25SZXBsYWNlZElubGluZUxldmVsQm94KGNvbnN0IElu bGluZUl0ZW0mIGlubGluZUl0ZW0sIGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSwgSW5saW5lTGF5 b3V0VW5pdCBtYXJnaW5Cb3hMb2dpY2FsV2lkdGgpCiB7Ci0gICAgbV90cmltbWFibGVUcmFpbGlu Z0NvbnRlbnQucmVzZXQoKTsKLSAgICBtX3RyYWlsaW5nU29mdEh5cGhlbldpZHRoID0geyB9Owor ICAgIHJlc2V0VHJhaWxpbmdDb250ZW50KCk7CiAgICAgbV9jb250ZW50TG9naWNhbFdpZHRoICs9 IG1hcmdpbkJveExvZ2ljYWxXaWR0aDsKICAgICArK21fbm9uU3Bhbm5pbmdJbmxpbmVMZXZlbEJv eENvdW50OwogICAgIGF1dG8gbWFyZ2luU3RhcnQgPSBmb3JtYXR0aW5nQ29udGV4dCgpLmdlb21l dHJ5Rm9yQm94KGlubGluZUl0ZW0ubGF5b3V0Qm94KCkpLm1hcmdpblN0YXJ0KCk7CkBAIC00NDIs MjcgKzQ1NiwxNCBAQCBJbmxpbmVMYXlvdXRVbml0IExpbmU6OlRyaW1tYWJsZVRyYWlsaW5nQ29u dGVudDo6cmVtb3ZlUGFydGlhbGx5VHJpbW1hYmxlQ29udGVudAogICAgIHJldHVybiByZW1vdmUo KTsKIH0KIAotTGluZTo6SGFuZ2luZ1RyYWlsaW5nQ29udGVudDo6SGFuZ2luZ1RyYWlsaW5nQ29u dGVudChjb25zdCBSdW5MaXN0JiBydW5zKQotICAgIDogbV9ydW5zKHJ1bnMpCi17Ci19Ci0KLUlu bGluZUxheW91dFVuaXQgTGluZTo6SGFuZ2luZ1RyYWlsaW5nQ29udGVudDo6d2lkdGgoKSBjb25z dAordm9pZCBMaW5lOjpIYW5naW5nVHJhaWxpbmdDb250ZW50OjphZGQoY29uc3QgSW5saW5lVGV4 dEl0ZW0mIHRyYWlsaW5nV2hpdGVzcGFjZSwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgp CiB7CiAgICAgLy8gV2hlbiBhIGdseXBoIGF0IHRoZSBzdGFydCBvciBlbmQgZWRnZSBvZiBhIGxp bmUgaGFuZ3MsIGl0IGlzIG5vdCBjb25zaWRlcmVkIHdoZW4gbWVhc3VyaW5nIHRoZSBsaW5l4oCZ cyBjb250ZW50cyBmb3IgZml0LCBhbGlnbm1lbnQsIG9yIGp1c3RpZmljYXRpb24uCiAgICAgLy8g RGVwZW5kaW5nIG9uIHRoZSBsaW5l4oCZcyBhbGlnbm1lbnQvanVzdGlmaWNhdGlvbiwgdGhpcyBj YW4gcmVzdWx0IGluIHRoZSBtYXJrIGJlaW5nIHBsYWNlZCBvdXRzaWRlIHRoZSBsaW5lIGJveC4K ICAgICAvLyBodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLXRleHQtMy8jaGFuZ2luZwotICAg IGF1dG8gaGFuZ2luZ1dpZHRoID0gSW5saW5lTGF5b3V0VW5pdCB7IH07Ci0gICAgZm9yIChhdXRv JiBydW4gOiBXVEY6Om1ha2VSZXZlcnNlZFJhbmdlKG1fcnVucykpIHsKLSAgICAgICAgaWYgKHJ1 bi5pc0JveCgpIHx8IHJ1bi5pc0xpbmVCcmVhaygpKQotICAgICAgICAgICAgYnJlYWs7Ci0gICAg ICAgIGlmIChydW4uaXNJbmxpbmVCb3hTdGFydCgpIHx8IHJ1bi5pc0lubGluZUJveEVuZCgpKQot ICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgIGlmICghcnVuLmhhc1RyYWlsaW5nV2hpdGVz cGFjZSgpIHx8ICFydW4uc2hvdWxkVHJhaWxpbmdXaGl0ZXNwYWNlSGFuZygpKQotICAgICAgICAg ICAgYnJlYWs7Ci0gICAgICAgIGhhbmdpbmdXaWR0aCArPSBydW4udHJhaWxpbmdXaGl0ZXNwYWNl V2lkdGgoKTsKLSAgICB9Ci0gICAgcmV0dXJuIGhhbmdpbmdXaWR0aDsKKyAgICBBU1NFUlQodHJh aWxpbmdXaGl0ZXNwYWNlLmlzV2hpdGVzcGFjZSgpKTsKKyAgICBtX3dpZHRoICs9IGxvZ2ljYWxX aWR0aDsKKyAgICBtX2xlbmd0aCArPSB0cmFpbGluZ1doaXRlc3BhY2UubGVuZ3RoKCk7CiB9CiAK IExpbmU6OlJ1bjo6UnVuKGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0sIGNvbnN0IFJlbmRl clN0eWxlJiBzdHlsZSwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsTGVmdCwgSW5saW5lTGF5b3V0 VW5pdCBsb2dpY2FsV2lkdGgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lLmgKaW5kZXggOGJmOWE4YzFm MGJkMDg5MTY2ZTM4MDgwNjA5YmMxMGE4ODg5NTYxMi4uODJmZTE5MzlhMzkyOGEzYjFjNWJmNTJh M2MxNDk0MTlkYThiZjAxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuaApAQCAtMTU2LDYgKzE1 Niw4IEBAIHByaXZhdGU6CiAgICAgdm9pZCByZW1vdmVUcmFpbGluZ1RyaW1tYWJsZUNvbnRlbnQo KTsKICAgICB2b2lkIHZpc3VhbGx5Q29sbGFwc2VIYW5naW5nT3ZlcmZsb3coSW5saW5lTGF5b3V0 VW5pdCBob3Jpem9udGFsQXZhaWxhYmxlU3BhY2UpOwogCisgICAgdm9pZCByZXNldFRyYWlsaW5n Q29udGVudCgpOworCiAgICAgY29uc3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIGZvcm1hdHRp bmdDb250ZXh0KCkgY29uc3Q7CiAKICAgICBzdHJ1Y3QgVHJpbW1hYmxlVHJhaWxpbmdDb250ZW50 IHsKQEAgLTE4MiwxMiArMTg0LDE1IEBAIHByaXZhdGU6CiAgICAgfTsKIAogICAgIHN0cnVjdCBI YW5naW5nVHJhaWxpbmdDb250ZW50IHsKLSAgICAgICAgSGFuZ2luZ1RyYWlsaW5nQ29udGVudChj b25zdCBSdW5MaXN0Jik7CisgICAgICAgIHZvaWQgYWRkKGNvbnN0IElubGluZVRleHRJdGVtJiB0 cmFpbGluZ1doaXRlc3BhY2UsIElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRoKTsKKyAgICAg ICAgdm9pZCByZXNldCgpOwogCi0gICAgICAgIElubGluZUxheW91dFVuaXQgd2lkdGgoKSBjb25z dDsKKyAgICAgICAgc2l6ZV90IGxlbmd0aCgpIGNvbnN0IHsgcmV0dXJuIG1fbGVuZ3RoOyB9Cisg ICAgICAgIElubGluZUxheW91dFVuaXQgd2lkdGgoKSBjb25zdCB7IHJldHVybiBtX3dpZHRoOyB9 CiAKICAgICBwcml2YXRlOgotICAgICAgICBjb25zdCBSdW5MaXN0JiBtX3J1bnM7CisgICAgICAg IHNpemVfdCBtX2xlbmd0aCB7IDAgfTsKKyAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBtX3dpZHRo IHsgMCB9OwogICAgIH07CiAKICAgICBjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgbV9p bmxpbmVGb3JtYXR0aW5nQ29udGV4dDsKQEAgLTIwNyw2ICsyMTIsMTIgQEAgaW5saW5lIHZvaWQg TGluZTo6VHJpbW1hYmxlVHJhaWxpbmdDb250ZW50OjpyZXNldCgpCiAgICAgbV9wYXJ0aWFsbHlU cmltbWFibGVXaWR0aCA9IHsgfTsKIH0KIAoraW5saW5lIHZvaWQgTGluZTo6SGFuZ2luZ1RyYWls aW5nQ29udGVudDo6cmVzZXQoKQoreworICAgIG1fd2lkdGggPSB7IH07CisgICAgbV9sZW5ndGgg PSB7IH07Cit9CisKIGlubGluZSBMaW5lOjpSdW46OlRyYWlsaW5nV2hpdGVzcGFjZSBMaW5lOjpS dW46OnRyYWlsaW5nV2hpdGVzcGFjZVR5cGUoY29uc3QgSW5saW5lVGV4dEl0ZW0mIGlubGluZVRl eHRJdGVtKSBjb25zdAogewogICAgIGlmICghaW5saW5lVGV4dEl0ZW0uaXNXaGl0ZXNwYWNlKCkp Cg== 440025 2021-10-03 16:46:31 -0700 2021-10-03 18:07:34 -0700 Patch bug-231128-20211003164630.patch text/plain 8850 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzNDc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTNiZDk3Nzc0OTYwZjNh ZDcwYTRhNDJlZjMwNjhlNzhmNmMzZDgzYi4uYzQwMTBjYTNkNjgxZjZlNTM4NDY0N2U0ODIwNWI4 Y2RkMmZiYTc4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIxLTEwLTAzICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIEhhbmdpbmdU cmFpbGluZ0NvbnRlbnQgc2hvdWxkIGNhY2hlIHdpZHRoL2xlbmd0aAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMxMTI4CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgQW50dGkgS29pdmlzdG8uCisKKyAgICAgICAgQ29tcHV0ZSB0aGUgbGVuZ3RoIG9mIHRo ZSBoYW5naW5nIHRyYWlsaW5nIHdoaXRlc3BhY2Ugc2VxdWVuY2UuCisgICAgICAgIFRoaXMgaXMg aW4gcHJlcGFyYXRpb24gZm9yIGZpeGluZyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz L2Nzcy9jc3MtdGV4dC93aGl0ZS1zcGFjZS90ZXh0YXJlYS1wcmUtd3JhcC0wMTQuaHRtbAorCisg ICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OkxpbmUpOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpMaW5lOjppbml0aWFsaXplKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 TGluZTo6cmVzZXRUcmFpbGluZ0NvbnRlbnQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpM aW5lOjphcHBlbmRUZXh0Q29udGVudCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6 OmFwcGVuZE5vblJlcGxhY2VkSW5saW5lTGV2ZWxCb3gpOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpMaW5lOjpIYW5naW5nVHJhaWxpbmdDb250ZW50OjphZGQpOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpMaW5lOjpIYW5naW5nVHJhaWxpbmdDb250ZW50OjpIYW5naW5nVHJhaWxpbmdD b250ZW50KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6SGFuZ2lu Z1RyYWlsaW5nQ29udGVudDo6d2lkdGggY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIGxheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuaDoKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6TGluZTo6SGFuZ2luZ1RyYWlsaW5nQ29udGVudDo6bGVuZ3RoIGNvbnN0KToK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6SGFuZ2luZ1RyYWlsaW5nQ29udGVudDo6 d2lkdGggY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjpIYW5naW5nVHJh aWxpbmdDb250ZW50OjpyZXNldCk6CisKIDIwMjEtMTAtMDMgIEFsYW4gQnVqdGFzICA8emFsYW5A YXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gTGluZSBmdW5jdGlvbnMgY2FuIGNvbXB1 dGUgdGhlICJleHRyYSBob3Jpem9udGFsIHNwYWNlIgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lLmNw cAppbmRleCAxYTQ1MTFkMjU4NTUyNjQzNGMyNDE1MjU4NjY4NWVhOGU5Y2QzOGZhLi5lMGQ5MGJl OGEwZTAxOWUwOTk4YTI5YWZjZGRiODFiOTdiNmRiYzgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVM aW5lLmNwcApAQCAtNDMsNyArNDMsNiBAQCBuYW1lc3BhY2UgTGF5b3V0IHsKIExpbmU6OkxpbmUo Y29uc3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIGlubGluZUZvcm1hdHRpbmdDb250ZXh0KQog ICAgIDogbV9pbmxpbmVGb3JtYXR0aW5nQ29udGV4dChpbmxpbmVGb3JtYXR0aW5nQ29udGV4dCkK ICAgICAsIG1fdHJpbW1hYmxlVHJhaWxpbmdDb250ZW50KG1fcnVucykKLSAgICAsIG1faGFuZ2lu Z1RyYWlsaW5nQ29udGVudChtX3J1bnMpCiB7CiB9CiAKQEAgLTU2LDggKzU1LDE0IEBAIHZvaWQg TGluZTo6aW5pdGlhbGl6ZSgpCiAgICAgbV9ub25TcGFubmluZ0lubGluZUxldmVsQm94Q291bnQg PSAwOwogICAgIG1fY29udGVudExvZ2ljYWxXaWR0aCA9IHsgfTsKICAgICBtX3J1bnMuY2xlYXIo KTsKLSAgICBtX3RyYWlsaW5nU29mdEh5cGhlbldpZHRoID0geyB9OworICAgIHJlc2V0VHJhaWxp bmdDb250ZW50KCk7Cit9CisKK3ZvaWQgTGluZTo6cmVzZXRUcmFpbGluZ0NvbnRlbnQoKQorewog ICAgIG1fdHJpbW1hYmxlVHJhaWxpbmdDb250ZW50LnJlc2V0KCk7CisgICAgbV9oYW5naW5nVHJh aWxpbmdDb250ZW50LnJlc2V0KCk7CisgICAgbV90cmFpbGluZ1NvZnRIeXBoZW5XaWR0aCA9IHsg fTsKIH0KIAogdm9pZCBMaW5lOjpyZW1vdmVDb2xsYXBzaWJsZUNvbnRlbnQoSW5saW5lTGF5b3V0 VW5pdCBob3Jpem9udGFsQXZhaWxhYmxlU3BhY2UpCkBAIC0xOTcsNiArMjAyLDggQEAgdm9pZCBM aW5lOjp2aXN1YWxseUNvbGxhcHNlSGFuZ2luZ092ZXJmbG93KElubGluZUxheW91dFVuaXQgaG9y aXpvbnRhbEF2YWlsYWJsZVMKICAgICAgICAgaWYgKG92ZXJmbG93V2lkdGggPD0gMCkKICAgICAg ICAgICAgIGJyZWFrOwogICAgIH0KKyAgICAvLyBGSVhNRTogQWRkIHN1cHBvcnQgZm9yIGluY3Jl bWVudGFsIHJlc2V0LCB3aGVyZSB0aGUgaGFuZ2luZyB3aGl0ZXNwYWNlIHBhcnRpYWxseSBvdmVy Zmxvd3MuCisgICAgbV9oYW5naW5nVHJhaWxpbmdDb250ZW50LnJlc2V0KCk7CiAgICAgbV9jb250 ZW50TG9naWNhbFdpZHRoIC09IHRyaW1tZWRDb250ZW50V2lkdGg7CiB9CiAKQEAgLTMwMywyMiAr MzEwLDMxIEBAIHZvaWQgTGluZTo6YXBwZW5kVGV4dENvbnRlbnQoY29uc3QgSW5saW5lVGV4dEl0 ZW0mIGlubGluZVRleHRJdGVtLCBjb25zdCBSZW5kZXJTCiAgICAgICAgIC8vIERvIG5vdCBsZXQg bmVnYXRpdmUgbGV0dGVyIHNwYWNpbmcgbWFrZSB0aGUgY29udGVudCBzaG9ydGVyIHRoYW4gaXQg YWxyZWFkeSBpcy4KICAgICAgICAgbV9jb250ZW50TG9naWNhbFdpZHRoICs9IHN0ZDo6bWF4KDAu MGYsIGxvZ2ljYWxXaWR0aCk7CiAgICAgfQotICAgIC8vIFNldCB0aGUgdHJhaWxpbmcgdHJpbW1h YmxlIGNvbnRlbnQuCi0gICAgaWYgKGlubGluZVRleHRJdGVtLmlzV2hpdGVzcGFjZSgpICYmICFJ bmxpbmVUZXh0SXRlbTo6c2hvdWxkUHJlc2VydmVTcGFjZXNBbmRUYWJzKGlubGluZVRleHRJdGVt KSkgewotICAgICAgICBtX3RyaW1tYWJsZVRyYWlsaW5nQ29udGVudC5hZGRGdWxseVRyaW1tYWJs ZUNvbnRlbnQobV9ydW5zLnNpemUoKSAtIDEsIGNvbnRlbnRMb2dpY2FsV2lkdGgoKSAtIG9sZENv bnRlbnRMb2dpY2FsV2lkdGgpOwotICAgICAgICByZXR1cm47CisKKyAgICAvLyBIYW5kbGUgdHJh aWxpbmcgY29udGVudCwgc3BlY2lmaWNhbGx5IHdoaXRlc3BhY2UgYW5kIGxldHRlciBzcGFjaW5n LgorICAgIGF1dG8gbGFzdFJ1bkluZGV4ID0gbV9ydW5zLnNpemUoKSAtIDE7CisgICAgaWYgKGlu bGluZVRleHRJdGVtLmlzV2hpdGVzcGFjZSgpKSB7CisgICAgICAgIGlmIChJbmxpbmVUZXh0SXRl bTo6c2hvdWxkUHJlc2VydmVTcGFjZXNBbmRUYWJzKGlubGluZVRleHRJdGVtKSkgeworICAgICAg ICAgICAgbV90cmltbWFibGVUcmFpbGluZ0NvbnRlbnQucmVzZXQoKTsKKyAgICAgICAgICAgIGlm IChtX3J1bnNbbGFzdFJ1bkluZGV4XS5zaG91bGRUcmFpbGluZ1doaXRlc3BhY2VIYW5nKCkpCisg ICAgICAgICAgICAgICAgbV9oYW5naW5nVHJhaWxpbmdDb250ZW50LmFkZChpbmxpbmVUZXh0SXRl bSwgbG9naWNhbFdpZHRoKTsKKyAgICAgICAgfSBlbHNlICB7CisgICAgICAgICAgICBtX2hhbmdp bmdUcmFpbGluZ0NvbnRlbnQucmVzZXQoKTsKKyAgICAgICAgICAgIG1fdHJpbW1hYmxlVHJhaWxp bmdDb250ZW50LmFkZEZ1bGx5VHJpbW1hYmxlQ29udGVudChsYXN0UnVuSW5kZXgsIGNvbnRlbnRM b2dpY2FsV2lkdGgoKSAtIG9sZENvbnRlbnRMb2dpY2FsV2lkdGgpOworICAgICAgICB9CisgICAg ICAgIG1fdHJhaWxpbmdTb2Z0SHlwaGVuV2lkdGggPSB7IH07CisgICAgfSBlbHNlIHsKKyAgICAg ICAgcmVzZXRUcmFpbGluZ0NvbnRlbnQoKTsKKyAgICAgICAgaWYgKHN0eWxlLmxldHRlclNwYWNp bmcoKSA+IDAgJiYgIWZvcm1hdHRpbmdDb250ZXh0KCkubGF5b3V0U3RhdGUoKS5zaG91bGRJZ25v cmVUcmFpbGluZ0xldHRlclNwYWNpbmcoKSkKKyAgICAgICAgICAgIG1fdHJpbW1hYmxlVHJhaWxp bmdDb250ZW50LmFkZFBhcnRpYWxseVRyaW1tYWJsZUNvbnRlbnQobGFzdFJ1bkluZGV4LCBzdHls ZS5sZXR0ZXJTcGFjaW5nKCkpOworICAgICAgICBpZiAoaW5saW5lVGV4dEl0ZW0uaGFzVHJhaWxp bmdTb2Z0SHlwaGVuKCkpCisgICAgICAgICAgICBtX3RyYWlsaW5nU29mdEh5cGhlbldpZHRoID0g c3R5bGUuZm9udENhc2NhZGUoKS53aWR0aChUZXh0UnVuIHsgU3RyaW5nVmlldyB7IHN0eWxlLmh5 cGhlblN0cmluZygpIH0gfSk7CiAgICAgfQotICAgIC8vIEFueSBub24td2hpdGVzcGFjZSwgbm8t dHJpbW1hYmxlIGNvbnRlbnQgcmVzZXRzIHRoZSBleGlzdGluZyB0cmltbWFibGUuCi0gICAgbV90 cmltbWFibGVUcmFpbGluZ0NvbnRlbnQucmVzZXQoKTsKLSAgICBpZiAoIWZvcm1hdHRpbmdDb250 ZXh0KCkubGF5b3V0U3RhdGUoKS5zaG91bGRJZ25vcmVUcmFpbGluZ0xldHRlclNwYWNpbmcoKSAm JiAhaW5saW5lVGV4dEl0ZW0uaXNXaGl0ZXNwYWNlKCkgJiYgc3R5bGUubGV0dGVyU3BhY2luZygp ID4gMCkKLSAgICAgICAgbV90cmltbWFibGVUcmFpbGluZ0NvbnRlbnQuYWRkUGFydGlhbGx5VHJp bW1hYmxlQ29udGVudChtX3J1bnMuc2l6ZSgpIC0gMSwgc3R5bGUubGV0dGVyU3BhY2luZygpKTsK LSAgICBtX3RyYWlsaW5nU29mdEh5cGhlbldpZHRoID0gaW5saW5lVGV4dEl0ZW0uaGFzVHJhaWxp bmdTb2Z0SHlwaGVuKCkgPyBzdGQ6Om1ha2Vfb3B0aW9uYWwoc3R5bGUuZm9udENhc2NhZGUoKS53 aWR0aChUZXh0UnVuIHsgU3RyaW5nVmlldyB7IHN0eWxlLmh5cGhlblN0cmluZygpIH0gfSkpIDog c3RkOjpudWxsb3B0OwogfQogCiB2b2lkIExpbmU6OmFwcGVuZE5vblJlcGxhY2VkSW5saW5lTGV2 ZWxCb3goY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSwgY29uc3QgUmVuZGVyU3R5bGUmIHN0 eWxlLCBJbmxpbmVMYXlvdXRVbml0IG1hcmdpbkJveExvZ2ljYWxXaWR0aCkKIHsKLSAgICBtX3Ry aW1tYWJsZVRyYWlsaW5nQ29udGVudC5yZXNldCgpOwotICAgIG1fdHJhaWxpbmdTb2Z0SHlwaGVu V2lkdGggPSB7IH07CisgICAgcmVzZXRUcmFpbGluZ0NvbnRlbnQoKTsKICAgICBtX2NvbnRlbnRM b2dpY2FsV2lkdGggKz0gbWFyZ2luQm94TG9naWNhbFdpZHRoOwogICAgICsrbV9ub25TcGFubmlu Z0lubGluZUxldmVsQm94Q291bnQ7CiAgICAgYXV0byBtYXJnaW5TdGFydCA9IGZvcm1hdHRpbmdD b250ZXh0KCkuZ2VvbWV0cnlGb3JCb3goaW5saW5lSXRlbS5sYXlvdXRCb3goKSkubWFyZ2luU3Rh cnQoKTsKQEAgLTQ0MywyNyArNDU5LDE0IEBAIElubGluZUxheW91dFVuaXQgTGluZTo6VHJpbW1h YmxlVHJhaWxpbmdDb250ZW50OjpyZW1vdmVQYXJ0aWFsbHlUcmltbWFibGVDb250ZW50CiAgICAg cmV0dXJuIHJlbW92ZSgpOwogfQogCi1MaW5lOjpIYW5naW5nVHJhaWxpbmdDb250ZW50OjpIYW5n aW5nVHJhaWxpbmdDb250ZW50KGNvbnN0IFJ1bkxpc3QmIHJ1bnMpCi0gICAgOiBtX3J1bnMocnVu cykKLXsKLX0KLQotSW5saW5lTGF5b3V0VW5pdCBMaW5lOjpIYW5naW5nVHJhaWxpbmdDb250ZW50 Ojp3aWR0aCgpIGNvbnN0Cit2b2lkIExpbmU6OkhhbmdpbmdUcmFpbGluZ0NvbnRlbnQ6OmFkZChj b25zdCBJbmxpbmVUZXh0SXRlbSYgdHJhaWxpbmdXaGl0ZXNwYWNlLCBJbmxpbmVMYXlvdXRVbml0 IGxvZ2ljYWxXaWR0aCkKIHsKICAgICAvLyBXaGVuIGEgZ2x5cGggYXQgdGhlIHN0YXJ0IG9yIGVu ZCBlZGdlIG9mIGEgbGluZSBoYW5ncywgaXQgaXMgbm90IGNvbnNpZGVyZWQgd2hlbiBtZWFzdXJp bmcgdGhlIGxpbmXigJlzIGNvbnRlbnRzIGZvciBmaXQsIGFsaWdubWVudCwgb3IganVzdGlmaWNh dGlvbi4KICAgICAvLyBEZXBlbmRpbmcgb24gdGhlIGxpbmXigJlzIGFsaWdubWVudC9qdXN0aWZp Y2F0aW9uLCB0aGlzIGNhbiByZXN1bHQgaW4gdGhlIG1hcmsgYmVpbmcgcGxhY2VkIG91dHNpZGUg dGhlIGxpbmUgYm94LgogICAgIC8vIGh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtdGV4dC0z LyNoYW5naW5nCi0gICAgYXV0byBoYW5naW5nV2lkdGggPSBJbmxpbmVMYXlvdXRVbml0IHsgfTsK LSAgICBmb3IgKGF1dG8mIHJ1biA6IFdURjo6bWFrZVJldmVyc2VkUmFuZ2UobV9ydW5zKSkgewot ICAgICAgICBpZiAocnVuLmlzQm94KCkgfHwgcnVuLmlzTGluZUJyZWFrKCkpCi0gICAgICAgICAg ICBicmVhazsKLSAgICAgICAgaWYgKHJ1bi5pc0lubGluZUJveFN0YXJ0KCkgfHwgcnVuLmlzSW5s aW5lQm94RW5kKCkpCi0gICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgaWYgKCFydW4uaGFz VHJhaWxpbmdXaGl0ZXNwYWNlKCkgfHwgIXJ1bi5zaG91bGRUcmFpbGluZ1doaXRlc3BhY2VIYW5n KCkpCi0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgaGFuZ2luZ1dpZHRoICs9IHJ1bi50cmFp bGluZ1doaXRlc3BhY2VXaWR0aCgpOwotICAgIH0KLSAgICByZXR1cm4gaGFuZ2luZ1dpZHRoOwor ICAgIEFTU0VSVCh0cmFpbGluZ1doaXRlc3BhY2UuaXNXaGl0ZXNwYWNlKCkpOworICAgIG1fd2lk dGggKz0gbG9naWNhbFdpZHRoOworICAgIG1fbGVuZ3RoICs9IHRyYWlsaW5nV2hpdGVzcGFjZS5s ZW5ndGgoKTsKIH0KIAogTGluZTo6UnVuOjpSdW4oY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRl bSwgY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0 LCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuaCBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuaApp bmRleCA4YmY5YThjMWYwYmQwODkxNjZlMzgwODA2MDliYzEwYTg4ODk1NjEyLi44MmZlMTkzOWEz OTI4YTNiMWM1YmY1MmEzYzE0OTQxOWRhOGJmMDEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5o CkBAIC0xNTYsNiArMTU2LDggQEAgcHJpdmF0ZToKICAgICB2b2lkIHJlbW92ZVRyYWlsaW5nVHJp bW1hYmxlQ29udGVudCgpOwogICAgIHZvaWQgdmlzdWFsbHlDb2xsYXBzZUhhbmdpbmdPdmVyZmxv dyhJbmxpbmVMYXlvdXRVbml0IGhvcml6b250YWxBdmFpbGFibGVTcGFjZSk7CiAKKyAgICB2b2lk IHJlc2V0VHJhaWxpbmdDb250ZW50KCk7CisKICAgICBjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29u dGV4dCYgZm9ybWF0dGluZ0NvbnRleHQoKSBjb25zdDsKIAogICAgIHN0cnVjdCBUcmltbWFibGVU cmFpbGluZ0NvbnRlbnQgewpAQCAtMTgyLDEyICsxODQsMTUgQEAgcHJpdmF0ZToKICAgICB9Owog CiAgICAgc3RydWN0IEhhbmdpbmdUcmFpbGluZ0NvbnRlbnQgewotICAgICAgICBIYW5naW5nVHJh aWxpbmdDb250ZW50KGNvbnN0IFJ1bkxpc3QmKTsKKyAgICAgICAgdm9pZCBhZGQoY29uc3QgSW5s aW5lVGV4dEl0ZW0mIHRyYWlsaW5nV2hpdGVzcGFjZSwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2Fs V2lkdGgpOworICAgICAgICB2b2lkIHJlc2V0KCk7CiAKLSAgICAgICAgSW5saW5lTGF5b3V0VW5p dCB3aWR0aCgpIGNvbnN0OworICAgICAgICBzaXplX3QgbGVuZ3RoKCkgY29uc3QgeyByZXR1cm4g bV9sZW5ndGg7IH0KKyAgICAgICAgSW5saW5lTGF5b3V0VW5pdCB3aWR0aCgpIGNvbnN0IHsgcmV0 dXJuIG1fd2lkdGg7IH0KIAogICAgIHByaXZhdGU6Ci0gICAgICAgIGNvbnN0IFJ1bkxpc3QmIG1f cnVuczsKKyAgICAgICAgc2l6ZV90IG1fbGVuZ3RoIHsgMCB9OworICAgICAgICBJbmxpbmVMYXlv dXRVbml0IG1fd2lkdGggeyAwIH07CiAgICAgfTsKIAogICAgIGNvbnN0IElubGluZUZvcm1hdHRp bmdDb250ZXh0JiBtX2lubGluZUZvcm1hdHRpbmdDb250ZXh0OwpAQCAtMjA3LDYgKzIxMiwxMiBA QCBpbmxpbmUgdm9pZCBMaW5lOjpUcmltbWFibGVUcmFpbGluZ0NvbnRlbnQ6OnJlc2V0KCkKICAg ICBtX3BhcnRpYWxseVRyaW1tYWJsZVdpZHRoID0geyB9OwogfQogCitpbmxpbmUgdm9pZCBMaW5l OjpIYW5naW5nVHJhaWxpbmdDb250ZW50OjpyZXNldCgpCit7CisgICAgbV93aWR0aCA9IHsgfTsK KyAgICBtX2xlbmd0aCA9IHsgfTsKK30KKwogaW5saW5lIExpbmU6OlJ1bjo6VHJhaWxpbmdXaGl0 ZXNwYWNlIExpbmU6OlJ1bjo6dHJhaWxpbmdXaGl0ZXNwYWNlVHlwZShjb25zdCBJbmxpbmVUZXh0 SXRlbSYgaW5saW5lVGV4dEl0ZW0pIGNvbnN0CiB7CiAgICAgaWYgKCFpbmxpbmVUZXh0SXRlbS5p c1doaXRlc3BhY2UoKSkK