230478 2021-09-20 06:35:36 -0700 TimingFunction::transformTime() is poorly-named 2021-09-20 09:27:22 -0700 1 1 1 Unclassified WebKit Animations WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 graouts graouts dino graouts simon.fraser webkit-bug-importer oldest_to_newest 1795051 0 graouts 2021-09-20 06:35:36 -0700 TimingFunction::transformTime() is poorly-named 1795052 1 438670 graouts 2021-09-20 06:36:08 -0700 Created attachment 438670 Patch 1795053 2 438671 graouts 2021-09-20 06:38:52 -0700 Created attachment 438671 Patch 1795068 3 438675 graouts 2021-09-20 07:19:20 -0700 Created attachment 438675 Patch 1795112 4 ews-feeder 2021-09-20 09:26:34 -0700 Committed r282751 (241888@main): <https://commits.webkit.org/241888@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 438675. 1795113 5 webkit-bug-importer 2021-09-20 09:27:22 -0700 <rdar://problem/83309591> 438670 2021-09-20 06:36:08 -0700 2021-09-20 06:38:49 -0700 Patch bug-230478-20210920153607.patch text/plain 9412 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyNzQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDk1M2Q3MDZlMDY5ZDc5 ZjA4MGQ1ZTFjNzYzNjI2NDA0MzBmODZhYi4uMmZlMmQ3YjhkNzI3YjQ4YzJhZWM1MzRmNTdjMjYx MWY4YTRkNzYyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIxLTA5LTIwICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0B3ZWJraXQub3JnPgorCisgICAgICAgIFRpbWluZ0Z1bmN0aW9u Ojp0cmFuc2Zvcm1UaW1lKCkgaXMgcG9vcmx5LW5hbWVkCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzA0NzgKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMgKE9PUFMhKS4KKworICAgICAg ICAqIGFuaW1hdGlvbi9BbmltYXRpb25FZmZlY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QW5p bWF0aW9uRWZmZWN0OjpnZXRDb21wdXRlZFRpbWluZyBjb25zdCk6CisgICAgICAgICogYW5pbWF0 aW9uL0tleWZyYW1lRWZmZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OktleWZyYW1lRWZmZWN0 OjpzZXRBbmltYXRlZFByb3BlcnRpZXNJblN0eWxlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9TY3Jv bGxBbmltYXRpb25TbW9vdGguY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsQW5pbWF0aW9u U21vb3RoOjphbmltYXRlU2Nyb2xsKToKKyAgICAgICAgKiBwbGF0Zm9ybS9hbmltYXRpb24vVGlt aW5nRnVuY3Rpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6VGltaW5nRnVuY3Rpb246OnRyYW5z Zm9ybVByb2dyZXNzIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlRpbWluZ0Z1bmN0aW9uOjp0 cmFuc2Zvcm1UaW1lIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9hbmltYXRp b24vVGltaW5nRnVuY3Rpb24uaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvU2Nyb2xsYmFyc0Nv bnRyb2xsZXJNYWMubW06CisgICAgICAgICgtW1dlYlNjcm9sbGJhclBhcnRBbmltYXRpb24gc2V0 Q3VycmVudFByb2dyZXNzOl0pOgorCiAyMDIxLTA5LTE5ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5m cmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEhhdmUgU2Nyb2xsQW5pbWF0aW9uIHdvcmsgaW4g dGVybXMgb2Ygb2Zmc2V0cywgbm90IHBvc2l0aW9ucwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYW5pbWF0aW9uL0FuaW1hdGlvbkVmZmVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hbmltYXRp b24vQW5pbWF0aW9uRWZmZWN0LmNwcAppbmRleCBjZThmOGNkMzcwNjFiMjM4ZmZmZWUxMDkxMmZj NTczNzBjZDYwYmFlLi44YmIzYmZhYmU1OThlMzBlZWFhMWM1NTFlYzUwNTFhMjgyMDk4NWEzIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vQW5pbWF0aW9uRWZmZWN0LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vQW5pbWF0aW9uRWZmZWN0LmNwcApAQCAtMzI2 LDcgKzMyNiw3IEBAIENvbXB1dGVkRWZmZWN0VGltaW5nIEFuaW1hdGlvbkVmZmVjdDo6Z2V0Q29t cHV0ZWRUaW1pbmcoc3RkOjpvcHRpb25hbDxTZWNvbmRzPiBzCiAKICAgICAgICAgICAgIC8vIDMu IFJldHVybiB0aGUgcmVzdWx0IG9mIGV2YWx1YXRpbmcgdGhlIGFuaW1hdGlvbiBlZmZlY3TigJlz IHRpbWluZyBmdW5jdGlvbiBwYXNzaW5nIGRpcmVjdGVkIHByb2dyZXNzIGFzIHRoZQogICAgICAg ICAgICAgLy8gICAgaW5wdXQgcHJvZ3Jlc3MgdmFsdWUgYW5kIGJlZm9yZSBmbGFnIGFzIHRoZSBi ZWZvcmUgZmxhZy4KLSAgICAgICAgICAgIHJldHVybiBtX3RpbWluZ0Z1bmN0aW9uLT50cmFuc2Zv cm1UaW1lKCpkaXJlY3RlZFByb2dyZXNzLCBpdGVyYXRpb25EdXJhdGlvbiwgYmVmb3JlKTsKKyAg ICAgICAgICAgIHJldHVybiBtX3RpbWluZ0Z1bmN0aW9uLT50cmFuc2Zvcm1Qcm9ncmVzcygqZGly ZWN0ZWRQcm9ncmVzcywgaXRlcmF0aW9uRHVyYXRpb24sIGJlZm9yZSk7CiAgICAgICAgIH0KIAog ICAgICAgICByZXR1cm4gKmRpcmVjdGVkUHJvZ3Jlc3M7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9hbmltYXRpb24vS2V5ZnJhbWVFZmZlY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvYW5pbWF0 aW9uL0tleWZyYW1lRWZmZWN0LmNwcAppbmRleCAxMWQ1ZjE2ODExNjY1OGVjMTZmNGJiNTgzNmFk YTVjNzIwY2JiY2M5Li5hZGY3ZGU5MTBlZDQyZmY4NWEzOGExNmRjMTVhNmY4MmQ2M2ZmMzQyIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vS2V5ZnJhbWVFZmZlY3QuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9LZXlmcmFtZUVmZmVjdC5jcHAKQEAgLTE1NTUs NyArMTU1NSw3IEBAIHZvaWQgS2V5ZnJhbWVFZmZlY3Q6OnNldEFuaW1hdGVkUHJvcGVydGllc0lu U3R5bGUoUmVuZGVyU3R5bGUmIHRhcmdldFN0eWxlLCBkb3ViCiAgICAgICAgICAgICBpZiAoYXV0 byBkdXJhdGlvbiA9IGl0ZXJhdGlvbkR1cmF0aW9uKCkpIHsKICAgICAgICAgICAgICAgICBhdXRv IHJhbmdlRHVyYXRpb24gPSAoZW5kT2Zmc2V0IC0gc3RhcnRPZmZzZXQpICogZHVyYXRpb24uc2Vj b25kcygpOwogICAgICAgICAgICAgICAgIGlmIChhdXRvKiB0aW1pbmdGdW5jdGlvbiA9IHRpbWlu Z0Z1bmN0aW9uRm9yS2V5ZnJhbWVBdEluZGV4KHN0YXJ0S2V5ZnJhbWVJbmRleC52YWx1ZSgpKSkK LSAgICAgICAgICAgICAgICAgICAgdHJhbnNmb3JtZWREaXN0YW5jZSA9IHRpbWluZ0Z1bmN0aW9u LT50cmFuc2Zvcm1UaW1lKGludGVydmFsRGlzdGFuY2UsIHJhbmdlRHVyYXRpb24pOworICAgICAg ICAgICAgICAgICAgICB0cmFuc2Zvcm1lZERpc3RhbmNlID0gdGltaW5nRnVuY3Rpb24tPnRyYW5z Zm9ybVByb2dyZXNzKGludGVydmFsRGlzdGFuY2UsIHJhbmdlRHVyYXRpb24pOwogICAgICAgICAg ICAgfQogICAgICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Nj cm9sbEFuaW1hdGlvblNtb290aC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxB bmltYXRpb25TbW9vdGguY3BwCmluZGV4IDZlMjk3NTE5ZDg0ZGQ1NGViZWI1MzUyMzUzYjAzYzZk MjRlNTBiNDYuLjI5ZTRmZGI2NGFlNzQ5MTljOWIxYjVhMmRlZDUxMjU0NmE0ZmRjNTAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbEFuaW1hdGlvblNtb290aC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsQW5pbWF0aW9uU21vb3RoLmNwcApA QCAtMTMzLDcgKzEzMyw3IEBAIGJvb2wgU2Nyb2xsQW5pbWF0aW9uU21vb3RoOjphbmltYXRlU2Ny b2xsKE1vbm90b25pY1RpbWUgY3VycmVudFRpbWUpCiAgICAgY3VycmVudFRpbWUgPSBzdGQ6Om1p bihjdXJyZW50VGltZSwgZW5kVGltZSk7CiAKICAgICBkb3VibGUgZnJhY3Rpb25Db21wbGV0ZSA9 IChjdXJyZW50VGltZSAtIG1fc3RhcnRUaW1lKSAvIG1fZHVyYXRpb247Ci0gICAgZG91YmxlIHBy b2dyZXNzID0gbV9lYXNlSW5PdXRUaW1pbmdGdW5jdGlvbi0+dHJhbnNmb3JtVGltZShmcmFjdGlv bkNvbXBsZXRlLCBtX2R1cmF0aW9uLnZhbHVlKCkpOworICAgIGRvdWJsZSBwcm9ncmVzcyA9IG1f ZWFzZUluT3V0VGltaW5nRnVuY3Rpb24tPnRyYW5zZm9ybVByb2dyZXNzKGZyYWN0aW9uQ29tcGxl dGUsIG1fZHVyYXRpb24udmFsdWUoKSk7CiAKICAgICBtX2N1cnJlbnRPZmZzZXQgPSB7CiAgICAg ICAgIGxpbmVhckludGVycG9sYXRpb24ocHJvZ3Jlc3MsIG1fc3RhcnRPZmZzZXQueCgpLCBtX2Rl c3RpbmF0aW9uT2Zmc2V0LngoKSksCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9hbmltYXRpb24vVGltaW5nRnVuY3Rpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v YW5pbWF0aW9uL1RpbWluZ0Z1bmN0aW9uLmNwcAppbmRleCAzZThiNjgyNjlhZjg0NDNhYzkwNzkw NDgxYmUzZGVhZjk4MDAxYjhjLi45N2IyMDU3ZjZhNDBmZGViZTRkZDM1NmRmM2MzNzRiMDg2ZTVh Zjc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hbmltYXRpb24vVGltaW5n RnVuY3Rpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2FuaW1hdGlvbi9UaW1p bmdGdW5jdGlvbi5jcHAKQEAgLTg5LDE3ICs4OSwxNyBAQCBUZXh0U3RyZWFtJiBvcGVyYXRvcjw8 KFRleHRTdHJlYW0mIHRzLCBjb25zdCBUaW1pbmdGdW5jdGlvbiYgdGltaW5nRnVuY3Rpb24pCiAg ICAgcmV0dXJuIHRzOwogfQogCi1kb3VibGUgVGltaW5nRnVuY3Rpb246OnRyYW5zZm9ybVRpbWUo ZG91YmxlIGlucHV0VGltZSwgZG91YmxlIGR1cmF0aW9uLCBib29sIGJlZm9yZSkgY29uc3QKK2Rv dWJsZSBUaW1pbmdGdW5jdGlvbjo6dHJhbnNmb3JtUHJvZ3Jlc3MoZG91YmxlIHByb2dyZXNzLCBk b3VibGUgZHVyYXRpb24sIGJvb2wgYmVmb3JlKSBjb25zdAogewogICAgIHN3aXRjaCAobV90eXBl KSB7CiAgICAgY2FzZSBUaW1pbmdGdW5jdGlvbjo6Q3ViaWNCZXppZXJGdW5jdGlvbjogewogICAg ICAgICBhdXRvJiBmdW5jdGlvbiA9IGRvd25jYXN0PEN1YmljQmV6aWVyVGltaW5nRnVuY3Rpb24+ KCp0aGlzKTsKICAgICAgICAgaWYgKGZ1bmN0aW9uLmlzTGluZWFyKCkpCi0gICAgICAgICAgICBy ZXR1cm4gaW5wdXRUaW1lOworICAgICAgICAgICAgcmV0dXJuIHByb2dyZXNzOwogICAgICAgICAv LyBUaGUgZXBzaWxvbiB2YWx1ZSB3ZSBwYXNzIHRvIFVuaXRCZXppZXI6OnNvbHZlIGdpdmVuIHRo YXQgdGhlIGFuaW1hdGlvbiBpcyBnb2luZyB0byBydW4gb3ZlciB8ZHVyfCBzZWNvbmRzLiBUaGUg bG9uZ2VyIHRoZQogICAgICAgICAvLyBhbmltYXRpb24sIHRoZSBtb3JlIHByZWNpc2lvbiB3ZSBu ZWVkIGluIHRoZSB0aW1pbmcgZnVuY3Rpb24gcmVzdWx0IHRvIGF2b2lkIHVnbHkgZGlzY29udGlu dWl0aWVzLgogICAgICAgICBhdXRvIGVwc2lsb24gPSAxLjAgLyAoMTAwMC4wICogZHVyYXRpb24p OwotICAgICAgICByZXR1cm4gVW5pdEJlemllcihmdW5jdGlvbi54MSgpLCBmdW5jdGlvbi55MSgp LCBmdW5jdGlvbi54MigpLCBmdW5jdGlvbi55MigpKS5zb2x2ZShpbnB1dFRpbWUsIGVwc2lsb24p OworICAgICAgICByZXR1cm4gVW5pdEJlemllcihmdW5jdGlvbi54MSgpLCBmdW5jdGlvbi55MSgp LCBmdW5jdGlvbi54MigpLCBmdW5jdGlvbi55MigpKS5zb2x2ZShwcm9ncmVzcywgZXBzaWxvbik7 CiAgICAgfQogICAgIGNhc2UgVGltaW5nRnVuY3Rpb246OlN0ZXBzRnVuY3Rpb246IHsKICAgICAg ICAgLy8gaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1lYXNpbmctMS8jc3RlcC10aW1pbmct ZnVuY3Rpb25zCkBAIC0xMDcsNyArMTA3LDcgQEAgZG91YmxlIFRpbWluZ0Z1bmN0aW9uOjp0cmFu c2Zvcm1UaW1lKGRvdWJsZSBpbnB1dFRpbWUsIGRvdWJsZSBkdXJhdGlvbiwgYm9vbCBiZWYKICAg ICAgICAgYXV0byBzdGVwcyA9IGZ1bmN0aW9uLm51bWJlck9mU3RlcHMoKTsKICAgICAgICAgYXV0 byBzdGVwUG9zaXRpb24gPSBmdW5jdGlvbi5zdGVwUG9zaXRpb24oKTsKICAgICAgICAgLy8gMS4g Q2FsY3VsYXRlIHRoZSBjdXJyZW50IHN0ZXAgYXMgZmxvb3IoaW5wdXQgcHJvZ3Jlc3MgdmFsdWUg w5cgc3RlcHMpLgotICAgICAgICBhdXRvIGN1cnJlbnRTdGVwID0gc3RkOjpmbG9vcihpbnB1dFRp bWUgKiBzdGVwcyk7CisgICAgICAgIGF1dG8gY3VycmVudFN0ZXAgPSBzdGQ6OmZsb29yKHByb2dy ZXNzICogc3RlcHMpOwogICAgICAgICAvLyAyLiBJZiB0aGUgc3RlcCBwb3NpdGlvbiBwcm9wZXJ0 eSBpcyBzdGFydCwgaW5jcmVtZW50IGN1cnJlbnQgc3RlcCBieSBvbmUuCiAgICAgICAgIGlmIChz dGVwUG9zaXRpb24gPT0gU3RlcHNUaW1pbmdGdW5jdGlvbjo6U3RlcFBvc2l0aW9uOjpKdW1wU3Rh cnQgfHwgc3RlcFBvc2l0aW9uID09IFN0ZXBzVGltaW5nRnVuY3Rpb246OlN0ZXBQb3NpdGlvbjo6 U3RhcnQgfHwgc3RlcFBvc2l0aW9uID09IFN0ZXBzVGltaW5nRnVuY3Rpb246OlN0ZXBQb3NpdGlv bjo6SnVtcEJvdGgpCiAgICAgICAgICAgICArK2N1cnJlbnRTdGVwOwpAQCAtMTE1LDEwICsxMTUs MTAgQEAgZG91YmxlIFRpbWluZ0Z1bmN0aW9uOjp0cmFuc2Zvcm1UaW1lKGRvdWJsZSBpbnB1dFRp bWUsIGRvdWJsZSBkdXJhdGlvbiwgYm9vbCBiZWYKICAgICAgICAgLy8gICAgLSB0aGUgYmVmb3Jl IGZsYWcgaXMgc2V0LCBhbmQKICAgICAgICAgLy8gICAgLSBpbnB1dCBwcm9ncmVzcyB2YWx1ZSDD lyBzdGVwcyBtb2QgMSBlcXVhbHMgemVybyAodGhhdCBpcywgaWYgaW5wdXQgcHJvZ3Jlc3MgdmFs dWUgw5cgc3RlcHMgaXMgaW50ZWdyYWwpLCB0aGVuCiAgICAgICAgIC8vICAgIGRlY3JlbWVudCBj dXJyZW50IHN0ZXAgYnkgb25lLgotICAgICAgICBpZiAoYmVmb3JlICYmICFmbW9kKGlucHV0VGlt ZSAqIHN0ZXBzLCAxKSkKKyAgICAgICAgaWYgKGJlZm9yZSAmJiAhZm1vZChwcm9ncmVzcyAqIHN0 ZXBzLCAxKSkKICAgICAgICAgICAgIGN1cnJlbnRTdGVwLS07CiAgICAgICAgIC8vIDQuIElmIGlu cHV0IHByb2dyZXNzIHZhbHVlIOKJpSAwIGFuZCBjdXJyZW50IHN0ZXAgPCAwLCBsZXQgY3VycmVu dCBzdGVwIGJlIHplcm8uCi0gICAgICAgIGlmIChpbnB1dFRpbWUgPj0gMCAmJiBjdXJyZW50U3Rl cCA8IDApCisgICAgICAgIGlmIChwcm9ncmVzcyA+PSAwICYmIGN1cnJlbnRTdGVwIDwgMCkKICAg ICAgICAgICAgIGN1cnJlbnRTdGVwID0gMDsKICAgICAgICAgLy8gNS4gQ2FsY3VsYXRlIGp1bXBz IGJhc2VkIG9uIHRoZSBzdGVwIHBvc2l0aW9uLgogICAgICAgICBpZiAoc3RlcFBvc2l0aW9uID09 IFN0ZXBzVGltaW5nRnVuY3Rpb246OlN0ZXBQb3NpdGlvbjo6SnVtcE5vbmUpCkBAIC0xMjYsMTcg KzEyNiwxNyBAQCBkb3VibGUgVGltaW5nRnVuY3Rpb246OnRyYW5zZm9ybVRpbWUoZG91YmxlIGlu cHV0VGltZSwgZG91YmxlIGR1cmF0aW9uLCBib29sIGJlZgogICAgICAgICBlbHNlIGlmIChzdGVw UG9zaXRpb24gPT0gU3RlcHNUaW1pbmdGdW5jdGlvbjo6U3RlcFBvc2l0aW9uOjpKdW1wQm90aCkK ICAgICAgICAgICAgICsrc3RlcHM7CiAgICAgICAgIC8vIDYuIElmIGlucHV0IHByb2dyZXNzIHZh bHVlIOKJpCAxIGFuZCBjdXJyZW50IHN0ZXAgPiBqdW1wcywgbGV0IGN1cnJlbnQgc3RlcCBiZSBq dW1wcy4KLSAgICAgICAgaWYgKGlucHV0VGltZSA8PSAxICYmIGN1cnJlbnRTdGVwID4gc3RlcHMp CisgICAgICAgIGlmIChwcm9ncmVzcyA8PSAxICYmIGN1cnJlbnRTdGVwID4gc3RlcHMpCiAgICAg ICAgICAgICBjdXJyZW50U3RlcCA9IHN0ZXBzOwogICAgICAgICAvLyA3LiBUaGUgb3V0cHV0IHBy b2dyZXNzIHZhbHVlIGlzIGN1cnJlbnQgc3RlcCAvIGp1bXBzLgogICAgICAgICByZXR1cm4gY3Vy cmVudFN0ZXAgLyBzdGVwczsKICAgICB9CiAgICAgY2FzZSBUaW1pbmdGdW5jdGlvbjo6U3ByaW5n RnVuY3Rpb246IHsKICAgICAgICAgYXV0byYgZnVuY3Rpb24gPSBkb3duY2FzdDxTcHJpbmdUaW1p bmdGdW5jdGlvbj4oKnRoaXMpOwotICAgICAgICByZXR1cm4gU3ByaW5nU29sdmVyKGZ1bmN0aW9u Lm1hc3MoKSwgZnVuY3Rpb24uc3RpZmZuZXNzKCksIGZ1bmN0aW9uLmRhbXBpbmcoKSwgZnVuY3Rp b24uaW5pdGlhbFZlbG9jaXR5KCkpLnNvbHZlKGlucHV0VGltZSAqIGR1cmF0aW9uKTsKKyAgICAg ICAgcmV0dXJuIFNwcmluZ1NvbHZlcihmdW5jdGlvbi5tYXNzKCksIGZ1bmN0aW9uLnN0aWZmbmVz cygpLCBmdW5jdGlvbi5kYW1waW5nKCksIGZ1bmN0aW9uLmluaXRpYWxWZWxvY2l0eSgpKS5zb2x2 ZShwcm9ncmVzcyAqIGR1cmF0aW9uKTsKICAgICB9CiAgICAgY2FzZSBUaW1pbmdGdW5jdGlvbjo6 TGluZWFyRnVuY3Rpb246Ci0gICAgICAgIHJldHVybiBpbnB1dFRpbWU7CisgICAgICAgIHJldHVy biBwcm9ncmVzczsKICAgICB9CiAKICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2FuaW1hdGlvbi9UaW1pbmdGdW5jdGlvbi5oIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYW5pbWF0aW9uL1RpbWluZ0Z1bmN0aW9uLmgKaW5kZXgg MmJmNmFjNjllYWJhYmUyNDIzYzlkZjFiNGJmY2YyNTI1YTEzZTc2Mi4uMzU2ZWFjMTRjN2Y2OTk1 YjdhNWIzZDMxZWQwZjY1MWUxY2VlMDhlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vYW5pbWF0aW9uL1RpbWluZ0Z1bmN0aW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vYW5pbWF0aW9uL1RpbWluZ0Z1bmN0aW9uLmgKQEAgLTU1LDcgKzU1LDcgQEAgcHVibGlj OgogCiAgICAgc3RhdGljIEV4Y2VwdGlvbk9yPFJlZlB0cjxUaW1pbmdGdW5jdGlvbj4+IGNyZWF0 ZUZyb21DU1NUZXh0KGNvbnN0IFN0cmluZyYpOwogICAgIHN0YXRpYyBSZWZQdHI8VGltaW5nRnVu Y3Rpb24+IGNyZWF0ZUZyb21DU1NWYWx1ZShjb25zdCBDU1NWYWx1ZSYpOwotICAgIGRvdWJsZSB0 cmFuc2Zvcm1UaW1lKGRvdWJsZSwgZG91YmxlLCBib29sIGJlZm9yZSA9IGZhbHNlKSBjb25zdDsK KyAgICBkb3VibGUgdHJhbnNmb3JtUHJvZ3Jlc3MoZG91YmxlIHByb2dyZXNzLCBkb3VibGUgZHVy YXRpb24sIGJvb2wgYmVmb3JlID0gZmFsc2UpIGNvbnN0OwogICAgIFN0cmluZyBjc3NUZXh0KCkg Y29uc3Q7CiAKIHByb3RlY3RlZDoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L21hYy9TY3JvbGxiYXJzQ29udHJvbGxlck1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L21hYy9TY3JvbGxiYXJzQ29udHJvbGxlck1hYy5tbQppbmRleCA2NTEwNDNhMzU5OGUzZjhhMTRh MTI0MjYwZDNmN2NjNDY1YzI1ZTJjLi40NDUwYWMxZDljNjllYzFjODI4MWZmYzBmNjgzYWJmNzIy MjAxYzc0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsYmFy c0NvbnRyb2xsZXJNYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9s bGJhcnNDb250cm9sbGVyTWFjLm1tCkBAIC0yNjEsNyArMjYxLDcgQEAgLSAodm9pZClzZXRDdXJy ZW50UHJvZ3Jlc3M6KE5TVGltZXIgKil0aW1lcgogICAgICAgICBOU1RpbWVJbnRlcnZhbCB0ID0g MTsKICAgICAgICAgaWYgKF9kdXJhdGlvbikKICAgICAgICAgICAgIHQgPSBlbGFwc2VkIC8gX2R1 cmF0aW9uOwotICAgICAgICBwcm9ncmVzcyA9IF90aW1pbmdGdW5jdGlvbi0+dHJhbnNmb3JtVGlt ZSh0LCBfZHVyYXRpb24pOworICAgICAgICBwcm9ncmVzcyA9IF90aW1pbmdGdW5jdGlvbi0+dHJh bnNmb3JtUHJvZ3Jlc3ModCwgX2R1cmF0aW9uKTsKICAgICB9CiAgICAgQVNTRVJUKF9zY3JvbGxi YXIpOwogCg== 438671 2021-09-20 06:38:52 -0700 2021-09-20 07:54:12 -0700 Patch bug-230478-20210920153851.patch text/plain 9537 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyNzQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDk1M2Q3MDZlMDY5ZDc5 ZjA4MGQ1ZTFjNzYzNjI2NDA0MzBmODZhYi4uMDk2NDE4NjkzMTlmNzY3ZTVjNWQyZTU3Y2MxYWNm OGMxZjdjOWUwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIxLTA5LTIwICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0B3ZWJraXQub3JnPgorCisgICAgICAgIFRpbWluZ0Z1bmN0aW9u Ojp0cmFuc2Zvcm1UaW1lKCkgaXMgcG9vcmx5LW5hbWVkCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzA0NzgKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGZ1bmN0aW9uIHRyYW5zZm9ybXMgYW4gaW5w dXQgX3Byb2dyZXNzXyBub3QgYSB0aW1lLCBzbyB3ZSByZW5hbWUgaXQgdG8gdHJhbnNmb3JtUHJv Z3Jlc3MoKSBhbmQgbmFtZQorICAgICAgICBpdHMgZmlyc3QgcGFyYW1ldGVyIGFjY29yZGluZ2x5 LgorCisgICAgICAgICogYW5pbWF0aW9uL0FuaW1hdGlvbkVmZmVjdC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpBbmltYXRpb25FZmZlY3Q6OmdldENvbXB1dGVkVGltaW5nIGNvbnN0KToKKyAgICAg ICAgKiBhbmltYXRpb24vS2V5ZnJhbWVFZmZlY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6S2V5 ZnJhbWVFZmZlY3Q6OnNldEFuaW1hdGVkUHJvcGVydGllc0luU3R5bGUpOgorICAgICAgICAqIHBs YXRmb3JtL1Njcm9sbEFuaW1hdGlvblNtb290aC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3Jv bGxBbmltYXRpb25TbW9vdGg6OmFuaW1hdGVTY3JvbGwpOgorICAgICAgICAqIHBsYXRmb3JtL2Fu aW1hdGlvbi9UaW1pbmdGdW5jdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUaW1pbmdGdW5j dGlvbjo6dHJhbnNmb3JtUHJvZ3Jlc3MgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6VGltaW5n RnVuY3Rpb246OnRyYW5zZm9ybVRpbWUgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIHBsYXRm b3JtL2FuaW1hdGlvbi9UaW1pbmdGdW5jdGlvbi5oOgorICAgICAgICAqIHBsYXRmb3JtL21hYy9T Y3JvbGxiYXJzQ29udHJvbGxlck1hYy5tbToKKyAgICAgICAgKC1bV2ViU2Nyb2xsYmFyUGFydEFu aW1hdGlvbiBzZXRDdXJyZW50UHJvZ3Jlc3M6XSk6CisKIDIwMjEtMDktMTkgIFNpbW9uIEZyYXNl ciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgSGF2ZSBTY3JvbGxBbmltYXRp b24gd29yayBpbiB0ZXJtcyBvZiBvZmZzZXRzLCBub3QgcG9zaXRpb25zCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9hbmltYXRpb24vQW5pbWF0aW9uRWZmZWN0LmNwcCBiL1NvdXJjZS9XZWJD b3JlL2FuaW1hdGlvbi9BbmltYXRpb25FZmZlY3QuY3BwCmluZGV4IGNlOGY4Y2QzNzA2MWIyMzhm ZmZlZTEwOTEyZmM1NzM3MGNkNjBiYWUuLjhiYjNiZmFiZTU5OGUzMGVlYWExYzU1MWVjNTA1MWEy ODIwOTg1YTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9BbmltYXRpb25F ZmZlY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9BbmltYXRpb25FZmZlY3Qu Y3BwCkBAIC0zMjYsNyArMzI2LDcgQEAgQ29tcHV0ZWRFZmZlY3RUaW1pbmcgQW5pbWF0aW9uRWZm ZWN0OjpnZXRDb21wdXRlZFRpbWluZyhzdGQ6Om9wdGlvbmFsPFNlY29uZHM+IHMKIAogICAgICAg ICAgICAgLy8gMy4gUmV0dXJuIHRoZSByZXN1bHQgb2YgZXZhbHVhdGluZyB0aGUgYW5pbWF0aW9u IGVmZmVjdOKAmXMgdGltaW5nIGZ1bmN0aW9uIHBhc3NpbmcgZGlyZWN0ZWQgcHJvZ3Jlc3MgYXMg dGhlCiAgICAgICAgICAgICAvLyAgICBpbnB1dCBwcm9ncmVzcyB2YWx1ZSBhbmQgYmVmb3JlIGZs YWcgYXMgdGhlIGJlZm9yZSBmbGFnLgotICAgICAgICAgICAgcmV0dXJuIG1fdGltaW5nRnVuY3Rp b24tPnRyYW5zZm9ybVRpbWUoKmRpcmVjdGVkUHJvZ3Jlc3MsIGl0ZXJhdGlvbkR1cmF0aW9uLCBi ZWZvcmUpOworICAgICAgICAgICAgcmV0dXJuIG1fdGltaW5nRnVuY3Rpb24tPnRyYW5zZm9ybVBy b2dyZXNzKCpkaXJlY3RlZFByb2dyZXNzLCBpdGVyYXRpb25EdXJhdGlvbiwgYmVmb3JlKTsKICAg ICAgICAgfQogCiAgICAgICAgIHJldHVybiAqZGlyZWN0ZWRQcm9ncmVzczsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9LZXlmcmFtZUVmZmVjdC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9hbmltYXRpb24vS2V5ZnJhbWVFZmZlY3QuY3BwCmluZGV4IDExZDVmMTY4MTE2NjU4ZWMx NmY0YmI1ODM2YWRhNWM3MjBjYmJjYzkuLmFkZjdkZTkxMGVkNDJmZjg1YTM4YTE2ZGMxNWE2Zjgy ZDYzZmYzNDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9LZXlmcmFtZUVm ZmVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0tleWZyYW1lRWZmZWN0LmNw cApAQCAtMTU1NSw3ICsxNTU1LDcgQEAgdm9pZCBLZXlmcmFtZUVmZmVjdDo6c2V0QW5pbWF0ZWRQ cm9wZXJ0aWVzSW5TdHlsZShSZW5kZXJTdHlsZSYgdGFyZ2V0U3R5bGUsIGRvdWIKICAgICAgICAg ICAgIGlmIChhdXRvIGR1cmF0aW9uID0gaXRlcmF0aW9uRHVyYXRpb24oKSkgewogICAgICAgICAg ICAgICAgIGF1dG8gcmFuZ2VEdXJhdGlvbiA9IChlbmRPZmZzZXQgLSBzdGFydE9mZnNldCkgKiBk dXJhdGlvbi5zZWNvbmRzKCk7CiAgICAgICAgICAgICAgICAgaWYgKGF1dG8qIHRpbWluZ0Z1bmN0 aW9uID0gdGltaW5nRnVuY3Rpb25Gb3JLZXlmcmFtZUF0SW5kZXgoc3RhcnRLZXlmcmFtZUluZGV4 LnZhbHVlKCkpKQotICAgICAgICAgICAgICAgICAgICB0cmFuc2Zvcm1lZERpc3RhbmNlID0gdGlt aW5nRnVuY3Rpb24tPnRyYW5zZm9ybVRpbWUoaW50ZXJ2YWxEaXN0YW5jZSwgcmFuZ2VEdXJhdGlv bik7CisgICAgICAgICAgICAgICAgICAgIHRyYW5zZm9ybWVkRGlzdGFuY2UgPSB0aW1pbmdGdW5j dGlvbi0+dHJhbnNmb3JtUHJvZ3Jlc3MoaW50ZXJ2YWxEaXN0YW5jZSwgcmFuZ2VEdXJhdGlvbik7 CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vU2Nyb2xsQW5pbWF0aW9uU21vb3RoLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL1Njcm9sbEFuaW1hdGlvblNtb290aC5jcHAKaW5kZXggNmUyOTc1MTlkODRkZDU0ZWJlYjUz NTIzNTNiMDNjNmQyNGU1MGI0Ni4uMjllNGZkYjY0YWU3NDkxOWM5YjFiNWEyZGVkNTEyNTQ2YTRm ZGM1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsQW5pbWF0aW9u U21vb3RoLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxBbmltYXRpb25T bW9vdGguY3BwCkBAIC0xMzMsNyArMTMzLDcgQEAgYm9vbCBTY3JvbGxBbmltYXRpb25TbW9vdGg6 OmFuaW1hdGVTY3JvbGwoTW9ub3RvbmljVGltZSBjdXJyZW50VGltZSkKICAgICBjdXJyZW50VGlt ZSA9IHN0ZDo6bWluKGN1cnJlbnRUaW1lLCBlbmRUaW1lKTsKIAogICAgIGRvdWJsZSBmcmFjdGlv bkNvbXBsZXRlID0gKGN1cnJlbnRUaW1lIC0gbV9zdGFydFRpbWUpIC8gbV9kdXJhdGlvbjsKLSAg ICBkb3VibGUgcHJvZ3Jlc3MgPSBtX2Vhc2VJbk91dFRpbWluZ0Z1bmN0aW9uLT50cmFuc2Zvcm1U aW1lKGZyYWN0aW9uQ29tcGxldGUsIG1fZHVyYXRpb24udmFsdWUoKSk7CisgICAgZG91YmxlIHBy b2dyZXNzID0gbV9lYXNlSW5PdXRUaW1pbmdGdW5jdGlvbi0+dHJhbnNmb3JtUHJvZ3Jlc3MoZnJh Y3Rpb25Db21wbGV0ZSwgbV9kdXJhdGlvbi52YWx1ZSgpKTsKIAogICAgIG1fY3VycmVudE9mZnNl dCA9IHsKICAgICAgICAgbGluZWFySW50ZXJwb2xhdGlvbihwcm9ncmVzcywgbV9zdGFydE9mZnNl dC54KCksIG1fZGVzdGluYXRpb25PZmZzZXQueCgpKSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2FuaW1hdGlvbi9UaW1pbmdGdW5jdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9hbmltYXRpb24vVGltaW5nRnVuY3Rpb24uY3BwCmluZGV4IDNlOGI2ODI2OWFm ODQ0M2FjOTA3OTA0ODFiZTNkZWFmOTgwMDFiOGMuLjk3YjIwNTdmNmE0MGZkZWJlNGRkMzU2ZGYz YzM3NGIwODZlNWFmNzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2FuaW1h dGlvbi9UaW1pbmdGdW5jdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYW5p bWF0aW9uL1RpbWluZ0Z1bmN0aW9uLmNwcApAQCAtODksMTcgKzg5LDE3IEBAIFRleHRTdHJlYW0m IG9wZXJhdG9yPDwoVGV4dFN0cmVhbSYgdHMsIGNvbnN0IFRpbWluZ0Z1bmN0aW9uJiB0aW1pbmdG dW5jdGlvbikKICAgICByZXR1cm4gdHM7CiB9CiAKLWRvdWJsZSBUaW1pbmdGdW5jdGlvbjo6dHJh bnNmb3JtVGltZShkb3VibGUgaW5wdXRUaW1lLCBkb3VibGUgZHVyYXRpb24sIGJvb2wgYmVmb3Jl KSBjb25zdAorZG91YmxlIFRpbWluZ0Z1bmN0aW9uOjp0cmFuc2Zvcm1Qcm9ncmVzcyhkb3VibGUg cHJvZ3Jlc3MsIGRvdWJsZSBkdXJhdGlvbiwgYm9vbCBiZWZvcmUpIGNvbnN0CiB7CiAgICAgc3dp dGNoIChtX3R5cGUpIHsKICAgICBjYXNlIFRpbWluZ0Z1bmN0aW9uOjpDdWJpY0JlemllckZ1bmN0 aW9uOiB7CiAgICAgICAgIGF1dG8mIGZ1bmN0aW9uID0gZG93bmNhc3Q8Q3ViaWNCZXppZXJUaW1p bmdGdW5jdGlvbj4oKnRoaXMpOwogICAgICAgICBpZiAoZnVuY3Rpb24uaXNMaW5lYXIoKSkKLSAg ICAgICAgICAgIHJldHVybiBpbnB1dFRpbWU7CisgICAgICAgICAgICByZXR1cm4gcHJvZ3Jlc3M7 CiAgICAgICAgIC8vIFRoZSBlcHNpbG9uIHZhbHVlIHdlIHBhc3MgdG8gVW5pdEJlemllcjo6c29s dmUgZ2l2ZW4gdGhhdCB0aGUgYW5pbWF0aW9uIGlzIGdvaW5nIHRvIHJ1biBvdmVyIHxkdXJ8IHNl Y29uZHMuIFRoZSBsb25nZXIgdGhlCiAgICAgICAgIC8vIGFuaW1hdGlvbiwgdGhlIG1vcmUgcHJl Y2lzaW9uIHdlIG5lZWQgaW4gdGhlIHRpbWluZyBmdW5jdGlvbiByZXN1bHQgdG8gYXZvaWQgdWds eSBkaXNjb250aW51aXRpZXMuCiAgICAgICAgIGF1dG8gZXBzaWxvbiA9IDEuMCAvICgxMDAwLjAg KiBkdXJhdGlvbik7Ci0gICAgICAgIHJldHVybiBVbml0QmV6aWVyKGZ1bmN0aW9uLngxKCksIGZ1 bmN0aW9uLnkxKCksIGZ1bmN0aW9uLngyKCksIGZ1bmN0aW9uLnkyKCkpLnNvbHZlKGlucHV0VGlt ZSwgZXBzaWxvbik7CisgICAgICAgIHJldHVybiBVbml0QmV6aWVyKGZ1bmN0aW9uLngxKCksIGZ1 bmN0aW9uLnkxKCksIGZ1bmN0aW9uLngyKCksIGZ1bmN0aW9uLnkyKCkpLnNvbHZlKHByb2dyZXNz LCBlcHNpbG9uKTsKICAgICB9CiAgICAgY2FzZSBUaW1pbmdGdW5jdGlvbjo6U3RlcHNGdW5jdGlv bjogewogICAgICAgICAvLyBodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLWVhc2luZy0xLyNz dGVwLXRpbWluZy1mdW5jdGlvbnMKQEAgLTEwNyw3ICsxMDcsNyBAQCBkb3VibGUgVGltaW5nRnVu Y3Rpb246OnRyYW5zZm9ybVRpbWUoZG91YmxlIGlucHV0VGltZSwgZG91YmxlIGR1cmF0aW9uLCBi b29sIGJlZgogICAgICAgICBhdXRvIHN0ZXBzID0gZnVuY3Rpb24ubnVtYmVyT2ZTdGVwcygpOwog ICAgICAgICBhdXRvIHN0ZXBQb3NpdGlvbiA9IGZ1bmN0aW9uLnN0ZXBQb3NpdGlvbigpOwogICAg ICAgICAvLyAxLiBDYWxjdWxhdGUgdGhlIGN1cnJlbnQgc3RlcCBhcyBmbG9vcihpbnB1dCBwcm9n cmVzcyB2YWx1ZSDDlyBzdGVwcykuCi0gICAgICAgIGF1dG8gY3VycmVudFN0ZXAgPSBzdGQ6OmZs b29yKGlucHV0VGltZSAqIHN0ZXBzKTsKKyAgICAgICAgYXV0byBjdXJyZW50U3RlcCA9IHN0ZDo6 Zmxvb3IocHJvZ3Jlc3MgKiBzdGVwcyk7CiAgICAgICAgIC8vIDIuIElmIHRoZSBzdGVwIHBvc2l0 aW9uIHByb3BlcnR5IGlzIHN0YXJ0LCBpbmNyZW1lbnQgY3VycmVudCBzdGVwIGJ5IG9uZS4KICAg ICAgICAgaWYgKHN0ZXBQb3NpdGlvbiA9PSBTdGVwc1RpbWluZ0Z1bmN0aW9uOjpTdGVwUG9zaXRp b246Okp1bXBTdGFydCB8fCBzdGVwUG9zaXRpb24gPT0gU3RlcHNUaW1pbmdGdW5jdGlvbjo6U3Rl cFBvc2l0aW9uOjpTdGFydCB8fCBzdGVwUG9zaXRpb24gPT0gU3RlcHNUaW1pbmdGdW5jdGlvbjo6 U3RlcFBvc2l0aW9uOjpKdW1wQm90aCkKICAgICAgICAgICAgICsrY3VycmVudFN0ZXA7CkBAIC0x MTUsMTAgKzExNSwxMCBAQCBkb3VibGUgVGltaW5nRnVuY3Rpb246OnRyYW5zZm9ybVRpbWUoZG91 YmxlIGlucHV0VGltZSwgZG91YmxlIGR1cmF0aW9uLCBib29sIGJlZgogICAgICAgICAvLyAgICAt IHRoZSBiZWZvcmUgZmxhZyBpcyBzZXQsIGFuZAogICAgICAgICAvLyAgICAtIGlucHV0IHByb2dy ZXNzIHZhbHVlIMOXIHN0ZXBzIG1vZCAxIGVxdWFscyB6ZXJvICh0aGF0IGlzLCBpZiBpbnB1dCBw cm9ncmVzcyB2YWx1ZSDDlyBzdGVwcyBpcyBpbnRlZ3JhbCksIHRoZW4KICAgICAgICAgLy8gICAg ZGVjcmVtZW50IGN1cnJlbnQgc3RlcCBieSBvbmUuCi0gICAgICAgIGlmIChiZWZvcmUgJiYgIWZt b2QoaW5wdXRUaW1lICogc3RlcHMsIDEpKQorICAgICAgICBpZiAoYmVmb3JlICYmICFmbW9kKHBy b2dyZXNzICogc3RlcHMsIDEpKQogICAgICAgICAgICAgY3VycmVudFN0ZXAtLTsKICAgICAgICAg Ly8gNC4gSWYgaW5wdXQgcHJvZ3Jlc3MgdmFsdWUg4omlIDAgYW5kIGN1cnJlbnQgc3RlcCA8IDAs IGxldCBjdXJyZW50IHN0ZXAgYmUgemVyby4KLSAgICAgICAgaWYgKGlucHV0VGltZSA+PSAwICYm IGN1cnJlbnRTdGVwIDwgMCkKKyAgICAgICAgaWYgKHByb2dyZXNzID49IDAgJiYgY3VycmVudFN0 ZXAgPCAwKQogICAgICAgICAgICAgY3VycmVudFN0ZXAgPSAwOwogICAgICAgICAvLyA1LiBDYWxj dWxhdGUganVtcHMgYmFzZWQgb24gdGhlIHN0ZXAgcG9zaXRpb24uCiAgICAgICAgIGlmIChzdGVw UG9zaXRpb24gPT0gU3RlcHNUaW1pbmdGdW5jdGlvbjo6U3RlcFBvc2l0aW9uOjpKdW1wTm9uZSkK QEAgLTEyNiwxNyArMTI2LDE3IEBAIGRvdWJsZSBUaW1pbmdGdW5jdGlvbjo6dHJhbnNmb3JtVGlt ZShkb3VibGUgaW5wdXRUaW1lLCBkb3VibGUgZHVyYXRpb24sIGJvb2wgYmVmCiAgICAgICAgIGVs c2UgaWYgKHN0ZXBQb3NpdGlvbiA9PSBTdGVwc1RpbWluZ0Z1bmN0aW9uOjpTdGVwUG9zaXRpb246 Okp1bXBCb3RoKQogICAgICAgICAgICAgKytzdGVwczsKICAgICAgICAgLy8gNi4gSWYgaW5wdXQg cHJvZ3Jlc3MgdmFsdWUg4omkIDEgYW5kIGN1cnJlbnQgc3RlcCA+IGp1bXBzLCBsZXQgY3VycmVu dCBzdGVwIGJlIGp1bXBzLgotICAgICAgICBpZiAoaW5wdXRUaW1lIDw9IDEgJiYgY3VycmVudFN0 ZXAgPiBzdGVwcykKKyAgICAgICAgaWYgKHByb2dyZXNzIDw9IDEgJiYgY3VycmVudFN0ZXAgPiBz dGVwcykKICAgICAgICAgICAgIGN1cnJlbnRTdGVwID0gc3RlcHM7CiAgICAgICAgIC8vIDcuIFRo ZSBvdXRwdXQgcHJvZ3Jlc3MgdmFsdWUgaXMgY3VycmVudCBzdGVwIC8ganVtcHMuCiAgICAgICAg IHJldHVybiBjdXJyZW50U3RlcCAvIHN0ZXBzOwogICAgIH0KICAgICBjYXNlIFRpbWluZ0Z1bmN0 aW9uOjpTcHJpbmdGdW5jdGlvbjogewogICAgICAgICBhdXRvJiBmdW5jdGlvbiA9IGRvd25jYXN0 PFNwcmluZ1RpbWluZ0Z1bmN0aW9uPigqdGhpcyk7Ci0gICAgICAgIHJldHVybiBTcHJpbmdTb2x2 ZXIoZnVuY3Rpb24ubWFzcygpLCBmdW5jdGlvbi5zdGlmZm5lc3MoKSwgZnVuY3Rpb24uZGFtcGlu ZygpLCBmdW5jdGlvbi5pbml0aWFsVmVsb2NpdHkoKSkuc29sdmUoaW5wdXRUaW1lICogZHVyYXRp b24pOworICAgICAgICByZXR1cm4gU3ByaW5nU29sdmVyKGZ1bmN0aW9uLm1hc3MoKSwgZnVuY3Rp b24uc3RpZmZuZXNzKCksIGZ1bmN0aW9uLmRhbXBpbmcoKSwgZnVuY3Rpb24uaW5pdGlhbFZlbG9j aXR5KCkpLnNvbHZlKHByb2dyZXNzICogZHVyYXRpb24pOwogICAgIH0KICAgICBjYXNlIFRpbWlu Z0Z1bmN0aW9uOjpMaW5lYXJGdW5jdGlvbjoKLSAgICAgICAgcmV0dXJuIGlucHV0VGltZTsKKyAg ICAgICAgcmV0dXJuIHByb2dyZXNzOwogICAgIH0KIAogICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYW5pbWF0aW9uL1RpbWluZ0Z1 bmN0aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hbmltYXRpb24vVGltaW5nRnVuY3Rp b24uaAppbmRleCAyYmY2YWM2OWVhYmFiZTI0MjNjOWRmMWI0YmZjZjI1MjVhMTNlNzYyLi4zNTZl YWMxNGM3ZjY5OTViN2E1YjNkMzFlZDBmNjUxZTFjZWUwOGVmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9hbmltYXRpb24vVGltaW5nRnVuY3Rpb24uaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9hbmltYXRpb24vVGltaW5nRnVuY3Rpb24uaApAQCAtNTUsNyArNTUs NyBAQCBwdWJsaWM6CiAKICAgICBzdGF0aWMgRXhjZXB0aW9uT3I8UmVmUHRyPFRpbWluZ0Z1bmN0 aW9uPj4gY3JlYXRlRnJvbUNTU1RleHQoY29uc3QgU3RyaW5nJik7CiAgICAgc3RhdGljIFJlZlB0 cjxUaW1pbmdGdW5jdGlvbj4gY3JlYXRlRnJvbUNTU1ZhbHVlKGNvbnN0IENTU1ZhbHVlJik7Ci0g ICAgZG91YmxlIHRyYW5zZm9ybVRpbWUoZG91YmxlLCBkb3VibGUsIGJvb2wgYmVmb3JlID0gZmFs c2UpIGNvbnN0OworICAgIGRvdWJsZSB0cmFuc2Zvcm1Qcm9ncmVzcyhkb3VibGUgcHJvZ3Jlc3Ms IGRvdWJsZSBkdXJhdGlvbiwgYm9vbCBiZWZvcmUgPSBmYWxzZSkgY29uc3Q7CiAgICAgU3RyaW5n IGNzc1RleHQoKSBjb25zdDsKIAogcHJvdGVjdGVkOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbWFjL1Njcm9sbGJhcnNDb250cm9sbGVyTWFjLm1tIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbWFjL1Njcm9sbGJhcnNDb250cm9sbGVyTWFjLm1tCmluZGV4IDY1MTA0M2Ez NTk4ZTNmOGExNGExMjQyNjBkM2Y3Y2M0NjVjMjVlMmMuLjQ0NTBhYzFkOWM2OWVjMWM4MjgxZmZj MGY2ODNhYmY3MjIyMDFjNzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21h Yy9TY3JvbGxiYXJzQ29udHJvbGxlck1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9tYWMvU2Nyb2xsYmFyc0NvbnRyb2xsZXJNYWMubW0KQEAgLTI2MSw3ICsyNjEsNyBAQCAtICh2 b2lkKXNldEN1cnJlbnRQcm9ncmVzczooTlNUaW1lciAqKXRpbWVyCiAgICAgICAgIE5TVGltZUlu dGVydmFsIHQgPSAxOwogICAgICAgICBpZiAoX2R1cmF0aW9uKQogICAgICAgICAgICAgdCA9IGVs YXBzZWQgLyBfZHVyYXRpb247Ci0gICAgICAgIHByb2dyZXNzID0gX3RpbWluZ0Z1bmN0aW9uLT50 cmFuc2Zvcm1UaW1lKHQsIF9kdXJhdGlvbik7CisgICAgICAgIHByb2dyZXNzID0gX3RpbWluZ0Z1 bmN0aW9uLT50cmFuc2Zvcm1Qcm9ncmVzcyh0LCBfZHVyYXRpb24pOwogICAgIH0KICAgICBBU1NF UlQoX3Njcm9sbGJhcik7CiAK 438675 2021-09-20 07:19:20 -0700 2021-09-20 09:26:35 -0700 Patch bug-230478-20210920161919.patch text/plain 11087 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyNzQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDk1M2Q3MDZlMDY5ZDc5 ZjA4MGQ1ZTFjNzYzNjI2NDA0MzBmODZhYi4uMGRkYmNlMDhiZDNiMGIyYjgwNmVjYzE4N2ZhM2Y5 YzUwMjhmNTk1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTA5LTIwICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0B3ZWJraXQub3JnPgorCisgICAgICAgIFRpbWluZ0Z1bmN0aW9u Ojp0cmFuc2Zvcm1UaW1lKCkgaXMgcG9vcmx5LW5hbWVkCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzA0NzgKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGZ1bmN0aW9uIHRyYW5zZm9ybXMgYW4gaW5w dXQgX3Byb2dyZXNzXyBub3QgYSB0aW1lLCBzbyB3ZSByZW5hbWUgaXQgdG8gdHJhbnNmb3JtUHJv Z3Jlc3MoKQorICAgICAgICBhbmQgbmFtZSBpdHMgZmlyc3QgcGFyYW1ldGVyIGFjY29yZGluZ2x5 LgorCisgICAgICAgICogYW5pbWF0aW9uL0FuaW1hdGlvbkVmZmVjdC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpBbmltYXRpb25FZmZlY3Q6OmdldENvbXB1dGVkVGltaW5nIGNvbnN0KToKKyAgICAg ICAgKiBhbmltYXRpb24vS2V5ZnJhbWVFZmZlY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6S2V5 ZnJhbWVFZmZlY3Q6OnNldEFuaW1hdGVkUHJvcGVydGllc0luU3R5bGUpOgorICAgICAgICAqIHBs YXRmb3JtL1Njcm9sbEFuaW1hdGlvblNtb290aC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3Jv bGxBbmltYXRpb25TbW9vdGg6OmFuaW1hdGVTY3JvbGwpOgorICAgICAgICAqIHBsYXRmb3JtL2Fu aW1hdGlvbi9UaW1pbmdGdW5jdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUaW1pbmdGdW5j dGlvbjo6dHJhbnNmb3JtUHJvZ3Jlc3MgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6VGltaW5n RnVuY3Rpb246OnRyYW5zZm9ybVRpbWUgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIHBsYXRm b3JtL2FuaW1hdGlvbi9UaW1pbmdGdW5jdGlvbi5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL25pY29zaWEvTmljb3NpYUFuaW1hdGlvbi5jcHA6CisgICAgICAgIChOaWNvc2lhOjpBbmlt YXRpb246OmFwcGx5KToKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvU2Nyb2xsYmFyc0NvbnRyb2xs ZXJNYWMubW06CisgICAgICAgICgtW1dlYlNjcm9sbGJhclBhcnRBbmltYXRpb24gc2V0Q3VycmVu dFByb2dyZXNzOl0pOgorCiAyMDIxLTA5LTE5ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJA YXBwbGUuY29tPgogCiAgICAgICAgIEhhdmUgU2Nyb2xsQW5pbWF0aW9uIHdvcmsgaW4gdGVybXMg b2Ygb2Zmc2V0cywgbm90IHBvc2l0aW9ucwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYW5p bWF0aW9uL0FuaW1hdGlvbkVmZmVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vQW5p bWF0aW9uRWZmZWN0LmNwcAppbmRleCBjZThmOGNkMzcwNjFiMjM4ZmZmZWUxMDkxMmZjNTczNzBj ZDYwYmFlLi44YmIzYmZhYmU1OThlMzBlZWFhMWM1NTFlYzUwNTFhMjgyMDk4NWEzIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vQW5pbWF0aW9uRWZmZWN0LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9hbmltYXRpb24vQW5pbWF0aW9uRWZmZWN0LmNwcApAQCAtMzI2LDcgKzMy Niw3IEBAIENvbXB1dGVkRWZmZWN0VGltaW5nIEFuaW1hdGlvbkVmZmVjdDo6Z2V0Q29tcHV0ZWRU aW1pbmcoc3RkOjpvcHRpb25hbDxTZWNvbmRzPiBzCiAKICAgICAgICAgICAgIC8vIDMuIFJldHVy biB0aGUgcmVzdWx0IG9mIGV2YWx1YXRpbmcgdGhlIGFuaW1hdGlvbiBlZmZlY3TigJlzIHRpbWlu ZyBmdW5jdGlvbiBwYXNzaW5nIGRpcmVjdGVkIHByb2dyZXNzIGFzIHRoZQogICAgICAgICAgICAg Ly8gICAgaW5wdXQgcHJvZ3Jlc3MgdmFsdWUgYW5kIGJlZm9yZSBmbGFnIGFzIHRoZSBiZWZvcmUg ZmxhZy4KLSAgICAgICAgICAgIHJldHVybiBtX3RpbWluZ0Z1bmN0aW9uLT50cmFuc2Zvcm1UaW1l KCpkaXJlY3RlZFByb2dyZXNzLCBpdGVyYXRpb25EdXJhdGlvbiwgYmVmb3JlKTsKKyAgICAgICAg ICAgIHJldHVybiBtX3RpbWluZ0Z1bmN0aW9uLT50cmFuc2Zvcm1Qcm9ncmVzcygqZGlyZWN0ZWRQ cm9ncmVzcywgaXRlcmF0aW9uRHVyYXRpb24sIGJlZm9yZSk7CiAgICAgICAgIH0KIAogICAgICAg ICByZXR1cm4gKmRpcmVjdGVkUHJvZ3Jlc3M7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9h bmltYXRpb24vS2V5ZnJhbWVFZmZlY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvYW5pbWF0aW9uL0tl eWZyYW1lRWZmZWN0LmNwcAppbmRleCAxMWQ1ZjE2ODExNjY1OGVjMTZmNGJiNTgzNmFkYTVjNzIw Y2JiY2M5Li5hZGY3ZGU5MTBlZDQyZmY4NWEzOGExNmRjMTVhNmY4MmQ2M2ZmMzQyIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9hbmltYXRpb24vS2V5ZnJhbWVFZmZlY3QuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2FuaW1hdGlvbi9LZXlmcmFtZUVmZmVjdC5jcHAKQEAgLTE1NTUsNyArMTU1 NSw3IEBAIHZvaWQgS2V5ZnJhbWVFZmZlY3Q6OnNldEFuaW1hdGVkUHJvcGVydGllc0luU3R5bGUo UmVuZGVyU3R5bGUmIHRhcmdldFN0eWxlLCBkb3ViCiAgICAgICAgICAgICBpZiAoYXV0byBkdXJh dGlvbiA9IGl0ZXJhdGlvbkR1cmF0aW9uKCkpIHsKICAgICAgICAgICAgICAgICBhdXRvIHJhbmdl RHVyYXRpb24gPSAoZW5kT2Zmc2V0IC0gc3RhcnRPZmZzZXQpICogZHVyYXRpb24uc2Vjb25kcygp OwogICAgICAgICAgICAgICAgIGlmIChhdXRvKiB0aW1pbmdGdW5jdGlvbiA9IHRpbWluZ0Z1bmN0 aW9uRm9yS2V5ZnJhbWVBdEluZGV4KHN0YXJ0S2V5ZnJhbWVJbmRleC52YWx1ZSgpKSkKLSAgICAg ICAgICAgICAgICAgICAgdHJhbnNmb3JtZWREaXN0YW5jZSA9IHRpbWluZ0Z1bmN0aW9uLT50cmFu c2Zvcm1UaW1lKGludGVydmFsRGlzdGFuY2UsIHJhbmdlRHVyYXRpb24pOworICAgICAgICAgICAg ICAgICAgICB0cmFuc2Zvcm1lZERpc3RhbmNlID0gdGltaW5nRnVuY3Rpb24tPnRyYW5zZm9ybVBy b2dyZXNzKGludGVydmFsRGlzdGFuY2UsIHJhbmdlRHVyYXRpb24pOwogICAgICAgICAgICAgfQog ICAgICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbEFu aW1hdGlvblNtb290aC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxBbmltYXRp b25TbW9vdGguY3BwCmluZGV4IDZlMjk3NTE5ZDg0ZGQ1NGViZWI1MzUyMzUzYjAzYzZkMjRlNTBi NDYuLjI5ZTRmZGI2NGFlNzQ5MTljOWIxYjVhMmRlZDUxMjU0NmE0ZmRjNTAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbEFuaW1hdGlvblNtb290aC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsQW5pbWF0aW9uU21vb3RoLmNwcApAQCAtMTMz LDcgKzEzMyw3IEBAIGJvb2wgU2Nyb2xsQW5pbWF0aW9uU21vb3RoOjphbmltYXRlU2Nyb2xsKE1v bm90b25pY1RpbWUgY3VycmVudFRpbWUpCiAgICAgY3VycmVudFRpbWUgPSBzdGQ6Om1pbihjdXJy ZW50VGltZSwgZW5kVGltZSk7CiAKICAgICBkb3VibGUgZnJhY3Rpb25Db21wbGV0ZSA9IChjdXJy ZW50VGltZSAtIG1fc3RhcnRUaW1lKSAvIG1fZHVyYXRpb247Ci0gICAgZG91YmxlIHByb2dyZXNz ID0gbV9lYXNlSW5PdXRUaW1pbmdGdW5jdGlvbi0+dHJhbnNmb3JtVGltZShmcmFjdGlvbkNvbXBs ZXRlLCBtX2R1cmF0aW9uLnZhbHVlKCkpOworICAgIGRvdWJsZSBwcm9ncmVzcyA9IG1fZWFzZUlu T3V0VGltaW5nRnVuY3Rpb24tPnRyYW5zZm9ybVByb2dyZXNzKGZyYWN0aW9uQ29tcGxldGUsIG1f ZHVyYXRpb24udmFsdWUoKSk7CiAKICAgICBtX2N1cnJlbnRPZmZzZXQgPSB7CiAgICAgICAgIGxp bmVhckludGVycG9sYXRpb24ocHJvZ3Jlc3MsIG1fc3RhcnRPZmZzZXQueCgpLCBtX2Rlc3RpbmF0 aW9uT2Zmc2V0LngoKSksCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hbmlt YXRpb24vVGltaW5nRnVuY3Rpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYW5pbWF0 aW9uL1RpbWluZ0Z1bmN0aW9uLmNwcAppbmRleCAzZThiNjgyNjlhZjg0NDNhYzkwNzkwNDgxYmUz ZGVhZjk4MDAxYjhjLi45N2IyMDU3ZjZhNDBmZGViZTRkZDM1NmRmM2MzNzRiMDg2ZTVhZjc2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hbmltYXRpb24vVGltaW5nRnVuY3Rp b24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2FuaW1hdGlvbi9UaW1pbmdGdW5j dGlvbi5jcHAKQEAgLTg5LDE3ICs4OSwxNyBAQCBUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFRleHRT dHJlYW0mIHRzLCBjb25zdCBUaW1pbmdGdW5jdGlvbiYgdGltaW5nRnVuY3Rpb24pCiAgICAgcmV0 dXJuIHRzOwogfQogCi1kb3VibGUgVGltaW5nRnVuY3Rpb246OnRyYW5zZm9ybVRpbWUoZG91Ymxl IGlucHV0VGltZSwgZG91YmxlIGR1cmF0aW9uLCBib29sIGJlZm9yZSkgY29uc3QKK2RvdWJsZSBU aW1pbmdGdW5jdGlvbjo6dHJhbnNmb3JtUHJvZ3Jlc3MoZG91YmxlIHByb2dyZXNzLCBkb3VibGUg ZHVyYXRpb24sIGJvb2wgYmVmb3JlKSBjb25zdAogewogICAgIHN3aXRjaCAobV90eXBlKSB7CiAg ICAgY2FzZSBUaW1pbmdGdW5jdGlvbjo6Q3ViaWNCZXppZXJGdW5jdGlvbjogewogICAgICAgICBh dXRvJiBmdW5jdGlvbiA9IGRvd25jYXN0PEN1YmljQmV6aWVyVGltaW5nRnVuY3Rpb24+KCp0aGlz KTsKICAgICAgICAgaWYgKGZ1bmN0aW9uLmlzTGluZWFyKCkpCi0gICAgICAgICAgICByZXR1cm4g aW5wdXRUaW1lOworICAgICAgICAgICAgcmV0dXJuIHByb2dyZXNzOwogICAgICAgICAvLyBUaGUg ZXBzaWxvbiB2YWx1ZSB3ZSBwYXNzIHRvIFVuaXRCZXppZXI6OnNvbHZlIGdpdmVuIHRoYXQgdGhl IGFuaW1hdGlvbiBpcyBnb2luZyB0byBydW4gb3ZlciB8ZHVyfCBzZWNvbmRzLiBUaGUgbG9uZ2Vy IHRoZQogICAgICAgICAvLyBhbmltYXRpb24sIHRoZSBtb3JlIHByZWNpc2lvbiB3ZSBuZWVkIGlu IHRoZSB0aW1pbmcgZnVuY3Rpb24gcmVzdWx0IHRvIGF2b2lkIHVnbHkgZGlzY29udGludWl0aWVz LgogICAgICAgICBhdXRvIGVwc2lsb24gPSAxLjAgLyAoMTAwMC4wICogZHVyYXRpb24pOwotICAg ICAgICByZXR1cm4gVW5pdEJlemllcihmdW5jdGlvbi54MSgpLCBmdW5jdGlvbi55MSgpLCBmdW5j dGlvbi54MigpLCBmdW5jdGlvbi55MigpKS5zb2x2ZShpbnB1dFRpbWUsIGVwc2lsb24pOworICAg ICAgICByZXR1cm4gVW5pdEJlemllcihmdW5jdGlvbi54MSgpLCBmdW5jdGlvbi55MSgpLCBmdW5j dGlvbi54MigpLCBmdW5jdGlvbi55MigpKS5zb2x2ZShwcm9ncmVzcywgZXBzaWxvbik7CiAgICAg fQogICAgIGNhc2UgVGltaW5nRnVuY3Rpb246OlN0ZXBzRnVuY3Rpb246IHsKICAgICAgICAgLy8g aHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1lYXNpbmctMS8jc3RlcC10aW1pbmctZnVuY3Rp b25zCkBAIC0xMDcsNyArMTA3LDcgQEAgZG91YmxlIFRpbWluZ0Z1bmN0aW9uOjp0cmFuc2Zvcm1U aW1lKGRvdWJsZSBpbnB1dFRpbWUsIGRvdWJsZSBkdXJhdGlvbiwgYm9vbCBiZWYKICAgICAgICAg YXV0byBzdGVwcyA9IGZ1bmN0aW9uLm51bWJlck9mU3RlcHMoKTsKICAgICAgICAgYXV0byBzdGVw UG9zaXRpb24gPSBmdW5jdGlvbi5zdGVwUG9zaXRpb24oKTsKICAgICAgICAgLy8gMS4gQ2FsY3Vs YXRlIHRoZSBjdXJyZW50IHN0ZXAgYXMgZmxvb3IoaW5wdXQgcHJvZ3Jlc3MgdmFsdWUgw5cgc3Rl cHMpLgotICAgICAgICBhdXRvIGN1cnJlbnRTdGVwID0gc3RkOjpmbG9vcihpbnB1dFRpbWUgKiBz dGVwcyk7CisgICAgICAgIGF1dG8gY3VycmVudFN0ZXAgPSBzdGQ6OmZsb29yKHByb2dyZXNzICog c3RlcHMpOwogICAgICAgICAvLyAyLiBJZiB0aGUgc3RlcCBwb3NpdGlvbiBwcm9wZXJ0eSBpcyBz dGFydCwgaW5jcmVtZW50IGN1cnJlbnQgc3RlcCBieSBvbmUuCiAgICAgICAgIGlmIChzdGVwUG9z aXRpb24gPT0gU3RlcHNUaW1pbmdGdW5jdGlvbjo6U3RlcFBvc2l0aW9uOjpKdW1wU3RhcnQgfHwg c3RlcFBvc2l0aW9uID09IFN0ZXBzVGltaW5nRnVuY3Rpb246OlN0ZXBQb3NpdGlvbjo6U3RhcnQg fHwgc3RlcFBvc2l0aW9uID09IFN0ZXBzVGltaW5nRnVuY3Rpb246OlN0ZXBQb3NpdGlvbjo6SnVt cEJvdGgpCiAgICAgICAgICAgICArK2N1cnJlbnRTdGVwOwpAQCAtMTE1LDEwICsxMTUsMTAgQEAg ZG91YmxlIFRpbWluZ0Z1bmN0aW9uOjp0cmFuc2Zvcm1UaW1lKGRvdWJsZSBpbnB1dFRpbWUsIGRv dWJsZSBkdXJhdGlvbiwgYm9vbCBiZWYKICAgICAgICAgLy8gICAgLSB0aGUgYmVmb3JlIGZsYWcg aXMgc2V0LCBhbmQKICAgICAgICAgLy8gICAgLSBpbnB1dCBwcm9ncmVzcyB2YWx1ZSDDlyBzdGVw cyBtb2QgMSBlcXVhbHMgemVybyAodGhhdCBpcywgaWYgaW5wdXQgcHJvZ3Jlc3MgdmFsdWUgw5cg c3RlcHMgaXMgaW50ZWdyYWwpLCB0aGVuCiAgICAgICAgIC8vICAgIGRlY3JlbWVudCBjdXJyZW50 IHN0ZXAgYnkgb25lLgotICAgICAgICBpZiAoYmVmb3JlICYmICFmbW9kKGlucHV0VGltZSAqIHN0 ZXBzLCAxKSkKKyAgICAgICAgaWYgKGJlZm9yZSAmJiAhZm1vZChwcm9ncmVzcyAqIHN0ZXBzLCAx KSkKICAgICAgICAgICAgIGN1cnJlbnRTdGVwLS07CiAgICAgICAgIC8vIDQuIElmIGlucHV0IHBy b2dyZXNzIHZhbHVlIOKJpSAwIGFuZCBjdXJyZW50IHN0ZXAgPCAwLCBsZXQgY3VycmVudCBzdGVw IGJlIHplcm8uCi0gICAgICAgIGlmIChpbnB1dFRpbWUgPj0gMCAmJiBjdXJyZW50U3RlcCA8IDAp CisgICAgICAgIGlmIChwcm9ncmVzcyA+PSAwICYmIGN1cnJlbnRTdGVwIDwgMCkKICAgICAgICAg ICAgIGN1cnJlbnRTdGVwID0gMDsKICAgICAgICAgLy8gNS4gQ2FsY3VsYXRlIGp1bXBzIGJhc2Vk IG9uIHRoZSBzdGVwIHBvc2l0aW9uLgogICAgICAgICBpZiAoc3RlcFBvc2l0aW9uID09IFN0ZXBz VGltaW5nRnVuY3Rpb246OlN0ZXBQb3NpdGlvbjo6SnVtcE5vbmUpCkBAIC0xMjYsMTcgKzEyNiwx NyBAQCBkb3VibGUgVGltaW5nRnVuY3Rpb246OnRyYW5zZm9ybVRpbWUoZG91YmxlIGlucHV0VGlt ZSwgZG91YmxlIGR1cmF0aW9uLCBib29sIGJlZgogICAgICAgICBlbHNlIGlmIChzdGVwUG9zaXRp b24gPT0gU3RlcHNUaW1pbmdGdW5jdGlvbjo6U3RlcFBvc2l0aW9uOjpKdW1wQm90aCkKICAgICAg ICAgICAgICsrc3RlcHM7CiAgICAgICAgIC8vIDYuIElmIGlucHV0IHByb2dyZXNzIHZhbHVlIOKJ pCAxIGFuZCBjdXJyZW50IHN0ZXAgPiBqdW1wcywgbGV0IGN1cnJlbnQgc3RlcCBiZSBqdW1wcy4K LSAgICAgICAgaWYgKGlucHV0VGltZSA8PSAxICYmIGN1cnJlbnRTdGVwID4gc3RlcHMpCisgICAg ICAgIGlmIChwcm9ncmVzcyA8PSAxICYmIGN1cnJlbnRTdGVwID4gc3RlcHMpCiAgICAgICAgICAg ICBjdXJyZW50U3RlcCA9IHN0ZXBzOwogICAgICAgICAvLyA3LiBUaGUgb3V0cHV0IHByb2dyZXNz IHZhbHVlIGlzIGN1cnJlbnQgc3RlcCAvIGp1bXBzLgogICAgICAgICByZXR1cm4gY3VycmVudFN0 ZXAgLyBzdGVwczsKICAgICB9CiAgICAgY2FzZSBUaW1pbmdGdW5jdGlvbjo6U3ByaW5nRnVuY3Rp b246IHsKICAgICAgICAgYXV0byYgZnVuY3Rpb24gPSBkb3duY2FzdDxTcHJpbmdUaW1pbmdGdW5j dGlvbj4oKnRoaXMpOwotICAgICAgICByZXR1cm4gU3ByaW5nU29sdmVyKGZ1bmN0aW9uLm1hc3Mo KSwgZnVuY3Rpb24uc3RpZmZuZXNzKCksIGZ1bmN0aW9uLmRhbXBpbmcoKSwgZnVuY3Rpb24uaW5p dGlhbFZlbG9jaXR5KCkpLnNvbHZlKGlucHV0VGltZSAqIGR1cmF0aW9uKTsKKyAgICAgICAgcmV0 dXJuIFNwcmluZ1NvbHZlcihmdW5jdGlvbi5tYXNzKCksIGZ1bmN0aW9uLnN0aWZmbmVzcygpLCBm dW5jdGlvbi5kYW1waW5nKCksIGZ1bmN0aW9uLmluaXRpYWxWZWxvY2l0eSgpKS5zb2x2ZShwcm9n cmVzcyAqIGR1cmF0aW9uKTsKICAgICB9CiAgICAgY2FzZSBUaW1pbmdGdW5jdGlvbjo6TGluZWFy RnVuY3Rpb246Ci0gICAgICAgIHJldHVybiBpbnB1dFRpbWU7CisgICAgICAgIHJldHVybiBwcm9n cmVzczsKICAgICB9CiAKICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2FuaW1hdGlvbi9UaW1pbmdGdW5jdGlvbi5oIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vYW5pbWF0aW9uL1RpbWluZ0Z1bmN0aW9uLmgKaW5kZXggMmJmNmFj NjllYWJhYmUyNDIzYzlkZjFiNGJmY2YyNTI1YTEzZTc2Mi4uMzU2ZWFjMTRjN2Y2OTk1YjdhNWIz ZDMxZWQwZjY1MWUxY2VlMDhlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v YW5pbWF0aW9uL1RpbWluZ0Z1bmN0aW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v YW5pbWF0aW9uL1RpbWluZ0Z1bmN0aW9uLmgKQEAgLTU1LDcgKzU1LDcgQEAgcHVibGljOgogCiAg ICAgc3RhdGljIEV4Y2VwdGlvbk9yPFJlZlB0cjxUaW1pbmdGdW5jdGlvbj4+IGNyZWF0ZUZyb21D U1NUZXh0KGNvbnN0IFN0cmluZyYpOwogICAgIHN0YXRpYyBSZWZQdHI8VGltaW5nRnVuY3Rpb24+ IGNyZWF0ZUZyb21DU1NWYWx1ZShjb25zdCBDU1NWYWx1ZSYpOwotICAgIGRvdWJsZSB0cmFuc2Zv cm1UaW1lKGRvdWJsZSwgZG91YmxlLCBib29sIGJlZm9yZSA9IGZhbHNlKSBjb25zdDsKKyAgICBk b3VibGUgdHJhbnNmb3JtUHJvZ3Jlc3MoZG91YmxlIHByb2dyZXNzLCBkb3VibGUgZHVyYXRpb24s IGJvb2wgYmVmb3JlID0gZmFsc2UpIGNvbnN0OwogICAgIFN0cmluZyBjc3NUZXh0KCkgY29uc3Q7 CiAKIHByb3RlY3RlZDoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL25pY29zaWEvTmljb3NpYUFuaW1hdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9uaWNvc2lhL05pY29zaWFBbmltYXRpb24uY3BwCmluZGV4IDcyNTU5YjI5NzQy ZDQ0YzZkNmRhMDY2Y2MzZTBjNDUwZGJlYmU2NzQuLjdjYzAwM2YzMTQ2Zjg1NWFiM2RmZmQzODVj MzIxZDRiYjYxZWY3ZjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL25pY29zaWEvTmljb3NpYUFuaW1hdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3Mvbmljb3NpYS9OaWNvc2lhQW5pbWF0aW9uLmNwcApAQCAtMjQ4LDcgKzI0 OCw3IEBAIHZvaWQgQW5pbWF0aW9uOjphcHBseShBcHBsaWNhdGlvblJlc3VsdCYgYXBwbGljYXRp b25SZXN1bHRzLCBNb25vdG9uaWNUaW1lIHRpbWUpCiAgICAgfQogICAgIGlmIChtX2tleWZyYW1l cy5zaXplKCkgPT0gMikgewogICAgICAgICBhdXRvJiB0aW1pbmdGdW5jdGlvbiA9IHRpbWluZ0Z1 bmN0aW9uRm9yQW5pbWF0aW9uVmFsdWUobV9rZXlmcmFtZXMuYXQoMCksICp0aGlzKTsKLSAgICAg ICAgbm9ybWFsaXplZFZhbHVlID0gdGltaW5nRnVuY3Rpb24udHJhbnNmb3JtVGltZShub3JtYWxp emVkVmFsdWUsIG1fZHVyYXRpb24pOworICAgICAgICBub3JtYWxpemVkVmFsdWUgPSB0aW1pbmdG dW5jdGlvbi50cmFuc2Zvcm1Qcm9ncmVzcyhub3JtYWxpemVkVmFsdWUsIG1fZHVyYXRpb24pOwog ICAgICAgICBhcHBseUludGVybmFsKGFwcGxpY2F0aW9uUmVzdWx0cywgbV9rZXlmcmFtZXMuYXQo MCksIG1fa2V5ZnJhbWVzLmF0KDEpLCBub3JtYWxpemVkVmFsdWUpOwogICAgICAgICByZXR1cm47 CiAgICAgfQpAQCAtMjYxLDcgKzI2MSw3IEBAIHZvaWQgQW5pbWF0aW9uOjphcHBseShBcHBsaWNh dGlvblJlc3VsdCYgYXBwbGljYXRpb25SZXN1bHRzLCBNb25vdG9uaWNUaW1lIHRpbWUpCiAKICAg ICAgICAgbm9ybWFsaXplZFZhbHVlID0gKG5vcm1hbGl6ZWRWYWx1ZSAtIGZyb20ua2V5VGltZSgp KSAvICh0by5rZXlUaW1lKCkgLSBmcm9tLmtleVRpbWUoKSk7CiAgICAgICAgIGF1dG8mIHRpbWlu Z0Z1bmN0aW9uID0gdGltaW5nRnVuY3Rpb25Gb3JBbmltYXRpb25WYWx1ZShmcm9tLCAqdGhpcyk7 Ci0gICAgICAgIG5vcm1hbGl6ZWRWYWx1ZSA9IHRpbWluZ0Z1bmN0aW9uLnRyYW5zZm9ybVRpbWUo bm9ybWFsaXplZFZhbHVlLCBtX2R1cmF0aW9uKTsKKyAgICAgICAgbm9ybWFsaXplZFZhbHVlID0g dGltaW5nRnVuY3Rpb24udHJhbnNmb3JtUHJvZ3Jlc3Mobm9ybWFsaXplZFZhbHVlLCBtX2R1cmF0 aW9uKTsKICAgICAgICAgYXBwbHlJbnRlcm5hbChhcHBsaWNhdGlvblJlc3VsdHMsIGZyb20sIHRv LCBub3JtYWxpemVkVmFsdWUpOwogICAgICAgICBicmVhazsKICAgICB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsYmFyc0NvbnRyb2xsZXJNYWMubW0gYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsYmFyc0NvbnRyb2xsZXJNYWMubW0KaW5k ZXggNjUxMDQzYTM1OThlM2Y4YTE0YTEyNDI2MGQzZjdjYzQ2NWMyNWUyYy4uNDQ1MGFjMWQ5YzY5 ZWMxYzgyODFmZmMwZjY4M2FiZjcyMjIwMWM3NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbWFjL1Njcm9sbGJhcnNDb250cm9sbGVyTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL21hYy9TY3JvbGxiYXJzQ29udHJvbGxlck1hYy5tbQpAQCAtMjYxLDcgKzI2 MSw3IEBAIC0gKHZvaWQpc2V0Q3VycmVudFByb2dyZXNzOihOU1RpbWVyICopdGltZXIKICAgICAg ICAgTlNUaW1lSW50ZXJ2YWwgdCA9IDE7CiAgICAgICAgIGlmIChfZHVyYXRpb24pCiAgICAgICAg ICAgICB0ID0gZWxhcHNlZCAvIF9kdXJhdGlvbjsKLSAgICAgICAgcHJvZ3Jlc3MgPSBfdGltaW5n RnVuY3Rpb24tPnRyYW5zZm9ybVRpbWUodCwgX2R1cmF0aW9uKTsKKyAgICAgICAgcHJvZ3Jlc3Mg PSBfdGltaW5nRnVuY3Rpb24tPnRyYW5zZm9ybVByb2dyZXNzKHQsIF9kdXJhdGlvbik7CiAgICAg fQogICAgIEFTU0VSVChfc2Nyb2xsYmFyKTsKIAo=