199698 2019-07-10 19:34:12 -0700 Drop non thread-safe usage of WeakPtr in PlaybackSessionInterfaceAVKit 2019-07-12 19:48:28 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=195935 https://bugs.webkit.org/show_bug.cgi?id=199775 InRadar P2 Normal --- 199639 1 cdumez cdumez bfulgham commit-queue eric.carlson ggaren jer.noble webkit-bug-importer oldest_to_newest 1551963 0 cdumez 2019-07-10 19:34:12 -0700 Drop non thread-safe usage of WeakPtr in PlaybackSessionInterfaceAVKit. 1551965 1 373898 cdumez 2019-07-10 19:38:01 -0700 Created attachment 373898 Patch 1551986 2 373898 bfulgham 2019-07-10 22:10:26 -0700 Comment on attachment 373898 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=373898&action=review I’m not comfortable with this change unless we add some release asserts to prevent this member from being in an invalid state. I can talk to you in person next week if you want background on why this is important. > Source/WebCore/ChangeLog:14 > + purposes (Not trying to address a particular crash). I think your patch should include release-asserts that the pointer is in a safe state when assigned, when being destroyed, etc. 1552158 3 373939 cdumez 2019-07-11 12:44:12 -0700 Created attachment 373939 Patch 1552346 4 373939 commit-queue 2019-07-11 19:35:14 -0700 Comment on attachment 373939 Patch Clearing flags on attachment: 373939 Committed r247380: <https://trac.webkit.org/changeset/247380> 1552347 5 commit-queue 2019-07-11 19:35:16 -0700 All reviewed patches have been landed. Closing bug. 1552348 6 webkit-bug-importer 2019-07-11 19:36:43 -0700 <rdar://problem/52985961> 373898 2019-07-10 19:38:01 -0700 2019-07-11 12:44:11 -0700 Patch bug-199698-20190710193758.patch text/plain 3099 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3MzMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2M3NGRjYzgxYjU3YTkx YWMxNzMwN2Q3YjA2YWZhMjcxZjUxMDIwMC4uY2MxMWY0NjYwMDVkMTc4NmExNjY5YzI2MjA1MzNh OGIyZmVkMmQzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE5LTA3LTEwICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgRHJvcCBub24gdGhyZWFkLXNh ZmUgdXNhZ2Ugb2YgV2Vha1B0ciBpbiBQbGF5YmFja1Nlc3Npb25JbnRlcmZhY2VBVktpdAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5Njk4CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIFBsYXliYWNr U2Vzc2lvbkludGVyZmFjZUFWS2l0IGNvbnN0cnVjdG9yIHdhcyBtYWtpbmcgYSB3ZWFrUHRyIG9u IHRoZSBVSSBUaHJlYWQKKyAgICAgICAgb2YgYW4gV2ViVGhyZWFkIG9iamVjdC4gVGhlIFdlYWtQ dHIgd291bGQgdGhlbiBiZSB1c2VkIGFzIGEgZGF0YSBtZW1iZXIgdGhyb3VnaG91dAorICAgICAg ICB0aGUgY2xhc3Mgb24gdGhlIFVJVGhyZWFkLiBUaGlzIGlzIG5vdCB0aHJlYWQtc2FmZS4KKwor ICAgICAgICBUaGlzIHBhdGNoIHN3aXRjaGVzIHRvIHVzaW5nIGEgcmF3IHBvaW50ZXIgaW5zdGVh ZCBvZiBhIFdlYWtQdHIuIFRoaXMgaXMgYSBwYXJ0aWFsCisgICAgICAgIHJvbGxvdXQgb2YgcjI0 MzMzNywgd2hpY2ggdHVybmVkIHRoZSByYXcgcG9pbnRlciBpbnRvIGEgV2Vha1B0ciBmb3IgaGFy ZGVuaW5nCisgICAgICAgIHB1cnBvc2VzIChOb3QgdHJ5aW5nIHRvIGFkZHJlc3MgYSBwYXJ0aWN1 bGFyIGNyYXNoKS4KKworICAgICAgICAqIHBsYXRmb3JtL2lvcy9QbGF5YmFja1Nlc3Npb25JbnRl cmZhY2VBVktpdC5oOgorICAgICAgICAqIHBsYXRmb3JtL2lvcy9QbGF5YmFja1Nlc3Npb25JbnRl cmZhY2VBVktpdC5tbToKKyAgICAgICAgKFdlYkNvcmU6OlBsYXliYWNrU2Vzc2lvbkludGVyZmFj ZUFWS2l0OjpQbGF5YmFja1Nlc3Npb25JbnRlcmZhY2VBVktpdCk6CisgICAgICAgIChXZWJDb3Jl OjpQbGF5YmFja1Nlc3Npb25JbnRlcmZhY2VBVktpdDo6cGxheWJhY2tTZXNzaW9uTW9kZWwgY29u c3QpOgorCiAyMDE5LTA3LTEwICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAg ICAgICAgU3RvcCB1c2luZyBHZW5lcmljVGFza1F1ZXVlIGZyb20gbXVsdGlwbGUgdGhyZWFkcwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1BsYXliYWNrU2Vzc2lvbklu dGVyZmFjZUFWS2l0LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvUGxheWJhY2tTZXNz aW9uSW50ZXJmYWNlQVZLaXQuaAppbmRleCBkN2ZkYjdiY2E0NjFjNjAxZTAyOTFmOTRlYTI3YzJh ZWRkOTYxOTllLi42MDYwNmY4NGViZGYwNGFjMjU1YTA4NGZlMDYwYjUwZWNiOThlZjA1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvUGxheWJhY2tTZXNzaW9uSW50ZXJm YWNlQVZLaXQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvUGxheWJhY2tTZXNz aW9uSW50ZXJmYWNlQVZLaXQuaApAQCAtODYsNyArODYsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgV0VC Q09SRV9FWFBPUlQgUGxheWJhY2tTZXNzaW9uSW50ZXJmYWNlQVZLaXQoUGxheWJhY2tTZXNzaW9u TW9kZWwmKTsKIAogICAgIFJldGFpblB0cjxXZWJBVlBsYXllckNvbnRyb2xsZXI+IG1fcGxheWVy Q29udHJvbGxlcjsKLSAgICBXZWFrUHRyPFBsYXliYWNrU2Vzc2lvbk1vZGVsPiBtX3BsYXliYWNr U2Vzc2lvbk1vZGVsOworICAgIFBsYXliYWNrU2Vzc2lvbk1vZGVsKiBtX3BsYXliYWNrU2Vzc2lv bk1vZGVsIHsgbnVsbHB0ciB9OwogfTsKIAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vaW9zL1BsYXliYWNrU2Vzc2lvbkludGVyZmFjZUFWS2l0Lm1tIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vaW9zL1BsYXliYWNrU2Vzc2lvbkludGVyZmFjZUFWS2l0Lm1tCmluZGV4 IGMwNjRkNjA4NTIyMGM2Njk3ZjJlZjgxOTM0ODk3MzhmMTZkNWJjNmIuLjNkYjIyY2QxZjI0ZmI1 ODJlNjY1ZmIzMTY5YjZkNTg1Y2NmYjkyZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2lvcy9QbGF5YmFja1Nlc3Npb25JbnRlcmZhY2VBVktpdC5tbQorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9pb3MvUGxheWJhY2tTZXNzaW9uSW50ZXJmYWNlQVZLaXQubW0KQEAg LTUxLDcgKzUxLDcgQEAgdXNpbmcgbmFtZXNwYWNlIFBBTDsKIAogUGxheWJhY2tTZXNzaW9uSW50 ZXJmYWNlQVZLaXQ6OlBsYXliYWNrU2Vzc2lvbkludGVyZmFjZUFWS2l0KFBsYXliYWNrU2Vzc2lv bk1vZGVsJiBtb2RlbCkKICAgICA6IG1fcGxheWVyQ29udHJvbGxlcihhZG9wdE5TKFtbV2ViQVZQ bGF5ZXJDb250cm9sbGVyIGFsbG9jXSBpbml0XSkpCi0gICAgLCBtX3BsYXliYWNrU2Vzc2lvbk1v ZGVsKG1ha2VXZWFrUHRyKG1vZGVsKSkKKyAgICAsIG1fcGxheWJhY2tTZXNzaW9uTW9kZWwoJm1v ZGVsKQogewogICAgIG1vZGVsLmFkZENsaWVudCgqdGhpcyk7CiAgICAgW21fcGxheWVyQ29udHJv bGxlciBzZXRQbGF5YmFja1Nlc3Npb25JbnRlcmZhY2U6dGhpc107CkBAIC03OSw3ICs3OSw3IEBA IFBsYXliYWNrU2Vzc2lvbkludGVyZmFjZUFWS2l0Ojp+UGxheWJhY2tTZXNzaW9uSW50ZXJmYWNl QVZLaXQoKQogCiBQbGF5YmFja1Nlc3Npb25Nb2RlbCogUGxheWJhY2tTZXNzaW9uSW50ZXJmYWNl QVZLaXQ6OnBsYXliYWNrU2Vzc2lvbk1vZGVsKCkgY29uc3QKIHsKLSAgICByZXR1cm4gbV9wbGF5 YmFja1Nlc3Npb25Nb2RlbC5nZXQoKTsKKyAgICByZXR1cm4gbV9wbGF5YmFja1Nlc3Npb25Nb2Rl bDsKIH0KIAogdm9pZCBQbGF5YmFja1Nlc3Npb25JbnRlcmZhY2VBVktpdDo6ZHVyYXRpb25DaGFu Z2VkKGRvdWJsZSBkdXJhdGlvbikK 373939 2019-07-11 12:44:12 -0700 2019-07-11 19:35:14 -0700 Patch bug-199698-20190711124411.patch text/plain 7373 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3MzU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjAxYTZiMTRmNDQ5ODcy OTZlOWIzMGFhYzZkMmVmNGE4ZTE3ZWEzNC4uNDQ3YTExZjA0YTMyMDZiZTFhMGY2MGFhN2Y5OGI2 ODVmMjk2YjEwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDE5LTA3LTExICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgRHJvcCBub24gdGhyZWFkLXNh ZmUgdXNhZ2Ugb2YgV2Vha1B0ciBpbiBQbGF5YmFja1Nlc3Npb25JbnRlcmZhY2VBVktpdAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5Njk4CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIFBsYXliYWNr U2Vzc2lvbkludGVyZmFjZUFWS2l0IGNvbnN0cnVjdG9yIHdhcyBtYWtpbmcgYSB3ZWFrUHRyIG9u IHRoZSBVSSBUaHJlYWQKKyAgICAgICAgb2YgYW4gV2ViVGhyZWFkIG9iamVjdC4gVGhlIFdlYWtQ dHIgd291bGQgdGhlbiBiZSB1c2VkIGFzIGEgZGF0YSBtZW1iZXIgdGhyb3VnaG91dAorICAgICAg ICB0aGUgY2xhc3Mgb24gdGhlIFVJVGhyZWFkLiBUaGlzIGlzIG5vdCB0aHJlYWQtc2FmZS4KKwor ICAgICAgICBUaGlzIHBhdGNoIHN3aXRjaGVzIHRvIHVzaW5nIGEgcmF3IHBvaW50ZXIgaW5zdGVh ZCBvZiBhIFdlYWtQdHIuIFRoaXMgaXMgYSBwYXJ0aWFsCisgICAgICAgIHJvbGxvdXQgb2YgcjI0 MzMzNywgd2hpY2ggdHVybmVkIHRoZSByYXcgcG9pbnRlciBpbnRvIGEgV2Vha1B0ciBmb3IgaGFy ZGVuaW5nCisgICAgICAgIHB1cnBvc2VzLiBGb3IgZXh0cmEgc2FmZXR5LCB0aGlzIHBhdGNoIHVw ZGF0ZXMgdGhlIFZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXJDb250ZXh0CisgICAgICAgIHNvIHRo YXQgaXQgbm90aWZpZXMgaXRzIGNsaWVudHMgKGkuZS4gUGxheWJhY2tTZXNzaW9uSW50ZXJmYWNl QVZLaXQpIHRoYXQgaXQgaXMKKyAgICAgICAgZ2V0dGluZyBkZXN0cm95ZWQsIHNvIHRoYXQgdGhl eSBjYW4gbnVsbC1vdXQgdGhlaXIgbV9wbGF5YmFja1Nlc3Npb25Nb2RlbCBkYXRhCisgICAgICAg IG1lbWJlci4gVGhpcyBnaXZlcyB0aGUgc2FtZXMgZ3VhcmFudGVlcyB0aGFuIFdlYWtQdHIgYnV0 IGluIGEgdGhyZWFkLXNhZmUgd2F5LgorCisgICAgICAgICogcGxhdGZvcm0vY29jb2EvUGxheWJh Y2tTZXNzaW9uTW9kZWwuaDoKKyAgICAgICAgKFdlYkNvcmU6OlBsYXliYWNrU2Vzc2lvbk1vZGVs Q2xpZW50Ojptb2RlbERlc3Ryb3llZCk6CisgICAgICAgICogcGxhdGZvcm0vaW9zL1BsYXliYWNr U2Vzc2lvbkludGVyZmFjZUFWS2l0Lmg6CisgICAgICAgICogcGxhdGZvcm0vaW9zL1BsYXliYWNr U2Vzc2lvbkludGVyZmFjZUFWS2l0Lm1tOgorICAgICAgICAoV2ViQ29yZTo6UGxheWJhY2tTZXNz aW9uSW50ZXJmYWNlQVZLaXQ6OlBsYXliYWNrU2Vzc2lvbkludGVyZmFjZUFWS2l0KToKKyAgICAg ICAgKFdlYkNvcmU6OlBsYXliYWNrU2Vzc2lvbkludGVyZmFjZUFWS2l0Ojp+UGxheWJhY2tTZXNz aW9uSW50ZXJmYWNlQVZLaXQpOgorICAgICAgICAoV2ViQ29yZTo6UGxheWJhY2tTZXNzaW9uSW50 ZXJmYWNlQVZLaXQ6OnBsYXliYWNrU2Vzc2lvbk1vZGVsIGNvbnN0KToKKyAgICAgICAgKFdlYkNv cmU6OlBsYXliYWNrU2Vzc2lvbkludGVyZmFjZUFWS2l0Ojptb2RlbERlc3Ryb3llZCk6CisgICAg ICAgICogcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXJBVktpdC5tbToK KyAgICAgICAgKFZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXJDb250ZXh0Ojp+VmlkZW9GdWxsc2Ny ZWVuQ29udHJvbGxlckNvbnRleHQpOgorICAgICAgICAoVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxl ckNvbnRleHQ6OmFkZENsaWVudCk6CisgICAgICAgIChWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVy Q29udGV4dDo6cmVtb3ZlQ2xpZW50KToKKwogMjAxOS0wNy0xMSAgSm9uYXRoYW4gQmVkYXJkICA8 amJlZGFyZEBhcHBsZS5jb20+CiAKICAgICAgICAgW2lPUyAxM10gRW5hYmxlIFdlYktpdCBidWls ZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY29jb2EvUGxheWJhY2tTZXNz aW9uTW9kZWwuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL1BsYXliYWNrU2Vzc2lv bk1vZGVsLmgKaW5kZXggMmU5NzcxMDYxYTQzODNlZjMyOTc4Mjk5YzYxY2Q1YjIwNDU3NWMxYS4u MDIxZGQwZmYzNTBlY2MxZjllZjc1NjkwMjg3NDBmYmM4ZTY4ZGZjYiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vY29jb2EvUGxheWJhY2tTZXNzaW9uTW9kZWwuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9QbGF5YmFja1Nlc3Npb25Nb2RlbC5oCkBAIC0x MTAsNiArMTEwLDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBpc1BpY3R1cmVJblBpY3R1 cmVTdXBwb3J0ZWRDaGFuZ2VkKGJvb2wpIHsgfQogICAgIHZpcnR1YWwgdm9pZCBwaWN0dXJlSW5Q aWN0dXJlQWN0aXZlQ2hhbmdlZChib29sKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgZW5zdXJlQ29u dHJvbHNNYW5hZ2VyKCkgeyB9CisgICAgdmlydHVhbCB2b2lkIG1vZGVsRGVzdHJveWVkKCkgeyB9 CiB9OwogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvUGxheWJh Y2tTZXNzaW9uSW50ZXJmYWNlQVZLaXQuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9Q bGF5YmFja1Nlc3Npb25JbnRlcmZhY2VBVktpdC5oCmluZGV4IGQ3ZmRiN2JjYTQ2MWM2MDFlMDI5 MWY5NGVhMjdjMmFlZGQ5NjE5OWUuLjdkZWUxNTI3ZWYyMzk1ZjllNmJjZTBjY2NiZWJiZGU3NGQ2 ZGU3NGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9QbGF5YmFja1Nl c3Npb25JbnRlcmZhY2VBVktpdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9Q bGF5YmFja1Nlc3Npb25JbnRlcmZhY2VBVktpdC5oCkBAIC03Nyw2ICs3Nyw3IEBAIHB1YmxpYzoK ICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHdpcmVsZXNzVmlkZW9QbGF5YmFja0Rpc2FibGVkQ2hh bmdlZChib29sKSBvdmVycmlkZTsKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIG11dGVkQ2hhbmdl ZChib29sKSBvdmVycmlkZTsKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHZvbHVtZUNoYW5nZWQo ZG91YmxlKSBvdmVycmlkZTsKKyAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIG1vZGVsRGVzdHJveWVk KCkgb3ZlcnJpZGU7CiAKICAgICBXRUJDT1JFX0VYUE9SVCB2aXJ0dWFsIHZvaWQgaW52YWxpZGF0 ZSgpOwogCkBAIC04Niw3ICs4Nyw3IEBAIHByb3RlY3RlZDoKICAgICBXRUJDT1JFX0VYUE9SVCBQ bGF5YmFja1Nlc3Npb25JbnRlcmZhY2VBVktpdChQbGF5YmFja1Nlc3Npb25Nb2RlbCYpOwogCiAg ICAgUmV0YWluUHRyPFdlYkFWUGxheWVyQ29udHJvbGxlcj4gbV9wbGF5ZXJDb250cm9sbGVyOwot ICAgIFdlYWtQdHI8UGxheWJhY2tTZXNzaW9uTW9kZWw+IG1fcGxheWJhY2tTZXNzaW9uTW9kZWw7 CisgICAgUGxheWJhY2tTZXNzaW9uTW9kZWwqIG1fcGxheWJhY2tTZXNzaW9uTW9kZWwgeyBudWxs cHRyIH07CiB9OwogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3Mv UGxheWJhY2tTZXNzaW9uSW50ZXJmYWNlQVZLaXQubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9pb3MvUGxheWJhY2tTZXNzaW9uSW50ZXJmYWNlQVZLaXQubW0KaW5kZXggYzA2NGQ2MDg1MjIw YzY2OTdmMmVmODE5MzQ4OTczOGYxNmQ1YmM2Yi4uZmNhYjI2ZmJiNzJkZWI5ODkzZDI1ZTJmY2Ri YjlhMWQxNTk3M2NiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1Bs YXliYWNrU2Vzc2lvbkludGVyZmFjZUFWS2l0Lm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2lvcy9QbGF5YmFja1Nlc3Npb25JbnRlcmZhY2VBVktpdC5tbQpAQCAtNTEsOCArNTEsOSBA QCB1c2luZyBuYW1lc3BhY2UgUEFMOwogCiBQbGF5YmFja1Nlc3Npb25JbnRlcmZhY2VBVktpdDo6 UGxheWJhY2tTZXNzaW9uSW50ZXJmYWNlQVZLaXQoUGxheWJhY2tTZXNzaW9uTW9kZWwmIG1vZGVs KQogICAgIDogbV9wbGF5ZXJDb250cm9sbGVyKGFkb3B0TlMoW1tXZWJBVlBsYXllckNvbnRyb2xs ZXIgYWxsb2NdIGluaXRdKSkKLSAgICAsIG1fcGxheWJhY2tTZXNzaW9uTW9kZWwobWFrZVdlYWtQ dHIobW9kZWwpKQorICAgICwgbV9wbGF5YmFja1Nlc3Npb25Nb2RlbCgmbW9kZWwpCiB7CisgICAg QVNTRVJUKGlzVUlUaHJlYWQoKSk7CiAgICAgbW9kZWwuYWRkQ2xpZW50KCp0aGlzKTsKICAgICBb bV9wbGF5ZXJDb250cm9sbGVyIHNldFBsYXliYWNrU2Vzc2lvbkludGVyZmFjZTp0aGlzXTsKICAg ICBbbV9wbGF5ZXJDb250cm9sbGVyIHNldERlbGVnYXRlOiZtb2RlbF07CkBAIC03MSw2ICs3Miw3 IEBAIFBsYXliYWNrU2Vzc2lvbkludGVyZmFjZUFWS2l0OjpQbGF5YmFja1Nlc3Npb25JbnRlcmZh Y2VBVktpdChQbGF5YmFja1Nlc3Npb25Nb2RlCiAKIFBsYXliYWNrU2Vzc2lvbkludGVyZmFjZUFW S2l0Ojp+UGxheWJhY2tTZXNzaW9uSW50ZXJmYWNlQVZLaXQoKQogeworICAgIEFTU0VSVChpc1VJ VGhyZWFkKCkpOwogICAgIFttX3BsYXllckNvbnRyb2xsZXIgc2V0UGxheWJhY2tTZXNzaW9uSW50 ZXJmYWNlOm51bGxwdHJdOwogICAgIFttX3BsYXllckNvbnRyb2xsZXIgc2V0RXh0ZXJuYWxQbGF5 YmFja0FjdGl2ZTpmYWxzZV07CiAKQEAgLTc5LDcgKzgxLDcgQEAgUGxheWJhY2tTZXNzaW9uSW50 ZXJmYWNlQVZLaXQ6On5QbGF5YmFja1Nlc3Npb25JbnRlcmZhY2VBVktpdCgpCiAKIFBsYXliYWNr U2Vzc2lvbk1vZGVsKiBQbGF5YmFja1Nlc3Npb25JbnRlcmZhY2VBVktpdDo6cGxheWJhY2tTZXNz aW9uTW9kZWwoKSBjb25zdAogewotICAgIHJldHVybiBtX3BsYXliYWNrU2Vzc2lvbk1vZGVsLmdl dCgpOworICAgIHJldHVybiBtX3BsYXliYWNrU2Vzc2lvbk1vZGVsOwogfQogCiB2b2lkIFBsYXli YWNrU2Vzc2lvbkludGVyZmFjZUFWS2l0OjpkdXJhdGlvbkNoYW5nZWQoZG91YmxlIGR1cmF0aW9u KQpAQCAtMjE5LDYgKzIyMSwxMyBAQCB2b2lkIFBsYXliYWNrU2Vzc2lvbkludGVyZmFjZUFWS2l0 OjppbnZhbGlkYXRlKCkKICAgICBtX3BsYXliYWNrU2Vzc2lvbk1vZGVsID0gbnVsbHB0cjsKIH0K IAordm9pZCBQbGF5YmFja1Nlc3Npb25JbnRlcmZhY2VBVktpdDo6bW9kZWxEZXN0cm95ZWQoKQor eworICAgIEFTU0VSVChpc1VJVGhyZWFkKCkpOworICAgIGludmFsaWRhdGUoKTsKKyAgICBBU1NF UlQoIW1fcGxheWJhY2tTZXNzaW9uTW9kZWwpOworfQorCiB9CiAKICNlbmRpZiAvLyBIQVZFKEFW S0lUKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVs bHNjcmVlbkNvbnRyb2xsZXJBVktpdC5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9X ZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyQVZLaXQubW0KaW5kZXggNjkxY2JmODE3NjVjN2Rk MTU2MzI3YmRkM2Y4YzJmMWU2NGZhYTlhNi4uZDg5NGM5NDk3ZjQwMjA0NDQzYjc4OTc1NTIwNzQ5 YTQxZjNkZmY2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZp ZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXJBVktpdC5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9pb3MvV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlckFWS2l0Lm1tCkBAIC0xMDksNiAr MTA5LDggQEAgcHVibGljOgogICAgICAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBWaWRlb0Z1bGxz Y3JlZW5Db250cm9sbGVyQ29udGV4dCk7CiAgICAgfQogCisgICAgflZpZGVvRnVsbHNjcmVlbkNv bnRyb2xsZXJDb250ZXh0KCk7CisKICAgICB2b2lkIHNldENvbnRyb2xsZXIoV2ViVmlkZW9GdWxs c2NyZWVuQ29udHJvbGxlciogY29udHJvbGxlcikgeyBtX2NvbnRyb2xsZXIgPSBjb250cm9sbGVy OyB9CiAgICAgdm9pZCBzZXRVcEZ1bGxzY3JlZW4oSFRNTFZpZGVvRWxlbWVudCYsIFVJVmlldyAq LCBIVE1MTWVkaWFFbGVtZW50RW51bXM6OlZpZGVvRnVsbHNjcmVlbk1vZGUpOwogICAgIHZvaWQg ZXhpdEZ1bGxzY3JlZW4oKTsKQEAgLTIxNiw2ICsyMTgsMTggQEAgcHJpdmF0ZToKICAgICBSZXRh aW5QdHI8V2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlcj4gbV9jb250cm9sbGVyOwogfTsKIAor VmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlckNvbnRleHQ6On5WaWRlb0Z1bGxzY3JlZW5Db250cm9s bGVyQ29udGV4dCgpCit7CisgICAgYXV0byBub3RpZnlDbGllbnRzTW9kZWxXYXNEZXN0cm95ZWQg PSBbdGhpc10geworICAgICAgICB3aGlsZSAoIW1fcGxheWJhY2tDbGllbnRzLmlzRW1wdHkoKSkK KyAgICAgICAgICAgICgqbV9wbGF5YmFja0NsaWVudHMuYmVnaW4oKSktPm1vZGVsRGVzdHJveWVk KCk7CisgICAgfTsKKyAgICBpZiAoaXNVSVRocmVhZCgpKQorICAgICAgICBub3RpZnlDbGllbnRz TW9kZWxXYXNEZXN0cm95ZWQoKTsKKyAgICBlbHNlCisgICAgICAgIGRpc3BhdGNoX3N5bmMoZGlz cGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgV1RGTW92ZShub3RpZnlDbGllbnRzTW9kZWxXYXNEZXN0 cm95ZWQpKTsKK30KKwogI3ByYWdtYSBtYXJrIFZpZGVvRnVsbHNjcmVlbkNoYW5nZU9ic2VydmVy CiAKIHZvaWQgVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlckNvbnRleHQ6OnJlcXVlc3RVcGRhdGVJ bmxpbmVSZWN0KCkKQEAgLTU0MywxMiArNTU3LDE0IEBAIHZvaWQgVmlkZW9GdWxsc2NyZWVuQ29u dHJvbGxlckNvbnRleHQ6OnZvbHVtZUNoYW5nZWQoZG91YmxlIHZvbHVtZSkKIAogdm9pZCBWaWRl b0Z1bGxzY3JlZW5Db250cm9sbGVyQ29udGV4dDo6YWRkQ2xpZW50KFZpZGVvRnVsbHNjcmVlbk1v ZGVsQ2xpZW50JiBjbGllbnQpCiB7CisgICAgQVNTRVJUKGlzVUlUaHJlYWQoKSk7CiAgICAgQVNT RVJUKCFtX2Z1bGxzY3JlZW5DbGllbnRzLmNvbnRhaW5zKCZjbGllbnQpKTsKICAgICBtX2Z1bGxz Y3JlZW5DbGllbnRzLmFkZCgmY2xpZW50KTsKIH0KIAogdm9pZCBWaWRlb0Z1bGxzY3JlZW5Db250 cm9sbGVyQ29udGV4dDo6cmVtb3ZlQ2xpZW50KFZpZGVvRnVsbHNjcmVlbk1vZGVsQ2xpZW50JiBj bGllbnQpCiB7CisgICAgQVNTRVJUKGlzVUlUaHJlYWQoKSk7CiAgICAgQVNTRVJUKG1fZnVsbHNj cmVlbkNsaWVudHMuY29udGFpbnMoJmNsaWVudCkpOwogICAgIG1fZnVsbHNjcmVlbkNsaWVudHMu cmVtb3ZlKCZjbGllbnQpOwogfQo=