138505 2014-11-07 07:58:17 -0800 Crash playing DASH video 2014-11-07 11:30:25 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED DUPLICATE 137065 P2 Normal --- 1 xclaesse webkit-unassigned oldest_to_newest 1047078 0 241180 xclaesse 2014-11-07 07:58:17 -0800 Created attachment 241180 Relevant valgrind trace Webkit2 sometimes crash when playing that video: http://demo.unified-streaming.com/video/smurfs/smurfs.ism/smurfs.mpd?format=mp4 The crash happens when DASH decides to change the video's resolution (it's adaptative). When gstreamer sends caps it means that the NEXT buffer will have that new resolution, but a race can occure and webkit will use that new caps for the PREVIOUS buffer. That lead to a crash because the resolution (thus buffer size) mismatch. 1047080 1 241182 xclaesse 2014-11-07 07:59:59 -0800 Created attachment 241182 Proposed patch This patch makes sure we always use the GstCaps that goes with the GstBuffer. 1047128 2 xclaesse 2014-11-07 11:30:25 -0800 Oops, already fixed. *** This bug has been marked as a duplicate of bug 137065 *** 241180 2014-11-07 07:58:17 -0800 2014-11-07 07:58:17 -0800 Relevant valgrind trace valgrind.txt text/plain 5090 xclaesse PT0xMzM3Nz09IFRocmVhZCAxOgo9PTEzMzc3PT0gSW52YWxpZCByZWFkIG9mIHNpemUgOAo9PTEz Mzc3PT0gICAgYXQgMHg0QzJGNzlFOiBtZW1jcHlAQEdMSUJDXzIuMTQgKGluIC91c3IvbGliL3Zh bGdyaW5kL3ZncHJlbG9hZF9tZW1jaGVjay1hbWQ2NC1saW51eC5zbykKPT0xMzM3Nz09ICAgIGJ5 IDB4MjQ4NEE5ODU6ID8/PyAoaW4gL3Vzci9saWIveDg2XzY0LWxpbnV4LWdudS9kcmkvaTk2NV9k cmkuc28pCj09MTMzNzc9PSAgICBieSAweDI0ODUwMjhDOiA/Pz8gKGluIC91c3IvbGliL3g4Nl82 NC1saW51eC1nbnUvZHJpL2k5NjVfZHJpLnNvKQo9PTEzMzc3PT0gICAgYnkgMHgyNDg1MDU2MTog Pz8/IChpbiAvdXNyL2xpYi94ODZfNjQtbGludXgtZ251L2RyaS9pOTY1X2RyaS5zbykKPT0xMzM3 Nz09ICAgIGJ5IDB4MjQ5RkU5MUE6ID8/PyAoaW4gL3Vzci9saWIveDg2XzY0LWxpbnV4LWdudS9k cmkvaTk2NV9kcmkuc28pCj09MTMzNzc9PSAgICBieSAweDI0ODNCNThDOiA/Pz8gKGluIC91c3Iv bGliL3g4Nl82NC1saW51eC1nbnUvZHJpL2k5NjVfZHJpLnNvKQo9PTEzMzc3PT0gICAgYnkgMHgy NDgzRjJFQjogPz8/IChpbiAvdXNyL2xpYi94ODZfNjQtbGludXgtZ251L2RyaS9pOTY1X2RyaS5z bykKPT0xMzM3Nz09ICAgIGJ5IDB4NUQwMERCRjogV2ViQ29yZTo6Qml0bWFwVGV4dHVyZUdMOjp1 cGRhdGVDb250ZW50c05vU3dpenpsZSh2b2lkIGNvbnN0KiwgV2ViQ29yZTo6SW50UmVjdCBjb25z dCYsIFdlYkNvcmU6OkludFBvaW50IGNvbnN0JiwgaW50LCB1bnNpZ25lZCBpbnQsIHVuc2lnbmVk IGludCkgKGluIC9ob21lL3hjbGFlc3NlL3Byb2dyYW1tYXRpb24vc3RhL3dlYmtpdC1zdGEvLmxp YnMvbGlid2Via2l0Mmd0ay0zLjAuc28uMjUuMTAuOCkKPT0xMzM3Nz09ICAgIGJ5IDB4NUQwMTg1 NDogV2ViQ29yZTo6Qml0bWFwVGV4dHVyZUdMOjp1cGRhdGVDb250ZW50cyh2b2lkIGNvbnN0Kiwg V2ViQ29yZTo6SW50UmVjdCBjb25zdCYsIFdlYkNvcmU6OkludFBvaW50IGNvbnN0JiwgaW50LCBX ZWJDb3JlOjpCaXRtYXBUZXh0dXJlOjpVcGRhdGVDb250ZW50c0ZsYWcpIChpbiAvaG9tZS94Y2xh ZXNzZS9wcm9ncmFtbWF0aW9uL3N0YS93ZWJraXQtc3RhLy5saWJzL2xpYndlYmtpdDJndGstMy4w LnNvLjI1LjEwLjgpCj09MTMzNzc9PSAgICBieSAweDY2RTNCQ0E6IFdlYkNvcmU6Ok1lZGlhUGxh eWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6OnVwZGF0ZVRleHR1cmUoV2ViQ29yZTo6VGV4dHVyZU1h cHBlciopIChpbiAvaG9tZS94Y2xhZXNzZS9wcm9ncmFtbWF0aW9uL3N0YS93ZWJraXQtc3RhLy5s aWJzL2xpYndlYmtpdDJndGstMy4wLnNvLjI1LjEwLjgpCj09MTMzNzc9PSAgICBieSAweDY2RTND RTI6IFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6OnBhaW50VG9UZXh0 dXJlTWFwcGVyKFdlYkNvcmU6OlRleHR1cmVNYXBwZXIqLCBXZWJDb3JlOjpGbG9hdFJlY3QgY29u c3QmLCBXZWJDb3JlOjpUcmFuc2Zvcm1hdGlvbk1hdHJpeCBjb25zdCYsIGZsb2F0KSAoaW4gL2hv bWUveGNsYWVzc2UvcHJvZ3JhbW1hdGlvbi9zdGEvd2Via2l0LXN0YS8ubGlicy9saWJ3ZWJraXQy Z3RrLTMuMC5zby4yNS4xMC44KQo9PTEzMzc3PT0gICAgYnkgMHg1RDExNDhEOiBXZWJDb3JlOjpU ZXh0dXJlTWFwcGVyTGF5ZXI6OnBhaW50U2VsZihXZWJDb3JlOjpUZXh0dXJlTWFwcGVyUGFpbnRP cHRpb25zIGNvbnN0JikgKGluIC9ob21lL3hjbGFlc3NlL3Byb2dyYW1tYXRpb24vc3RhL3dlYmtp dC1zdGEvLmxpYnMvbGlid2Via2l0Mmd0ay0zLjAuc28uMjUuMTAuOCkKPT0xMzM3Nz09ICAgIGJ5 IDB4NUQxNEE3MTogV2ViQ29yZTo6VGV4dHVyZU1hcHBlckxheWVyOjpwYWludFNlbGZBbmRDaGls ZHJlbihXZWJDb3JlOjpUZXh0dXJlTWFwcGVyUGFpbnRPcHRpb25zIGNvbnN0JikgKGluIC9ob21l L3hjbGFlc3NlL3Byb2dyYW1tYXRpb24vc3RhL3dlYmtpdC1zdGEvLmxpYnMvbGlid2Via2l0Mmd0 ay0zLjAuc28uMjUuMTAuOCkKPT0xMzM3Nz09ICAgIGJ5IDB4NUQxNEMyQzogV2ViQ29yZTo6VGV4 dHVyZU1hcHBlckxheWVyOjpwYWludFNlbGZBbmRDaGlsZHJlbldpdGhSZXBsaWNhKFdlYkNvcmU6 OlRleHR1cmVNYXBwZXJQYWludE9wdGlvbnMgY29uc3QmKSAoaW4gL2hvbWUveGNsYWVzc2UvcHJv Z3JhbW1hdGlvbi9zdGEvd2Via2l0LXN0YS8ubGlicy9saWJ3ZWJraXQyZ3RrLTMuMC5zby4yNS4x MC44KQo9PTEzMzc3PT0gICAgYnkgMHg1RDE0NzM0OiBXZWJDb3JlOjpUZXh0dXJlTWFwcGVyTGF5 ZXI6OnBhaW50UmVjdXJzaXZlKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJQYWludE9wdGlvbnMgY29u c3QmKSAoaW4gL2hvbWUveGNsYWVzc2UvcHJvZ3JhbW1hdGlvbi9zdGEvd2Via2l0LXN0YS8ubGli cy9saWJ3ZWJraXQyZ3RrLTMuMC5zby4yNS4xMC44KQo9PTEzMzc3PT0gICAgYnkgMHg1RDE0OERD OiBXZWJDb3JlOjpUZXh0dXJlTWFwcGVyTGF5ZXI6OnBhaW50U2VsZkFuZENoaWxkcmVuKFdlYkNv cmU6OlRleHR1cmVNYXBwZXJQYWludE9wdGlvbnMgY29uc3QmKSBbY2xvbmUgLnBhcnQuODhdIChp biAvaG9tZS94Y2xhZXNzZS9wcm9ncmFtbWF0aW9uL3N0YS93ZWJraXQtc3RhLy5saWJzL2xpYndl YmtpdDJndGstMy4wLnNvLjI1LjEwLjgpCj09MTMzNzc9PSAgICBieSAweDVEMTRDMkM6IFdlYkNv cmU6OlRleHR1cmVNYXBwZXJMYXllcjo6cGFpbnRTZWxmQW5kQ2hpbGRyZW5XaXRoUmVwbGljYShX ZWJDb3JlOjpUZXh0dXJlTWFwcGVyUGFpbnRPcHRpb25zIGNvbnN0JikgKGluIC9ob21lL3hjbGFl c3NlL3Byb2dyYW1tYXRpb24vc3RhL3dlYmtpdC1zdGEvLmxpYnMvbGlid2Via2l0Mmd0ay0zLjAu c28uMjUuMTAuOCkKPT0xMzM3Nz09ICAgIGJ5IDB4NUQxNDczNDogV2ViQ29yZTo6VGV4dHVyZU1h cHBlckxheWVyOjpwYWludFJlY3Vyc2l2ZShXZWJDb3JlOjpUZXh0dXJlTWFwcGVyUGFpbnRPcHRp b25zIGNvbnN0JikgKGluIC9ob21lL3hjbGFlc3NlL3Byb2dyYW1tYXRpb24vc3RhL3dlYmtpdC1z dGEvLmxpYnMvbGlid2Via2l0Mmd0ay0zLjAuc28uMjUuMTAuOCkKPT0xMzM3Nz09ICAgIGJ5IDB4 NUQxNDhEQzogV2ViQ29yZTo6VGV4dHVyZU1hcHBlckxheWVyOjpwYWludFNlbGZBbmRDaGlsZHJl bihXZWJDb3JlOjpUZXh0dXJlTWFwcGVyUGFpbnRPcHRpb25zIGNvbnN0JikgW2Nsb25lIC5wYXJ0 Ljg4XSAoaW4gL2hvbWUveGNsYWVzc2UvcHJvZ3JhbW1hdGlvbi9zdGEvd2Via2l0LXN0YS8ubGli cy9saWJ3ZWJraXQyZ3RrLTMuMC5zby4yNS4xMC44KQo9PTEzMzc3PT0gICAgYnkgMHg1RDE0QzJD OiBXZWJDb3JlOjpUZXh0dXJlTWFwcGVyTGF5ZXI6OnBhaW50U2VsZkFuZENoaWxkcmVuV2l0aFJl cGxpY2EoV2ViQ29yZTo6VGV4dHVyZU1hcHBlclBhaW50T3B0aW9ucyBjb25zdCYpIChpbiAvaG9t ZS94Y2xhZXNzZS9wcm9ncmFtbWF0aW9uL3N0YS93ZWJraXQtc3RhLy5saWJzL2xpYndlYmtpdDJn dGstMy4wLnNvLjI1LjEwLjgpCj09MTMzNzc9PSAgQWRkcmVzcyAweDMwZDFkMTUwIGlzIDM2OCw1 OTIgYnl0ZXMgaW5zaWRlIGEgYmxvY2sgb2Ygc2l6ZSAzNjgsNTk5IGFsbG9jJ2QKPT0xMzM3Nz09 ICAgIGF0IDB4NEMyQUI4MDogbWFsbG9jIChpbiAvdXNyL2xpYi92YWxncmluZC92Z3ByZWxvYWRf bWVtY2hlY2stYW1kNjQtbGludXguc28pCj09MTMzNzc9PSAgICBieSAweENCNUY2MTA6IGdfbWFs bG9jIChpbiAvbGliL3g4Nl82NC1saW51eC1nbnUvbGliZ2xpYi0yLjAuc28uMC40MDAyLjApCj09 MTMzNzc9PSAgICBieSAweENCNzUyMkQ6IGdfc2xpY2VfYWxsb2MgKGluIC9saWIveDg2XzY0LWxp bnV4LWdudS9saWJnbGliLTIuMC5zby4wLjQwMDIuMCkKPT0xMzM3Nz09ICAgIGJ5IDB4OTk0QjBB QzogX3N5c21lbV9uZXdfYmxvY2sgKGdzdGFsbG9jYXRvci5jOjQxNCkKPT0xMzM3Nz09ICAgIGJ5 IDB4OTk1NEYxMTogZ3N0X2J1ZmZlcl9uZXdfYWxsb2NhdGUgKGdzdGJ1ZmZlci5jOjY3MykKPT0x MzM3Nz09ICAgIGJ5IDB4OTQ5NzJEQzogdmlkZW9fYnVmZmVyX3Bvb2xfYWxsb2MgKGdzdHZpZGVv cG9vbC5jOjIwNykKPT0xMzM3Nz09ICAgIGJ5IDB4OTk1N0ZGMzogZG9fYWxsb2NfYnVmZmVyLmNv bnN0cHJvcC4zIChnc3RidWZmZXJwb29sLmM6MjcwKQo9PTEzMzc3PT0gICAgYnkgMHg5OTU4MkM1 OiBkZWZhdWx0X2FjcXVpcmVfYnVmZmVyIChnc3RidWZmZXJwb29sLmM6MTEwMSkKPT0xMzM3Nz09 ICAgIGJ5IDB4OTk1OTdBMTogZ3N0X2J1ZmZlcl9wb29sX2FjcXVpcmVfYnVmZmVyIChnc3RidWZm ZXJwb29sLmM6MTIwOSkKPT0xMzM3Nz09ICAgIGJ5IDB4OTZGNzY1QTogZGVmYXVsdF9wcmVwYXJl X291dHB1dF9idWZmZXIgKGdzdGJhc2V0cmFuc2Zvcm0uYzoxNjAwKQo9PTEzMzc3PT0gICAgYnkg MHg5NkY5M0NBOiBnc3RfYmFzZV90cmFuc2Zvcm1faGFuZGxlX2J1ZmZlciAoZ3N0YmFzZXRyYW5z Zm9ybS5jOjIwODgpCj09MTMzNzc9PSAgICBieSAweDk2RjlEMTA6IGdzdF9iYXNlX3RyYW5zZm9y bV9jaGFpbiAoZ3N0YmFzZXRyYW5zZm9ybS5jOjIyMjQpCj09MTMzNzc9PSAgICBieSAweDk5ODRB Qzc6IGdzdF9wYWRfcHVzaF9kYXRhIChnc3RwYWQuYzozODM2KQo9PTEzMzc3PT0gICAgYnkgMHg5 NkY5RjE4OiBnc3RfYmFzZV90cmFuc2Zvcm1fY2hhaW4gKGdzdGJhc2V0cmFuc2Zvcm0uYzoyMjYw KQo9PTEzMzc3PT0gICAgYnkgMHg5OTg0QUM3OiBnc3RfcGFkX3B1c2hfZGF0YSAoZ3N0cGFkLmM6 MzgzNikKPT0xMzM3Nz09ICAgIGJ5IDB4OTZGOUYxODogZ3N0X2Jhc2VfdHJhbnNmb3JtX2NoYWlu IChnc3RiYXNldHJhbnNmb3JtLmM6MjI2MCkKPT0xMzM3Nz09ICAgIGJ5IDB4OTk4NEFDNzogZ3N0 X3BhZF9wdXNoX2RhdGEgKGdzdHBhZC5jOjM4MzYpCj09MTMzNzc9PSAgICBieSAweDk2RjlGMTg6 IGdzdF9iYXNlX3RyYW5zZm9ybV9jaGFpbiAoZ3N0YmFzZXRyYW5zZm9ybS5jOjIyNjApCj09MTMz Nzc9PSAgICBieSAweDk5ODRBQzc6IGdzdF9wYWRfcHVzaF9kYXRhIChnc3RwYWQuYzozODM2KQo9 PTEzMzc3PT0gICAgYnkgMHg5OTc1NDNBOiBnc3RfcHJveHlfcGFkX2NoYWluX2RlZmF1bHQgKGdz dGdob3N0cGFkLmM6MTI2KQo= 241182 2014-11-07 07:59:59 -0800 2014-11-07 07:59:59 -0800 Proposed patch 0001-MediaPlayerPrivateGStreamerBase-Make-sure-that-the-c.patch text/plain 4466 xclaesse RnJvbSA5ZDEyNzIxM2FkZTJkMzliZTRlYTM4YmU0Mzc4MWZjY2FjNDVkMGU2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBYYXZpZXIgQ2xhZXNzZW5zIDx4YXZpZXIuY2xhZXNzZW5zQGNv bGxhYm9yYS5jb20+CkRhdGU6IFRodSwgNiBOb3YgMjAxNCAxNjoyMzo1MyAtMDUwMApTdWJqZWN0 OiBbUEFUQ0hdIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6IE1ha2Ugc3VyZSB0aGF0 IHRoZSBjYXBzCiBhbHdheXMgbWF0Y2ggdGhlIGJ1ZmZlcgoKSXQgaXMgcmFjeSB0byBnZXQgdGhl IGNhcHMgd2hlbiB3ZSBkZWNpZGUgdG8gcmVuZGVyIHRoZSBidWZmZXIgYmVjYXVzZQp3ZSBjb3Vs ZCBoYXZlIGFscmVhZHkgcmVjZWl2ZWQgbmV3IGNhcHMgZm9yIHRoZSBuZXh0IGJ1ZmZlciB0aGF0 CmNoYW5nZSByZXNvbHV0aW9uLiBJdCBoYXBwZW5zIHdoZW4gcGxheWluZyBhZGFwdGF0aXZlIG1l ZGlhcywKbGlrZSBEQVNILgotLS0KIC4uLi9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0 cmVhbWVyQmFzZS5jcHAgIHwgMzcgKysrKysrKystLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5n ZWQsIDE0IGluc2VydGlvbnMoKyksIDIzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXJCYXNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJl YW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmNwcAppbmRleCBiNjA2OWI5Li4z ZjFhNmE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3Ry ZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJl YW1lckJhc2UuY3BwCkBAIC0xMDQsNiArMTA0LDcgQEAgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVh bWVyQmFzZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZShNZWRpYVBsYXllciogcGwK ICAgICAsIG1fcmVhZHlTdGF0ZShNZWRpYVBsYXllcjo6SGF2ZU5vdGhpbmcpCiAgICAgLCBtX25l dHdvcmtTdGF0ZShNZWRpYVBsYXllcjo6RW1wdHkpCiAgICAgLCBtX2J1ZmZlcigwKQorICAgICwg bV9jYXBzKDApCiAgICAgLCBtX3ZvbHVtZVRpbWVySGFuZGxlcigwKQogICAgICwgbV9tdXRlVGlt ZXJIYW5kbGVyKDApCiAgICAgLCBtX3JlcGFpbnRIYW5kbGVyKDApCkBAIC0xMzYsNiArMTM3LDEw IEBAIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6On5NZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXJCYXNlKCkKICAgICAgICAgZ3N0X2J1ZmZlcl91bnJlZihtX2J1ZmZlcik7CiAgICAg bV9idWZmZXIgPSAwOwogCisgICAgaWYgKG1fY2FwcykKKyAgICAgICAgZ3N0X2NhcHNfdW5yZWYo bV9jYXBzKTsKKyAgICBtX2NhcHMgPSAwOworCiAgICAgbV9wbGF5ZXIgPSAwOwogCiAgICAgaWYg KG1fbXV0ZVRpbWVySGFuZGxlcikKQEAgLTE2OSw4ICsxNzQsNyBAQCBJbnRTaXplIE1lZGlhUGxh eWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6Om5hdHVyYWxTaXplKCkgY29uc3QKICAgICBpZiAoIW1f dmlkZW9TaXplLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIG1fdmlkZW9TaXplOwogCi0gICAg R1JlZlB0cjxHc3RDYXBzPiBjYXBzID0gY3VycmVudFZpZGVvU2lua0NhcHMoKTsKLSAgICBpZiAo IWNhcHMpCisgICAgaWYgKCFtX2NhcHMpCiAgICAgICAgIHJldHVybiBJbnRTaXplKCk7CiAKIApA QCAtMTg0LDcgKzE4OCw3IEBAIEludFNpemUgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFz ZTo6bmF0dXJhbFNpemUoKSBjb25zdAogICAgIGludCBwaXhlbEFzcGVjdFJhdGlvTnVtZXJhdG9y LCBwaXhlbEFzcGVjdFJhdGlvRGVub21pbmF0b3IsIHN0cmlkZTsKICAgICBJbnRTaXplIG9yaWdp bmFsU2l6ZTsKICAgICBHc3RWaWRlb0Zvcm1hdCBmb3JtYXQ7Ci0gICAgaWYgKCFnZXRWaWRlb1Np emVBbmRGb3JtYXRGcm9tQ2FwcyhjYXBzLmdldCgpLCBvcmlnaW5hbFNpemUsIGZvcm1hdCwgcGl4 ZWxBc3BlY3RSYXRpb051bWVyYXRvciwgcGl4ZWxBc3BlY3RSYXRpb0Rlbm9taW5hdG9yLCBzdHJp ZGUpKQorICAgIGlmICghZ2V0VmlkZW9TaXplQW5kRm9ybWF0RnJvbUNhcHMobV9jYXBzLCBvcmln aW5hbFNpemUsIGZvcm1hdCwgcGl4ZWxBc3BlY3RSYXRpb051bWVyYXRvciwgcGl4ZWxBc3BlY3RS YXRpb0Rlbm9taW5hdG9yLCBzdHJpZGUpKQogICAgICAgICByZXR1cm4gSW50U2l6ZSgpOwogCiAg ICAgTE9HX01FRElBX01FU1NBR0UoIk9yaWdpbmFsIHZpZGVvIHNpemU6ICVkeCVkIiwgb3JpZ2lu YWxTaXplLndpZHRoKCksIG9yaWdpbmFsU2l6ZS5oZWlnaHQoKSk7CkBAIC0zMjAsMTMgKzMyNCw5 IEBAIFBhc3NSZWZQdHI8Qml0bWFwVGV4dHVyZT4gTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy QmFzZTo6dXBkYXRlVGV4dHVyZShUZXh0dXJlCiAgICAgaWYgKCFtX2J1ZmZlcikKICAgICAgICAg cmV0dXJuIG51bGxwdHI7CiAKLSAgICBHUmVmUHRyPEdzdENhcHM+IGNhcHMgPSBjdXJyZW50Vmlk ZW9TaW5rQ2FwcygpOwotICAgIGlmICghY2FwcykKLSAgICAgICAgcmV0dXJuIG51bGxwdHI7Ci0K ICAgICBHc3RWaWRlb0luZm8gdmlkZW9JbmZvOwogICAgIGdzdF92aWRlb19pbmZvX2luaXQoJnZp ZGVvSW5mbyk7Ci0gICAgaWYgKCFnc3RfdmlkZW9faW5mb19mcm9tX2NhcHMoJnZpZGVvSW5mbywg Y2Fwcy5nZXQoKSkpCisgICAgaWYgKCFnc3RfdmlkZW9faW5mb19mcm9tX2NhcHMoJnZpZGVvSW5m bywgbV9jYXBzKSkKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKICAgICBJbnRTaXplIHNpemUg PSBJbnRTaXplKEdTVF9WSURFT19JTkZPX1dJRFRIKCZ2aWRlb0luZm8pLCBHU1RfVklERU9fSU5G T19IRUlHSFQoJnZpZGVvSW5mbykpOwpAQCAtMzY4LDYgKzM2OCwxMSBAQCB2b2lkIE1lZGlhUGxh eWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6OnRyaWdnZXJSZXBhaW50KEdzdEJ1ZmZlciogYnVmZmVy KQogICAgIHsKICAgICAgICAgR011dGV4TG9ja2VyIGxvY2sobV9idWZmZXJNdXRleCk7CiAgICAg ICAgIGdzdF9idWZmZXJfcmVwbGFjZSgmbV9idWZmZXIsIGJ1ZmZlcik7CisKKyAgICAgICAgR3N0 Q2FwcyogY2FwczsKKyAgICAgICAgZ19vYmplY3RfZ2V0KEdfT0JKRUNUKG1fd2Via2l0VmlkZW9T aW5rLmdldCgpKSwgImN1cnJlbnQtY2FwcyIsICZjYXBzLCBOVUxMKTsKKyAgICAgICAgZ3N0X2Nh cHNfcmVwbGFjZSgmbV9jYXBzLCBjYXBzKTsKKyAgICAgICAgZ3N0X2NhcHNfdW5yZWYoY2Fwcyk7 CiAgICAgfQogCiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKSAmJiBVU0UoVEVYVFVS RV9NQVBQRVJfR0wpICYmICFVU0UoQ09PUkRJTkFURURfR1JBUEhJQ1MpCkBAIC00MDIsMTEgKzQw Nyw3IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZTo6cGFpbnQoR3JhcGhp Y3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBJbnRSCiAgICAgaWYgKCFtX2J1ZmZlcikKICAgICAg ICAgcmV0dXJuOwogCi0gICAgR1JlZlB0cjxHc3RDYXBzPiBjYXBzID0gY3VycmVudFZpZGVvU2lu a0NhcHMoKTsKLSAgICBpZiAoIWNhcHMpCi0gICAgICAgIHJldHVybjsKLQotICAgIFJlZlB0cjxJ bWFnZUdTdHJlYW1lcj4gZ3N0SW1hZ2UgPSBJbWFnZUdTdHJlYW1lcjo6Y3JlYXRlSW1hZ2UobV9i dWZmZXIsIGNhcHMuZ2V0KCkpOworICAgIFJlZlB0cjxJbWFnZUdTdHJlYW1lcj4gZ3N0SW1hZ2Ug PSBJbWFnZUdTdHJlYW1lcjo6Y3JlYXRlSW1hZ2UobV9idWZmZXIsIG1fY2Fwcyk7CiAgICAgaWYg KCFnc3RJbWFnZSkKICAgICAgICAgcmV0dXJuOwogCkBAIC00NTAsMTYgKzQ1MSw2IEBAIE1lZGlh UGxheWVyOjpNb3ZpZUxvYWRUeXBlIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6Om1v dmllTG9hZFR5cGUoKSBjb25zCiAgICAgcmV0dXJuIE1lZGlhUGxheWVyOjpEb3dubG9hZDsKIH0K IAotR1JlZlB0cjxHc3RDYXBzPiBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlOjpjdXJy ZW50VmlkZW9TaW5rQ2FwcygpIGNvbnN0Ci17Ci0gICAgaWYgKCFtX3dlYmtpdFZpZGVvU2luaykK LSAgICAgICAgcmV0dXJuIG51bGxwdHI7Ci0KLSAgICBHUmVmUHRyPEdzdENhcHM+IGN1cnJlbnRD YXBzOwotICAgIGdfb2JqZWN0X2dldChHX09CSkVDVChtX3dlYmtpdFZpZGVvU2luay5nZXQoKSks ICJjdXJyZW50LWNhcHMiLCAmY3VycmVudENhcHMub3V0UHRyKCksIE5VTEwpOwotICAgIHJldHVy biBjdXJyZW50Q2FwczsKLX0KLQogR3N0RWxlbWVudCogTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVh bWVyQmFzZTo6Y3JlYXRlVmlkZW9TaW5rKCkKIHsKICAgICBBU1NFUlQoaW5pdGlhbGl6ZUdTdHJl YW1lcigpKTsKLS0gCjEuOS4xCgo=