226445 2021-05-30 19:25:36 -0700 Drop PendingActivity data member from BaseAudioContext 2021-05-31 17:09:17 -0700 1 1 1 Unclassified WebKit Web Audio WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez cdumez darin eric.carlson ews-watchlist ggaren glenn jer.noble peng.liu6 philipj sam sergio webkit-bug-importer oldest_to_newest 1765293 0 cdumez 2021-05-30 19:25:36 -0700 Drop PendingActivity data member from BaseAudioContext and instead have AudioContext / OfflineAudioContext override virtualHasPendingActivity() to keep their JS wrapper alive. I find that PendingActivity data members are too error prone and a frequent cause of leaks. 1765294 1 430163 cdumez 2021-05-30 19:27:28 -0700 Created attachment 430163 Patch 1765295 2 430164 cdumez 2021-05-30 19:29:03 -0700 Created attachment 430164 Patch 1765469 3 ews-feeder 2021-05-31 17:08:27 -0700 Committed r278288 (238325@main): <https://commits.webkit.org/238325@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 430164. 1765470 4 webkit-bug-importer 2021-05-31 17:09:17 -0700 <rdar://problem/78695343> 430163 2021-05-30 19:27:28 -0700 2021-05-30 19:29:02 -0700 Patch bug-226445-20210530192727.patch text/plain 10435 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4MjYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTdiNjIxMDU0YWEzNWNm MDJiYTZmZTNlMjhkNTE2MTMyMzQ2NjU4ZC4uOWYxYTU5YTNmZDU5NmFjMjNmM2E5ZDZjZDFjODdl NmM1YThlMTU5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDIxLTA1LTMwICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgRHJvcCBQZW5kaW5nQWN0aXZp dHkgZGF0YSBtZW1iZXIgZnJvbSBCYXNlQXVkaW9Db250ZXh0CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjY0NDUKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEcm9wIFBlbmRpbmdBY3Rpdml0eSBkYXRhIG1l bWJlciBmcm9tIEJhc2VBdWRpb0NvbnRleHQgYW5kIGluc3RlYWQgaGF2ZSBBdWRpb0NvbnRleHQg LyBPZmZsaW5lQXVkaW9Db250ZXh0CisgICAgICAgIG92ZXJyaWRlIHZpcnR1YWxIYXNQZW5kaW5n QWN0aXZpdHkoKSB0byBrZWVwIHRoZWlyIEpTIHdyYXBwZXIgYWxpdmUuIEkgZmluZCB0aGF0IFBl bmRpbmdBY3Rpdml0eSBkYXRhIG1lbWJlcnMKKyAgICAgICAgYXJlIHRvbyBlcnJvciBwcm9uZSBh bmQgYSBmcmVxdWVudCBjYXVzZSBvZiBsZWFrcy4KKworICAgICAgICAqIE1vZHVsZXMvd2ViYXVk aW8vQXVkaW9Db250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkF1ZGlvQ29udGV4dDo6QXVk aW9Db250ZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OkF1ZGlvQ29udGV4dDo6c3RhcnRSZW5kZXJp bmcpOgorICAgICAgICAoV2ViQ29yZTo6QXVkaW9Db250ZXh0OjptYXlSZXN1bWVQbGF5YmFjayk6 CisgICAgICAgIChXZWJDb3JlOjpBdWRpb0NvbnRleHQ6OnN1c3BlbmRQbGF5YmFjayk6CisgICAg ICAgIChXZWJDb3JlOjpBdWRpb0NvbnRleHQ6OnZpcnR1YWxIYXNQZW5kaW5nQWN0aXZpdHkgY29u c3QpOgorICAgICAgICAqIE1vZHVsZXMvd2ViYXVkaW8vQXVkaW9Db250ZXh0Lmg6CisgICAgICAg ICogTW9kdWxlcy93ZWJhdWRpby9CYXNlQXVkaW9Db250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkJhc2VBdWRpb0NvbnRleHQ6OmNsZWFyKToKKyAgICAgICAgKFdlYkNvcmU6OkJhc2VBdWRp b0NvbnRleHQ6OmNsZWFyUGVuZGluZ0FjdGl2aXR5KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNv cmU6OkJhc2VBdWRpb0NvbnRleHQ6OnNldFBlbmRpbmdBY3Rpdml0eSk6IERlbGV0ZWQuCisgICAg ICAgICogTW9kdWxlcy93ZWJhdWRpby9CYXNlQXVkaW9Db250ZXh0Lmg6CisgICAgICAgICogTW9k dWxlcy93ZWJhdWRpby9PZmZsaW5lQXVkaW9Db250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 Ok9mZmxpbmVBdWRpb0NvbnRleHQ6OnN0YXJ0UmVuZGVyaW5nKToKKyAgICAgICAgKFdlYkNvcmU6 Ok9mZmxpbmVBdWRpb0NvbnRleHQ6OnJlc3VtZVJlbmRlcmluZyk6CisgICAgICAgIChXZWJDb3Jl OjpPZmZsaW5lQXVkaW9Db250ZXh0OjpkaWRTdXNwZW5kUmVuZGVyaW5nKToKKyAgICAgICAgKFdl YkNvcmU6Ok9mZmxpbmVBdWRpb0NvbnRleHQ6OmZpbmlzaGVkUmVuZGVyaW5nKToKKyAgICAgICAg KFdlYkNvcmU6Ok9mZmxpbmVBdWRpb0NvbnRleHQ6OnZpcnR1YWxIYXNQZW5kaW5nQWN0aXZpdHkg Y29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6T2ZmbGluZUF1ZGlvQ29udGV4dDo6ZGlzcGF0Y2hF dmVudCk6IERlbGV0ZWQuCisgICAgICAgICogTW9kdWxlcy93ZWJhdWRpby9PZmZsaW5lQXVkaW9D b250ZXh0Lmg6CisKIDIwMjEtMDUtMzAgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4K IAogICAgICAgICBVbnJldmlld2VkLCB0d2VhayBzbGlnaHRseSBpbmNvcnJlY3QgYXNzZXJ0aW9u IGFkZGVkIGluIHIyNzgyMzMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dl YmF1ZGlvL0F1ZGlvQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1ZGlv L0F1ZGlvQ29udGV4dC5jcHAKaW5kZXggNTA1NWI0NmI4OWJmYjg2YWRmMTc1YTQ3ZDg0NzAxYTUx ZjA2NzA3OC4uMDdkMDM3MDhiMDkxY2NiZTFiZTFkZjczMmYzMDdhY2YyYzdlMjUxZSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJhdWRpby9BdWRpb0NvbnRleHQuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8vQXVkaW9Db250ZXh0LmNwcApAQCAt MTE1LDEwICsxMTUsNiBAQCBBdWRpb0NvbnRleHQ6OkF1ZGlvQ29udGV4dChEb2N1bWVudCYgZG9j dW1lbnQsIGNvbnN0IEF1ZGlvQ29udGV4dE9wdGlvbnMmIGNvbnRleAogICAgICwgbV9kZXN0aW5h dGlvbk5vZGUobWFrZVVuaXF1ZVJlZjxEZWZhdWx0QXVkaW9EZXN0aW5hdGlvbk5vZGU+KCp0aGlz LCBjb250ZXh0T3B0aW9ucy5zYW1wbGVSYXRlKSkKICAgICAsIG1fbWVkaWFTZXNzaW9uKFBsYXRm b3JtTWVkaWFTZXNzaW9uOjpjcmVhdGUoUGxhdGZvcm1NZWRpYVNlc3Npb25NYW5hZ2VyOjpzaGFy ZWRNYW5hZ2VyKCksICp0aGlzKSkKIHsKLSAgICAvLyBBY2NvcmRpbmcgdG8gc3BlYyBBdWRpb0Nv bnRleHQgbXVzdCBkaWUgb25seSBhZnRlciBwYWdlIG5hdmlnYXRlLgotICAgIC8vIExldHMgbWFy ayBpdCBhcyBBY3RpdmVET01PYmplY3Qgd2l0aCBwZW5kaW5nIGFjdGl2aXR5IGFuZCB1bm1hcmsg aXQgaW4gY2xlYXIgbWV0aG9kLgotICAgIHNldFBlbmRpbmdBY3Rpdml0eSgpOwotCiAgICAgY29u c3RydWN0Q29tbW9uKCk7CiAKICAgICAvLyBJbml0aWFsaXplIHRoZSBkZXN0aW5hdGlvbiBub2Rl J3MgbXV0ZWQgc3RhdGUgdG8gbWF0Y2ggdGhlIHBhZ2UncyBjdXJyZW50IG11dGVkIHN0YXRlLgpA QCAtMTMwLDcgKzEyNiw3IEBAIEF1ZGlvQ29udGV4dDo6QXVkaW9Db250ZXh0KERvY3VtZW50JiBk b2N1bWVudCwgY29uc3QgQXVkaW9Db250ZXh0T3B0aW9ucyYgY29udGV4CiAgICAgLy8gVW5saWtl IE9mZmxpbmVBdWRpb0NvbnRleHQsIEF1ZGlvQ29udGV4dCBkb2VzIG5vdCByZXF1aXJlIGNhbGxp bmcgcmVzdW1lKCkgdG8gc3RhcnQgcmVuZGVyaW5nLgogICAgIC8vIExhenkgaW5pdGlhbGl6YXRp b24gc3RhcnRzIHJlbmRlcmluZyBzbyB3ZSBzY2hlZHVsZSBhIHRhc2sgaGVyZSB0byBtYWtlIHN1 cmUgbGF6eSBpbml0aWFsaXphdGlvbgogICAgIC8vIGVuZHMgdXAgaGFwcGVuaW5nLCBldmVuIGlm IG5vIGF1ZGlvIG5vZGUgZ2V0cyBjb25zdHJ1Y3RlZC4KLSAgICBwb3N0VGFzayhbdGhpc10gewor ICAgIHBvc3RUYXNrKFt0aGlzLCBwZW5kaW5nQWN0aXZpdHkgPSBtYWtlUGVuZGluZ0FjdGl2aXR5 KCp0aGlzKV0gewogICAgICAgICBpZiAoIWlzU3RvcHBlZCgpKQogICAgICAgICAgICAgbGF6eUlu aXRpYWxpemUoKTsKICAgICB9KTsKQEAgLTMwOSwxMCArMzA1LDggQEAgdm9pZCBBdWRpb0NvbnRl eHQ6OnN0YXJ0UmVuZGVyaW5nKCkKICAgICBpZiAoaXNTdG9wcGVkKCkgfHwgIXdpbGxCZWdpblBs YXliYWNrKCkgfHwgbV93YXNTdXNwZW5kZWRCeVNjcmlwdCkKICAgICAgICAgcmV0dXJuOwogCi0g ICAgc2V0UGVuZGluZ0FjdGl2aXR5KCk7Ci0KICAgICBsYXp5SW5pdGlhbGl6ZSgpOwotICAgIGRl c3RpbmF0aW9uKCkuc3RhcnRSZW5kZXJpbmcoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVm KCp0aGlzKV0oc3RkOjpvcHRpb25hbDxFeGNlcHRpb24+JiYgZXhjZXB0aW9uKSB7CisgICAgZGVz dGluYXRpb24oKS5zdGFydFJlbmRlcmluZyhbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYo KnRoaXMpLCBwZW5kaW5nQWN0aXZpdHkgPSBtYWtlUGVuZGluZ0FjdGl2aXR5KCp0aGlzKV0oc3Rk OjpvcHRpb25hbDxFeGNlcHRpb24+JiYgZXhjZXB0aW9uKSB7CiAgICAgICAgIGlmICghZXhjZXB0 aW9uKQogICAgICAgICAgICAgc2V0U3RhdGUoU3RhdGU6OlJ1bm5pbmcpOwogICAgIH0pOwpAQCAt Mzg1LDcgKzM3OSw3IEBAIHZvaWQgQXVkaW9Db250ZXh0OjptYXlSZXN1bWVQbGF5YmFjayhib29s IHNob3VsZFJlc3VtZSkKIAogICAgIGxhenlJbml0aWFsaXplKCk7CiAKLSAgICBkZXN0aW5hdGlv bigpLnJlc3VtZShbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpXShzdGQ6Om9w dGlvbmFsPEV4Y2VwdGlvbj4mJiBleGNlcHRpb24pIHsKKyAgICBkZXN0aW5hdGlvbigpLnJlc3Vt ZShbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBwZW5kaW5nQWN0aXZpdHkg PSBtYWtlUGVuZGluZ0FjdGl2aXR5KCp0aGlzKV0oc3RkOjpvcHRpb25hbDxFeGNlcHRpb24+JiYg ZXhjZXB0aW9uKSB7CiAgICAgICAgIHNldFN0YXRlKGV4Y2VwdGlvbiA/IFN0YXRlOjpTdXNwZW5k ZWQgOiBTdGF0ZTo6UnVubmluZyk7CiAgICAgfSk7CiB9CkBAIC00NzEsNyArNDY1LDcgQEAgdm9p ZCBBdWRpb0NvbnRleHQ6OnN1c3BlbmRQbGF5YmFjaygpCiAKICAgICBsYXp5SW5pdGlhbGl6ZSgp OwogCi0gICAgZGVzdGluYXRpb24oKS5zdXNwZW5kKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFr ZVJlZigqdGhpcyldKHN0ZDo6b3B0aW9uYWw8RXhjZXB0aW9uPiYmIGV4Y2VwdGlvbikgeworICAg IGRlc3RpbmF0aW9uKCkuc3VzcGVuZChbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRo aXMpLCBwZW5kaW5nQWN0aXZpdHkgPSBtYWtlUGVuZGluZ0FjdGl2aXR5KCp0aGlzKV0oc3RkOjpv cHRpb25hbDxFeGNlcHRpb24+JiYgZXhjZXB0aW9uKSB7CiAgICAgICAgIGlmIChleGNlcHRpb24p CiAgICAgICAgICAgICByZXR1cm47CiAKQEAgLTU1NSw2ICs1NDksMTEgQEAgRXhjZXB0aW9uT3I8 UmVmPE1lZGlhU3RyZWFtQXVkaW9EZXN0aW5hdGlvbk5vZGU+PiBBdWRpb0NvbnRleHQ6OmNyZWF0 ZU1lZGlhU3RyZWEKIAogI2VuZGlmCiAKK2Jvb2wgQXVkaW9Db250ZXh0Ojp2aXJ0dWFsSGFzUGVu ZGluZ0FjdGl2aXR5KCkgY29uc3QKK3sKKyAgICByZXR1cm4gIWlzQ2xvc2VkKCk7Cit9CisKIH0g Ly8gbmFtZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlmIC8vIEVOQUJMRShXRUJfQVVESU8pCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1ZGlvL0F1ZGlvQ29udGV4dC5oIGIv U291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJhdWRpby9BdWRpb0NvbnRleHQuaAppbmRleCBmMjQw YjljNTZlOGYyN2Y1ZmM4MTk1Nzc3ZGU2MzcyOTI3ZTZkNGM0Li43MWZiNzEwMjU2NjBlNGM1NDI1 ZTk1ZWZhOThlNjZlODYwZDNhNmYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L3dlYmF1ZGlvL0F1ZGlvQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2Vi YXVkaW8vQXVkaW9Db250ZXh0LmgKQEAgLTE0Miw2ICsxNDIsNyBAQCBwcml2YXRlOgogICAgIGNv bnN0IGNoYXIqIGFjdGl2ZURPTU9iamVjdE5hbWUoKSBjb25zdCBmaW5hbDsKICAgICB2b2lkIHN1 c3BlbmQoUmVhc29uRm9yU3VzcGVuc2lvbikgZmluYWw7CiAgICAgdm9pZCByZXN1bWUoKSBmaW5h bDsKKyAgICBib29sIHZpcnR1YWxIYXNQZW5kaW5nQWN0aXZpdHkoKSBjb25zdCBmaW5hbDsKIAog ICAgIFVuaXF1ZVJlZjxEZWZhdWx0QXVkaW9EZXN0aW5hdGlvbk5vZGU+IG1fZGVzdGluYXRpb25O b2RlOwogICAgIHN0ZDo6dW5pcXVlX3B0cjxQbGF0Zm9ybU1lZGlhU2Vzc2lvbj4gbV9tZWRpYVNl c3Npb247CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1ZGlvL0Jhc2VB dWRpb0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJhdWRpby9CYXNlQXVk aW9Db250ZXh0LmNwcAppbmRleCBkMGJlMGM0OTcyZmUxN2I2ZDMzOTUxNDliYWU5NGZhMjcwNjI3 OTgxLi4zMTY2NGZiODU5MTYyN2RhYWU5ZTc5YzM2ZGRiYTNkZDE2NDAzMjA0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1ZGlvL0Jhc2VBdWRpb0NvbnRleHQuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8vQmFzZUF1ZGlvQ29udGV4dC5jcHAK QEAgLTE3OSw4ICsxNzksNiBAQCB2b2lkIEJhc2VBdWRpb0NvbnRleHQ6OmNsZWFyKCkKICAgICAg ICAgZGVsZXRlTWFya2VkTm9kZXMoKTsKICAgICAgICAgbV9ub2Rlc1RvRGVsZXRlID0gc3RkOjpl eGNoYW5nZShtX25vZGVzTWFya2VkRm9yRGVsZXRpb24sIHsgfSk7CiAgICAgfSB3aGlsZSAoIW1f bm9kZXNUb0RlbGV0ZS5pc0VtcHR5KCkpOwotCi0gICAgY2xlYXJQZW5kaW5nQWN0aXZpdHkoKTsK IH0KIAogdm9pZCBCYXNlQXVkaW9Db250ZXh0Ojp1bmluaXRpYWxpemUoKQpAQCAtOTA1LDE3ICs5 MDMsNiBAQCB2b2lkIEJhc2VBdWRpb0NvbnRleHQ6OmFkZENvbnNvbGVNZXNzYWdlKE1lc3NhZ2VT b3VyY2Ugc291cmNlLCBNZXNzYWdlTGV2ZWwgbGV2ZQogICAgICAgICBtX3NjcmlwdEV4ZWN1dGlv bkNvbnRleHQtPmFkZENvbnNvbGVNZXNzYWdlKHNvdXJjZSwgbGV2ZWwsIG1lc3NhZ2UpOwogfQog Ci12b2lkIEJhc2VBdWRpb0NvbnRleHQ6OmNsZWFyUGVuZGluZ0FjdGl2aXR5KCkKLXsKLSAgICBt X3BlbmRpbmdBY3Rpdml0eSA9IG51bGxwdHI7Ci19Ci0KLXZvaWQgQmFzZUF1ZGlvQ29udGV4dDo6 c2V0UGVuZGluZ0FjdGl2aXR5KCkKLXsKLSAgICBpZiAoIW1fcGVuZGluZ0FjdGl2aXR5KQotICAg ICAgICBtX3BlbmRpbmdBY3Rpdml0eSA9IG1ha2VQZW5kaW5nQWN0aXZpdHkoKnRoaXMpOwotfQot CiBQZXJpb2RpY1dhdmUmIEJhc2VBdWRpb0NvbnRleHQ6OnBlcmlvZGljV2F2ZShPc2NpbGxhdG9y VHlwZSB0eXBlKQogewogICAgIHN3aXRjaCAodHlwZSkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy93ZWJhdWRpby9CYXNlQXVkaW9Db250ZXh0LmggYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL3dlYmF1ZGlvL0Jhc2VBdWRpb0NvbnRleHQuaAppbmRleCBmYWEzZDdlMTNmNmZi ZjRmNTU4OTE4ODY0NmFkZGU4OGM4YThhZWJiLi4yODA0YzVkYjQ0YmI1MzRlZjgxYzI5MGRhYzIw ZTQ0N2E1MjNiOTYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1ZGlv L0Jhc2VBdWRpb0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1ZGlv L0Jhc2VBdWRpb0NvbnRleHQuaApAQCAtMjQwLDkgKzI0MCw2IEBAIHB1YmxpYzoKIAogcHJvdGVj dGVkOgogICAgIGV4cGxpY2l0IEJhc2VBdWRpb0NvbnRleHQoRG9jdW1lbnQmKTsKLSAgICAKLSAg ICB2b2lkIGNsZWFyUGVuZGluZ0FjdGl2aXR5KCk7Ci0gICAgdm9pZCBzZXRQZW5kaW5nQWN0aXZp dHkoKTsKIAogICAgIHZpcnR1YWwgdm9pZCB1bmluaXRpYWxpemUoKTsKIApAQCAtMzY2LDggKzM2 Myw2IEBAIHByaXZhdGU6CiAKICAgICBzdGQ6OnVuaXF1ZV9wdHI8QXN5bmNBdWRpb0RlY29kZXI+ IG1fYXVkaW9EZWNvZGVyOwogCi0gICAgUmVmUHRyPFBlbmRpbmdBY3Rpdml0eTxCYXNlQXVkaW9D b250ZXh0Pj4gbV9wZW5kaW5nQWN0aXZpdHk7Ci0KICAgICBBdWRpb0lPUG9zaXRpb24gbV9vdXRw dXRQb3NpdGlvbjsKIAogICAgIEhhc2hNYXA8U3RyaW5nLCBWZWN0b3I8QXVkaW9QYXJhbURlc2Ny aXB0b3I+PiBtX3BhcmFtZXRlckRlc2NyaXB0b3JNYXA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL3dlYmF1ZGlvL09mZmxpbmVBdWRpb0NvbnRleHQuY3BwIGIvU291cmNlL1dl YkNvcmUvTW9kdWxlcy93ZWJhdWRpby9PZmZsaW5lQXVkaW9Db250ZXh0LmNwcAppbmRleCBlMWIw ZjAyZTFhZDMzOWUzNDU3OWM3NmY0YjI0MjdhMWUzM2Y1Y2E5Li40MzgwNzJmNzRiNmNhMzFlM2Mw ZGVjNjNlNzliYzFiZjY1YjUyMjIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L3dlYmF1ZGlvL09mZmxpbmVBdWRpb0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvd2ViYXVkaW8vT2ZmbGluZUF1ZGlvQ29udGV4dC5jcHAKQEAgLTExMyw3ICsxMTMsNiBA QCB2b2lkIE9mZmxpbmVBdWRpb0NvbnRleHQ6OnN0YXJ0UmVuZGVyaW5nKFJlZjxEZWZlcnJlZFBy b21pc2U+JiYgcHJvbWlzZSkKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCi0gICAg ICAgIHNldFBlbmRpbmdBY3Rpdml0eSgpOwogICAgICAgICBtX3BlbmRpbmdSZW5kZXJpbmdQcm9t aXNlID0gV1RGTW92ZShwcm9taXNlKTsKICAgICAgICAgbV9kaWRTdGFydFJlbmRlcmluZyA9IHRy dWU7CiAgICAgICAgIHNldFN0YXRlKFN0YXRlOjpSdW5uaW5nKTsKQEAgLTE3NSw3ICsxNzQsNiBA QCB2b2lkIE9mZmxpbmVBdWRpb0NvbnRleHQ6OnJlc3VtZVJlbmRlcmluZyhSZWY8RGVmZXJyZWRQ cm9taXNlPiYmIHByb21pc2UpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIAotICAg ICAgICBzZXRQZW5kaW5nQWN0aXZpdHkoKTsKICAgICAgICAgc2V0U3RhdGUoU3RhdGU6OlJ1bm5p bmcpOwogICAgICAgICBwcm9taXNlLT5yZXNvbHZlKCk7CiAgICAgfSk7CkBAIC0xOTUsOCArMTkz LDYgQEAgdm9pZCBPZmZsaW5lQXVkaW9Db250ZXh0OjpkaWRTdXNwZW5kUmVuZGVyaW5nKHNpemVf dCBmcmFtZSkKIHsKICAgICBzZXRTdGF0ZShTdGF0ZTo6U3VzcGVuZGVkKTsKIAotICAgIGNsZWFy UGVuZGluZ0FjdGl2aXR5KCk7Ci0KICAgICBSZWZQdHI8RGVmZXJyZWRQcm9taXNlPiBwcm9taXNl OwogICAgIHsKICAgICAgICAgTG9ja2VyIGxvY2tlciB7IGdyYXBoTG9jaygpIH07CkBAIC0yMTcs NiArMjEzLDkgQEAgdm9pZCBPZmZsaW5lQXVkaW9Db250ZXh0OjpmaW5pc2hlZFJlbmRlcmluZyhi b29sIGRpZFJlbmRlcmluZykKICAgICAgICAgY2xlYXIoKTsKICAgICB9KTsKIAorICAgIC8vIE1h a2Ugc3VyZSBvdXIgSlN3cmFwcGVyIHN0YXlzIGFsaXZlIGxvbmcgZW5vdWdoIHRvIHJlc29sdmUg dGhlIHByb21pc2UgYW5kIHF1ZXVlIHRoZSBjb21wbGV0aW9uIGV2ZW50LgorICAgIC8vIE90aGVy d2lzZSwgc2V0dGluZyB0aGUgc3RhdGUgdG8gQ2xvc2VkIG1heSBjYXVzZSBvdXIgSlMgd3JhcHBl ciB0byBnZXQgY29sbGVjdGVkIGVhcmx5LgorICAgIGF1dG8gcHJvdGVjdGVkSlNXcmFwcGVyID0g bWFrZVBlbmRpbmdBY3Rpdml0eSgqdGhpcyk7CiAgICAgc2V0U3RhdGUoU3RhdGU6OkNsb3NlZCk7 CiAKICAgICAvLyBBdm9pZCBmaXJpbmcgdGhlIGV2ZW50IGlmIHRoZSBkb2N1bWVudCBoYXMgYWxy ZWFkeSBnb25lIGF3YXkuCkBAIC0yNDYsMTEgKzI0NSw5IEBAIHZvaWQgT2ZmbGluZUF1ZGlvQ29u dGV4dDo6c2V0dGxlUmVuZGVyaW5nUHJvbWlzZShFeGNlcHRpb25PcjxSZWY8QXVkaW9CdWZmZXI+ PiYmCiAgICAgcHJvbWlzZS0+cmVzb2x2ZTxJRExJbnRlcmZhY2U8QXVkaW9CdWZmZXI+PihyZXN1 bHQucmVsZWFzZVJldHVyblZhbHVlKCkpOwogfQogCi12b2lkIE9mZmxpbmVBdWRpb0NvbnRleHQ6 OmRpc3BhdGNoRXZlbnQoRXZlbnQmIGV2ZW50KQorYm9vbCBPZmZsaW5lQXVkaW9Db250ZXh0Ojp2 aXJ0dWFsSGFzUGVuZGluZ0FjdGl2aXR5KCkgY29uc3QKIHsKLSAgICBCYXNlQXVkaW9Db250ZXh0 OjpkaXNwYXRjaEV2ZW50KGV2ZW50KTsKLSAgICBpZiAoZXZlbnQuZXZlbnRJbnRlcmZhY2UoKSA9 PSBPZmZsaW5lQXVkaW9Db21wbGV0aW9uRXZlbnRJbnRlcmZhY2VUeXBlKQotICAgICAgICBjbGVh clBlbmRpbmdBY3Rpdml0eSgpOworICAgIHJldHVybiBzdGF0ZSgpID09IFN0YXRlOjpSdW5uaW5n OwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL3dlYmF1ZGlvL09mZmxpbmVBdWRpb0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvd2ViYXVkaW8vT2ZmbGluZUF1ZGlvQ29udGV4dC5oCmluZGV4IDAxZmJlMzMxYTk1 Y2VhNTRjMGU5NTkzNmZhZTU1MjJiZTM2N2M2NGQuLjA2NWE0NTIzMDlmZTE1ZDE4MjYxMzVmN2Uy YzM2Yzg2NTdkMTE2YTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXVk aW8vT2ZmbGluZUF1ZGlvQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2Vi YXVkaW8vT2ZmbGluZUF1ZGlvQ29udGV4dC5oCkBAIC02MCw5ICs2MCw3IEBAIHByaXZhdGU6CiAK ICAgICAvLyBBY3RpdmVET01PYmplY3QKICAgICBjb25zdCBjaGFyKiBhY3RpdmVET01PYmplY3RO YW1lKCkgY29uc3QgZmluYWw7Ci0KLSAgICAvLyBFdmVudFRhcmdldAotICAgIHZvaWQgZGlzcGF0 Y2hFdmVudChFdmVudCYpIGZpbmFsOworICAgIGJvb2wgdmlydHVhbEhhc1BlbmRpbmdBY3Rpdml0 eSgpIGNvbnN0IGZpbmFsOwogCiAgICAgdm9pZCBzZXR0bGVSZW5kZXJpbmdQcm9taXNlKEV4Y2Vw dGlvbk9yPFJlZjxBdWRpb0J1ZmZlcj4+JiYpOwogICAgIHZvaWQgdW5pbml0aWFsaXplKCkgZmlu YWw7Cg== 430164 2021-05-30 19:29:03 -0700 2021-05-31 17:08:28 -0700 Patch bug-226445-20210530192903.patch text/plain 10429 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4MjY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODk5ZWVjNjJhNmIxMWZk YjczNzIzNzkzNzdiNWUzOTk1MTllMmMwYy4uNmFmOTE5MmJhMWFjNzkwMDgwODA1MjJhOGQyOWE5 NDgxYjNlMWE3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDIxLTA1LTMwICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgRHJvcCBQZW5kaW5nQWN0aXZp dHkgZGF0YSBtZW1iZXIgZnJvbSBCYXNlQXVkaW9Db250ZXh0CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjY0NDUKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEcm9wIFBlbmRpbmdBY3Rpdml0eSBkYXRhIG1l bWJlciBmcm9tIEJhc2VBdWRpb0NvbnRleHQgYW5kIGluc3RlYWQgaGF2ZSBBdWRpb0NvbnRleHQg LyBPZmZsaW5lQXVkaW9Db250ZXh0CisgICAgICAgIG92ZXJyaWRlIHZpcnR1YWxIYXNQZW5kaW5n QWN0aXZpdHkoKSB0byBrZWVwIHRoZWlyIEpTIHdyYXBwZXIgYWxpdmUuIEkgZmluZCB0aGF0IFBl bmRpbmdBY3Rpdml0eSBkYXRhIG1lbWJlcnMKKyAgICAgICAgYXJlIHRvbyBlcnJvciBwcm9uZSBh bmQgYSBmcmVxdWVudCBjYXVzZSBvZiBsZWFrcy4KKworICAgICAgICAqIE1vZHVsZXMvd2ViYXVk aW8vQXVkaW9Db250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkF1ZGlvQ29udGV4dDo6QXVk aW9Db250ZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OkF1ZGlvQ29udGV4dDo6c3RhcnRSZW5kZXJp bmcpOgorICAgICAgICAoV2ViQ29yZTo6QXVkaW9Db250ZXh0OjptYXlSZXN1bWVQbGF5YmFjayk6 CisgICAgICAgIChXZWJDb3JlOjpBdWRpb0NvbnRleHQ6OnN1c3BlbmRQbGF5YmFjayk6CisgICAg ICAgIChXZWJDb3JlOjpBdWRpb0NvbnRleHQ6OnZpcnR1YWxIYXNQZW5kaW5nQWN0aXZpdHkgY29u c3QpOgorICAgICAgICAqIE1vZHVsZXMvd2ViYXVkaW8vQXVkaW9Db250ZXh0Lmg6CisgICAgICAg ICogTW9kdWxlcy93ZWJhdWRpby9CYXNlQXVkaW9Db250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkJhc2VBdWRpb0NvbnRleHQ6OmNsZWFyKToKKyAgICAgICAgKFdlYkNvcmU6OkJhc2VBdWRp b0NvbnRleHQ6OmNsZWFyUGVuZGluZ0FjdGl2aXR5KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNv cmU6OkJhc2VBdWRpb0NvbnRleHQ6OnNldFBlbmRpbmdBY3Rpdml0eSk6IERlbGV0ZWQuCisgICAg ICAgICogTW9kdWxlcy93ZWJhdWRpby9CYXNlQXVkaW9Db250ZXh0Lmg6CisgICAgICAgICogTW9k dWxlcy93ZWJhdWRpby9PZmZsaW5lQXVkaW9Db250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 Ok9mZmxpbmVBdWRpb0NvbnRleHQ6OnN0YXJ0UmVuZGVyaW5nKToKKyAgICAgICAgKFdlYkNvcmU6 Ok9mZmxpbmVBdWRpb0NvbnRleHQ6OnJlc3VtZVJlbmRlcmluZyk6CisgICAgICAgIChXZWJDb3Jl OjpPZmZsaW5lQXVkaW9Db250ZXh0OjpkaWRTdXNwZW5kUmVuZGVyaW5nKToKKyAgICAgICAgKFdl YkNvcmU6Ok9mZmxpbmVBdWRpb0NvbnRleHQ6OmZpbmlzaGVkUmVuZGVyaW5nKToKKyAgICAgICAg KFdlYkNvcmU6Ok9mZmxpbmVBdWRpb0NvbnRleHQ6OnZpcnR1YWxIYXNQZW5kaW5nQWN0aXZpdHkg Y29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6T2ZmbGluZUF1ZGlvQ29udGV4dDo6ZGlzcGF0Y2hF dmVudCk6IERlbGV0ZWQuCisgICAgICAgICogTW9kdWxlcy93ZWJhdWRpby9PZmZsaW5lQXVkaW9D b250ZXh0Lmg6CisKIDIwMjEtMDUtMzAgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4K IAogICAgICAgICBSZW1vdmUgc29tZSBkZWFkIGNvZGUgZnJvbSBCYXNlQXVkaW9Db250ZXh0IC8g QXVkaW9Db250ZXh0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1ZGlv L0F1ZGlvQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1ZGlvL0F1ZGlv Q29udGV4dC5jcHAKaW5kZXggNTA1NWI0NmI4OWJmYjg2YWRmMTc1YTQ3ZDg0NzAxYTUxZjA2NzA3 OC4uMDdkMDM3MDhiMDkxY2NiZTFiZTFkZjczMmYzMDdhY2YyYzdlMjUxZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJhdWRpby9BdWRpb0NvbnRleHQuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8vQXVkaW9Db250ZXh0LmNwcApAQCAtMTE1LDEw ICsxMTUsNiBAQCBBdWRpb0NvbnRleHQ6OkF1ZGlvQ29udGV4dChEb2N1bWVudCYgZG9jdW1lbnQs IGNvbnN0IEF1ZGlvQ29udGV4dE9wdGlvbnMmIGNvbnRleAogICAgICwgbV9kZXN0aW5hdGlvbk5v ZGUobWFrZVVuaXF1ZVJlZjxEZWZhdWx0QXVkaW9EZXN0aW5hdGlvbk5vZGU+KCp0aGlzLCBjb250 ZXh0T3B0aW9ucy5zYW1wbGVSYXRlKSkKICAgICAsIG1fbWVkaWFTZXNzaW9uKFBsYXRmb3JtTWVk aWFTZXNzaW9uOjpjcmVhdGUoUGxhdGZvcm1NZWRpYVNlc3Npb25NYW5hZ2VyOjpzaGFyZWRNYW5h Z2VyKCksICp0aGlzKSkKIHsKLSAgICAvLyBBY2NvcmRpbmcgdG8gc3BlYyBBdWRpb0NvbnRleHQg bXVzdCBkaWUgb25seSBhZnRlciBwYWdlIG5hdmlnYXRlLgotICAgIC8vIExldHMgbWFyayBpdCBh cyBBY3RpdmVET01PYmplY3Qgd2l0aCBwZW5kaW5nIGFjdGl2aXR5IGFuZCB1bm1hcmsgaXQgaW4g Y2xlYXIgbWV0aG9kLgotICAgIHNldFBlbmRpbmdBY3Rpdml0eSgpOwotCiAgICAgY29uc3RydWN0 Q29tbW9uKCk7CiAKICAgICAvLyBJbml0aWFsaXplIHRoZSBkZXN0aW5hdGlvbiBub2RlJ3MgbXV0 ZWQgc3RhdGUgdG8gbWF0Y2ggdGhlIHBhZ2UncyBjdXJyZW50IG11dGVkIHN0YXRlLgpAQCAtMTMw LDcgKzEyNiw3IEBAIEF1ZGlvQ29udGV4dDo6QXVkaW9Db250ZXh0KERvY3VtZW50JiBkb2N1bWVu dCwgY29uc3QgQXVkaW9Db250ZXh0T3B0aW9ucyYgY29udGV4CiAgICAgLy8gVW5saWtlIE9mZmxp bmVBdWRpb0NvbnRleHQsIEF1ZGlvQ29udGV4dCBkb2VzIG5vdCByZXF1aXJlIGNhbGxpbmcgcmVz dW1lKCkgdG8gc3RhcnQgcmVuZGVyaW5nLgogICAgIC8vIExhenkgaW5pdGlhbGl6YXRpb24gc3Rh cnRzIHJlbmRlcmluZyBzbyB3ZSBzY2hlZHVsZSBhIHRhc2sgaGVyZSB0byBtYWtlIHN1cmUgbGF6 eSBpbml0aWFsaXphdGlvbgogICAgIC8vIGVuZHMgdXAgaGFwcGVuaW5nLCBldmVuIGlmIG5vIGF1 ZGlvIG5vZGUgZ2V0cyBjb25zdHJ1Y3RlZC4KLSAgICBwb3N0VGFzayhbdGhpc10geworICAgIHBv c3RUYXNrKFt0aGlzLCBwZW5kaW5nQWN0aXZpdHkgPSBtYWtlUGVuZGluZ0FjdGl2aXR5KCp0aGlz KV0gewogICAgICAgICBpZiAoIWlzU3RvcHBlZCgpKQogICAgICAgICAgICAgbGF6eUluaXRpYWxp emUoKTsKICAgICB9KTsKQEAgLTMwOSwxMCArMzA1LDggQEAgdm9pZCBBdWRpb0NvbnRleHQ6OnN0 YXJ0UmVuZGVyaW5nKCkKICAgICBpZiAoaXNTdG9wcGVkKCkgfHwgIXdpbGxCZWdpblBsYXliYWNr KCkgfHwgbV93YXNTdXNwZW5kZWRCeVNjcmlwdCkKICAgICAgICAgcmV0dXJuOwogCi0gICAgc2V0 UGVuZGluZ0FjdGl2aXR5KCk7Ci0KICAgICBsYXp5SW5pdGlhbGl6ZSgpOwotICAgIGRlc3RpbmF0 aW9uKCkuc3RhcnRSZW5kZXJpbmcoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlz KV0oc3RkOjpvcHRpb25hbDxFeGNlcHRpb24+JiYgZXhjZXB0aW9uKSB7CisgICAgZGVzdGluYXRp b24oKS5zdGFydFJlbmRlcmluZyhbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMp LCBwZW5kaW5nQWN0aXZpdHkgPSBtYWtlUGVuZGluZ0FjdGl2aXR5KCp0aGlzKV0oc3RkOjpvcHRp b25hbDxFeGNlcHRpb24+JiYgZXhjZXB0aW9uKSB7CiAgICAgICAgIGlmICghZXhjZXB0aW9uKQog ICAgICAgICAgICAgc2V0U3RhdGUoU3RhdGU6OlJ1bm5pbmcpOwogICAgIH0pOwpAQCAtMzg1LDcg KzM3OSw3IEBAIHZvaWQgQXVkaW9Db250ZXh0OjptYXlSZXN1bWVQbGF5YmFjayhib29sIHNob3Vs ZFJlc3VtZSkKIAogICAgIGxhenlJbml0aWFsaXplKCk7CiAKLSAgICBkZXN0aW5hdGlvbigpLnJl c3VtZShbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpXShzdGQ6Om9wdGlvbmFs PEV4Y2VwdGlvbj4mJiBleGNlcHRpb24pIHsKKyAgICBkZXN0aW5hdGlvbigpLnJlc3VtZShbdGhp cywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBwZW5kaW5nQWN0aXZpdHkgPSBtYWtl UGVuZGluZ0FjdGl2aXR5KCp0aGlzKV0oc3RkOjpvcHRpb25hbDxFeGNlcHRpb24+JiYgZXhjZXB0 aW9uKSB7CiAgICAgICAgIHNldFN0YXRlKGV4Y2VwdGlvbiA/IFN0YXRlOjpTdXNwZW5kZWQgOiBT dGF0ZTo6UnVubmluZyk7CiAgICAgfSk7CiB9CkBAIC00NzEsNyArNDY1LDcgQEAgdm9pZCBBdWRp b0NvbnRleHQ6OnN1c3BlbmRQbGF5YmFjaygpCiAKICAgICBsYXp5SW5pdGlhbGl6ZSgpOwogCi0g ICAgZGVzdGluYXRpb24oKS5zdXNwZW5kKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigq dGhpcyldKHN0ZDo6b3B0aW9uYWw8RXhjZXB0aW9uPiYmIGV4Y2VwdGlvbikgeworICAgIGRlc3Rp bmF0aW9uKCkuc3VzcGVuZChbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBw ZW5kaW5nQWN0aXZpdHkgPSBtYWtlUGVuZGluZ0FjdGl2aXR5KCp0aGlzKV0oc3RkOjpvcHRpb25h bDxFeGNlcHRpb24+JiYgZXhjZXB0aW9uKSB7CiAgICAgICAgIGlmIChleGNlcHRpb24pCiAgICAg ICAgICAgICByZXR1cm47CiAKQEAgLTU1NSw2ICs1NDksMTEgQEAgRXhjZXB0aW9uT3I8UmVmPE1l ZGlhU3RyZWFtQXVkaW9EZXN0aW5hdGlvbk5vZGU+PiBBdWRpb0NvbnRleHQ6OmNyZWF0ZU1lZGlh U3RyZWEKIAogI2VuZGlmCiAKK2Jvb2wgQXVkaW9Db250ZXh0Ojp2aXJ0dWFsSGFzUGVuZGluZ0Fj dGl2aXR5KCkgY29uc3QKK3sKKyAgICByZXR1cm4gIWlzQ2xvc2VkKCk7Cit9CisKIH0gLy8gbmFt ZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlmIC8vIEVOQUJMRShXRUJfQVVESU8pCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1ZGlvL0F1ZGlvQ29udGV4dC5oIGIvU291cmNl L1dlYkNvcmUvTW9kdWxlcy93ZWJhdWRpby9BdWRpb0NvbnRleHQuaAppbmRleCAwNmJiOTkyNzRj YmFjMDY2MzdmNmMyYjMxM2U5NGRmOGYxMzc5MGQ0Li40MzM0NDUxOTk0MWVlZDE3OWQyMmZjM2E1 ZDg0ZDdmMWMwODM2YmEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1 ZGlvL0F1ZGlvQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8v QXVkaW9Db250ZXh0LmgKQEAgLTE0Miw2ICsxNDIsNyBAQCBwcml2YXRlOgogICAgIGNvbnN0IGNo YXIqIGFjdGl2ZURPTU9iamVjdE5hbWUoKSBjb25zdCBmaW5hbDsKICAgICB2b2lkIHN1c3BlbmQo UmVhc29uRm9yU3VzcGVuc2lvbikgZmluYWw7CiAgICAgdm9pZCByZXN1bWUoKSBmaW5hbDsKKyAg ICBib29sIHZpcnR1YWxIYXNQZW5kaW5nQWN0aXZpdHkoKSBjb25zdCBmaW5hbDsKIAogICAgIFVu aXF1ZVJlZjxEZWZhdWx0QXVkaW9EZXN0aW5hdGlvbk5vZGU+IG1fZGVzdGluYXRpb25Ob2RlOwog ICAgIHN0ZDo6dW5pcXVlX3B0cjxQbGF0Zm9ybU1lZGlhU2Vzc2lvbj4gbV9tZWRpYVNlc3Npb247 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1ZGlvL0Jhc2VBdWRpb0Nv bnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJhdWRpby9CYXNlQXVkaW9Db250 ZXh0LmNwcAppbmRleCA3MzQxYWY2NzM4M2Y2MmE2NDc0MzdmYWYwMGZlZjE1MTY4MmFjMjBkLi5h MTA2OWQxZDYzYTNhZDYwYTUzYmZhMGYwMjk1M2MwNGE4ZmI3YjFlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1ZGlvL0Jhc2VBdWRpb0NvbnRleHQuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8vQmFzZUF1ZGlvQ29udGV4dC5jcHAKQEAgLTE3 OSw4ICsxNzksNiBAQCB2b2lkIEJhc2VBdWRpb0NvbnRleHQ6OmNsZWFyKCkKICAgICAgICAgZGVs ZXRlTWFya2VkTm9kZXMoKTsKICAgICAgICAgbV9ub2Rlc1RvRGVsZXRlID0gc3RkOjpleGNoYW5n ZShtX25vZGVzTWFya2VkRm9yRGVsZXRpb24sIHsgfSk7CiAgICAgfSB3aGlsZSAoIW1fbm9kZXNU b0RlbGV0ZS5pc0VtcHR5KCkpOwotCi0gICAgY2xlYXJQZW5kaW5nQWN0aXZpdHkoKTsKIH0KIAog dm9pZCBCYXNlQXVkaW9Db250ZXh0Ojp1bmluaXRpYWxpemUoKQpAQCAtODc3LDE3ICs4NzUsNiBA QCB2b2lkIEJhc2VBdWRpb0NvbnRleHQ6OmFkZENvbnNvbGVNZXNzYWdlKE1lc3NhZ2VTb3VyY2Ug c291cmNlLCBNZXNzYWdlTGV2ZWwgbGV2ZQogICAgICAgICBtX3NjcmlwdEV4ZWN1dGlvbkNvbnRl eHQtPmFkZENvbnNvbGVNZXNzYWdlKHNvdXJjZSwgbGV2ZWwsIG1lc3NhZ2UpOwogfQogCi12b2lk IEJhc2VBdWRpb0NvbnRleHQ6OmNsZWFyUGVuZGluZ0FjdGl2aXR5KCkKLXsKLSAgICBtX3BlbmRp bmdBY3Rpdml0eSA9IG51bGxwdHI7Ci19Ci0KLXZvaWQgQmFzZUF1ZGlvQ29udGV4dDo6c2V0UGVu ZGluZ0FjdGl2aXR5KCkKLXsKLSAgICBpZiAoIW1fcGVuZGluZ0FjdGl2aXR5KQotICAgICAgICBt X3BlbmRpbmdBY3Rpdml0eSA9IG1ha2VQZW5kaW5nQWN0aXZpdHkoKnRoaXMpOwotfQotCiBQZXJp b2RpY1dhdmUmIEJhc2VBdWRpb0NvbnRleHQ6OnBlcmlvZGljV2F2ZShPc2NpbGxhdG9yVHlwZSB0 eXBlKQogewogICAgIHN3aXRjaCAodHlwZSkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv TW9kdWxlcy93ZWJhdWRpby9CYXNlQXVkaW9Db250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL3dlYmF1ZGlvL0Jhc2VBdWRpb0NvbnRleHQuaAppbmRleCBjYjcwMTVmZGRiNjg3ZDczNzM2 ZWMzOGIyOWIxOWIxYjYwZjU4ZjQ1Li40YWZmYWMzM2UzNDI0YzNmYWI1YWE1YjJiZWQwZDc0NDc2 NzIyZmQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1ZGlvL0Jhc2VB dWRpb0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1ZGlvL0Jhc2VB dWRpb0NvbnRleHQuaApAQCAtMjI3LDkgKzIyNyw2IEBAIHB1YmxpYzoKIAogcHJvdGVjdGVkOgog ICAgIGV4cGxpY2l0IEJhc2VBdWRpb0NvbnRleHQoRG9jdW1lbnQmKTsKLSAgICAKLSAgICB2b2lk IGNsZWFyUGVuZGluZ0FjdGl2aXR5KCk7Ci0gICAgdm9pZCBzZXRQZW5kaW5nQWN0aXZpdHkoKTsK IAogICAgIHZpcnR1YWwgdm9pZCB1bmluaXRpYWxpemUoKTsKIApAQCAtMzQ2LDggKzM0Myw2IEBA IHByaXZhdGU6CiAKICAgICBzdGQ6OnVuaXF1ZV9wdHI8QXN5bmNBdWRpb0RlY29kZXI+IG1fYXVk aW9EZWNvZGVyOwogCi0gICAgUmVmUHRyPFBlbmRpbmdBY3Rpdml0eTxCYXNlQXVkaW9Db250ZXh0 Pj4gbV9wZW5kaW5nQWN0aXZpdHk7Ci0KICAgICBBdWRpb0lPUG9zaXRpb24gbV9vdXRwdXRQb3Np dGlvbjsKIAogICAgIEhhc2hNYXA8U3RyaW5nLCBWZWN0b3I8QXVkaW9QYXJhbURlc2NyaXB0b3I+ PiBtX3BhcmFtZXRlckRlc2NyaXB0b3JNYXA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL3dlYmF1ZGlvL09mZmxpbmVBdWRpb0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUv TW9kdWxlcy93ZWJhdWRpby9PZmZsaW5lQXVkaW9Db250ZXh0LmNwcAppbmRleCBlMWIwZjAyZTFh ZDMzOWUzNDU3OWM3NmY0YjI0MjdhMWUzM2Y1Y2E5Li40MzgwNzJmNzRiNmNhMzFlM2MwZGVjNjNl NzliYzFiZjY1YjUyMjIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1 ZGlvL09mZmxpbmVBdWRpb0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv d2ViYXVkaW8vT2ZmbGluZUF1ZGlvQ29udGV4dC5jcHAKQEAgLTExMyw3ICsxMTMsNiBAQCB2b2lk IE9mZmxpbmVBdWRpb0NvbnRleHQ6OnN0YXJ0UmVuZGVyaW5nKFJlZjxEZWZlcnJlZFByb21pc2U+ JiYgcHJvbWlzZSkKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCi0gICAgICAgIHNl dFBlbmRpbmdBY3Rpdml0eSgpOwogICAgICAgICBtX3BlbmRpbmdSZW5kZXJpbmdQcm9taXNlID0g V1RGTW92ZShwcm9taXNlKTsKICAgICAgICAgbV9kaWRTdGFydFJlbmRlcmluZyA9IHRydWU7CiAg ICAgICAgIHNldFN0YXRlKFN0YXRlOjpSdW5uaW5nKTsKQEAgLTE3NSw3ICsxNzQsNiBAQCB2b2lk IE9mZmxpbmVBdWRpb0NvbnRleHQ6OnJlc3VtZVJlbmRlcmluZyhSZWY8RGVmZXJyZWRQcm9taXNl PiYmIHByb21pc2UpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIAotICAgICAgICBz ZXRQZW5kaW5nQWN0aXZpdHkoKTsKICAgICAgICAgc2V0U3RhdGUoU3RhdGU6OlJ1bm5pbmcpOwog ICAgICAgICBwcm9taXNlLT5yZXNvbHZlKCk7CiAgICAgfSk7CkBAIC0xOTUsOCArMTkzLDYgQEAg dm9pZCBPZmZsaW5lQXVkaW9Db250ZXh0OjpkaWRTdXNwZW5kUmVuZGVyaW5nKHNpemVfdCBmcmFt ZSkKIHsKICAgICBzZXRTdGF0ZShTdGF0ZTo6U3VzcGVuZGVkKTsKIAotICAgIGNsZWFyUGVuZGlu Z0FjdGl2aXR5KCk7Ci0KICAgICBSZWZQdHI8RGVmZXJyZWRQcm9taXNlPiBwcm9taXNlOwogICAg IHsKICAgICAgICAgTG9ja2VyIGxvY2tlciB7IGdyYXBoTG9jaygpIH07CkBAIC0yMTcsNiArMjEz LDkgQEAgdm9pZCBPZmZsaW5lQXVkaW9Db250ZXh0OjpmaW5pc2hlZFJlbmRlcmluZyhib29sIGRp ZFJlbmRlcmluZykKICAgICAgICAgY2xlYXIoKTsKICAgICB9KTsKIAorICAgIC8vIE1ha2Ugc3Vy ZSBvdXIgSlN3cmFwcGVyIHN0YXlzIGFsaXZlIGxvbmcgZW5vdWdoIHRvIHJlc29sdmUgdGhlIHBy b21pc2UgYW5kIHF1ZXVlIHRoZSBjb21wbGV0aW9uIGV2ZW50LgorICAgIC8vIE90aGVyd2lzZSwg c2V0dGluZyB0aGUgc3RhdGUgdG8gQ2xvc2VkIG1heSBjYXVzZSBvdXIgSlMgd3JhcHBlciB0byBn ZXQgY29sbGVjdGVkIGVhcmx5LgorICAgIGF1dG8gcHJvdGVjdGVkSlNXcmFwcGVyID0gbWFrZVBl bmRpbmdBY3Rpdml0eSgqdGhpcyk7CiAgICAgc2V0U3RhdGUoU3RhdGU6OkNsb3NlZCk7CiAKICAg ICAvLyBBdm9pZCBmaXJpbmcgdGhlIGV2ZW50IGlmIHRoZSBkb2N1bWVudCBoYXMgYWxyZWFkeSBn b25lIGF3YXkuCkBAIC0yNDYsMTEgKzI0NSw5IEBAIHZvaWQgT2ZmbGluZUF1ZGlvQ29udGV4dDo6 c2V0dGxlUmVuZGVyaW5nUHJvbWlzZShFeGNlcHRpb25PcjxSZWY8QXVkaW9CdWZmZXI+PiYmCiAg ICAgcHJvbWlzZS0+cmVzb2x2ZTxJRExJbnRlcmZhY2U8QXVkaW9CdWZmZXI+PihyZXN1bHQucmVs ZWFzZVJldHVyblZhbHVlKCkpOwogfQogCi12b2lkIE9mZmxpbmVBdWRpb0NvbnRleHQ6OmRpc3Bh dGNoRXZlbnQoRXZlbnQmIGV2ZW50KQorYm9vbCBPZmZsaW5lQXVkaW9Db250ZXh0Ojp2aXJ0dWFs SGFzUGVuZGluZ0FjdGl2aXR5KCkgY29uc3QKIHsKLSAgICBCYXNlQXVkaW9Db250ZXh0OjpkaXNw YXRjaEV2ZW50KGV2ZW50KTsKLSAgICBpZiAoZXZlbnQuZXZlbnRJbnRlcmZhY2UoKSA9PSBPZmZs aW5lQXVkaW9Db21wbGV0aW9uRXZlbnRJbnRlcmZhY2VUeXBlKQotICAgICAgICBjbGVhclBlbmRp bmdBY3Rpdml0eSgpOworICAgIHJldHVybiBzdGF0ZSgpID09IFN0YXRlOjpSdW5uaW5nOwogfQog CiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL3dlYmF1ZGlvL09mZmxpbmVBdWRpb0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvd2ViYXVkaW8vT2ZmbGluZUF1ZGlvQ29udGV4dC5oCmluZGV4IDAxZmJlMzMxYTk1Y2VhNTRj MGU5NTkzNmZhZTU1MjJiZTM2N2M2NGQuLjA2NWE0NTIzMDlmZTE1ZDE4MjYxMzVmN2UyYzM2Yzg2 NTdkMTE2YTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8vT2Zm bGluZUF1ZGlvQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8v T2ZmbGluZUF1ZGlvQ29udGV4dC5oCkBAIC02MCw5ICs2MCw3IEBAIHByaXZhdGU6CiAKICAgICAv LyBBY3RpdmVET01PYmplY3QKICAgICBjb25zdCBjaGFyKiBhY3RpdmVET01PYmplY3ROYW1lKCkg Y29uc3QgZmluYWw7Ci0KLSAgICAvLyBFdmVudFRhcmdldAotICAgIHZvaWQgZGlzcGF0Y2hFdmVu dChFdmVudCYpIGZpbmFsOworICAgIGJvb2wgdmlydHVhbEhhc1BlbmRpbmdBY3Rpdml0eSgpIGNv bnN0IGZpbmFsOwogCiAgICAgdm9pZCBzZXR0bGVSZW5kZXJpbmdQcm9taXNlKEV4Y2VwdGlvbk9y PFJlZjxBdWRpb0J1ZmZlcj4+JiYpOwogICAgIHZvaWQgdW5pbml0aWFsaXplKCkgZmluYWw7Cg==