224728 2021-04-17 22:53:00 -0700 Update LibWebRTCCodecsProxy to use a Lock 2021-04-24 15:06:16 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=224709 InRadar P2 Normal --- 1 cdumez cdumez darin kkinnunen webkit-bug-importer oldest_to_newest 1751573 0 cdumez 2021-04-17 22:53:00 -0700 Update LibWebRTCCodecsProxy to use a Lock, instead of a std::atomic<bool> that has to be kept up to date. 1751574 1 426369 cdumez 2021-04-17 22:55:48 -0700 Created attachment 426369 Patch 1751581 2 ews-feeder 2021-04-18 00:10:12 -0700 Committed r276223 (236705@main): <https://commits.webkit.org/236705@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 426369. 1753919 3 webkit-bug-importer 2021-04-24 15:06:16 -0700 <rdar://problem/77110073> 426369 2021-04-17 22:55:48 -0700 2021-04-18 00:10:13 -0700 Patch bug-224728-20210417225547.patch text/plain 9918 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2MjIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDM3MGM3NjhiZmRhYWM3NDFi YzcwMjM4NTgyNjQ3Yjg4NDAzN2E3OWIuLmQ4NTg4ZjkyOGQ0MjlkODhkZTQzNWUwNjZkYmMxNTI0 OWIyMTY0YWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMjEtMDQtMTcgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBVcGRhdGUgTGliV2ViUlRDQ29kZWNz UHJveHkgdG8gdXNlIGEgTG9jaworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjI0NzI4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgVXBkYXRlIExpYldlYlJUQ0NvZGVjc1Byb3h5IHRvIHVzZSBhIExvY2ssIGlu c3RlYWQgb2YgYSBzdGQ6OmF0b21pYzxib29sPiB0aGF0CisgICAgICAgIGhhcyB0byBiZSBrZXB0 IHVwIHRvIGRhdGUuIEkgdGhpbmsgdGhpcyBzaW1wbGlmaWVzIHRoZSBjb2RlIGEgYml0LiBBZGRp bmcgLyBSZW1vdmluZworICAgICAgICBlbmNvZGVyIC8gZGVjb2RlciBpcyBub3QgdmVyeSBob3Qg Y29kZSBhcyBmYXIgYXMgSSBrbm93IGFuZCB0aGVyZSB3aWxsIHZlcnkgcmFyZWx5CisgICAgICAg IGJlIGNvbnRlbnRpb24gc2luY2UgYWxsb3dzRXhpdFVuZGVyTWVtb3J5UHJlc3N1cmUoKSBpcyBv bmx5IGNhbGxlZCBvbiBtZW1vcnkgcHJlc3N1cmUuCisKKyAgICAgICAgbV9lbmNvZGVyIC8gbV9k ZWNvZGVyIGFyZSBzdGlsbCBhbHdheXMgbW9kaWZpZWQgZnJvbSB0aGUgYmFja2dyb3VuZCB0aHJl YWQuIEhvd2V2ZXIsIHdlCisgICAgICAgIG5vdyBjaGVjayBmcm9tIHRoZSBtYWluIHRocmVhZCBp ZiB0aGV5IGFyZSBlbXB0eSBieSBsb2NraW5nLgorCisgICAgICAgICogR1BVUHJvY2Vzcy93ZWJy dGMvTGliV2ViUlRDQ29kZWNzUHJveHkuaDoKKyAgICAgICAgKiBHUFVQcm9jZXNzL3dlYnJ0Yy9M aWJXZWJSVENDb2RlY3NQcm94eS5tbToKKyAgICAgICAgKFdlYktpdDo6TGliV2ViUlRDQ29kZWNz UHJveHk6OmNsb3NlKToKKyAgICAgICAgKFdlYktpdDo6TGliV2ViUlRDQ29kZWNzUHJveHk6OmNy ZWF0ZUgyNjREZWNvZGVyKToKKyAgICAgICAgKFdlYktpdDo6TGliV2ViUlRDQ29kZWNzUHJveHk6 OmNyZWF0ZUgyNjVEZWNvZGVyKToKKyAgICAgICAgKFdlYktpdDo6TGliV2ViUlRDQ29kZWNzUHJv eHk6OmNyZWF0ZVZQOURlY29kZXIpOgorICAgICAgICAoV2ViS2l0OjpMaWJXZWJSVENDb2RlY3NQ cm94eTo6cmVsZWFzZURlY29kZXIpOgorICAgICAgICAoV2ViS2l0OjpMaWJXZWJSVENDb2RlY3NQ cm94eTo6ZGVjb2RlRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpMaWJXZWJSVENDb2RlY3NQcm94 eTo6c2V0RnJhbWVTaXplKToKKyAgICAgICAgKFdlYktpdDo6TGliV2ViUlRDQ29kZWNzUHJveHk6 OmNyZWF0ZUVuY29kZXIpOgorICAgICAgICAoV2ViS2l0OjpMaWJXZWJSVENDb2RlY3NQcm94eTo6 cmVsZWFzZUVuY29kZXIpOgorICAgICAgICAoV2ViS2l0OjpMaWJXZWJSVENDb2RlY3NQcm94eTo6 aW5pdGlhbGl6ZUVuY29kZXIpOgorICAgICAgICAoV2ViS2l0OjpMaWJXZWJSVENDb2RlY3NQcm94 eTo6ZW5jb2RlRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpMaWJXZWJSVENDb2RlY3NQcm94eTo6 c2V0RW5jb2RlUmF0ZXMpOgorICAgICAgICAoV2ViS2l0OjpMaWJXZWJSVENDb2RlY3NQcm94eTo6 YWxsb3dzRXhpdFVuZGVyTWVtb3J5UHJlc3N1cmUgY29uc3QpOgorICAgICAgICAoV2ViS2l0OjpM aWJXZWJSVENDb2RlY3NQcm94eTo6dXBkYXRlSGFzRW5jb2RlcnNPckRlY29kZXJzKTogRGVsZXRl ZC4KKwogMjAyMS0wNC0xNyAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAg ICAgIEdQVUNvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OmFsbG93c0V4aXRVbmRlck1lbW9yeVByZXNz dXJlKCkgc2hvdWxkIGNoZWNrIGlmIGxpYldlYlJUQ0NvZGVjc1Byb3h5IGlzIHVzZWQKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy93ZWJydGMvTGliV2ViUlRDQ29kZWNzUHJv eHkuaCBiL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy93ZWJydGMvTGliV2ViUlRDQ29kZWNzUHJv eHkuaAppbmRleCA1NDY2NzRkOTRmNjE4NzY0YjA5Njk3ZmQwMWUwYmRlYjBhMDk1MGJjLi43ODVk ZmQ4N2JhZGI4N2UyZGJkOGU5MTU0ODVjY2ViMDMxYTBmMzRkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0dQVVByb2Nlc3Mvd2VicnRjL0xpYldlYlJUQ0NvZGVjc1Byb3h5LmgKKysrIGIvU291 cmNlL1dlYktpdC9HUFVQcm9jZXNzL3dlYnJ0Yy9MaWJXZWJSVENDb2RlY3NQcm94eS5oCkBAIC04 MiwxNCArODIsMTMgQEAgcHJpdmF0ZToKICAgICB2b2lkIGVuY29kZUZyYW1lKFJUQ0VuY29kZXJJ ZGVudGlmaWVyLCBXZWJDb3JlOjpSZW1vdGVWaWRlb1NhbXBsZSYmLCB1aW50MzJfdCB0aW1lU3Rh bXAsIGJvb2wgc2hvdWxkRW5jb2RlQXNLZXlGcmFtZSk7CiAgICAgdm9pZCBzZXRFbmNvZGVSYXRl cyhSVENFbmNvZGVySWRlbnRpZmllciwgdWludDMyX3QgYml0UmF0ZSwgdWludDMyX3QgZnJhbWVS YXRlKTsKIAotICAgIHZvaWQgdXBkYXRlSGFzRW5jb2RlcnNPckRlY29kZXJzKCk7Ci0KICAgICBD RkRpY3Rpb25hcnlSZWYgaW9TdXJmYWNlUGl4ZWxCdWZmZXJDcmVhdGlvbk9wdGlvbnMoSU9TdXJm YWNlUmVmKTsKIAogICAgIEdQVUNvbm5lY3Rpb25Ub1dlYlByb2Nlc3MmIG1fZ3B1Q29ubmVjdGlv blRvV2ViUHJvY2VzczsKKworICAgIG11dGFibGUgTG9jayBtX2xvY2s7CiAgICAgSGFzaE1hcDxS VENEZWNvZGVySWRlbnRpZmllciwgd2VicnRjOjpMb2NhbERlY29kZXI+IG1fZGVjb2RlcnM7CiAg ICAgSGFzaE1hcDxSVENFbmNvZGVySWRlbnRpZmllciwgd2VicnRjOjpMb2NhbEVuY29kZXI+IG1f ZW5jb2RlcnM7Ci0gICAgc3RkOjphdG9taWM8Ym9vbD4gbV9oYXNFbmNvZGVyc09yRGVjb2RlcnM7 CiAKICAgICBSZWY8V29ya1F1ZXVlPiBtX3F1ZXVlOwogICAgIHN0ZDo6dW5pcXVlX3B0cjxXZWJD b3JlOjpJbWFnZVRyYW5zZmVyU2Vzc2lvblZUPiBtX2ltYWdlVHJhbnNmZXJTZXNzaW9uOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL3dlYnJ0Yy9MaWJXZWJSVENDb2RlY3NQ cm94eS5tbSBiL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy93ZWJydGMvTGliV2ViUlRDQ29kZWNz UHJveHkubW0KaW5kZXggZDI0YWE5OGY0YjFmY2NlY2I3NWMwMjk3ZjM1MDlmY2M3NjViOGMxMC4u MWM3ZGFkZDY3YzRkOGI4MTRkNDc3YWRjNTE5YmU3MGIwMTIxZDc0YSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9HUFVQcm9jZXNzL3dlYnJ0Yy9MaWJXZWJSVENDb2RlY3NQcm94eS5tbQorKysg Yi9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3Mvd2VicnRjL0xpYldlYlJUQ0NvZGVjc1Byb3h5Lm1t CkBAIC02Miw2ICs2Miw3IEBAIHZvaWQgTGliV2ViUlRDQ29kZWNzUHJveHk6OmNsb3NlKCkKICAg ICBtX2dwdUNvbm5lY3Rpb25Ub1dlYlByb2Nlc3MuY29ubmVjdGlvbigpLnJlbW92ZVRocmVhZE1l c3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6TGliV2ViUlRDQ29kZWNzUHJveHk6Om1lc3NhZ2VSZWNl aXZlck5hbWUoKSk7CiAKICAgICBkaXNwYXRjaFRvVGhyZWFkKFt0aGlzLCBwcm90ZWN0ZWRUaGlz ID0gbWFrZVJlZigqdGhpcyldIHsKKyAgICAgICAgYXV0byBsb2NrZXIgPSBob2xkTG9jayhtX2xv Y2spOwogICAgICAgICBhdXRvIGRlY29kZXJzID0gV1RGTW92ZShtX2RlY29kZXJzKTsKICAgICAg ICAgZm9yIChhdXRvIGRlY29kZXIgOiBkZWNvZGVycy52YWx1ZXMoKSkKICAgICAgICAgICAgIHdl YnJ0Yzo6cmVsZWFzZUxvY2FsRGVjb2RlcihkZWNvZGVyKTsKQEAgLTczLDQ1ICs3NCw0OSBAQCB2 b2lkIExpYldlYlJUQ0NvZGVjc1Byb3h5OjpjbG9zZSgpCiAKIHZvaWQgTGliV2ViUlRDQ29kZWNz UHJveHk6OmNyZWF0ZUgyNjREZWNvZGVyKFJUQ0RlY29kZXJJZGVudGlmaWVyIGlkZW50aWZpZXIp CiB7CisgICAgQVNTRVJUKCFpc01haW5SdW5Mb29wKCkpOworICAgIGF1dG8gbG9ja2VyID0gaG9s ZExvY2sobV9sb2NrKTsKICAgICBBU1NFUlQoIW1fZGVjb2RlcnMuY29udGFpbnMoaWRlbnRpZmll cikpOwogICAgIG1fZGVjb2RlcnMuYWRkKGlkZW50aWZpZXIsIHdlYnJ0Yzo6Y3JlYXRlTG9jYWxI MjY0RGVjb2RlcihtYWtlQmxvY2tQdHIoW2Nvbm5lY3Rpb24gPSBtYWtlUmVmKG1fZ3B1Q29ubmVj dGlvblRvV2ViUHJvY2Vzcy5jb25uZWN0aW9uKCkpLCBpZGVudGlmaWVyXShDVlBpeGVsQnVmZmVy UmVmIHBpeGVsQnVmZmVyLCB1aW50MzJfdCB0aW1lU3RhbXBOcywgdWludDMyX3QgdGltZVN0YW1w KSB7CiAgICAgICAgIGlmIChhdXRvIHNhbXBsZSA9IFdlYkNvcmU6OlJlbW90ZVZpZGVvU2FtcGxl OjpjcmVhdGUocGl4ZWxCdWZmZXIsIE1lZGlhVGltZSh0aW1lU3RhbXBOcywgMSkpKQogICAgICAg ICAgICAgY29ubmVjdGlvbi0+c2VuZChNZXNzYWdlczo6TGliV2ViUlRDQ29kZWNzOjpDb21wbGV0 ZWREZWNvZGluZyB7IGlkZW50aWZpZXIsIHRpbWVTdGFtcCwgKnNhbXBsZSB9LCAwKTsKICAgICB9 KS5nZXQoKSkpOwotICAgIHVwZGF0ZUhhc0VuY29kZXJzT3JEZWNvZGVycygpOwogfQogCiB2b2lk IExpYldlYlJUQ0NvZGVjc1Byb3h5OjpjcmVhdGVIMjY1RGVjb2RlcihSVENEZWNvZGVySWRlbnRp ZmllciBpZGVudGlmaWVyKQogeworICAgIEFTU0VSVCghaXNNYWluUnVuTG9vcCgpKTsKKyAgICBh dXRvIGxvY2tlciA9IGhvbGRMb2NrKG1fbG9jayk7CiAgICAgQVNTRVJUKCFtX2RlY29kZXJzLmNv bnRhaW5zKGlkZW50aWZpZXIpKTsKICAgICBtX2RlY29kZXJzLmFkZChpZGVudGlmaWVyLCB3ZWJy dGM6OmNyZWF0ZUxvY2FsSDI2NURlY29kZXIobWFrZUJsb2NrUHRyKFtjb25uZWN0aW9uID0gbWFr ZVJlZihtX2dwdUNvbm5lY3Rpb25Ub1dlYlByb2Nlc3MuY29ubmVjdGlvbigpKSwgaWRlbnRpZmll cl0oQ1ZQaXhlbEJ1ZmZlclJlZiBwaXhlbEJ1ZmZlciwgdWludDMyX3QgdGltZVN0YW1wTnMsIHVp bnQzMl90IHRpbWVTdGFtcCkgewogICAgICAgICBpZiAoYXV0byBzYW1wbGUgPSBXZWJDb3JlOjpS ZW1vdGVWaWRlb1NhbXBsZTo6Y3JlYXRlKHBpeGVsQnVmZmVyLCBNZWRpYVRpbWUodGltZVN0YW1w TnMsIDEpKSkKICAgICAgICAgICAgIGNvbm5lY3Rpb24tPnNlbmQoTWVzc2FnZXM6OkxpYldlYlJU Q0NvZGVjczo6Q29tcGxldGVkRGVjb2RpbmcgeyBpZGVudGlmaWVyLCB0aW1lU3RhbXAsICpzYW1w bGUgfSwgMCk7CiAgICAgfSkuZ2V0KCkpKTsKLSAgICB1cGRhdGVIYXNFbmNvZGVyc09yRGVjb2Rl cnMoKTsKIH0KIAogdm9pZCBMaWJXZWJSVENDb2RlY3NQcm94eTo6Y3JlYXRlVlA5RGVjb2RlcihS VENEZWNvZGVySWRlbnRpZmllciBpZGVudGlmaWVyKQogeworICAgIEFTU0VSVCghaXNNYWluUnVu TG9vcCgpKTsKKyAgICBhdXRvIGxvY2tlciA9IGhvbGRMb2NrKG1fbG9jayk7CiAgICAgQVNTRVJU KCFtX2RlY29kZXJzLmNvbnRhaW5zKGlkZW50aWZpZXIpKTsKICAgICBtX2RlY29kZXJzLmFkZChp ZGVudGlmaWVyLCB3ZWJydGM6OmNyZWF0ZUxvY2FsVlA5RGVjb2RlcihtYWtlQmxvY2tQdHIoW2Nv bm5lY3Rpb24gPSBtYWtlUmVmKG1fZ3B1Q29ubmVjdGlvblRvV2ViUHJvY2Vzcy5jb25uZWN0aW9u KCkpLCBpZGVudGlmaWVyXShDVlBpeGVsQnVmZmVyUmVmIHBpeGVsQnVmZmVyLCB1aW50MzJfdCB0 aW1lU3RhbXBOcywgdWludDMyX3QgdGltZVN0YW1wKSB7CiAgICAgICAgIGlmIChhdXRvIHNhbXBs ZSA9IFdlYkNvcmU6OlJlbW90ZVZpZGVvU2FtcGxlOjpjcmVhdGUocGl4ZWxCdWZmZXIsIE1lZGlh VGltZSh0aW1lU3RhbXBOcywgMSkpKQogICAgICAgICAgICAgY29ubmVjdGlvbi0+c2VuZChNZXNz YWdlczo6TGliV2ViUlRDQ29kZWNzOjpDb21wbGV0ZWREZWNvZGluZyB7IGlkZW50aWZpZXIsIHRp bWVTdGFtcCwgKnNhbXBsZSB9LCAwKTsKICAgICB9KS5nZXQoKSkpOwotICAgIHVwZGF0ZUhhc0Vu Y29kZXJzT3JEZWNvZGVycygpOwogfQogCiB2b2lkIExpYldlYlJUQ0NvZGVjc1Byb3h5OjpyZWxl YXNlRGVjb2RlcihSVENEZWNvZGVySWRlbnRpZmllciBpZGVudGlmaWVyKQogeworICAgIEFTU0VS VCghaXNNYWluUnVuTG9vcCgpKTsKKyAgICBhdXRvIGxvY2tlciA9IGhvbGRMb2NrKG1fbG9jayk7 CiAgICAgQVNTRVJUKG1fZGVjb2RlcnMuY29udGFpbnMoaWRlbnRpZmllcikpOwotICAgIGlmIChh dXRvIGRlY29kZXIgPSBtX2RlY29kZXJzLnRha2UoaWRlbnRpZmllcikpIHsKKyAgICBpZiAoYXV0 byBkZWNvZGVyID0gbV9kZWNvZGVycy50YWtlKGlkZW50aWZpZXIpKQogICAgICAgICB3ZWJydGM6 OnJlbGVhc2VMb2NhbERlY29kZXIoZGVjb2Rlcik7Ci0gICAgICAgIHVwZGF0ZUhhc0VuY29kZXJz T3JEZWNvZGVycygpOwotICAgIH0KIH0KIAogdm9pZCBMaWJXZWJSVENDb2RlY3NQcm94eTo6ZGVj b2RlRnJhbWUoUlRDRGVjb2RlcklkZW50aWZpZXIgaWRlbnRpZmllciwgdWludDMyX3QgdGltZVN0 YW1wLCBjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmIGRhdGEpCiB7CisgICAgQVNTRVJUKCFpc01h aW5SdW5Mb29wKCkpOwogICAgIEFTU0VSVChtX2RlY29kZXJzLmNvbnRhaW5zKGlkZW50aWZpZXIp KTsKICAgICBhdXRvIGRlY29kZXIgPSBtX2RlY29kZXJzLmdldChpZGVudGlmaWVyKTsKICAgICBp ZiAoIWRlY29kZXIpCkBAIC0xMjMsNiArMTI4LDcgQEAgdm9pZCBMaWJXZWJSVENDb2RlY3NQcm94 eTo6ZGVjb2RlRnJhbWUoUlRDRGVjb2RlcklkZW50aWZpZXIgaWRlbnRpZmllciwgdWludDMyX3QK IAogdm9pZCBMaWJXZWJSVENDb2RlY3NQcm94eTo6c2V0RnJhbWVTaXplKFJUQ0RlY29kZXJJZGVu dGlmaWVyIGlkZW50aWZpZXIsIHVpbnQxNl90IHdpZHRoLCB1aW50MTZfdCBoZWlnaHQpCiB7Cisg ICAgQVNTRVJUKCFpc01haW5SdW5Mb29wKCkpOwogICAgIEFTU0VSVChtX2RlY29kZXJzLmNvbnRh aW5zKGlkZW50aWZpZXIpKTsKICAgICBhdXRvIGRlY29kZXIgPSBtX2RlY29kZXJzLmdldChpZGVu dGlmaWVyKTsKICAgICBpZiAoIWRlY29kZXIpCkBAIC0xMzMsNiArMTM5LDggQEAgdm9pZCBMaWJX ZWJSVENDb2RlY3NQcm94eTo6c2V0RnJhbWVTaXplKFJUQ0RlY29kZXJJZGVudGlmaWVyIGlkZW50 aWZpZXIsIHVpbnQxNl8KIAogdm9pZCBMaWJXZWJSVENDb2RlY3NQcm94eTo6Y3JlYXRlRW5jb2Rl cihSVENFbmNvZGVySWRlbnRpZmllciBpZGVudGlmaWVyLCBjb25zdCBTdHJpbmcmIGZvcm1hdE5h bWUsIGNvbnN0IFZlY3RvcjxzdGQ6OnBhaXI8U3RyaW5nLCBTdHJpbmc+PiYgcGFyYW1ldGVycywg Ym9vbCB1c2VMb3dMYXRlbmN5KQogeworICAgIEFTU0VSVCghaXNNYWluUnVuTG9vcCgpKTsKKyAg ICBhdXRvIGxvY2tlciA9IGhvbGRMb2NrKG1fbG9jayk7CiAgICAgQVNTRVJUKCFtX2VuY29kZXJz LmNvbnRhaW5zKGlkZW50aWZpZXIpKTsKIAogICAgIHN0ZDo6bWFwPHN0ZDo6c3RyaW5nLCBzdGQ6 OnN0cmluZz4gcnRjUGFyYW1ldGVyczsKQEAgLTE0NCwyMCArMTUyLDIwIEBAIHZvaWQgTGliV2Vi UlRDQ29kZWNzUHJveHk6OmNyZWF0ZUVuY29kZXIoUlRDRW5jb2RlcklkZW50aWZpZXIgaWRlbnRp ZmllciwgY29uc3QKICAgICB9KS5nZXQoKSk7CiAgICAgd2VicnRjOjpzZXRMb2NhbEVuY29kZXJM b3dMYXRlbmN5KGVuY29kZXIsIHVzZUxvd0xhdGVuY3kpOwogICAgIG1fZW5jb2RlcnMuYWRkKGlk ZW50aWZpZXIsIGVuY29kZXIpOwotICAgIHVwZGF0ZUhhc0VuY29kZXJzT3JEZWNvZGVycygpOwog fQogCiB2b2lkIExpYldlYlJUQ0NvZGVjc1Byb3h5OjpyZWxlYXNlRW5jb2RlcihSVENFbmNvZGVy SWRlbnRpZmllciBpZGVudGlmaWVyKQogeworICAgIEFTU0VSVCghaXNNYWluUnVuTG9vcCgpKTsK KyAgICBhdXRvIGxvY2tlciA9IGhvbGRMb2NrKG1fbG9jayk7CiAgICAgQVNTRVJUKG1fZW5jb2Rl cnMuY29udGFpbnMoaWRlbnRpZmllcikpOwotICAgIGlmIChhdXRvIGVuY29kZXIgPSBtX2VuY29k ZXJzLnRha2UoaWRlbnRpZmllcikpIHsKKyAgICBpZiAoYXV0byBlbmNvZGVyID0gbV9lbmNvZGVy cy50YWtlKGlkZW50aWZpZXIpKQogICAgICAgICB3ZWJydGM6OnJlbGVhc2VMb2NhbEVuY29kZXIo ZW5jb2Rlcik7Ci0gICAgICAgIHVwZGF0ZUhhc0VuY29kZXJzT3JEZWNvZGVycygpOwotICAgIH0K IH0KIAogdm9pZCBMaWJXZWJSVENDb2RlY3NQcm94eTo6aW5pdGlhbGl6ZUVuY29kZXIoUlRDRW5j b2RlcklkZW50aWZpZXIgaWRlbnRpZmllciwgdWludDE2X3Qgd2lkdGgsIHVpbnQxNl90IGhlaWdo dCwgdW5zaWduZWQgc3RhcnRCaXRyYXRlLCB1bnNpZ25lZCBtYXhCaXRyYXRlLCB1bnNpZ25lZCBt aW5CaXRyYXRlLCB1aW50MzJfdCBtYXhGcmFtZXJhdGUpCiB7CisgICAgQVNTRVJUKCFpc01haW5S dW5Mb29wKCkpOwogICAgIEFTU0VSVChtX2VuY29kZXJzLmNvbnRhaW5zKGlkZW50aWZpZXIpKTsK ICAgICBhdXRvIGVuY29kZXIgPSBtX2VuY29kZXJzLmdldChpZGVudGlmaWVyKTsKICAgICBpZiAo IWVuY29kZXIpCkBAIC0xODQsNiArMTkyLDcgQEAgc3RhdGljIGlubGluZSB3ZWJydGM6OlZpZGVv Um90YXRpb24gdG9XZWJSVENWaWRlb1JvdGF0aW9uKE1lZGlhU2FtcGxlOjpWaWRlb1JvdGEKIAog dm9pZCBMaWJXZWJSVENDb2RlY3NQcm94eTo6ZW5jb2RlRnJhbWUoUlRDRW5jb2RlcklkZW50aWZp ZXIgaWRlbnRpZmllciwgV2ViQ29yZTo6UmVtb3RlVmlkZW9TYW1wbGUmJiBzYW1wbGUsIHVpbnQz Ml90IHRpbWVTdGFtcCwgYm9vbCBzaG91bGRFbmNvZGVBc0tleUZyYW1lKQogeworICAgIEFTU0VS VCghaXNNYWluUnVuTG9vcCgpKTsKICAgICBBU1NFUlQobV9lbmNvZGVycy5jb250YWlucyhpZGVu dGlmaWVyKSk7CiAgICAgYXV0byBlbmNvZGVyID0gbV9lbmNvZGVycy5nZXQoaWRlbnRpZmllcik7 CiAgICAgaWYgKCFlbmNvZGVyKQpAQCAtMjAwLDYgKzIwOSw3IEBAIHZvaWQgTGliV2ViUlRDQ29k ZWNzUHJveHk6OmVuY29kZUZyYW1lKFJUQ0VuY29kZXJJZGVudGlmaWVyIGlkZW50aWZpZXIsIFdl YkNvcmU6CiAKIHZvaWQgTGliV2ViUlRDQ29kZWNzUHJveHk6OnNldEVuY29kZVJhdGVzKFJUQ0Vu Y29kZXJJZGVudGlmaWVyIGlkZW50aWZpZXIsIHVpbnQzMl90IGJpdFJhdGUsIHVpbnQzMl90IGZy YW1lUmF0ZSkKIHsKKyAgICBBU1NFUlQoIWlzTWFpblJ1bkxvb3AoKSk7CiAgICAgYXV0byBlbmNv ZGVyID0gbV9lbmNvZGVycy5nZXQoaWRlbnRpZmllcik7CiAgICAgaWYgKCFlbmNvZGVyKQogICAg ICAgICByZXR1cm47CkBAIC0yMDcsMTQgKzIxNywxMSBAQCB2b2lkIExpYldlYlJUQ0NvZGVjc1By b3h5OjpzZXRFbmNvZGVSYXRlcyhSVENFbmNvZGVySWRlbnRpZmllciBpZGVudGlmaWVyLCB1aW50 MwogICAgIHdlYnJ0Yzo6c2V0TG9jYWxFbmNvZGVyUmF0ZXMoZW5jb2RlciwgYml0UmF0ZSwgZnJh bWVSYXRlKTsKIH0KIAotdm9pZCBMaWJXZWJSVENDb2RlY3NQcm94eTo6dXBkYXRlSGFzRW5jb2Rl cnNPckRlY29kZXJzKCkKLXsKLSAgICBtX2hhc0VuY29kZXJzT3JEZWNvZGVycyA9ICFtX2VuY29k ZXJzLmlzRW1wdHkoKSB8fCAhbV9kZWNvZGVycy5pc0VtcHR5KCk7Ci19Ci0KIGJvb2wgTGliV2Vi UlRDQ29kZWNzUHJveHk6OmFsbG93c0V4aXRVbmRlck1lbW9yeVByZXNzdXJlKCkgY29uc3QKIHsK LSAgICByZXR1cm4gIW1faGFzRW5jb2RlcnNPckRlY29kZXJzOworICAgIEFTU0VSVChpc01haW5S dW5Mb29wKCkpOworICAgIGF1dG8gbG9ja2VyID0gaG9sZExvY2sobV9sb2NrKTsKKyAgICByZXR1 cm4gbV9lbmNvZGVycy5pc0VtcHR5KCkgJiYgbV9kZWNvZGVycy5pc0VtcHR5KCk7CiB9CiAKIH0K