213029 2020-06-10 09:48:20 -0700 [GStreamer] Avoid setting GstContext twice in GLVideoSinkGStreamer 2020-06-19 09:30:54 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 vjaquez vjaquez aakash_jain ap calvaris cgarcia dino eric.carlson ews-watchlist glenn gustavo jer.noble menard philipj pnormand sam sergio webkit-bug-importer oldest_to_newest 1661188 0 vjaquez 2020-06-10 09:48:20 -0700 When the GL video sink changes it state, it might set in the bin its context twice. 1661190 1 401549 vjaquez 2020-06-10 09:52:16 -0700 Created attachment 401549 Patch 1661527 2 401549 calvaris 2020-06-10 23:58:34 -0700 Comment on attachment 401549 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=401549&action=review I guess a GstContext should disappear at some point when we transition down to a certain state, I don't know if this is READY or NULL but this element is not handling that. If context disappears in READY in the sub elements, you won't be setting it again, or am I missing anything? I guess we should check this, not in the scope of this patch. Besides, at some point I guess we should clear the context at some state here, right? This patch seems to be ok considering only this piece of code but please consider the rest I'm saying. > Source/WebCore/ChangeLog:3 > + [GStreamer] Avoid set gstcontext twice in GLVideoSinkGStreamer GstContext, please change the bug title in bugzilla. > Source/WebCore/ChangeLog:10 > + No new tests as there is no change in functionality. I guess setting the GstContext twice does not create problems, right? If it creates problems it would be a bug and that would require a test. 1663431 3 402097 vjaquez 2020-06-17 03:46:29 -0700 Created attachment 402097 Patch 1663432 4 vjaquez 2020-06-17 03:47:09 -0700 I've refactored the patch, so it might need a second look 1663436 5 vjaquez 2020-06-17 04:33:46 -0700 (In reply to Xabier Rodríguez Calvar from comment #2) > Comment on attachment 401549 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=401549&action=review > > I guess a GstContext should disappear at some point when we transition down > to a certain state, I don't know if this is READY or NULL but this element > is not handling that. If context disappears in READY in the sub elements, > you won't be setting it again, or am I missing anything? I guess we should > check this, not in the scope of this patch. Besides, at some point I guess > we should clear the context at some state here, right? if contexts are persistent (and ours are!) they are removed until dispose: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/blob/master/gst/gstelement.c#L3376 (non persistent contexts are removed when state changes from READY to NULL: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/blob/master/gst/gstelement.c#L3266 ) The problem setting them several times, at least, in a waste of cpu cycles because when they are set, the bin set them again to its children, and so on. 1663472 6 402097 calvaris 2020-06-17 07:43:09 -0700 Comment on attachment 402097 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=402097&action=review > Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp:161 > + auto setContext = [&] (const gchar *contextType) { Nit: make this a regular function and you're done. 1663514 7 402113 vjaquez 2020-06-17 09:15:57 -0700 Created attachment 402113 Patch 1663906 8 pnormand 2020-06-18 10:03:26 -0700 If you want to land this with cq I'm afraid you'll need to re-upload the patch... 1663914 9 ews-feeder 2020-06-18 10:25:12 -0700 Committed r263217: <https://trac.webkit.org/changeset/263217> All reviewed patches have been landed. Closing bug and clearing flags on attachment 402113. 1663916 10 webkit-bug-importer 2020-06-18 10:26:19 -0700 <rdar://problem/64494905> 1664392 11 aakash_jain 2020-06-19 09:30:17 -0700 (In reply to Philippe Normand from comment #8) > If you want to land this with cq I'm afraid you'll need to re-upload the patch... I believe you fixed the issue by removing and setting the cq+ flag. I have improved the commit-queue in Bug 213377 so that it can better handle such trac downtime. Also, my aim is that no-one should have to re-upload a patch just because of EWS. Please file a bug if you come across any scenario requiring re-upload of patch because of any EWS issue. 401549 2020-06-10 09:52:16 -0700 2020-06-17 03:46:25 -0700 Patch bug-213029-20200610185215.patch text/plain 2420 vjaquez U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyODM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTljOGNlNWFmYWI4NTA1 NWE3ODZjZjlhNzc4YWY3MDkwNjMwOTc5MC4uZjAyODk4NjgwYjgwOWE5Mjk4YzU1ZmZlZDFiODVh MjlhMDcyYmI5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIwLTA2LTEwICBWw61j dG9yIE1hbnVlbCBKw6FxdWV6IExlYWwgIDx2amFxdWV6QGlnYWxpYS5jb20+CisKKyAgICAgICAg W0dTdHJlYW1lcl0gQXZvaWQgc2V0IGdzdGNvbnRleHQgdHdpY2UgaW4gR0xWaWRlb1NpbmtHU3Ry ZWFtZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIx MzAyOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRo ZSBjb250ZXh0IHdpdGggR0wgaW5mb3JtYXRpb24gaXMgb25seSBzZXQgb25jZS4KKworICAgICAg ICBObyBuZXcgdGVzdHMgYXMgdGhlcmUgaXMgbm8gY2hhbmdlIGluIGZ1bmN0aW9uYWxpdHkuCisK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvR0xWaWRlb1NpbmtHU3RyZWFt ZXIuY3BwOgorICAgICAgICAod2ViS2l0R0xWaWRlb1NpbmtDaGFuZ2VTdGF0ZSk6CisKIDIwMjAt MDYtMDUgIFNlcmdpbyBWaWxsYXIgU2VuaW4gIDxzdmlsbGFyQGlnYWxpYS5jb20+CiAKICAgICAg ICAgW1dlYlhSXSBSZWZhY3RvciBPcGVuWFIgcGxhdGZvcm0gY29kZQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0dMVmlkZW9TaW5rR1N0cmVh bWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9HTFZp ZGVvU2lua0dTdHJlYW1lci5jcHAKaW5kZXggMTQxZmU0Mjk5OWQ4OTU1NzI2MjViZmI5Y2I4OTM2 M2FlZjkzZTUyZi4uNDQzZTM1ZTU2MjU3MjgwNjEzYzE3MmU2MmEwMDA5YmY1MzBmNGZjZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0dMVmlk ZW9TaW5rR1N0cmVhbWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9nc3RyZWFtZXIvR0xWaWRlb1NpbmtHU3RyZWFtZXIuY3BwCkBAIC0xNTksMTcgKzE1OSwxNyBA QCBzdGF0aWMgR3N0U3RhdGVDaGFuZ2VSZXR1cm4gd2ViS2l0R0xWaWRlb1NpbmtDaGFuZ2VTdGF0 ZShHc3RFbGVtZW50KiBlbGVtZW50LCBHcwogICAgIGNhc2UgR1NUX1NUQVRFX0NIQU5HRV9SRUFE WV9UT19SRUFEWToKICNlbmRpZgogICAgIGNhc2UgR1NUX1NUQVRFX0NIQU5HRV9SRUFEWV9UT19Q QVVTRUQ6IHsKLSAgICAgICAgaWYgKCFwcml2LT5nbERpc3BsYXlFbGVtZW50Q29udGV4dCkKKyAg ICAgICAgaWYgKCFwcml2LT5nbERpc3BsYXlFbGVtZW50Q29udGV4dCkgewogICAgICAgICAgICAg cHJpdi0+Z2xEaXNwbGF5RWxlbWVudENvbnRleHQgPSByZXF1ZXN0R0xDb250ZXh0KEdTVF9HTF9E SVNQTEFZX0NPTlRFWFRfVFlQRSk7CisgICAgICAgICAgICBpZiAocHJpdi0+Z2xEaXNwbGF5RWxl bWVudENvbnRleHQpCisgICAgICAgICAgICAgICAgZ3N0X2VsZW1lbnRfc2V0X2NvbnRleHQoR1NU X0VMRU1FTlRfQ0FTVChzaW5rKSwgcHJpdi0+Z2xEaXNwbGF5RWxlbWVudENvbnRleHQuZ2V0KCkp OworICAgICAgICB9CiAKLSAgICAgICAgaWYgKHByaXYtPmdsRGlzcGxheUVsZW1lbnRDb250ZXh0 KQotICAgICAgICAgICAgZ3N0X2VsZW1lbnRfc2V0X2NvbnRleHQoR1NUX0VMRU1FTlRfQ0FTVChz aW5rKSwgcHJpdi0+Z2xEaXNwbGF5RWxlbWVudENvbnRleHQuZ2V0KCkpOwotCi0gICAgICAgIGlm ICghcHJpdi0+Z2xBcHBFbGVtZW50Q29udGV4dCkKKyAgICAgICAgaWYgKCFwcml2LT5nbEFwcEVs ZW1lbnRDb250ZXh0KSB7CiAgICAgICAgICAgICBwcml2LT5nbEFwcEVsZW1lbnRDb250ZXh0ID0g cmVxdWVzdEdMQ29udGV4dCgiZ3N0LmdsLmFwcF9jb250ZXh0Iik7Ci0KLSAgICAgICAgaWYgKHBy aXYtPmdsQXBwRWxlbWVudENvbnRleHQpCi0gICAgICAgICAgICBnc3RfZWxlbWVudF9zZXRfY29u dGV4dChHU1RfRUxFTUVOVF9DQVNUKHNpbmspLCBwcml2LT5nbEFwcEVsZW1lbnRDb250ZXh0Lmdl dCgpKTsKKyAgICAgICAgICAgIGlmIChwcml2LT5nbEFwcEVsZW1lbnRDb250ZXh0KQorICAgICAg ICAgICAgICAgIGdzdF9lbGVtZW50X3NldF9jb250ZXh0KEdTVF9FTEVNRU5UX0NBU1Qoc2luayks IHByaXYtPmdsQXBwRWxlbWVudENvbnRleHQuZ2V0KCkpOworICAgICAgICB9CiAgICAgICAgIGJy ZWFrOwogICAgIH0KICAgICBkZWZhdWx0Ogo= 402097 2020-06-17 03:46:29 -0700 2020-06-17 09:15:53 -0700 Patch bug-213029-20200617124628.patch text/plain 4646 vjaquez U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMTM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTkwOTg0YmI1YWE5NzBm MmYyZDRjZDRhZjlhZDA0NTNkZjNmM2ZjMC4uMzkxY2UxMmZmYzBlZjZhNmZiYjEwMDhjMWQ4Mzg3 ZGE0ZTY3Y2ZiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIwLTA2LTE2ICBWw61j dG9yIE1hbnVlbCBKw6FxdWV6IExlYWwgIDx2amFxdWV6QGlnYWxpYS5jb20+CisKKyAgICAgICAg W0dTdHJlYW1lcl0gQXZvaWQgc2V0dGluZyBHc3RDb250ZXh0IHR3aWNlIGluIEdMVmlkZW9TaW5r R1N0cmVhbWVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMTMwMjkKKworICAgICAgICBSZXZpZXdlZCBieSBYYWJpZXIgUm9kcmlndWV6LUNhbHZhci4K KworICAgICAgICBUaGVyZSBpcyBhIHJlcG9ydGVkIGlzc3VlZCBpbiBHU3RyZWFyR0wgPCAxLjE3 IGZvciBHTEJhc2VGaWx0ZXIKKyAgICAgICAgY2FuJ3QgaGFuZGxlIGl0cyBHTENvbnRleHQgYW5k IERpc3BsYXkgcmVhc3NpZ25hdGlvbi4gVGhpcyBwYXRjaAorICAgICAgICBhaW1zIHRvIHRvIGF2 b2lkIHNldHRpbmcgRGlzcGxheSBvciBHTCBDb250ZXh0IGluIEdMIHZpZGVvIHNpbmsKKyAgICAg ICAgbXVsdGlwbGUgdGltZXMgYnkgY2hlY2tpbmcgaWYgdGhlIHZpZGVvIHNpbmsgYmluIGFscmVh ZHkgaGFzIHRob3NlCisgICAgICAgIGNvbnRleHRzLgorCisgICAgICAgIEFsc28sIGluc3RlYWQg b2YgcmVseWluZyBvbiBhbiBhc3NlcnQgaWYgc29tZXRoaW5nIGdvZXMgd3JvbmcgYXQKKyAgICAg ICAgZmV0Y2hpbmcgdGhlIEdMIHBhcmFtZXRlcnMsIGl0IHJldHVybnMgYW4gZXJyb3IgYXQgc3Rh dGUgY2hhbmdlLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyByZXF1aXJlZC4KKworICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9HTFZpZGVvU2lua0dTdHJlYW1lci5jcHA6Cisg ICAgICAgIChyZXF1ZXN0R0xDb250ZXh0KToKKyAgICAgICAgKHdlYktpdEdMVmlkZW9TaW5rQ2hh bmdlU3RhdGUpOgorCiAyMDIwLTA2LTE2ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+ CiAKICAgICAgICAgW1N1YnBpeGVsXSBSZXBsYWNlZCBjb250ZW50IGJsZWVkcyBvdmVyIGNvbnRl bnQgYm94IHdoZW4gYm9yZGVyIHJhZGl1cyBpcyBzZXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9HTFZpZGVvU2lua0dTdHJlYW1lci5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvR0xWaWRlb1NpbmtH U3RyZWFtZXIuY3BwCmluZGV4IDE0MWZlNDI5OTlkODk1NTcyNjI1YmZiOWNiODkzNjNhZWY5M2U1 MmYuLjRhNjc5YTY0NzEyZGFmYzI0ZTgwZjRlYjFjMTY5NDQ3NmFlZDgxNmMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9HTFZpZGVvU2lua0dT dHJlYW1lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVh bWVyL0dMVmlkZW9TaW5rR1N0cmVhbWVyLmNwcApAQCAtNDUsOCArNDUsNiBAQCBlbnVtIHsKIAog c3RydWN0IF9XZWJLaXRHTFZpZGVvU2lua1ByaXZhdGUgewogICAgIEdSZWZQdHI8R3N0RWxlbWVu dD4gYXBwU2luazsKLSAgICBHUmVmUHRyPEdzdENvbnRleHQ+IGdsRGlzcGxheUVsZW1lbnRDb250 ZXh0OwotICAgIEdSZWZQdHI8R3N0Q29udGV4dD4gZ2xBcHBFbGVtZW50Q29udGV4dDsKICAgICBN ZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIqIG1lZGlhUGxheWVyUHJpdmF0ZTsKIH07CiAKQEAg LTExNywxMiArMTE1LDE0IEBAIHZvaWQgd2ViS2l0R0xWaWRlb1NpbmtGaW5hbGl6ZShHT2JqZWN0 KiBvYmplY3QpCiAgICAgR1NUX0NBTExfUEFSRU5UKEdfT0JKRUNUX0NMQVNTLCBmaW5hbGl6ZSwg KG9iamVjdCkpOwogfQogCi1HUmVmUHRyPEdzdENvbnRleHQ+IHJlcXVlc3RHTENvbnRleHQoY29u c3QgY2hhciogY29udGV4dFR5cGUpCitPcHRpb25hbDxHUmVmUHRyPEdzdENvbnRleHQ+PiByZXF1 ZXN0R0xDb250ZXh0KGNvbnN0IGNoYXIqIGNvbnRleHRUeXBlKQogewogICAgIGF1dG8mIHNoYXJl ZERpc3BsYXkgPSBQbGF0Zm9ybURpc3BsYXk6OnNoYXJlZERpc3BsYXlGb3JDb21wb3NpdGluZygp OwogICAgIGF1dG8qIGdzdEdMRGlzcGxheSA9IHNoYXJlZERpc3BsYXkuZ3N0R0xEaXNwbGF5KCk7 CiAgICAgYXV0byogZ3N0R0xDb250ZXh0ID0gc2hhcmVkRGlzcGxheS5nc3RHTENvbnRleHQoKTsK LSAgICBBU1NFUlQoZ3N0R0xEaXNwbGF5ICYmIGdzdEdMQ29udGV4dCk7CisKKyAgICBpZiAoIShn c3RHTERpc3BsYXkgJiYgZ3N0R0xDb250ZXh0KSkKKyAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9w dDsKIAogICAgIGlmICghZ19zdHJjbXAwKGNvbnRleHRUeXBlLCBHU1RfR0xfRElTUExBWV9DT05U RVhUX1RZUEUpKSB7CiAgICAgICAgIEdzdENvbnRleHQqIGRpc3BsYXlDb250ZXh0ID0gZ3N0X2Nv bnRleHRfbmV3KEdTVF9HTF9ESVNQTEFZX0NPTlRFWFRfVFlQRSwgVFJVRSk7CkBAIC0xNDEsMTMg KzE0MSwxMiBAQCBHUmVmUHRyPEdzdENvbnRleHQ+IHJlcXVlc3RHTENvbnRleHQoY29uc3QgY2hh ciogY29udGV4dFR5cGUpCiAgICAgICAgIHJldHVybiBhZG9wdEdSZWYoYXBwQ29udGV4dCk7CiAg ICAgfQogCi0gICAgcmV0dXJuIG51bGxwdHI7CisgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKIH0K IAogc3RhdGljIEdzdFN0YXRlQ2hhbmdlUmV0dXJuIHdlYktpdEdMVmlkZW9TaW5rQ2hhbmdlU3Rh dGUoR3N0RWxlbWVudCogZWxlbWVudCwgR3N0U3RhdGVDaGFuZ2UgdHJhbnNpdGlvbikKIHsKICAg ICBXZWJLaXRHTFZpZGVvU2luayogc2luayA9IFdFQktJVF9HTF9WSURFT19TSU5LKGVsZW1lbnQp OwotICAgIFdlYktpdEdMVmlkZW9TaW5rUHJpdmF0ZSogcHJpdiA9IHNpbmstPnByaXY7CiAKICNp ZiBHU1RfQ0hFQ0tfVkVSU0lPTigxLCAxNCwgMCkKICAgICBHU1RfREVCVUdfT0JKRUNUKGVsZW1l bnQsICIlcyIsIGdzdF9zdGF0ZV9jaGFuZ2VfZ2V0X25hbWUodHJhbnNpdGlvbikpOwpAQCAtMTU5 LDE3ICsxNTgsMjIgQEAgc3RhdGljIEdzdFN0YXRlQ2hhbmdlUmV0dXJuIHdlYktpdEdMVmlkZW9T aW5rQ2hhbmdlU3RhdGUoR3N0RWxlbWVudCogZWxlbWVudCwgR3MKICAgICBjYXNlIEdTVF9TVEFU RV9DSEFOR0VfUkVBRFlfVE9fUkVBRFk6CiAjZW5kaWYKICAgICBjYXNlIEdTVF9TVEFURV9DSEFO R0VfUkVBRFlfVE9fUEFVU0VEOiB7Ci0gICAgICAgIGlmICghcHJpdi0+Z2xEaXNwbGF5RWxlbWVu dENvbnRleHQpCi0gICAgICAgICAgICBwcml2LT5nbERpc3BsYXlFbGVtZW50Q29udGV4dCA9IHJl cXVlc3RHTENvbnRleHQoR1NUX0dMX0RJU1BMQVlfQ09OVEVYVF9UWVBFKTsKLQotICAgICAgICBp ZiAocHJpdi0+Z2xEaXNwbGF5RWxlbWVudENvbnRleHQpCi0gICAgICAgICAgICBnc3RfZWxlbWVu dF9zZXRfY29udGV4dChHU1RfRUxFTUVOVF9DQVNUKHNpbmspLCBwcml2LT5nbERpc3BsYXlFbGVt ZW50Q29udGV4dC5nZXQoKSk7Ci0KLSAgICAgICAgaWYgKCFwcml2LT5nbEFwcEVsZW1lbnRDb250 ZXh0KQotICAgICAgICAgICAgcHJpdi0+Z2xBcHBFbGVtZW50Q29udGV4dCA9IHJlcXVlc3RHTENv bnRleHQoImdzdC5nbC5hcHBfY29udGV4dCIpOworICAgICAgICBhdXRvIHNldENvbnRleHQgPSBb Jl0gKGNvbnN0IGdjaGFyICpjb250ZXh0VHlwZSkgeworICAgICAgICAgICAgR1JlZlB0cjxHc3RD b250ZXh0PiBvbGRDb250ZXh0ID0gZ3N0X2VsZW1lbnRfZ2V0X2NvbnRleHQoR1NUX0VMRU1FTlRf Q0FTVChzaW5rKSwgY29udGV4dFR5cGUpOworICAgICAgICAgICAgaWYgKCFvbGRDb250ZXh0KSB7 CisgICAgICAgICAgICAgICAgYXV0byBuZXdDb250ZXh0ID0gcmVxdWVzdEdMQ29udGV4dChjb250 ZXh0VHlwZSk7CisgICAgICAgICAgICAgICAgaWYgKCFuZXdDb250ZXh0Lmhhc1ZhbHVlKCkpCisg ICAgICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgICAgICAgICBnc3RfZWxl bWVudF9zZXRfY29udGV4dChHU1RfRUxFTUVOVF9DQVNUKHNpbmspLCBuZXdDb250ZXh0LT5nZXQo KSk7CisgICAgICAgICAgICB9CisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgfTsK KworICAgICAgICBpZiAoIXNldENvbnRleHQoR1NUX0dMX0RJU1BMQVlfQ09OVEVYVF9UWVBFKSkK KyAgICAgICAgICAgIHJldHVybiBHU1RfU1RBVEVfQ0hBTkdFX0ZBSUxVUkU7CisgICAgICAgIGlm ICghc2V0Q29udGV4dCgiZ3N0LmdsLmFwcF9jb250ZXh0IikpCisgICAgICAgICAgICByZXR1cm4g R1NUX1NUQVRFX0NIQU5HRV9GQUlMVVJFOwogCi0gICAgICAgIGlmIChwcml2LT5nbEFwcEVsZW1l bnRDb250ZXh0KQotICAgICAgICAgICAgZ3N0X2VsZW1lbnRfc2V0X2NvbnRleHQoR1NUX0VMRU1F TlRfQ0FTVChzaW5rKSwgcHJpdi0+Z2xBcHBFbGVtZW50Q29udGV4dC5nZXQoKSk7CiAgICAgICAg IGJyZWFrOwogICAgIH0KICAgICBkZWZhdWx0Ogo= 402113 2020-06-17 09:15:57 -0700 2020-06-18 10:25:12 -0700 Patch bug-213029-20200617181556.patch text/plain 4743 vjaquez U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMTM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTkwOTg0YmI1YWE5NzBm MmYyZDRjZDRhZjlhZDA0NTNkZjNmM2ZjMC4uZmViZjY5ODM3ZjMwZmE2OWI0NDA3OTUyMjU5ZWM5 ZDI5Nzc2ZDMxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIwLTA2LTE3ICBWw61j dG9yIE1hbnVlbCBKw6FxdWV6IExlYWwgIDx2amFxdWV6QGlnYWxpYS5jb20+CisKKyAgICAgICAg W0dTdHJlYW1lcl0gQXZvaWQgc2V0dGluZyBHc3RDb250ZXh0IHR3aWNlIGluIEdMVmlkZW9TaW5r R1N0cmVhbWVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMTMwMjkKKworICAgICAgICBSZXZpZXdlZCBieSBYYWJpZXIgUm9kcmlndWV6LUNhbHZhci4K KworICAgICAgICBUaGVyZSBpcyBhIHJlcG9ydGVkIGlzc3VlZCBpbiBHU3RyZWFyR0wgPCAxLjE3 IGZvciBHTEJhc2VGaWx0ZXIKKyAgICAgICAgY2FuJ3QgaGFuZGxlIGl0cyBHTENvbnRleHQgYW5k IERpc3BsYXkgcmVhc3NpZ25hdGlvbi4gVGhpcyBwYXRjaAorICAgICAgICBhaW1zIHRvIHRvIGF2 b2lkIHNldHRpbmcgRGlzcGxheSBvciBHTCBDb250ZXh0IGluIEdMIHZpZGVvIHNpbmsKKyAgICAg ICAgbXVsdGlwbGUgdGltZXMgYnkgY2hlY2tpbmcgaWYgdGhlIHZpZGVvIHNpbmsgYmluIGFscmVh ZHkgaGFzIHRob3NlCisgICAgICAgIGNvbnRleHRzLgorCisgICAgICAgIEFsc28sIGluc3RlYWQg b2YgcmVseWluZyBvbiBhbiBhc3NlcnQgaWYgc29tZXRoaW5nIGdvZXMgd3JvbmcgYXQKKyAgICAg ICAgZmV0Y2hpbmcgdGhlIEdMIHBhcmFtZXRlcnMsIGl0IHJldHVybnMgYW4gZXJyb3IgYXQgc3Rh dGUgY2hhbmdlLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyByZXF1aXJlZC4KKworICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9HTFZpZGVvU2lua0dTdHJlYW1lci5jcHA6Cisg ICAgICAgIChyZXF1ZXN0R0xDb250ZXh0KToKKyAgICAgICAgKHNldEdMQ29udGV4dCk6IG5ldyBm dW5jdGlvbi4KKyAgICAgICAgKHdlYktpdEdMVmlkZW9TaW5rQ2hhbmdlU3RhdGUpOgorCiAyMDIw LTA2LTE2ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW1N1YnBp eGVsXSBSZXBsYWNlZCBjb250ZW50IGJsZWVkcyBvdmVyIGNvbnRlbnQgYm94IHdoZW4gYm9yZGVy IHJhZGl1cyBpcyBzZXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2dzdHJlYW1lci9HTFZpZGVvU2lua0dTdHJlYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvR0xWaWRlb1NpbmtHU3RyZWFtZXIuY3BwCmluZGV4 IDE0MWZlNDI5OTlkODk1NTcyNjI1YmZiOWNiODkzNjNhZWY5M2U1MmYuLmE4OGIyZjJlNGIxYjA3 ZTgxNjhhZmQ0OWQ2OTI2OWY0OTJjMGY5YTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9HTFZpZGVvU2lua0dTdHJlYW1lci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0dMVmlkZW9TaW5rR1N0 cmVhbWVyLmNwcApAQCAtNDUsOCArNDUsNiBAQCBlbnVtIHsKIAogc3RydWN0IF9XZWJLaXRHTFZp ZGVvU2lua1ByaXZhdGUgewogICAgIEdSZWZQdHI8R3N0RWxlbWVudD4gYXBwU2luazsKLSAgICBH UmVmUHRyPEdzdENvbnRleHQ+IGdsRGlzcGxheUVsZW1lbnRDb250ZXh0OwotICAgIEdSZWZQdHI8 R3N0Q29udGV4dD4gZ2xBcHBFbGVtZW50Q29udGV4dDsKICAgICBNZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXIqIG1lZGlhUGxheWVyUHJpdmF0ZTsKIH07CiAKQEAgLTExNywxMiArMTE1LDE0IEBA IHZvaWQgd2ViS2l0R0xWaWRlb1NpbmtGaW5hbGl6ZShHT2JqZWN0KiBvYmplY3QpCiAgICAgR1NU X0NBTExfUEFSRU5UKEdfT0JKRUNUX0NMQVNTLCBmaW5hbGl6ZSwgKG9iamVjdCkpOwogfQogCi1H UmVmUHRyPEdzdENvbnRleHQ+IHJlcXVlc3RHTENvbnRleHQoY29uc3QgY2hhciogY29udGV4dFR5 cGUpCitPcHRpb25hbDxHUmVmUHRyPEdzdENvbnRleHQ+PiByZXF1ZXN0R0xDb250ZXh0KGNvbnN0 IGNoYXIqIGNvbnRleHRUeXBlKQogewogICAgIGF1dG8mIHNoYXJlZERpc3BsYXkgPSBQbGF0Zm9y bURpc3BsYXk6OnNoYXJlZERpc3BsYXlGb3JDb21wb3NpdGluZygpOwogICAgIGF1dG8qIGdzdEdM RGlzcGxheSA9IHNoYXJlZERpc3BsYXkuZ3N0R0xEaXNwbGF5KCk7CiAgICAgYXV0byogZ3N0R0xD b250ZXh0ID0gc2hhcmVkRGlzcGxheS5nc3RHTENvbnRleHQoKTsKLSAgICBBU1NFUlQoZ3N0R0xE aXNwbGF5ICYmIGdzdEdMQ29udGV4dCk7CisKKyAgICBpZiAoIShnc3RHTERpc3BsYXkgJiYgZ3N0 R0xDb250ZXh0KSkKKyAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKIAogICAgIGlmICghZ19z dHJjbXAwKGNvbnRleHRUeXBlLCBHU1RfR0xfRElTUExBWV9DT05URVhUX1RZUEUpKSB7CiAgICAg ICAgIEdzdENvbnRleHQqIGRpc3BsYXlDb250ZXh0ID0gZ3N0X2NvbnRleHRfbmV3KEdTVF9HTF9E SVNQTEFZX0NPTlRFWFRfVFlQRSwgVFJVRSk7CkBAIC0xNDEsMTQgKzE0MSwyMyBAQCBHUmVmUHRy PEdzdENvbnRleHQ+IHJlcXVlc3RHTENvbnRleHQoY29uc3QgY2hhciogY29udGV4dFR5cGUpCiAg ICAgICAgIHJldHVybiBhZG9wdEdSZWYoYXBwQ29udGV4dCk7CiAgICAgfQogCi0gICAgcmV0dXJu IG51bGxwdHI7CisgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKIH0KIAotc3RhdGljIEdzdFN0YXRl Q2hhbmdlUmV0dXJuIHdlYktpdEdMVmlkZW9TaW5rQ2hhbmdlU3RhdGUoR3N0RWxlbWVudCogZWxl bWVudCwgR3N0U3RhdGVDaGFuZ2UgdHJhbnNpdGlvbikKK3N0YXRpYyBib29sIHNldEdMQ29udGV4 dChHc3RFbGVtZW50KiBlbGVtZW50U2luaywgY29uc3QgY2hhciogY29udGV4dFR5cGUpCiB7Ci0g ICAgV2ViS2l0R0xWaWRlb1NpbmsqIHNpbmsgPSBXRUJLSVRfR0xfVklERU9fU0lOSyhlbGVtZW50 KTsKLSAgICBXZWJLaXRHTFZpZGVvU2lua1ByaXZhdGUqIHByaXYgPSBzaW5rLT5wcml2OworICAg IEdSZWZQdHI8R3N0Q29udGV4dD4gb2xkQ29udGV4dCA9IGdzdF9lbGVtZW50X2dldF9jb250ZXh0 KGVsZW1lbnRTaW5rLCBjb250ZXh0VHlwZSk7CisgICAgaWYgKCFvbGRDb250ZXh0KSB7CisgICAg ICAgIGF1dG8gbmV3Q29udGV4dCA9IHJlcXVlc3RHTENvbnRleHQoY29udGV4dFR5cGUpOworICAg ICAgICBpZiAoIW5ld0NvbnRleHQuaGFzVmFsdWUoKSkKKyAgICAgICAgICAgIHJldHVybiBmYWxz ZTsKKyAgICAgICAgZ3N0X2VsZW1lbnRfc2V0X2NvbnRleHQoZWxlbWVudFNpbmssIG5ld0NvbnRl eHQtPmdldCgpKTsKKyAgICB9CisgICAgcmV0dXJuIHRydWU7Cit9CiAKK3N0YXRpYyBHc3RTdGF0 ZUNoYW5nZVJldHVybiB3ZWJLaXRHTFZpZGVvU2lua0NoYW5nZVN0YXRlKEdzdEVsZW1lbnQqIGVs ZW1lbnQsIEdzdFN0YXRlQ2hhbmdlIHRyYW5zaXRpb24pCit7CiAjaWYgR1NUX0NIRUNLX1ZFUlNJ T04oMSwgMTQsIDApCiAgICAgR1NUX0RFQlVHX09CSkVDVChlbGVtZW50LCAiJXMiLCBnc3Rfc3Rh dGVfY2hhbmdlX2dldF9uYW1lKHRyYW5zaXRpb24pKTsKICNlbmRpZgpAQCAtMTU5LDE3ICsxNjgs MTAgQEAgc3RhdGljIEdzdFN0YXRlQ2hhbmdlUmV0dXJuIHdlYktpdEdMVmlkZW9TaW5rQ2hhbmdl U3RhdGUoR3N0RWxlbWVudCogZWxlbWVudCwgR3MKICAgICBjYXNlIEdTVF9TVEFURV9DSEFOR0Vf UkVBRFlfVE9fUkVBRFk6CiAjZW5kaWYKICAgICBjYXNlIEdTVF9TVEFURV9DSEFOR0VfUkVBRFlf VE9fUEFVU0VEOiB7Ci0gICAgICAgIGlmICghcHJpdi0+Z2xEaXNwbGF5RWxlbWVudENvbnRleHQp Ci0gICAgICAgICAgICBwcml2LT5nbERpc3BsYXlFbGVtZW50Q29udGV4dCA9IHJlcXVlc3RHTENv bnRleHQoR1NUX0dMX0RJU1BMQVlfQ09OVEVYVF9UWVBFKTsKLQotICAgICAgICBpZiAocHJpdi0+ Z2xEaXNwbGF5RWxlbWVudENvbnRleHQpCi0gICAgICAgICAgICBnc3RfZWxlbWVudF9zZXRfY29u dGV4dChHU1RfRUxFTUVOVF9DQVNUKHNpbmspLCBwcml2LT5nbERpc3BsYXlFbGVtZW50Q29udGV4 dC5nZXQoKSk7Ci0KLSAgICAgICAgaWYgKCFwcml2LT5nbEFwcEVsZW1lbnRDb250ZXh0KQotICAg ICAgICAgICAgcHJpdi0+Z2xBcHBFbGVtZW50Q29udGV4dCA9IHJlcXVlc3RHTENvbnRleHQoImdz dC5nbC5hcHBfY29udGV4dCIpOwotCi0gICAgICAgIGlmIChwcml2LT5nbEFwcEVsZW1lbnRDb250 ZXh0KQotICAgICAgICAgICAgZ3N0X2VsZW1lbnRfc2V0X2NvbnRleHQoR1NUX0VMRU1FTlRfQ0FT VChzaW5rKSwgcHJpdi0+Z2xBcHBFbGVtZW50Q29udGV4dC5nZXQoKSk7CisgICAgICAgIGlmICgh c2V0R0xDb250ZXh0KGVsZW1lbnQsIEdTVF9HTF9ESVNQTEFZX0NPTlRFWFRfVFlQRSkpCisgICAg ICAgICAgICByZXR1cm4gR1NUX1NUQVRFX0NIQU5HRV9GQUlMVVJFOworICAgICAgICBpZiAoIXNl dEdMQ29udGV4dChlbGVtZW50LCAiZ3N0LmdsLmFwcF9jb250ZXh0IikpCisgICAgICAgICAgICBy ZXR1cm4gR1NUX1NUQVRFX0NIQU5HRV9GQUlMVVJFOwogICAgICAgICBicmVhazsKICAgICB9CiAg ICAgZGVmYXVsdDoK