214112 2020-07-08 16:59:38 -0700 Reset AVSystemController_PIDToInheritApplicationStateFrom when mediaserverd dies 2020-07-09 09:57:24 -0700 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson ews-watchlist glenn hta jer.noble philipj sergio tommyw webkit-bug-importer youennf oldest_to_newest 1669953 0 eric.carlson 2020-07-08 16:59:38 -0700 Reset AVSystemController_PIDToInheritApplicationStateFrom when mediaserverd dies so capture can be restarted. 1669954 1 eric.carlson 2020-07-08 17:00:07 -0700 <rdar://problem/65229214> 1669962 2 403827 eric.carlson 2020-07-08 17:21:04 -0700 Created attachment 403827 Patch 1670151 3 ews-feeder 2020-07-09 09:57:24 -0700 Committed r264177: <https://trac.webkit.org/changeset/264177> All reviewed patches have been landed. Closing bug and clearing flags on attachment 403827. 403827 2020-07-08 17:21:04 -0700 2020-07-09 09:57:24 -0700 Patch bug-214112-20200708172103.patch text/plain 12016 eric.carlson U3VidmVyc2lvbiBSZXZpc2lvbjogMjY0MDM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWU0ZWZlYTg1ZTU4Yzdh NDFkNmNmZDNkNDU4ODM4MTQxY2YxZDg5Ny4uNmRjZDU3MmI1YzFhMDI4MDdmNjJhYWJlZDU5YmVh NjJlNTIzYjI3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDIwLTA3LTA4ICBFcmlj IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFJlc2V0IEFWU3lz dGVtQ29udHJvbGxlcl9QSURUb0luaGVyaXRBcHBsaWNhdGlvblN0YXRlRnJvbSB3aGVuIG1lZGlh c2VydmVyZCBkaWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMTQxMTIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY1MjI5MjE0PgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3RlZCBtYW51YWxseSBi ZWNhdXNlIHRoaXMgY2FuIG9ubHkgYmUgdGVzdGVkIGJ5IGtpbGxpbmcgYSBzeXN0ZW0gcHJvY2Vz cyB3aGlsZQorICAgICAgICBjYXB0dXJpbmcgb24gaU9TIGhhcmR3YXJlLgorCisgICAgICAgICog cGxhdGZvcm0vYXVkaW8vY29jb2EvTWVkaWFTZXNzaW9uTWFuYWdlckNvY29hLmg6IEFkZCB0YXNr IHF1ZXVlIGFjY2Vzc29yLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTZXNzaW9uTWFuYWdlckNv Y29hOjp0YXNrUXVldWUpOgorCisgICAgICAgICogcGxhdGZvcm0vYXVkaW8vaW9zL01lZGlhU2Vz c2lvbkhlbHBlcklPUy5oOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTZXNzaW9uSGVscGVyQ2xp ZW50OjptZWRpYVNlcnZlckNvbm5lY3Rpb25EaWVkKToKKyAgICAgICAgKiBwbGF0Zm9ybS9hdWRp by9pb3MvTWVkaWFTZXNzaW9uSGVscGVySU9TLm1tOgorICAgICAgICAoTWVkaWFTZXNzaW9uSGVs cGVyaU9TOjptZWRpYVNlcnZlckNvbm5lY3Rpb25EaWVkKTogUmVuYW1lZCBmcm9tIGNhclBsYXlT ZXJ2ZXJEaWVkLiAKKyAgICAgICAgSW5mb3JtIGNsaWVudHMgaWYgd2UgcHJldmlvdXNseSBzZXQg dGhlIFBJRCBwcm94eS4KKyAgICAgICAgKC1bV2ViTWVkaWFTZXNzaW9uSGVscGVyIGluaXRXaXRo Q2FsbGJhY2s6XSk6IENhbGwgbWVkaWFTZXJ2ZXJDb25uZWN0aW9uRGllZC4KKyAgICAgICAgKC1b V2ViTWVkaWFTZXNzaW9uSGVscGVyIG1lZGlhU2VydmVyQ29ubmVjdGlvbkRpZWQ6XSk6IERpdHRv LgorICAgICAgICAoTWVkaWFTZXNzaW9uSGVscGVyaU9TOjpjYXJQbGF5U2VydmVyRGllZCk6IERl bGV0ZWQuCisgICAgICAgICgtW1dlYk1lZGlhU2Vzc2lvbkhlbHBlciBjYXJQbGF5U2VydmVyRGll ZDpdKTogRGVsZXRlZC4KKworICAgICAgICAqIHBsYXRmb3JtL2F1ZGlvL2lvcy9NZWRpYVNlc3Np b25NYW5hZ2VySU9TLmg6CisgICAgICAgICogcGxhdGZvcm0vYXVkaW8vaW9zL01lZGlhU2Vzc2lv bk1hbmFnZXJJT1MubW06CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVNlc3Npb25NYW5hZ2VyaU9T OjptZWRpYVNlcnZlckNvbm5lY3Rpb25EaWVkKTogQ2FsbCBwcm92aWRlUHJlc2VudGluZ0FwcGxp Y2F0aW9uUElECisgICAgICAgIGlmIHdlIHByZXZpb3VzbHkgc2V0IHRoZSBQSUQgcHJveHkuCisK KyAgICAgICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQVZWaWRlb0NhcHR1cmVTb3VyY2Uu bW06CisgICAgICAgIChXZWJDb3JlOjpBVlZpZGVvQ2FwdHVyZVNvdXJjZTo6Y2FwdHVyZVNlc3Np b25SdW50aW1lRXJyb3IpOiBEb24ndCB0cnkgdG8gcmVzdGFydCB0aGUKKyAgICAgICAgc2Vzc2lv biBpbW1lZGlhdGVseSBzaW5jZSB0aGlzIGlzIGNhbGxlZCBkaXJlY3RseSBmcm9tIHRoZSBub3Rp ZmljYXRpb24gaGFuZGxlci4KKwogMjAyMC0wNy0wNyAgQW5kcmVzIEdvbnphbGV6ICA8YW5kcmVz Z18yMkBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIGNvbnRlbnQgcHJvY2VzcyBoYW5ncyBpbiBB Y2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpzZXRTZWxlY3RlZFZpc2libGVQb3NpdGlvblJhbmdl IGluIHNvbWUgY29ybmVyIGNhc2VzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCA4MmU0MzkyYWE0MTQ5ZDIzNjUxZjQx Y2QzOTM2MjY4Njk1N2FhZmNmLi5lOTg1ZWIwNzBhOTQ4MTdjODM5YWY4YjkxYWI1MGE2ZDYxNWNl N2EzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIwLTA3LTA4ICBFcmljIENhcmxzb24g IDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFJlc2V0IEFWU3lzdGVtQ29udHJv bGxlcl9QSURUb0luaGVyaXRBcHBsaWNhdGlvblN0YXRlRnJvbSB3aGVuIG1lZGlhc2VydmVyZCBk aWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTQx MTIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY1MjI5MjE0PgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogR1BVUHJvY2Vzcy9tZWRpYS9pb3MvUmVt b3RlTWVkaWFTZXNzaW9uSGVscGVyUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVN ZWRpYVNlc3Npb25IZWxwZXJQcm94eTo6cHJvdmlkZVByZXNlbnRpbmdBcHBsaWNhdGlvblBJRCk6 IERvbid0IGJvdGhlcgorICAgICAgICB0cmFja2luZyB3aGV0aGVyIG9yIG5vdCBwcm92aWRlUHJl c2VudGluZ0FwcGxpY2F0aW9uUElEIGhhcyBiZWVuIGNhbGxlZCwgdGhlIHNlc3Npb24KKyAgICAg ICAgaGVscGVyIGFscmVhZHkgZG9lcyB0aGF0LgorICAgICAgICAqIEdQVVByb2Nlc3MvbWVkaWEv aW9zL1JlbW90ZU1lZGlhU2Vzc2lvbkhlbHBlclByb3h5Lmg6CisKIDIwMjAtMDctMDcgIFNpaHVp IExpdSAgPHNpaHVpX2xpdUBhcHBlLmNvbT4KIAogICAgICAgICBOZXR3b3JrIHByb2Nlc3MgY3Jh c2hlcyBpbiBXZWJLaXQ6OlN0b3JhZ2VNYW5hZ2VyU2V0OjpkZWxldGVTZXNzaW9uU3RvcmFnZUZv ck9yaWdpbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2NvY29h L01lZGlhU2Vzc2lvbk1hbmFnZXJDb2NvYS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVk aW8vY29jb2EvTWVkaWFTZXNzaW9uTWFuYWdlckNvY29hLmgKaW5kZXggMjc1MTZkZTU2NDkzMjlm ODVlY2YzYmE4NmIxZWI2NTg2NjY5MWI1Yi4uZWU4ZTk4NjUzNTEyOWQ2OTFmYjU4NzRmOGYzYzkx OWY1M2NjYTIyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vY29j b2EvTWVkaWFTZXNzaW9uTWFuYWdlckNvY29hLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vYXVkaW8vY29jb2EvTWVkaWFTZXNzaW9uTWFuYWdlckNvY29hLmgKQEAgLTgyLDYgKzgyLDgg QEAgcHJvdGVjdGVkOgogCiAgICAgUGxhdGZvcm1NZWRpYVNlc3Npb24qIG5vd1BsYXlpbmdFbGln aWJsZVNlc3Npb24oKTsKIAorICAgIEdlbmVyaWNUYXNrUXVldWU8VGltZXI+JiB0YXNrUXVldWUo KSB7IHJldHVybiBtX3Rhc2tRdWV1ZTsgfQorCiBwcml2YXRlOgogI2lmICFSRUxFQVNFX0xPR19E SVNBQkxFRAogICAgIGNvbnN0IGNoYXIqIGxvZ0NsYXNzTmFtZSgpIGNvbnN0IG92ZXJyaWRlIHsg cmV0dXJuICJNZWRpYVNlc3Npb25NYW5hZ2VyQ29jb2EiOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9pb3MvTWVkaWFTZXNzaW9uSGVscGVySU9TLmggYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9pb3MvTWVkaWFTZXNzaW9uSGVscGVySU9TLmgKaW5k ZXggMWE3NTJjZjc3OGRmZjFmYmQzMTkxNDM0YTgxOGVhNTM4YTEyMTRiNy4uYjEyY2NkNzQ1YzYw MTI1NjEzYThjNjU1MjcxNDU2NjhiOGVhZWUxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vYXVkaW8vaW9zL01lZGlhU2Vzc2lvbkhlbHBlcklPUy5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2lvcy9NZWRpYVNlc3Npb25IZWxwZXJJT1MuaApAQCAtNDIs NiArNDIsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGFwcGxpY2F0aW9uRGlkRW50ZXJC YWNrZ3JvdW5kKFN1c3BlbmRlZFVuZGVyTG9jaykgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBhcHBs aWNhdGlvbldpbGxCZWNvbWVJbmFjdGl2ZSgpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgYXBwbGlj YXRpb25EaWRCZWNvbWVBY3RpdmUoKSA9IDA7CisgICAgdmlydHVhbCB2b2lkIG1lZGlhU2VydmVy Q29ubmVjdGlvbkRpZWQoKSB7IH07CiAKICAgICBlbnVtIGNsYXNzIEhhc0F2YWlsYWJsZVRhcmdl dHMgOiBib29sIHsgTm8sIFllcyB9OwogICAgIHZpcnR1YWwgdm9pZCBleHRlcm5hbE91dHB1dERl dmljZUF2YWlsYWJsZURpZENoYW5nZShIYXNBdmFpbGFibGVUYXJnZXRzKSA9IDA7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9pb3MvTWVkaWFTZXNzaW9uSGVscGVy SU9TLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vaW9zL01lZGlhU2Vzc2lvbkhl bHBlcklPUy5tbQppbmRleCA0MmEyZjcwODExMzA3ODJkYWY4YTQxNWVmYWQ0NjAwNzk1NTExYmJi Li5mMDMxMjBmNWE4ZmMxYjUyYzQ1NWVhMTZjNDI2NGYwMjEwYTE3NTA3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9pb3MvTWVkaWFTZXNzaW9uSGVscGVySU9TLm1t CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2lvcy9NZWRpYVNlc3Npb25IZWxw ZXJJT1MubW0KQEAgLTk4LDcgKzk4LDcgQEAgcHVibGljOgogICAgIHZvaWQgYXBwbGljYXRpb25X aWxsQmVjb21lSW5hY3RpdmUoKTsKICAgICB2b2lkIGFwcGxpY2F0aW9uRGlkQmVjb21lQWN0aXZl KCk7CiAjaWYgSEFWRShDRUxFU1RJQUwpCi0gICAgdm9pZCBjYXJQbGF5U2VydmVyRGllZCgpOwor ICAgIHZvaWQgbWVkaWFTZXJ2ZXJDb25uZWN0aW9uRGllZCgpOwogICAgIHZvaWQgdXBkYXRlQ2Fy UGxheUlzQ29ubmVjdGVkKE9wdGlvbmFsPGJvb2w+JiYpOwogI2VuZGlmCiAjaWYgUExBVEZPUk0o SU9TX0ZBTUlMWSkgJiYgIVBMQVRGT1JNKElPU19GQU1JTFlfU0lNVUxBVE9SKSAmJiAhUExBVEZP Uk0oTUFDQ0FUQUxZU1QpICYmICFQTEFURk9STShXQVRDSE9TKQpAQCAtMjI2LDkgKzIyNiwxNiBA QCB2b2lkIE1lZGlhU2Vzc2lvbkhlbHBlcmlPUzo6c3RvcE1vbml0b3JpbmdXaXJlbGVzc1JvdXRl cygpCiB9CiAKICNpZiBIQVZFKENFTEVTVElBTCkKLXZvaWQgTWVkaWFTZXNzaW9uSGVscGVyaU9T OjpjYXJQbGF5U2VydmVyRGllZCgpCit2b2lkIE1lZGlhU2Vzc2lvbkhlbHBlcmlPUzo6bWVkaWFT ZXJ2ZXJDb25uZWN0aW9uRGllZCgpCiB7CiAgICAgdXBkYXRlQ2FyUGxheUlzQ29ubmVjdGVkKFdU Rjo6bnVsbG9wdCk7CisKKyAgICBpZiAoIW1faGF2ZVByZXNlbnRlZEFwcGxpY2F0aW9uUElEKQor ICAgICAgICByZXR1cm47CisKKyAgICBtX2hhdmVQcmVzZW50ZWRBcHBsaWNhdGlvblBJRCA9IGZh bHNlOworICAgIGZvciAoYXV0byYgY2xpZW50IDogbV9jbGllbnRzKQorICAgICAgICBjbGllbnQu bWVkaWFTZXJ2ZXJDb25uZWN0aW9uRGllZCgpOwogfQogCiB2b2lkIE1lZGlhU2Vzc2lvbkhlbHBl cmlPUzo6dXBkYXRlQ2FyUGxheUlzQ29ubmVjdGVkKE9wdGlvbmFsPGJvb2w+JiYgY2FyUGxheUlz Q29ubmVjdGVkKQpAQCAtMzMzLDcgKzM0MCw3IEBAIHZvaWQgTWVkaWFTZXNzaW9uSGVscGVyaU9T OjpleHRlcm5hbE91dHB1dERldmljZUF2YWlsYWJsZURpZENoYW5nZSgpCiAKICNpZiBIQVZFKENF TEVTVElBTCkKICAgICBpZiAoY2FuTG9hZEFWU3lzdGVtQ29udHJvbGxlcl9TZXJ2ZXJDb25uZWN0 aW9uRGllZE5vdGlmaWNhdGlvbigpKQotICAgICAgICBbY2VudGVyIGFkZE9ic2VydmVyOnNlbGYg c2VsZWN0b3I6QHNlbGVjdG9yKGNhclBsYXlTZXJ2ZXJEaWVkOikgbmFtZTpnZXRBVlN5c3RlbUNv bnRyb2xsZXJfU2VydmVyQ29ubmVjdGlvbkRpZWROb3RpZmljYXRpb24oKSBvYmplY3Q6bmlsXTsK KyAgICAgICAgW2NlbnRlciBhZGRPYnNlcnZlcjpzZWxmIHNlbGVjdG9yOkBzZWxlY3RvcihtZWRp YVNlcnZlckNvbm5lY3Rpb25EaWVkOikgbmFtZTpnZXRBVlN5c3RlbUNvbnRyb2xsZXJfU2VydmVy Q29ubmVjdGlvbkRpZWROb3RpZmljYXRpb24oKSBvYmplY3Q6bmlsXTsKICAgICBpZiAoY2FuTG9h ZEFWU3lzdGVtQ29udHJvbGxlcl9DYXJQbGF5SXNDb25uZWN0ZWREaWRDaGFuZ2VOb3RpZmljYXRp b24oKSkKICAgICAgICAgW2NlbnRlciBhZGRPYnNlcnZlcjpzZWxmIHNlbGVjdG9yOkBzZWxlY3Rv cihjYXJQbGF5SXNDb25uZWN0ZWREaWRDaGFuZ2U6KSBuYW1lOmdldEFWU3lzdGVtQ29udHJvbGxl cl9DYXJQbGF5SXNDb25uZWN0ZWREaWRDaGFuZ2VOb3RpZmljYXRpb24oKSBvYmplY3Q6bmlsXTsK ICNlbmRpZgpAQCAtNTEyLDE2ICs1MTksMTYgQEAgdm9pZCBNZWRpYVNlc3Npb25IZWxwZXJpT1M6 OmV4dGVybmFsT3V0cHV0RGV2aWNlQXZhaWxhYmxlRGlkQ2hhbmdlKCkKIH0KIAogI2lmIEhBVkUo Q0VMRVNUSUFMKQotLSAodm9pZCljYXJQbGF5U2VydmVyRGllZDooTlNOb3RpZmljYXRpb24gKilu b3RpZmljYXRpb24KKy0gKHZvaWQpbWVkaWFTZXJ2ZXJDb25uZWN0aW9uRGllZDooTlNOb3RpZmlj YXRpb24gKilub3RpZmljYXRpb24KIHsKICAgICBpZiAoIV9jYWxsYmFjaykKICAgICAgICAgcmV0 dXJuOwogCi0gICAgTE9HKE1lZGlhLCAiLVtXZWJNZWRpYVNlc3Npb25IZWxwZXIgY2FyUGxheVNl cnZlckRpZWQ6XSIpOworICAgIExPRyhNZWRpYSwgIi1bV2ViTWVkaWFTZXNzaW9uSGVscGVyIG1l ZGlhU2VydmVyQ29ubmVjdGlvbkRpZWQ6XSIpOwogICAgIFVOVVNFRF9QQVJBTShub3RpZmljYXRp b24pOwogICAgIGNhbGxPbldlYlRocmVhZE9yRGlzcGF0Y2hBc3luY09uTWFpblRocmVhZChbcHJv dGVjdGVkU2VsZiA9IHJldGFpblB0cihzZWxmKV0oKSBtdXRhYmxlIHsKICAgICAgICAgaWYgKGF1 dG8qIGNhbGxiYWNrID0gcHJvdGVjdGVkU2VsZi0+X2NhbGxiYWNrKQotICAgICAgICAgICAgY2Fs bGJhY2stPmNhclBsYXlTZXJ2ZXJEaWVkKCk7CisgICAgICAgICAgICBjYWxsYmFjay0+bWVkaWFT ZXJ2ZXJDb25uZWN0aW9uRGllZCgpOwogICAgIH0pOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9pb3MvTWVkaWFTZXNzaW9uTWFuYWdlcklPUy5oIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vaW9zL01lZGlhU2Vzc2lvbk1hbmFnZXJJT1MuaApp bmRleCA4ZjkwZmI3OTI2MDlmOTIwNWQ0MjY1ODViZjMyZGQ5NTQ1OGFmNGYzLi5jOTY1YzI4NDU1 M2I4N2ZiOGQxMWE4MTI0MjAyMmE3NmY1NTZmYTJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9hdWRpby9pb3MvTWVkaWFTZXNzaW9uTWFuYWdlcklPUy5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2lvcy9NZWRpYVNlc3Npb25NYW5hZ2VySU9TLmgKQEAg LTc2LDYgKzc2LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGFwcGxpY2F0aW9uRGlkRW50ZXJCYWNr Z3JvdW5kKFN1c3BlbmRlZFVuZGVyTG9jaykgZmluYWw7CiAgICAgdm9pZCBhcHBsaWNhdGlvbldp bGxCZWNvbWVJbmFjdGl2ZSgpIGZpbmFsOwogICAgIHZvaWQgYXBwbGljYXRpb25EaWRCZWNvbWVB Y3RpdmUoKSBmaW5hbDsKKyAgICB2b2lkIG1lZGlhU2VydmVyQ29ubmVjdGlvbkRpZWQoKSBmaW5h bDsKICAgICB2b2lkIGV4dGVybmFsT3V0cHV0RGV2aWNlQXZhaWxhYmxlRGlkQ2hhbmdlKEhhc0F2 YWlsYWJsZVRhcmdldHMpIGZpbmFsOwogICAgIHZvaWQgYWN0aXZlQXVkaW9Sb3V0ZURpZENoYW5n ZShTaG91bGRQYXVzZSkgZmluYWw7CiAgICAgdm9pZCBhY3RpdmVWaWRlb1JvdXRlRGlkQ2hhbmdl KFN1cHBvcnRzQWlyUGxheVZpZGVvLCBSZWY8TWVkaWFQbGF5YmFja1RhcmdldD4mJikgZmluYWw7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9pb3MvTWVkaWFTZXNz aW9uTWFuYWdlcklPUy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2lvcy9NZWRp YVNlc3Npb25NYW5hZ2VySU9TLm1tCmluZGV4IDFhYjNhNTQ3YzAwMzEwZThjODI2YTYzNTI0ZjIx MjBjMGVhMjRkNDkuLjAyNTRiNmM4Y2VlZGUyNjFhMThlNmRkNGVhMjIzNzJjOTNlNWJiMWEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2lvcy9NZWRpYVNlc3Npb25N YW5hZ2VySU9TLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2lvcy9NZWRp YVNlc3Npb25NYW5hZ2VySU9TLm1tCkBAIC0xMTUsNiArMTE1LDE5IEBAIHZvaWQgTWVkaWFTZXNz aW9uTWFuYWdlcmlPUzo6cHJvdmlkZVByZXNlbnRpbmdBcHBsaWNhdGlvblBJRElmTmVjZXNzYXJ5 KCkKICNlbmRpZgogfQogCit2b2lkIE1lZGlhU2Vzc2lvbk1hbmFnZXJpT1M6Om1lZGlhU2VydmVy Q29ubmVjdGlvbkRpZWQoKQoreworICAgIEFMV0FZU19MT0coTE9HSURFTlRJRklFUiwgbV9oYXZl UHJlc2VudGVkQXBwbGljYXRpb25QSUQpOworCisgICAgaWYgKCFtX2hhdmVQcmVzZW50ZWRBcHBs aWNhdGlvblBJRCkKKyAgICAgICAgcmV0dXJuOworCisgICAgbV9oYXZlUHJlc2VudGVkQXBwbGlj YXRpb25QSUQgPSBmYWxzZTsKKyAgICB0YXNrUXVldWUoKS5lbnF1ZXVlVGFzayhbXSAoKSB7Cisg ICAgICAgIHByb3ZpZGVQcmVzZW50aW5nQXBwbGljYXRpb25QSUQoKTsKKyAgICB9KTsKK30KKwog dm9pZCBNZWRpYVNlc3Npb25NYW5hZ2VyaU9TOjpwcm92aWRlUHJlc2VudGluZ0FwcGxpY2F0aW9u UElEKCkKIHsKICAgICBNZWRpYVNlc3Npb25IZWxwZXI6OnNoYXJlZEhlbHBlcigpLnByb3ZpZGVQ cmVzZW50aW5nQXBwbGljYXRpb25QSUQocHJlc2VudGluZ0FwcGxpY2F0aW9uUElEKCkpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0FWVmlkZW9D YXB0dXJlU291cmNlLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFj L0FWVmlkZW9DYXB0dXJlU291cmNlLm1tCmluZGV4IDhlNDU1NTg4Yjg0NzgwMjY4MjM0OGU0ZjAx YzQ3YTk0YTNhNjg3OWUuLjQwMTM5NDA0YzY4OTA3N2Y0NTY0YzQ3NDY1MTFhM2FkOTYyZmIzZjYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9BVlZp ZGVvQ2FwdHVyZVNvdXJjZS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0 cmVhbS9tYWMvQVZWaWRlb0NhcHR1cmVTb3VyY2UubW0KQEAgLTYxNSwxNCArNjE1LDE4IEBAIHZv aWQgQVZWaWRlb0NhcHR1cmVTb3VyY2U6OmdlbmVyYXRlUHJlc2V0cygpCiAjaWYgUExBVEZPUk0o SU9TX0ZBTUlMWSkKIHZvaWQgQVZWaWRlb0NhcHR1cmVTb3VyY2U6OmNhcHR1cmVTZXNzaW9uUnVu dGltZUVycm9yKFJldGFpblB0cjxOU0Vycm9yPiBlcnJvcikKIHsKLSAgICBFUlJPUl9MT0dfSUYo bG9nZ2VyUHRyKCksIExPR0lERU5USUZJRVIsIFtbZXJyb3IgbG9jYWxpemVkRGVzY3JpcHRpb25d IFVURjhTdHJpbmddKTsKKyAgICBhdXRvIGlkZW50aWZpZXIgPSBMT0dJREVOVElGSUVSOworICAg IEVSUk9SX0xPR19JRihsb2dnZXJQdHIoKSwgaWRlbnRpZmllciwgW2Vycm9yIGNvZGVdLCAiLCAi LCBbW2Vycm9yIGxvY2FsaXplZERlc2NyaXB0aW9uXSBVVEY4U3RyaW5nXSk7CiAKICAgICBpZiAo IW1faXNSdW5uaW5nIHx8IGVycm9yLmdldCgpLmNvZGUgIT0gQVZFcnJvck1lZGlhU2VydmljZXNX ZXJlUmVzZXQpCiAgICAgICAgIHJldHVybjsKIAotICAgIC8vIFRyeSB0byByZXN0YXJ0IHRoZSBz ZXNzaW9uLCBidXQgcmVzZXQgbV9pc1J1bm5pbmcgaW1tZWRpYXRlbHkgc28gaWYgaXQgZmFpbHMg d2Ugd29uJ3QgdHJ5IGFnYWluLgotICAgIFttX3Nlc3Npb24gc3RhcnRSdW5uaW5nXTsKLSAgICBt X2lzUnVubmluZyA9IFttX3Nlc3Npb24gaXNSdW5uaW5nXTsKKyAgICBzY2hlZHVsZURlZmVycmVk VGFzayhbdGhpcywgaWRlbnRpZmllcl0geworICAgICAgICAvLyBUcnkgdG8gcmVzdGFydCB0aGUg c2Vzc2lvbiwgYnV0IHJlc2V0IG1faXNSdW5uaW5nIGltbWVkaWF0ZWx5IHNvIGlmIGl0IGZhaWxz IHdlIHdvbid0IHRyeSBhZ2Fpbi4KKyAgICAgICAgRVJST1JfTE9HX0lGKGxvZ2dlclB0cigpLCBp ZGVudGlmaWVyLCAicmVzdGFydGluZyBzZXNzaW9uIik7CisgICAgICAgIFttX3Nlc3Npb24gc3Rh cnRSdW5uaW5nXTsKKyAgICAgICAgbV9pc1J1bm5pbmcgPSBbbV9zZXNzaW9uIGlzUnVubmluZ107 CisgICAgfSk7CiB9CiAKIHZvaWQgQVZWaWRlb0NhcHR1cmVTb3VyY2U6OmNhcHR1cmVTZXNzaW9u QmVnaW5JbnRlcnJ1cHRpb24oUmV0YWluUHRyPE5TTm90aWZpY2F0aW9uPiBub3RpZmljYXRpb24p CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvbWVkaWEvaW9zL1JlbW90ZU1l ZGlhU2Vzc2lvbkhlbHBlclByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9tZWRp YS9pb3MvUmVtb3RlTWVkaWFTZXNzaW9uSGVscGVyUHJveHkuY3BwCmluZGV4IDAyZTJmYzYyNTBj YWExZmI3YTVmM2EwYTQzMzM5NzVmZWI5NzU0YjYuLjIxNzUzZDAzZGZmYmMwN2U2ZjZmODM1MzJh Yzg1Zjk3ZTViOTg4MjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9tZWRp YS9pb3MvUmVtb3RlTWVkaWFTZXNzaW9uSGVscGVyUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvR1BVUHJvY2Vzcy9tZWRpYS9pb3MvUmVtb3RlTWVkaWFTZXNzaW9uSGVscGVyUHJveHkuY3Bw CkBAIC02NywxMCArNjcsNiBAQCB2b2lkIFJlbW90ZU1lZGlhU2Vzc2lvbkhlbHBlclByb3h5Ojpz dG9wTW9uaXRvcmluZ1dpcmVsZXNzUm91dGVzKCkKIAogdm9pZCBSZW1vdGVNZWRpYVNlc3Npb25I ZWxwZXJQcm94eTo6cHJvdmlkZVByZXNlbnRpbmdBcHBsaWNhdGlvblBJRChpbnQgcGlkKQogewot ICAgIGlmIChtX3Byb3ZpZGVkQXBwbGljYXRpb25QSUQpCi0gICAgICAgIHJldHVybjsKLQotICAg IG1fcHJvdmlkZWRBcHBsaWNhdGlvblBJRCA9IHRydWU7CiAgICAgTWVkaWFTZXNzaW9uSGVscGVy OjpzaGFyZWRIZWxwZXIoKS5wcm92aWRlUHJlc2VudGluZ0FwcGxpY2F0aW9uUElEKHBpZCk7CiB9 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9tZWRpYS9pb3MvUmVtb3Rl TWVkaWFTZXNzaW9uSGVscGVyUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9tZWRp YS9pb3MvUmVtb3RlTWVkaWFTZXNzaW9uSGVscGVyUHJveHkuaAppbmRleCA2ZTMxOWYwMWFhYmNi NDY0OGU4NWNhYjdlYTcxN2ZiOWE1MWQxYzliLi5hMGI4NDI4NjA0M2MyZTY3ZjI1ZmU2OGVmMjJl ZTNhOWU2YzI4MGE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvbWVkaWEv aW9zL1JlbW90ZU1lZGlhU2Vzc2lvbkhlbHBlclByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9H UFVQcm9jZXNzL21lZGlhL2lvcy9SZW1vdGVNZWRpYVNlc3Npb25IZWxwZXJQcm94eS5oCkBAIC02 MSw3ICs2MSw2IEBAIHByaXZhdGU6CiAgICAgdm9pZCBhY3RpdmVBdWRpb1JvdXRlRGlkQ2hhbmdl KFNob3VsZFBhdXNlKSBmaW5hbDsKICAgICB2b2lkIGFjdGl2ZVZpZGVvUm91dGVEaWRDaGFuZ2Uo U3VwcG9ydHNBaXJQbGF5VmlkZW8sIFJlZjxXZWJDb3JlOjpNZWRpYVBsYXliYWNrVGFyZ2V0PiYm KSBmaW5hbDsKIAotICAgIGJvb2wgbV9wcm92aWRlZEFwcGxpY2F0aW9uUElEIHsgZmFsc2UgfTsK ICAgICBib29sIG1faXNNb25pdG9yaW5nV2lyZWxlc3NSb3V0ZXMgeyBmYWxzZSB9OwogICAgIEdQ VUNvbm5lY3Rpb25Ub1dlYlByb2Nlc3MmIG1fZ3B1Q29ubmVjdGlvbjsKIH07Cg==