215263 2020-08-07 05:10:24 -0700 [MSE][GStreamer] Remove m_sourceBufferPrivateClient checks in SourceBufferPrivateGStreamer 2020-08-11 04:41:17 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 aboya aboya bugs-noreply calvaris cgarcia ews-watchlist gustavo menard pnormand vjaquez oldest_to_newest 1678556 0 aboya 2020-08-07 05:10:24 -0700 m_sourceBufferPrivateClient is only reset to NULL from SourceBuffer's destructor. At this point SourceBufferPrivateGStreamer is about to receive its last unref by SourceBuffer and therefore be destroyed. Similarly, there is no need to check for m_mediaSource being null. m_mediaSource is only reset when the SourceBuffer is removed, and at that point SourceBufferPrivate shouldn't receive any calls. This is a clean-up and doesn't introduce new behavior. Asserts have been added checking the precondition above. 1678558 1 406164 aboya 2020-08-07 05:28:01 -0700 Created attachment 406164 Patch 1678560 2 406166 aboya 2020-08-07 05:54:22 -0700 Created attachment 406166 Patch 1679339 3 406166 calvaris 2020-08-11 01:44:19 -0700 Comment on attachment 406166 Patch I would be quieter if we ASSERT on the client before calling it. 1679341 4 aboya 2020-08-11 01:52:37 -0700 (In reply to Xabier Rodríguez Calvar from comment #3) > Comment on attachment 406166 [details] > Patch > > I would be quieter if we ASSERT on the client before calling it. The way I see it, there is already an implicit assert there, built in the CPU: the pointer indirection will segfault (and crash, just like with asserts) in that same line if m_sourceBufferPrivateClient is NULL. Since it's the only pointer being indirected in that line, or the function even, an assert doesn't give us any more specificity even when looking at the traceback. 1679362 5 ews-feeder 2020-08-11 04:41:16 -0700 Committed r265494: <https://trac.webkit.org/changeset/265494> All reviewed patches have been landed. Closing bug and clearing flags on attachment 406166. 406164 2020-08-07 05:28:01 -0700 2020-08-07 05:54:13 -0700 Patch bug-215263-20200807142759.patch text/plain 5012 aboya U3VidmVyc2lvbiBSZXZpc2lvbjogMjY0MjExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmQ1MTAyZWRkM2Q5NGJj MmIxNDIwOTEyMWE1NThhMzZmYjBkYmJkMi4uYjg5M2I1NzNmMzliMjE1NmIyNTBjODg0MjAzNjRi NzEyOTQxZTJlYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTA3LTE1ICBBbGlj aWEgQm95YSBHYXJjw61hICA8YWJveWFAaWdhbGlhLmNvbT4KKworICAgICAgICBbTVNFXVtHU3Ry ZWFtZXJdIFJlbW92ZSBtX3NvdXJjZUJ1ZmZlclByaXZhdGVDbGllbnQgY2hlY2tzIGluIFNvdXJj ZUJ1ZmZlclByaXZhdGVHU3RyZWFtZXIKKyAgICAgICAgTmVlZCB0aGUgYnVnIFVSTCAoT09QUyEp LgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIG1fc291 cmNlQnVmZmVyUHJpdmF0ZUNsaWVudCBpcyBvbmx5IHJlc2V0IHRvIE5VTEwgZnJvbSBTb3VyY2VC dWZmZXIncworICAgICAgICBkZXN0cnVjdG9yLiBBdCB0aGlzIHBvaW50IFNvdXJjZUJ1ZmZlclBy aXZhdGVHU3RyZWFtZXIgaXMgYWJvdXQgdG8KKyAgICAgICAgcmVjZWl2ZSBpdHMgbGFzdCB1bnJl ZiBieSBTb3VyY2VCdWZmZXIgYW5kIGFsc28gYmUgZGVzdHJveWVkLgorCisgICAgICAgIFRoaXMg aXMgYSBjbGVhbi11cCBhbmQgZG9lc24ndCBpbnRyb2R1Y2UgbmV3IGJlaGF2aW9yLiBBc3NlcnRz IGhhdmUKKyAgICAgICAgYmVlbiBhZGRlZCBjaGVja2luZyB0aGUgcHJlY29uZGl0aW9uIGFib3Zl LgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL21zZS9Tb3VyY2VCdWZm ZXJQcml2YXRlR1N0cmVhbWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNvdXJjZUJ1ZmZlclBy aXZhdGVHU3RyZWFtZXI6OnJlbW92ZWRGcm9tTWVkaWFTb3VyY2UpOgorICAgICAgICAoV2ViQ29y ZTo6U291cmNlQnVmZmVyUHJpdmF0ZUdTdHJlYW1lcjo6ZGlkUmVjZWl2ZUluaXRpYWxpemF0aW9u U2VnbWVudCk6CisgICAgICAgIChXZWJDb3JlOjpTb3VyY2VCdWZmZXJQcml2YXRlR1N0cmVhbWVy OjpkaWRSZWNlaXZlU2FtcGxlKToKKyAgICAgICAgKFdlYkNvcmU6OlNvdXJjZUJ1ZmZlclByaXZh dGVHU3RyZWFtZXI6OmRpZFJlY2VpdmVBbGxQZW5kaW5nU2FtcGxlcyk6CisgICAgICAgIChXZWJD b3JlOjpTb3VyY2VCdWZmZXJQcml2YXRlR1N0cmVhbWVyOjphcHBlbmRQYXJzaW5nRmFpbGVkKToK KwogMjAyMC0wNy0xNSAgQWxpY2lhIEJveWEgR2FyY8OtYSAgPGFib3lhQGlnYWxpYS5jb20+CiAK ICAgICAgICAgW01TRV1bR1N0cmVhbWVyXSBCcmVhayBjaXJjdWxhciByZWZlcmVuY2UgYmV0d2Vl biBTb3VyY2VCdWZmZXJQcml2YXRlR1N0cmVhbWVyIGFuZCBBcHBlbmRQaXBlbGluZQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL21zZS9Tb3Vy Y2VCdWZmZXJQcml2YXRlR1N0cmVhbWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2dzdHJlYW1lci9tc2UvU291cmNlQnVmZmVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKaW5k ZXggYTQyMThiMTcxMjEyOTQ3MGU1Zjc5ZjcxOTE5MmFjNDA4YmY4Nzk2ZC4uZDNhODdlZmU4OWFl YjNhZDU2N2RlYzQ4YTFlMWE3ZWU0M2U1YzQ4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL21zZS9Tb3VyY2VCdWZmZXJQcml2YXRlR1N0cmVh bWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIv bXNlL1NvdXJjZUJ1ZmZlclByaXZhdGVHU3RyZWFtZXIuY3BwCkBAIC02OSw2ICs2OSw5IEBAIFNv dXJjZUJ1ZmZlclByaXZhdGVHU3RyZWFtZXI6OlNvdXJjZUJ1ZmZlclByaXZhdGVHU3RyZWFtZXIo TWVkaWFTb3VyY2VQcml2YXRlR1N0CiAKIHZvaWQgU291cmNlQnVmZmVyUHJpdmF0ZUdTdHJlYW1l cjo6c2V0Q2xpZW50KFNvdXJjZUJ1ZmZlclByaXZhdGVDbGllbnQqIGNsaWVudCkKIHsKKyAgICAv LyBzZXRDbGllbnQobnVsbHB0cikgaXMgb25seSBjYWxsZWQgZnJvbSBTb3VyY2VCdWZmZXIgZGVz dHJ1Y3Rvci4gQXQgdGhhdCBwb2ludCwgU291cmNlQnVmZmVyIGlzIGFsc28gdGhlCisgICAgLy8g b3duZXIgb2YgdGhlIGxhc3QgcmVmZXJlbmNlIHRvIHVzLCBzbyB3ZSdyZSBhYm91dCB0byBiZSBk ZXN0cm95ZWQuCisgICAgQVNTRVJUKGNsaWVudCB8fCByZWZDb3VudCgpID09IDEpOwogICAgIG1f c291cmNlQnVmZmVyUHJpdmF0ZUNsaWVudCA9IGNsaWVudDsKIH0KIApAQCAtMTA4LDkgKzExMSwx MSBAQCB2b2lkIFNvdXJjZUJ1ZmZlclByaXZhdGVHU3RyZWFtZXI6OnJlc2V0UGFyc2VyU3RhdGUo KQogdm9pZCBTb3VyY2VCdWZmZXJQcml2YXRlR1N0cmVhbWVyOjpyZW1vdmVkRnJvbU1lZGlhU291 cmNlKCkKIHsKICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwotICAgIGlmIChtX21lZGlhU291 cmNlKQotICAgICAgICBtX21lZGlhU291cmNlLT5yZW1vdmVTb3VyY2VCdWZmZXIodGhpcyk7Cisg ICAgbV9tZWRpYVNvdXJjZS0+cmVtb3ZlU291cmNlQnVmZmVyKHRoaXMpOwogICAgIG1fcGxheWVy UHJpdmF0ZS5wbGF5YmFja1BpcGVsaW5lKCktPnJlbW92ZVNvdXJjZUJ1ZmZlcih0aGlzKTsKKyAg ICAvLyBBZnRlciB0aGlzIG9ubHkgU291cmNlQnVmZmVyIHNob3VsZCBob2xkIGEgcmVmZXJlbmNl IHRvIHVzLCB3aGljaCB3aWxsIGJlIGRlc3Ryb3llZCBldmVudHVhbGx5ICh3aGVuIEpTCisgICAg Ly8gR0MgcmVsZWFzZXMgdGhlIGxhc3QgcmVmZXJlbmNlKS4gVW50aWwgdGhlbiBTb3VyY2VCdWZm ZXIgaXMgaW4gInJlbW92ZWQiIHN0YXRlIGFuZCB3b24ndCB1c2UgU291cmNlQnVmZmVyUHJpdmF0 ZS4KKyAgICBBU1NFUlQocmVmQ291bnQoKSA9PSAxKTsKIH0KIAogTWVkaWFQbGF5ZXI6OlJlYWR5 U3RhdGUgU291cmNlQnVmZmVyUHJpdmF0ZUdTdHJlYW1lcjo6cmVhZHlTdGF0ZSgpIGNvbnN0CkBA IC0xNjcsOCArMTcyLDcgQEAgdm9pZCBTb3VyY2VCdWZmZXJQcml2YXRlR1N0cmVhbWVyOjpub3Rp ZnlSZWFkeUZvck1vcmVTYW1wbGVzKCkKIAogdm9pZCBTb3VyY2VCdWZmZXJQcml2YXRlR1N0cmVh bWVyOjpzZXRBY3RpdmUoYm9vbCBpc0FjdGl2ZSkKIHsKLSAgICBpZiAobV9tZWRpYVNvdXJjZSkK LSAgICAgICAgbV9tZWRpYVNvdXJjZS0+c291cmNlQnVmZmVyUHJpdmF0ZURpZENoYW5nZUFjdGl2 ZVN0YXRlKHRoaXMsIGlzQWN0aXZlKTsKKyAgICBtX21lZGlhU291cmNlLT5zb3VyY2VCdWZmZXJQ cml2YXRlRGlkQ2hhbmdlQWN0aXZlU3RhdGUodGhpcywgaXNBY3RpdmUpOwogfQogCiB2b2lkIFNv dXJjZUJ1ZmZlclByaXZhdGVHU3RyZWFtZXI6Om5vdGlmeUNsaWVudFdoZW5SZWFkeUZvck1vcmVT YW1wbGVzKGNvbnN0IEF0b21TdHJpbmcmIHRyYWNrSWQpCkBAIC0xODAsMjYgKzE4NCwyMiBAQCB2 b2lkIFNvdXJjZUJ1ZmZlclByaXZhdGVHU3RyZWFtZXI6Om5vdGlmeUNsaWVudFdoZW5SZWFkeUZv ck1vcmVTYW1wbGVzKGNvbnN0IEF0bwogCiB2b2lkIFNvdXJjZUJ1ZmZlclByaXZhdGVHU3RyZWFt ZXI6OmRpZFJlY2VpdmVJbml0aWFsaXphdGlvblNlZ21lbnQoY29uc3QgU291cmNlQnVmZmVyUHJp dmF0ZUNsaWVudDo6SW5pdGlhbGl6YXRpb25TZWdtZW50JiBpbml0aWFsaXphdGlvblNlZ21lbnQp CiB7Ci0gICAgaWYgKG1fc291cmNlQnVmZmVyUHJpdmF0ZUNsaWVudCkKLSAgICAgICAgbV9zb3Vy Y2VCdWZmZXJQcml2YXRlQ2xpZW50LT5zb3VyY2VCdWZmZXJQcml2YXRlRGlkUmVjZWl2ZUluaXRp YWxpemF0aW9uU2VnbWVudChpbml0aWFsaXphdGlvblNlZ21lbnQpOworICAgIG1fc291cmNlQnVm ZmVyUHJpdmF0ZUNsaWVudC0+c291cmNlQnVmZmVyUHJpdmF0ZURpZFJlY2VpdmVJbml0aWFsaXph dGlvblNlZ21lbnQoaW5pdGlhbGl6YXRpb25TZWdtZW50KTsKIH0KIAogdm9pZCBTb3VyY2VCdWZm ZXJQcml2YXRlR1N0cmVhbWVyOjpkaWRSZWNlaXZlU2FtcGxlKE1lZGlhU2FtcGxlJiBzYW1wbGUp CiB7Ci0gICAgaWYgKG1fc291cmNlQnVmZmVyUHJpdmF0ZUNsaWVudCkKLSAgICAgICAgbV9zb3Vy Y2VCdWZmZXJQcml2YXRlQ2xpZW50LT5zb3VyY2VCdWZmZXJQcml2YXRlRGlkUmVjZWl2ZVNhbXBs ZShzYW1wbGUpOworICAgIG1fc291cmNlQnVmZmVyUHJpdmF0ZUNsaWVudC0+c291cmNlQnVmZmVy UHJpdmF0ZURpZFJlY2VpdmVTYW1wbGUoc2FtcGxlKTsKIH0KIAogdm9pZCBTb3VyY2VCdWZmZXJQ cml2YXRlR1N0cmVhbWVyOjpkaWRSZWNlaXZlQWxsUGVuZGluZ1NhbXBsZXMoKQogewotICAgIGlm IChtX3NvdXJjZUJ1ZmZlclByaXZhdGVDbGllbnQpCi0gICAgICAgIG1fc291cmNlQnVmZmVyUHJp dmF0ZUNsaWVudC0+c291cmNlQnVmZmVyUHJpdmF0ZUFwcGVuZENvbXBsZXRlKFNvdXJjZUJ1ZmZl clByaXZhdGVDbGllbnQ6OkFwcGVuZFN1Y2NlZWRlZCk7CisgICAgbV9zb3VyY2VCdWZmZXJQcml2 YXRlQ2xpZW50LT5zb3VyY2VCdWZmZXJQcml2YXRlQXBwZW5kQ29tcGxldGUoU291cmNlQnVmZmVy UHJpdmF0ZUNsaWVudDo6QXBwZW5kU3VjY2VlZGVkKTsKIH0KIAogdm9pZCBTb3VyY2VCdWZmZXJQ cml2YXRlR1N0cmVhbWVyOjphcHBlbmRQYXJzaW5nRmFpbGVkKCkKIHsKLSAgICBpZiAobV9zb3Vy Y2VCdWZmZXJQcml2YXRlQ2xpZW50KQotICAgICAgICBtX3NvdXJjZUJ1ZmZlclByaXZhdGVDbGll bnQtPnNvdXJjZUJ1ZmZlclByaXZhdGVBcHBlbmRDb21wbGV0ZShTb3VyY2VCdWZmZXJQcml2YXRl Q2xpZW50OjpQYXJzaW5nRmFpbGVkKTsKKyAgICBtX3NvdXJjZUJ1ZmZlclByaXZhdGVDbGllbnQt PnNvdXJjZUJ1ZmZlclByaXZhdGVBcHBlbmRDb21wbGV0ZShTb3VyY2VCdWZmZXJQcml2YXRlQ2xp ZW50OjpQYXJzaW5nRmFpbGVkKTsKIH0KIAogI2lmICFSRUxFQVNFX0xPR19ESVNBQkxFRAo= 406166 2020-08-07 05:54:22 -0700 2020-08-11 04:41:17 -0700 Patch bug-215263-20200807145419.patch text/plain 5263 aboya U3VidmVyc2lvbiBSZXZpc2lvbjogMjY0MjExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmQ1MTAyZWRkM2Q5NGJj MmIxNDIwOTEyMWE1NThhMzZmYjBkYmJkMi4uZDU5ZWU5ZmQ4NWMwMWQzZDBkMDY5ZDA2OWZhYjE3 MjQwZGEzODMwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIwLTA3LTE1ICBBbGlj aWEgQm95YSBHYXJjw61hICA8YWJveWFAaWdhbGlhLmNvbT4KKworICAgICAgICBbTVNFXVtHU3Ry ZWFtZXJdIFJlbW92ZSBtX3NvdXJjZUJ1ZmZlclByaXZhdGVDbGllbnQgY2hlY2tzIGluIFNvdXJj ZUJ1ZmZlclByaXZhdGVHU3RyZWFtZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIxNTI2MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIG1fc291cmNlQnVmZmVyUHJpdmF0ZUNsaWVudCBpcyBvbmx5IHJlc2V0 IHRvIE5VTEwgZnJvbSBTb3VyY2VCdWZmZXIncworICAgICAgICBkZXN0cnVjdG9yLiBBdCB0aGlz IHBvaW50IFNvdXJjZUJ1ZmZlclByaXZhdGVHU3RyZWFtZXIgaXMgYWJvdXQgdG8KKyAgICAgICAg cmVjZWl2ZSBpdHMgbGFzdCB1bnJlZiBieSBTb3VyY2VCdWZmZXIgYW5kIHRoZXJlZm9yZSBiZSBk ZXN0cm95ZWQuCisKKyAgICAgICAgU2ltaWxhcmx5LCB0aGVyZSBpcyBubyBuZWVkIHRvIGNoZWNr IGZvciBtX21lZGlhU291cmNlIGJlaW5nIG51bGwuCisgICAgICAgIG1fbWVkaWFTb3VyY2UgaXMg b25seSByZXNldCB3aGVuIHRoZSBTb3VyY2VCdWZmZXIgaXMgcmVtb3ZlZCwgYW5kIGF0CisgICAg ICAgIHRoYXQgcG9pbnQgU291cmNlQnVmZmVyUHJpdmF0ZSBzaG91bGRuJ3QgcmVjZWl2ZSBhbnkg Y2FsbHMuCisKKyAgICAgICAgVGhpcyBpcyBhIGNsZWFuLXVwIGFuZCBkb2Vzbid0IGludHJvZHVj ZSBuZXcgYmVoYXZpb3IuIEFzc2VydHMgaGF2ZQorICAgICAgICBiZWVuIGFkZGVkIGNoZWNraW5n IHRoZSBwcmVjb25kaXRpb24gYWJvdmUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9n c3RyZWFtZXIvbXNlL1NvdXJjZUJ1ZmZlclByaXZhdGVHU3RyZWFtZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6U291cmNlQnVmZmVyUHJpdmF0ZUdTdHJlYW1lcjo6cmVtb3ZlZEZyb21NZWRpYVNv dXJjZSk6CisgICAgICAgIChXZWJDb3JlOjpTb3VyY2VCdWZmZXJQcml2YXRlR1N0cmVhbWVyOjpk aWRSZWNlaXZlSW5pdGlhbGl6YXRpb25TZWdtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OlNvdXJj ZUJ1ZmZlclByaXZhdGVHU3RyZWFtZXI6OmRpZFJlY2VpdmVTYW1wbGUpOgorICAgICAgICAoV2Vi Q29yZTo6U291cmNlQnVmZmVyUHJpdmF0ZUdTdHJlYW1lcjo6ZGlkUmVjZWl2ZUFsbFBlbmRpbmdT YW1wbGVzKToKKyAgICAgICAgKFdlYkNvcmU6OlNvdXJjZUJ1ZmZlclByaXZhdGVHU3RyZWFtZXI6 OmFwcGVuZFBhcnNpbmdGYWlsZWQpOgorCiAyMDIwLTA3LTE1ICBBbGljaWEgQm95YSBHYXJjw61h ICA8YWJveWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbTVNFXVtHU3RyZWFtZXJdIEJyZWFrIGNp cmN1bGFyIHJlZmVyZW5jZSBiZXR3ZWVuIFNvdXJjZUJ1ZmZlclByaXZhdGVHU3RyZWFtZXIgYW5k IEFwcGVuZFBpcGVsaW5lCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9nc3RyZWFtZXIvbXNlL1NvdXJjZUJ1ZmZlclByaXZhdGVHU3RyZWFtZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL21zZS9Tb3VyY2VCdWZmZXJQ cml2YXRlR1N0cmVhbWVyLmNwcAppbmRleCBhNDIxOGIxNzEyMTI5NDcwZTVmNzlmNzE5MTkyYWM0 MDhiZjg3OTZkLi5kM2E4N2VmZTg5YWViM2FkNTY3ZGVjNDhhMWUxYTdlZTQzZTVjNDhjIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvbXNlL1Nv dXJjZUJ1ZmZlclByaXZhdGVHU3RyZWFtZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2dzdHJlYW1lci9tc2UvU291cmNlQnVmZmVyUHJpdmF0ZUdTdHJlYW1lci5j cHAKQEAgLTY5LDYgKzY5LDkgQEAgU291cmNlQnVmZmVyUHJpdmF0ZUdTdHJlYW1lcjo6U291cmNl QnVmZmVyUHJpdmF0ZUdTdHJlYW1lcihNZWRpYVNvdXJjZVByaXZhdGVHU3QKIAogdm9pZCBTb3Vy Y2VCdWZmZXJQcml2YXRlR1N0cmVhbWVyOjpzZXRDbGllbnQoU291cmNlQnVmZmVyUHJpdmF0ZUNs aWVudCogY2xpZW50KQogeworICAgIC8vIHNldENsaWVudChudWxscHRyKSBpcyBvbmx5IGNhbGxl ZCBmcm9tIFNvdXJjZUJ1ZmZlciBkZXN0cnVjdG9yLiBBdCB0aGF0IHBvaW50LCBTb3VyY2VCdWZm ZXIgaXMgYWxzbyB0aGUKKyAgICAvLyBvd25lciBvZiB0aGUgbGFzdCByZWZlcmVuY2UgdG8gdXMs IHNvIHdlJ3JlIGFib3V0IHRvIGJlIGRlc3Ryb3llZC4KKyAgICBBU1NFUlQoY2xpZW50IHx8IHJl ZkNvdW50KCkgPT0gMSk7CiAgICAgbV9zb3VyY2VCdWZmZXJQcml2YXRlQ2xpZW50ID0gY2xpZW50 OwogfQogCkBAIC0xMDgsOSArMTExLDExIEBAIHZvaWQgU291cmNlQnVmZmVyUHJpdmF0ZUdTdHJl YW1lcjo6cmVzZXRQYXJzZXJTdGF0ZSgpCiB2b2lkIFNvdXJjZUJ1ZmZlclByaXZhdGVHU3RyZWFt ZXI6OnJlbW92ZWRGcm9tTWVkaWFTb3VyY2UoKQogewogICAgIEFTU0VSVChpc01haW5UaHJlYWQo KSk7Ci0gICAgaWYgKG1fbWVkaWFTb3VyY2UpCi0gICAgICAgIG1fbWVkaWFTb3VyY2UtPnJlbW92 ZVNvdXJjZUJ1ZmZlcih0aGlzKTsKKyAgICBtX21lZGlhU291cmNlLT5yZW1vdmVTb3VyY2VCdWZm ZXIodGhpcyk7CiAgICAgbV9wbGF5ZXJQcml2YXRlLnBsYXliYWNrUGlwZWxpbmUoKS0+cmVtb3Zl U291cmNlQnVmZmVyKHRoaXMpOworICAgIC8vIEFmdGVyIHRoaXMgb25seSBTb3VyY2VCdWZmZXIg c2hvdWxkIGhvbGQgYSByZWZlcmVuY2UgdG8gdXMsIHdoaWNoIHdpbGwgYmUgZGVzdHJveWVkIGV2 ZW50dWFsbHkgKHdoZW4gSlMKKyAgICAvLyBHQyByZWxlYXNlcyB0aGUgbGFzdCByZWZlcmVuY2Up LiBVbnRpbCB0aGVuIFNvdXJjZUJ1ZmZlciBpcyBpbiAicmVtb3ZlZCIgc3RhdGUgYW5kIHdvbid0 IHVzZSBTb3VyY2VCdWZmZXJQcml2YXRlLgorICAgIEFTU0VSVChyZWZDb3VudCgpID09IDEpOwog fQogCiBNZWRpYVBsYXllcjo6UmVhZHlTdGF0ZSBTb3VyY2VCdWZmZXJQcml2YXRlR1N0cmVhbWVy OjpyZWFkeVN0YXRlKCkgY29uc3QKQEAgLTE2Nyw4ICsxNzIsNyBAQCB2b2lkIFNvdXJjZUJ1ZmZl clByaXZhdGVHU3RyZWFtZXI6Om5vdGlmeVJlYWR5Rm9yTW9yZVNhbXBsZXMoKQogCiB2b2lkIFNv dXJjZUJ1ZmZlclByaXZhdGVHU3RyZWFtZXI6OnNldEFjdGl2ZShib29sIGlzQWN0aXZlKQogewot ICAgIGlmIChtX21lZGlhU291cmNlKQotICAgICAgICBtX21lZGlhU291cmNlLT5zb3VyY2VCdWZm ZXJQcml2YXRlRGlkQ2hhbmdlQWN0aXZlU3RhdGUodGhpcywgaXNBY3RpdmUpOworICAgIG1fbWVk aWFTb3VyY2UtPnNvdXJjZUJ1ZmZlclByaXZhdGVEaWRDaGFuZ2VBY3RpdmVTdGF0ZSh0aGlzLCBp c0FjdGl2ZSk7CiB9CiAKIHZvaWQgU291cmNlQnVmZmVyUHJpdmF0ZUdTdHJlYW1lcjo6bm90aWZ5 Q2xpZW50V2hlblJlYWR5Rm9yTW9yZVNhbXBsZXMoY29uc3QgQXRvbVN0cmluZyYgdHJhY2tJZCkK QEAgLTE4MCwyNiArMTg0LDIyIEBAIHZvaWQgU291cmNlQnVmZmVyUHJpdmF0ZUdTdHJlYW1lcjo6 bm90aWZ5Q2xpZW50V2hlblJlYWR5Rm9yTW9yZVNhbXBsZXMoY29uc3QgQXRvCiAKIHZvaWQgU291 cmNlQnVmZmVyUHJpdmF0ZUdTdHJlYW1lcjo6ZGlkUmVjZWl2ZUluaXRpYWxpemF0aW9uU2VnbWVu dChjb25zdCBTb3VyY2VCdWZmZXJQcml2YXRlQ2xpZW50OjpJbml0aWFsaXphdGlvblNlZ21lbnQm IGluaXRpYWxpemF0aW9uU2VnbWVudCkKIHsKLSAgICBpZiAobV9zb3VyY2VCdWZmZXJQcml2YXRl Q2xpZW50KQotICAgICAgICBtX3NvdXJjZUJ1ZmZlclByaXZhdGVDbGllbnQtPnNvdXJjZUJ1ZmZl clByaXZhdGVEaWRSZWNlaXZlSW5pdGlhbGl6YXRpb25TZWdtZW50KGluaXRpYWxpemF0aW9uU2Vn bWVudCk7CisgICAgbV9zb3VyY2VCdWZmZXJQcml2YXRlQ2xpZW50LT5zb3VyY2VCdWZmZXJQcml2 YXRlRGlkUmVjZWl2ZUluaXRpYWxpemF0aW9uU2VnbWVudChpbml0aWFsaXphdGlvblNlZ21lbnQp OwogfQogCiB2b2lkIFNvdXJjZUJ1ZmZlclByaXZhdGVHU3RyZWFtZXI6OmRpZFJlY2VpdmVTYW1w bGUoTWVkaWFTYW1wbGUmIHNhbXBsZSkKIHsKLSAgICBpZiAobV9zb3VyY2VCdWZmZXJQcml2YXRl Q2xpZW50KQotICAgICAgICBtX3NvdXJjZUJ1ZmZlclByaXZhdGVDbGllbnQtPnNvdXJjZUJ1ZmZl clByaXZhdGVEaWRSZWNlaXZlU2FtcGxlKHNhbXBsZSk7CisgICAgbV9zb3VyY2VCdWZmZXJQcml2 YXRlQ2xpZW50LT5zb3VyY2VCdWZmZXJQcml2YXRlRGlkUmVjZWl2ZVNhbXBsZShzYW1wbGUpOwog fQogCiB2b2lkIFNvdXJjZUJ1ZmZlclByaXZhdGVHU3RyZWFtZXI6OmRpZFJlY2VpdmVBbGxQZW5k aW5nU2FtcGxlcygpCiB7Ci0gICAgaWYgKG1fc291cmNlQnVmZmVyUHJpdmF0ZUNsaWVudCkKLSAg ICAgICAgbV9zb3VyY2VCdWZmZXJQcml2YXRlQ2xpZW50LT5zb3VyY2VCdWZmZXJQcml2YXRlQXBw ZW5kQ29tcGxldGUoU291cmNlQnVmZmVyUHJpdmF0ZUNsaWVudDo6QXBwZW5kU3VjY2VlZGVkKTsK KyAgICBtX3NvdXJjZUJ1ZmZlclByaXZhdGVDbGllbnQtPnNvdXJjZUJ1ZmZlclByaXZhdGVBcHBl bmRDb21wbGV0ZShTb3VyY2VCdWZmZXJQcml2YXRlQ2xpZW50OjpBcHBlbmRTdWNjZWVkZWQpOwog fQogCiB2b2lkIFNvdXJjZUJ1ZmZlclByaXZhdGVHU3RyZWFtZXI6OmFwcGVuZFBhcnNpbmdGYWls ZWQoKQogewotICAgIGlmIChtX3NvdXJjZUJ1ZmZlclByaXZhdGVDbGllbnQpCi0gICAgICAgIG1f c291cmNlQnVmZmVyUHJpdmF0ZUNsaWVudC0+c291cmNlQnVmZmVyUHJpdmF0ZUFwcGVuZENvbXBs ZXRlKFNvdXJjZUJ1ZmZlclByaXZhdGVDbGllbnQ6OlBhcnNpbmdGYWlsZWQpOworICAgIG1fc291 cmNlQnVmZmVyUHJpdmF0ZUNsaWVudC0+c291cmNlQnVmZmVyUHJpdmF0ZUFwcGVuZENvbXBsZXRl KFNvdXJjZUJ1ZmZlclByaXZhdGVDbGllbnQ6OlBhcnNpbmdGYWlsZWQpOwogfQogCiAjaWYgIVJF TEVBU0VfTE9HX0RJU0FCTEVECg==