168322 2017-02-14 08:16:12 -0800 [GStreamer] Implement MediaPlayerPrivate::hasSingleSecurityOrigin() 2017-02-15 00:50:45 -0800 1 1 1 Unclassified WebKit Platform WebKit Local Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=168359 Gtk, LayoutTestFailure P2 Normal --- 1 cgarcia webkit-unassigned bugs-noreply oldest_to_newest 1276748 0 cgarcia 2017-02-14 08:16:12 -0800 It currently returns true unconditionally. 1276749 1 301503 cgarcia 2017-02-14 08:20:39 -0800 Created attachment 301503 Patch 1276753 2 301504 cgarcia 2017-02-14 08:26:27 -0800 Created attachment 301504 Patch 1277087 3 301504 zan 2017-02-14 23:28:20 -0800 Comment on attachment 301504 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=301504&action=review > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1440 > + return resolvedOrigin->isSameSchemeHostPort(requestedOrigin.get()); Why isSameSchemeHostPort(), and not e.g. canAccess() or isSameOriginAs()? Is this specified anywhere, or is the Mac port doing this the same way? 1277090 4 cgarcia 2017-02-14 23:30:42 -0800 (In reply to comment #3) > Comment on attachment 301504 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=301504&action=review > > > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1440 > > + return resolvedOrigin->isSameSchemeHostPort(requestedOrigin.get()); > > Why isSameSchemeHostPort(), and not e.g. canAccess() or isSameOriginAs()? Is > this specified anywhere, or is the Mac port doing this the same way? I just copied what other ports do. 1277094 5 301504 zan 2017-02-14 23:38:20 -0800 Comment on attachment 301504 Patch OK. Have Calvaris have a look at it, even if it's after the patch lands. 1277099 6 cgarcia 2017-02-14 23:44:57 -0800 (In reply to comment #5) > Comment on attachment 301504 [details] > Patch > > OK. Have Calvaris have a look at it, even if it's after the patch lands. Sure, thanks! 1277102 7 cgarcia 2017-02-14 23:46:37 -0800 Committed r212349: <http://trac.webkit.org/changeset/212349> 301503 2017-02-14 08:20:39 -0800 2017-02-14 08:26:27 -0800 Patch wcore-gst-single-origin.diff text/plain 9908 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhOTliOWZmZmNjYi4uZWRkOTNhZmVjZmYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwzMiBAQAogMjAxNy0wMi0xNCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CiAKKyAgICAgICAgW0dTdHJlYW1lcl0gSW1wbGVtZW50IE1lZGlhUGxheWVyUHJp dmF0ZTo6aGFzU2luZ2xlU2VjdXJpdHlPcmlnaW4oKQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY4MzIyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgSXQgY3VycmVudGx5IHJldHVybnMgdHJ1ZSB1bmNvbmRp dGlvbmFsbHkuIEFkZCByZXNvbHZlZC1sb2NhdGlvbiBwcm9wZXJ0eSB0byBXZWJLaXRXZWJTb3Vy Y2VHU3RyZWFtZXIgdG8gdHJhY2sKKyAgICAgICAgdGhlIHJlc29sdmVkIHVybCByZXR1cm5lZCBi eSB0aGUgc2VydmVyIGFuZCB1c2UgdGhhdCBmcm9tIE1lZGlhUGxheWVyUHJpdmF0ZSB0byBjaGVj ayBpZiB0aGVyZSB3YXMgYSBjcm9zcworICAgICAgICBvcmlnaW4gcmVkaXJlY3Rpb24uCisKKyAg ICAgICAgRml4ZXM6IGh0dHAvdGVzdHMvc2VjdXJpdHkvY2FudmFzLXJlbW90ZS1yZWFkLXJlbW90 ZS12aWRlby1yZWRpcmVjdC5odG1sCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3Ry ZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6aGFzU2luZ2xlU2VjdXJpdHlPcmlnaW4pOgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXIuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0 V2ViU291cmNlR1N0cmVhbWVyLmNwcDoKKyAgICAgICAgKHdlYktpdFdlYlNyY0ZpbmFsaXplKToK KyAgICAgICAgKHdlYktpdFdlYlNyY0dldFByb3BlcnR5KToKKyAgICAgICAgKHdlYktpdFdlYlNy Y1N0YXJ0KToKKyAgICAgICAgKHdlYktpdFdlYlNyY1F1ZXJ5V2l0aFBhcmVudCk6CisgICAgICAg ICh3ZWJLaXRXZWJTcmNHZXRVcmkpOgorICAgICAgICAod2ViS2l0V2ViU3JjU2V0VXJpKToKKyAg ICAgICAgKFN0cmVhbWluZ0NsaWVudDo6aGFuZGxlUmVzcG9uc2VSZWNlaXZlZCk6CisgICAgICAg IChSZXNvdXJjZUhhbmRsZVN0cmVhbWluZ0NsaWVudDo6d2FzQmxvY2tlZCk6CisgICAgICAgIChS ZXNvdXJjZUhhbmRsZVN0cmVhbWluZ0NsaWVudDo6Y2Fubm90U2hvd1VSTCk6CisKKzIwMTctMDIt MTQgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCiAgICAgICAg IFJFR1JFU1NJT04gKHIyMDYwMTQpOiBIVFRQSGVhZGVyTWFwIGRvZXMgbm90IGNvbnNpc3RlbnRs eSB1c2UgY29tbWEgd2l0aG91dCBzcGFjZSB0byBzZXBhcmF0ZSB2YWx1ZXMgb2YgaGVhZGVyIGZp ZWxkcwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY4 MTE1CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJl YW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAK aW5kZXggMGM5MGY3ZGY2YjEuLmM1NWM1YzdiN2U4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcApAQCAtMTQyMyw2ICsxNDIzLDIzIEBAIHZvaWQg TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpzb3VyY2VDaGFuZ2VkKCkKICAgICB9CiB9CiAK K2Jvb2wgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpoYXNTaW5nbGVTZWN1cml0eU9yaWdp bigpIGNvbnN0Cit7CisgICAgaWYgKCFtX3NvdXJjZSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwor CisgICAgR1VuaXF1ZU91dFB0cjxjaGFyPiBvcmlnaW5hbFVSSSwgcmVzb2x2ZWRVUkk7CisgICAg Z19vYmplY3RfZ2V0KG1fc291cmNlLmdldCgpLCAibG9jYXRpb24iLCAmb3JpZ2luYWxVUkkub3V0 UHRyKCksICJyZXNvbHZlZC1sb2NhdGlvbiIsICZyZXNvbHZlZFVSSS5vdXRQdHIoKSwgbnVsbHB0 cik7CisgICAgaWYgKCFvcmlnaW5hbFVSSSB8fCAhcmVzb2x2ZWRVUkkpCisgICAgICAgIHJldHVy biBmYWxzZTsKKyAgICBpZiAoIWdfc3RyY21wMChvcmlnaW5hbFVSSS5nZXQoKSwgcmVzb2x2ZWRV UkkuZ2V0KCkpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgIFJlZjxTZWN1cml0eU9yaWdp bj4gcmVzb2x2ZWRPcmlnaW4oU2VjdXJpdHlPcmlnaW46OmNyZWF0ZUZyb21TdHJpbmcoU3RyaW5n Ojpmcm9tVVRGOChyZXNvbHZlZFVSSS5nZXQoKSkpKTsKKyAgICBSZWY8U2VjdXJpdHlPcmlnaW4+ IHJlcXVlc3RlZE9yaWdpbihTZWN1cml0eU9yaWdpbjo6Y3JlYXRlRnJvbVN0cmluZyhTdHJpbmc6 OmZyb21VVEY4KG9yaWdpbmFsVVJJLmdldCgpKSkpOworICAgIHJldHVybiByZXNvbHZlZE9yaWdp bi0+aXNTYW1lU2NoZW1lSG9zdFBvcnQocmVxdWVzdGVkT3JpZ2luLmdldCgpKTsKK30KKwogdm9p ZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmNhbmNlbExvYWQoKQogewogICAgIGlmICht X25ldHdvcmtTdGF0ZSA8IE1lZGlhUGxheWVyOjpMb2FkaW5nIHx8IG1fbmV0d29ya1N0YXRlID09 IE1lZGlhUGxheWVyOjpMb2FkZWQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmggYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRl R1N0cmVhbWVyLmgKaW5kZXggYTM0YzI5MDI1MDQuLmFlYTZjZTFjMjIxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2 YXRlR1N0cmVhbWVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0 cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oCkBAIC0xMDksNiArMTA5LDggQEAg cHVibGljOgogICAgIHVuc2lnbmVkIGxvbmcgbG9uZyB0b3RhbEJ5dGVzKCkgY29uc3Qgb3ZlcnJp ZGU7CiAgICAgZmxvYXQgbWF4VGltZUxvYWRlZCgpIGNvbnN0IG92ZXJyaWRlOwogCisgICAgYm9v bCBoYXNTaW5nbGVTZWN1cml0eU9yaWdpbigpIGNvbnN0IG92ZXJyaWRlOworCiAgICAgdm9pZCBs b2FkU3RhdGVDaGFuZ2VkKCk7CiAgICAgdm9pZCB0aW1lQ2hhbmdlZCgpOwogICAgIHZvaWQgZGlk RW5kKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3Ry ZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2dzdHJlYW1lci9XZWJLaXRXZWJTb3VyY2VHU3RyZWFtZXIuY3BwCmluZGV4 IDdlMDIxNmMyMTIyLi5lMjliZDFmNTA1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNv dXJjZUdTdHJlYW1lci5jcHAKQEAgLTEzMiw3ICsxMzIsOCBAQCBlbnVtIE1haW5UaHJlYWRTb3Vy Y2VOb3RpZmljYXRpb24gewogc3RydWN0IF9XZWJLaXRXZWJTcmNQcml2YXRlIHsKICAgICBHc3RB cHBTcmMqIGFwcHNyYzsKICAgICBHc3RQYWQqIHNyY3BhZDsKLSAgICBnY2hhciogdXJpOworICAg IENTdHJpbmcgb3JpZ2luYWxVUkk7CisgICAgQ1N0cmluZyByZXNvbHZlZFVSSTsKICAgICBib29s IGtlZXBBbGl2ZTsKICAgICBHVW5pcXVlUHRyPEdzdFN0cnVjdHVyZT4gZXh0cmFIZWFkZXJzOwog ICAgIGJvb2wgY29tcHJlc3M7CkBAIC0xNjIsNiArMTYzLDcgQEAgc3RydWN0IF9XZWJLaXRXZWJT cmNQcml2YXRlIHsKIGVudW0gewogICAgIFBST1BfMCwKICAgICBQUk9QX0xPQ0FUSU9OLAorICAg IFBST1BfUkVTT0xWRURfTE9DQVRJT04sCiAgICAgUFJPUF9LRUVQX0FMSVZFLAogICAgIFBST1Bf RVhUUkFfSEVBREVSUywKICAgICBQUk9QX0NPTVBSRVNTLApAQCAtMjMwLDEzICsyMzIsMTMgQEAg c3RhdGljIHZvaWQgd2Via2l0X3dlYl9zcmNfY2xhc3NfaW5pdChXZWJLaXRXZWJTcmNDbGFzcyog a2xhc3MpCiAKICAgICAvKiBBbGxvd3Mgc2V0dGluZyB0aGUgdXJpIHVzaW5nIHRoZSAnbG9jYXRp b24nIHByb3BlcnR5LCB3aGljaCBpcyB1c2VkCiAgICAgICogZm9yIGV4YW1wbGUgYnkgZ3N0X2Vs ZW1lbnRfbWFrZV9mcm9tX3VyaSgpICovCi0gICAgZ19vYmplY3RfY2xhc3NfaW5zdGFsbF9wcm9w ZXJ0eShva2xhc3MsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQUk9QX0xP Q0FUSU9OLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ19wYXJhbV9zcGVj X3N0cmluZygibG9jYXRpb24iLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAibG9jYXRpb24iLAotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiTG9jYXRpb24gdG8gcmVhZCBmcm9tIiwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg MCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgKEdQYXJhbUZsYWdzKSAoR19QQVJBTV9SRUFEV1JJVEUgfCBHX1BBUkFNX1NUQVRJQ19TVFJJ TkdTKSkpOworICAgIGdfb2JqZWN0X2NsYXNzX2luc3RhbGxfcHJvcGVydHkob2tsYXNzLCBQUk9Q X0xPQ0FUSU9OLAorICAgICAgICBnX3BhcmFtX3NwZWNfc3RyaW5nKCJsb2NhdGlvbiIsICJsb2Nh dGlvbiIsICJMb2NhdGlvbiB0byByZWFkIGZyb20iLAorICAgICAgICAgICAgbnVsbHB0ciwgc3Rh dGljX2Nhc3Q8R1BhcmFtRmxhZ3M+KEdfUEFSQU1fUkVBRFdSSVRFIHwgR19QQVJBTV9TVEFUSUNf U1RSSU5HUykpKTsKKworICAgIGdfb2JqZWN0X2NsYXNzX2luc3RhbGxfcHJvcGVydHkob2tsYXNz LCBQUk9QX1JFU09MVkVEX0xPQ0FUSU9OLAorICAgICAgICBnX3BhcmFtX3NwZWNfc3RyaW5nKCJy ZXNvbHZlZC1sb2NhdGlvbiIsICJSZXNvbHZlZCBsb2NhdGlvbiIsICJUaGUgbG9jYXRpb24gcmVz b2x2ZWQgYnkgdGhlIHNlcnZlciIsCisgICAgICAgICAgICBudWxscHRyLCBzdGF0aWNfY2FzdDxH UGFyYW1GbGFncz4oR19QQVJBTV9SRUFEQUJMRSB8IEdfUEFSQU1fU1RBVElDX1NUUklOR1MpKSk7 CiAKICAgICBnX29iamVjdF9jbGFzc19pbnN0YWxsX3Byb3BlcnR5KG9rbGFzcywgUFJPUF9LRUVQ X0FMSVZFLAogICAgICAgICBnX3BhcmFtX3NwZWNfYm9vbGVhbigia2VlcC1hbGl2ZSIsICJrZWVw LWFsaXZlIiwgIlVzZSBIVFRQIHBlcnNpc3RlbnQgY29ubmVjdGlvbnMiLApAQCAtMzI0LDEwICsz MjYsOCBAQCBzdGF0aWMgdm9pZCB3ZWJLaXRXZWJTcmNEaXNwb3NlKEdPYmplY3QqIG9iamVjdCkK IAogc3RhdGljIHZvaWQgd2ViS2l0V2ViU3JjRmluYWxpemUoR09iamVjdCogb2JqZWN0KQogewot ICAgIFdlYktpdFdlYlNyYyogc3JjID0gV0VCS0lUX1dFQl9TUkMob2JqZWN0KTsKLSAgICBXZWJL aXRXZWJTcmNQcml2YXRlKiBwcml2ID0gc3JjLT5wcml2OworICAgIFdlYktpdFdlYlNyY1ByaXZh dGUqIHByaXYgPSBXRUJLSVRfV0VCX1NSQyhvYmplY3QpLT5wcml2OwogCi0gICAgZ19mcmVlKHBy aXYtPnVyaSk7CiAgICAgcHJpdi0+fldlYktpdFdlYlNyY1ByaXZhdGUoKTsKIAogICAgIEdTVF9D QUxMX1BBUkVOVChHX09CSkVDVF9DTEFTUywgZmluYWxpemUsIChvYmplY3QpKTsKQEAgLTM2OSw3 ICszNjksMTAgQEAgc3RhdGljIHZvaWQgd2ViS2l0V2ViU3JjR2V0UHJvcGVydHkoR09iamVjdCog b2JqZWN0LCBndWludCBwcm9wSUQsIEdWYWx1ZSogdmFsdWUKICAgICBXVEY6OkdNdXRleExvY2tl cjxHTXV0ZXg+IGxvY2tlcigqR1NUX09CSkVDVF9HRVRfTE9DSyhzcmMpKTsKICAgICBzd2l0Y2gg KHByb3BJRCkgewogICAgIGNhc2UgUFJPUF9MT0NBVElPTjoKLSAgICAgICAgZ192YWx1ZV9zZXRf c3RyaW5nKHZhbHVlLCBwcml2LT51cmkpOworICAgICAgICBnX3ZhbHVlX3NldF9zdHJpbmcodmFs dWUsIHByaXYtPm9yaWdpbmFsVVJJLmRhdGEoKSk7CisgICAgICAgIGJyZWFrOworICAgIGNhc2Ug UFJPUF9SRVNPTFZFRF9MT0NBVElPTjoKKyAgICAgICAgZ192YWx1ZV9zZXRfc3RyaW5nKHZhbHVl LCBwcml2LT5yZXNvbHZlZFVSSS5kYXRhKCkpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIFBS T1BfS0VFUF9BTElWRToKICAgICAgICAgZ192YWx1ZV9zZXRfYm9vbGVhbih2YWx1ZSwgcHJpdi0+ a2VlcEFsaXZlKTsKQEAgLTUwMyw3ICs1MDYsNyBAQCBzdGF0aWMgdm9pZCB3ZWJLaXRXZWJTcmNT dGFydChXZWJLaXRXZWJTcmMqIHNyYykKIAogICAgIHByaXYtPmRpZFBhc3NBY2Nlc3NDb250cm9s Q2hlY2sgPSBmYWxzZTsKIAotICAgIGlmICghcHJpdi0+dXJpKSB7CisgICAgaWYgKHByaXYtPm9y aWdpbmFsVVJJLmlzTnVsbCgpKSB7CiAgICAgICAgIEdTVF9FUlJPUl9PQkpFQ1Qoc3JjLCAiTm8g VVJJIHByb3ZpZGVkIik7CiAgICAgICAgIGxvY2tlci51bmxvY2soKTsKICAgICAgICAgd2ViS2l0 V2ViU3JjU3RvcChzcmMpOwpAQCAtNTEyLDggKzUxNSw4IEBAIHN0YXRpYyB2b2lkIHdlYktpdFdl YlNyY1N0YXJ0KFdlYktpdFdlYlNyYyogc3JjKQogCiAgICAgQVNTRVJUKCFwcml2LT5jbGllbnQp OwogCi0gICAgR1NUX0RFQlVHX09CSkVDVChzcmMsICJGZXRjaGluZyAlcyIsIHByaXYtPnVyaSk7 Ci0gICAgVVJMIHVybCA9IFVSTChVUkwoKSwgcHJpdi0+dXJpKTsKKyAgICBHU1RfREVCVUdfT0JK RUNUKHNyYywgIkZldGNoaW5nICVzIiwgcHJpdi0+b3JpZ2luYWxVUkkuZGF0YSgpKTsKKyAgICBV UkwgdXJsID0gVVJMKFVSTCgpLCBwcml2LT5vcmlnaW5hbFVSSS5kYXRhKCkpOwogCiAgICAgUmVz b3VyY2VSZXF1ZXN0IHJlcXVlc3QodXJsKTsKICAgICByZXF1ZXN0LnNldEFsbG93Q29va2llcyh0 cnVlKTsKQEAgLTY2Nyw3ICs2NzAsNyBAQCBzdGF0aWMgZ2Jvb2xlYW4gd2ViS2l0V2ViU3JjUXVl cnlXaXRoUGFyZW50KEdzdFBhZCogcGFkLCBHc3RPYmplY3QqIHBhcmVudCwgR3N0UQogICAgIH0K ICAgICBjYXNlIEdTVF9RVUVSWV9VUkk6IHsKICAgICAgICAgV1RGOjpHTXV0ZXhMb2NrZXI8R011 dGV4PiBsb2NrZXIoKkdTVF9PQkpFQ1RfR0VUX0xPQ0soc3JjKSk7Ci0gICAgICAgIGdzdF9xdWVy eV9zZXRfdXJpKHF1ZXJ5LCBzcmMtPnByaXYtPnVyaSk7CisgICAgICAgIGdzdF9xdWVyeV9zZXRf dXJpKHF1ZXJ5LCBzcmMtPnByaXYtPm9yaWdpbmFsVVJJLmRhdGEoKSk7CiAgICAgICAgIHJlc3Vs dCA9IFRSVUU7CiAgICAgICAgIGJyZWFrOwogICAgIH0KQEAgLTcxNyw3ICs3MjAsNyBAQCBzdGF0 aWMgZ2NoYXIqIHdlYktpdFdlYlNyY0dldFVyaShHc3RVUklIYW5kbGVyKiBoYW5kbGVyKQogICAg IGdjaGFyKiByZXQ7CiAKICAgICBXVEY6OkdNdXRleExvY2tlcjxHTXV0ZXg+IGxvY2tlcigqR1NU X09CSkVDVF9HRVRfTE9DSyhzcmMpKTsKLSAgICByZXQgPSBnX3N0cmR1cChzcmMtPnByaXYtPnVy aSk7CisgICAgcmV0ID0gZ19zdHJkdXAoc3JjLT5wcml2LT5vcmlnaW5hbFVSSS5kYXRhKCkpOwog ICAgIHJldHVybiByZXQ7CiB9CiAKQEAgLTczMyw5ICs3MzYsNyBAQCBzdGF0aWMgZ2Jvb2xlYW4g d2ViS2l0V2ViU3JjU2V0VXJpKEdzdFVSSUhhbmRsZXIqIGhhbmRsZXIsIGNvbnN0IGdjaGFyKiB1 cmksIEdFcgogCiAgICAgV1RGOjpHTXV0ZXhMb2NrZXI8R011dGV4PiBsb2NrZXIoKkdTVF9PQkpF Q1RfR0VUX0xPQ0soc3JjKSk7CiAKLSAgICBnX2ZyZWUocHJpdi0+dXJpKTsKLSAgICBwcml2LT51 cmkgPSAwOwotCisgICAgcHJpdi0+b3JpZ2luYWxVUkkgPSBDU3RyaW5nKCk7CiAgICAgaWYgKCF1 cmkpCiAgICAgICAgIHJldHVybiBUUlVFOwogCkBAIC03NDUsNyArNzQ2LDcgQEAgc3RhdGljIGdi b29sZWFuIHdlYktpdFdlYlNyY1NldFVyaShHc3RVUklIYW5kbGVyKiBoYW5kbGVyLCBjb25zdCBn Y2hhciogdXJpLCBHRXIKICAgICAgICAgcmV0dXJuIEZBTFNFOwogICAgIH0KIAotICAgIHByaXYt PnVyaSA9IGdfc3RyZHVwKHVybC5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKKyAgICBwcml2LT5v cmlnaW5hbFVSSSA9IHVybC5zdHJpbmcoKS51dGY4KCk7CiAgICAgcmV0dXJuIFRSVUU7CiB9CiAK QEAgLTg4OSw2ICs4OTAsOCBAQCB2b2lkIFN0cmVhbWluZ0NsaWVudDo6aGFuZGxlUmVzcG9uc2VS ZWNlaXZlZChjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSkKIAogICAgIEdTVF9ERUJV R19PQkpFQ1Qoc3JjLCAiUmVjZWl2ZWQgcmVzcG9uc2U6ICVkIiwgcmVzcG9uc2UuaHR0cFN0YXR1 c0NvZGUoKSk7CiAKKyAgICBwcml2LT5yZXNvbHZlZFVSSSA9IHJlc3BvbnNlLnVybCgpLnN0cmlu ZygpLnV0ZjgoKTsKKwogICAgIGlmIChyZXNwb25zZS5odHRwU3RhdHVzQ29kZSgpID49IDQwMCkg ewogICAgICAgICBHU1RfRUxFTUVOVF9FUlJPUihzcmMsIFJFU09VUkNFLCBSRUFELCAoIlJlY2Vp dmVkICVkIEhUVFAgZXJyb3IgY29kZSIsIHJlc3BvbnNlLmh0dHBTdGF0dXNDb2RlKCkpLCAobnVs bHB0cikpOwogICAgICAgICBnc3RfYXBwX3NyY19lbmRfb2Zfc3RyZWFtKHByaXYtPmFwcHNyYyk7 CkBAIC0xMTkxLDcgKzExOTQsNyBAQCB2b2lkIFJlc291cmNlSGFuZGxlU3RyZWFtaW5nQ2xpZW50 Ojp3YXNCbG9ja2VkKFJlc291cmNlSGFuZGxlKikKICAgICBHU1RfRVJST1JfT0JKRUNUKHNyYywg IlJlcXVlc3Qgd2FzIGJsb2NrZWQiKTsKIAogICAgIFdURjo6R011dGV4TG9ja2VyPEdNdXRleD4g bG9ja2VyKCpHU1RfT0JKRUNUX0dFVF9MT0NLKHNyYykpOwotICAgIHVyaS5yZXNldChnX3N0cmR1 cChzcmMtPnByaXYtPnVyaSkpOworICAgIHVyaS5yZXNldChnX3N0cmR1cChzcmMtPnByaXYtPm9y aWdpbmFsVVJJLmRhdGEoKSkpOwogICAgIGxvY2tlci51bmxvY2soKTsKIAogICAgIEdTVF9FTEVN RU5UX0VSUk9SKHNyYywgUkVTT1VSQ0UsIE9QRU5fUkVBRCwgKCJBY2Nlc3MgdG8gXCIlc1wiIHdh cyBibG9ja2VkIiwgdXJpLmdldCgpKSwgKDApKTsKQEAgLTEyMDUsNyArMTIwOCw3IEBAIHZvaWQg UmVzb3VyY2VIYW5kbGVTdHJlYW1pbmdDbGllbnQ6OmNhbm5vdFNob3dVUkwoUmVzb3VyY2VIYW5k bGUqKQogICAgIEdTVF9FUlJPUl9PQkpFQ1Qoc3JjLCAiQ2Fubm90IHNob3cgVVJMIik7CiAKICAg ICBXVEY6OkdNdXRleExvY2tlcjxHTXV0ZXg+IGxvY2tlcigqR1NUX09CSkVDVF9HRVRfTE9DSyhz cmMpKTsKLSAgICB1cmkucmVzZXQoZ19zdHJkdXAoc3JjLT5wcml2LT51cmkpKTsKKyAgICB1cmku cmVzZXQoZ19zdHJkdXAoc3JjLT5wcml2LT5vcmlnaW5hbFVSSS5kYXRhKCkpKTsKICAgICBsb2Nr ZXIudW5sb2NrKCk7CiAKICAgICBHU1RfRUxFTUVOVF9FUlJPUihzcmMsIFJFU09VUkNFLCBPUEVO X1JFQUQsICgiQ2FuJ3Qgc2hvdyBcIiVzXCIiLCB1cmkuZ2V0KCkpLCAoMCkpOwo= 301504 2017-02-14 08:26:27 -0800 2017-02-14 23:38:20 -0800 Patch wcore-gst-single-origin.diff text/plain 9933 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhOTliOWZmZmNjYi4uZWRkOTNhZmVjZmYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwzMiBAQAogMjAxNy0wMi0xNCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CiAKKyAgICAgICAgW0dTdHJlYW1lcl0gSW1wbGVtZW50IE1lZGlhUGxheWVyUHJp dmF0ZTo6aGFzU2luZ2xlU2VjdXJpdHlPcmlnaW4oKQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY4MzIyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgSXQgY3VycmVudGx5IHJldHVybnMgdHJ1ZSB1bmNvbmRp dGlvbmFsbHkuIEFkZCByZXNvbHZlZC1sb2NhdGlvbiBwcm9wZXJ0eSB0byBXZWJLaXRXZWJTb3Vy Y2VHU3RyZWFtZXIgdG8gdHJhY2sKKyAgICAgICAgdGhlIHJlc29sdmVkIHVybCByZXR1cm5lZCBi eSB0aGUgc2VydmVyIGFuZCB1c2UgdGhhdCBmcm9tIE1lZGlhUGxheWVyUHJpdmF0ZSB0byBjaGVj ayBpZiB0aGVyZSB3YXMgYSBjcm9zcworICAgICAgICBvcmlnaW4gcmVkaXJlY3Rpb24uCisKKyAg ICAgICAgRml4ZXM6IGh0dHAvdGVzdHMvc2VjdXJpdHkvY2FudmFzLXJlbW90ZS1yZWFkLXJlbW90 ZS12aWRlby1yZWRpcmVjdC5odG1sCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3Ry ZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6aGFzU2luZ2xlU2VjdXJpdHlPcmlnaW4pOgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXIuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0 V2ViU291cmNlR1N0cmVhbWVyLmNwcDoKKyAgICAgICAgKHdlYktpdFdlYlNyY0ZpbmFsaXplKToK KyAgICAgICAgKHdlYktpdFdlYlNyY0dldFByb3BlcnR5KToKKyAgICAgICAgKHdlYktpdFdlYlNy Y1N0YXJ0KToKKyAgICAgICAgKHdlYktpdFdlYlNyY1F1ZXJ5V2l0aFBhcmVudCk6CisgICAgICAg ICh3ZWJLaXRXZWJTcmNHZXRVcmkpOgorICAgICAgICAod2ViS2l0V2ViU3JjU2V0VXJpKToKKyAg ICAgICAgKFN0cmVhbWluZ0NsaWVudDo6aGFuZGxlUmVzcG9uc2VSZWNlaXZlZCk6CisgICAgICAg IChSZXNvdXJjZUhhbmRsZVN0cmVhbWluZ0NsaWVudDo6d2FzQmxvY2tlZCk6CisgICAgICAgIChS ZXNvdXJjZUhhbmRsZVN0cmVhbWluZ0NsaWVudDo6Y2Fubm90U2hvd1VSTCk6CisKKzIwMTctMDIt MTQgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCiAgICAgICAg IFJFR1JFU1NJT04gKHIyMDYwMTQpOiBIVFRQSGVhZGVyTWFwIGRvZXMgbm90IGNvbnNpc3RlbnRs eSB1c2UgY29tbWEgd2l0aG91dCBzcGFjZSB0byBzZXBhcmF0ZSB2YWx1ZXMgb2YgaGVhZGVyIGZp ZWxkcwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY4 MTE1CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJl YW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAK aW5kZXggMGM5MGY3ZGY2YjEuLjMzY2VhZGExMGYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcApAQCAtMTQyMyw2ICsxNDIzLDIzIEBAIHZvaWQg TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpzb3VyY2VDaGFuZ2VkKCkKICAgICB9CiB9CiAK K2Jvb2wgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpoYXNTaW5nbGVTZWN1cml0eU9yaWdp bigpIGNvbnN0Cit7CisgICAgaWYgKCFXRUJLSVRfSVNfV0VCX1NSQyhtX3NvdXJjZS5nZXQoKSkp CisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIEdVbmlxdWVPdXRQdHI8Y2hhcj4gb3JpZ2lu YWxVUkksIHJlc29sdmVkVVJJOworICAgIGdfb2JqZWN0X2dldChtX3NvdXJjZS5nZXQoKSwgImxv Y2F0aW9uIiwgJm9yaWdpbmFsVVJJLm91dFB0cigpLCAicmVzb2x2ZWQtbG9jYXRpb24iLCAmcmVz b2x2ZWRVUkkub3V0UHRyKCksIG51bGxwdHIpOworICAgIGlmICghb3JpZ2luYWxVUkkgfHwgIXJl c29sdmVkVVJJKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgaWYgKCFnX3N0cmNtcDAob3Jp Z2luYWxVUkkuZ2V0KCksIHJlc29sdmVkVVJJLmdldCgpKSkKKyAgICAgICAgcmV0dXJuIHRydWU7 CisKKyAgICBSZWY8U2VjdXJpdHlPcmlnaW4+IHJlc29sdmVkT3JpZ2luKFNlY3VyaXR5T3JpZ2lu OjpjcmVhdGVGcm9tU3RyaW5nKFN0cmluZzo6ZnJvbVVURjgocmVzb2x2ZWRVUkkuZ2V0KCkpKSk7 CisgICAgUmVmPFNlY3VyaXR5T3JpZ2luPiByZXF1ZXN0ZWRPcmlnaW4oU2VjdXJpdHlPcmlnaW46 OmNyZWF0ZUZyb21TdHJpbmcoU3RyaW5nOjpmcm9tVVRGOChvcmlnaW5hbFVSSS5nZXQoKSkpKTsK KyAgICByZXR1cm4gcmVzb2x2ZWRPcmlnaW4tPmlzU2FtZVNjaGVtZUhvc3RQb3J0KHJlcXVlc3Rl ZE9yaWdpbi5nZXQoKSk7Cit9CisKIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpj YW5jZWxMb2FkKCkKIHsKICAgICBpZiAobV9uZXR3b3JrU3RhdGUgPCBNZWRpYVBsYXllcjo6TG9h ZGluZyB8fCBtX25ldHdvcmtTdGF0ZSA9PSBNZWRpYVBsYXllcjo6TG9hZGVkKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0 cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oCmluZGV4IGEzNGMyOTAyNTA0Li5h ZWE2Y2UxYzIyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFt ZXIuaApAQCAtMTA5LDYgKzEwOSw4IEBAIHB1YmxpYzoKICAgICB1bnNpZ25lZCBsb25nIGxvbmcg dG90YWxCeXRlcygpIGNvbnN0IG92ZXJyaWRlOwogICAgIGZsb2F0IG1heFRpbWVMb2FkZWQoKSBj b25zdCBvdmVycmlkZTsKIAorICAgIGJvb2wgaGFzU2luZ2xlU2VjdXJpdHlPcmlnaW4oKSBjb25z dCBvdmVycmlkZTsKKwogICAgIHZvaWQgbG9hZFN0YXRlQ2hhbmdlZCgpOwogICAgIHZvaWQgdGlt ZUNoYW5nZWQoKTsKICAgICB2b2lkIGRpZEVuZCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0V2Vi U291cmNlR1N0cmVhbWVyLmNwcAppbmRleCA3ZTAyMTZjMjEyMi4uZTI5YmQxZjUwNWQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9XZWJLaXRX ZWJTb3VyY2VHU3RyZWFtZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2dzdHJlYW1lci9XZWJLaXRXZWJTb3VyY2VHU3RyZWFtZXIuY3BwCkBAIC0xMzIsNyArMTMy LDggQEAgZW51bSBNYWluVGhyZWFkU291cmNlTm90aWZpY2F0aW9uIHsKIHN0cnVjdCBfV2ViS2l0 V2ViU3JjUHJpdmF0ZSB7CiAgICAgR3N0QXBwU3JjKiBhcHBzcmM7CiAgICAgR3N0UGFkKiBzcmNw YWQ7Ci0gICAgZ2NoYXIqIHVyaTsKKyAgICBDU3RyaW5nIG9yaWdpbmFsVVJJOworICAgIENTdHJp bmcgcmVzb2x2ZWRVUkk7CiAgICAgYm9vbCBrZWVwQWxpdmU7CiAgICAgR1VuaXF1ZVB0cjxHc3RT dHJ1Y3R1cmU+IGV4dHJhSGVhZGVyczsKICAgICBib29sIGNvbXByZXNzOwpAQCAtMTYyLDYgKzE2 Myw3IEBAIHN0cnVjdCBfV2ViS2l0V2ViU3JjUHJpdmF0ZSB7CiBlbnVtIHsKICAgICBQUk9QXzAs CiAgICAgUFJPUF9MT0NBVElPTiwKKyAgICBQUk9QX1JFU09MVkVEX0xPQ0FUSU9OLAogICAgIFBS T1BfS0VFUF9BTElWRSwKICAgICBQUk9QX0VYVFJBX0hFQURFUlMsCiAgICAgUFJPUF9DT01QUkVT UywKQEAgLTIzMCwxMyArMjMyLDEzIEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfc3JjX2NsYXNz X2luaXQoV2ViS2l0V2ViU3JjQ2xhc3MqIGtsYXNzKQogCiAgICAgLyogQWxsb3dzIHNldHRpbmcg dGhlIHVyaSB1c2luZyB0aGUgJ2xvY2F0aW9uJyBwcm9wZXJ0eSwgd2hpY2ggaXMgdXNlZAogICAg ICAqIGZvciBleGFtcGxlIGJ5IGdzdF9lbGVtZW50X21ha2VfZnJvbV91cmkoKSAqLwotICAgIGdf b2JqZWN0X2NsYXNzX2luc3RhbGxfcHJvcGVydHkob2tsYXNzLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgUFJPUF9MT0NBVElPTiwKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGdfcGFyYW1fc3BlY19zdHJpbmcoImxvY2F0aW9uIiwKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgImxvY2F0aW9uIiwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IkxvY2F0aW9uIHRvIHJlYWQgZnJvbSIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIDAsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIChHUGFyYW1GbGFncykgKEdfUEFSQU1fUkVBRFdS SVRFIHwgR19QQVJBTV9TVEFUSUNfU1RSSU5HUykpKTsKKyAgICBnX29iamVjdF9jbGFzc19pbnN0 YWxsX3Byb3BlcnR5KG9rbGFzcywgUFJPUF9MT0NBVElPTiwKKyAgICAgICAgZ19wYXJhbV9zcGVj X3N0cmluZygibG9jYXRpb24iLCAibG9jYXRpb24iLCAiTG9jYXRpb24gdG8gcmVhZCBmcm9tIiwK KyAgICAgICAgICAgIG51bGxwdHIsIHN0YXRpY19jYXN0PEdQYXJhbUZsYWdzPihHX1BBUkFNX1JF QURXUklURSB8IEdfUEFSQU1fU1RBVElDX1NUUklOR1MpKSk7CisKKyAgICBnX29iamVjdF9jbGFz c19pbnN0YWxsX3Byb3BlcnR5KG9rbGFzcywgUFJPUF9SRVNPTFZFRF9MT0NBVElPTiwKKyAgICAg ICAgZ19wYXJhbV9zcGVjX3N0cmluZygicmVzb2x2ZWQtbG9jYXRpb24iLCAiUmVzb2x2ZWQgbG9j YXRpb24iLCAiVGhlIGxvY2F0aW9uIHJlc29sdmVkIGJ5IHRoZSBzZXJ2ZXIiLAorICAgICAgICAg ICAgbnVsbHB0ciwgc3RhdGljX2Nhc3Q8R1BhcmFtRmxhZ3M+KEdfUEFSQU1fUkVBREFCTEUgfCBH X1BBUkFNX1NUQVRJQ19TVFJJTkdTKSkpOwogCiAgICAgZ19vYmplY3RfY2xhc3NfaW5zdGFsbF9w cm9wZXJ0eShva2xhc3MsIFBST1BfS0VFUF9BTElWRSwKICAgICAgICAgZ19wYXJhbV9zcGVjX2Jv b2xlYW4oImtlZXAtYWxpdmUiLCAia2VlcC1hbGl2ZSIsICJVc2UgSFRUUCBwZXJzaXN0ZW50IGNv bm5lY3Rpb25zIiwKQEAgLTMyNCwxMCArMzI2LDggQEAgc3RhdGljIHZvaWQgd2ViS2l0V2ViU3Jj RGlzcG9zZShHT2JqZWN0KiBvYmplY3QpCiAKIHN0YXRpYyB2b2lkIHdlYktpdFdlYlNyY0ZpbmFs aXplKEdPYmplY3QqIG9iamVjdCkKIHsKLSAgICBXZWJLaXRXZWJTcmMqIHNyYyA9IFdFQktJVF9X RUJfU1JDKG9iamVjdCk7Ci0gICAgV2ViS2l0V2ViU3JjUHJpdmF0ZSogcHJpdiA9IHNyYy0+cHJp djsKKyAgICBXZWJLaXRXZWJTcmNQcml2YXRlKiBwcml2ID0gV0VCS0lUX1dFQl9TUkMob2JqZWN0 KS0+cHJpdjsKIAotICAgIGdfZnJlZShwcml2LT51cmkpOwogICAgIHByaXYtPn5XZWJLaXRXZWJT cmNQcml2YXRlKCk7CiAKICAgICBHU1RfQ0FMTF9QQVJFTlQoR19PQkpFQ1RfQ0xBU1MsIGZpbmFs aXplLCAob2JqZWN0KSk7CkBAIC0zNjksNyArMzY5LDEwIEBAIHN0YXRpYyB2b2lkIHdlYktpdFdl YlNyY0dldFByb3BlcnR5KEdPYmplY3QqIG9iamVjdCwgZ3VpbnQgcHJvcElELCBHVmFsdWUqIHZh bHVlCiAgICAgV1RGOjpHTXV0ZXhMb2NrZXI8R011dGV4PiBsb2NrZXIoKkdTVF9PQkpFQ1RfR0VU X0xPQ0soc3JjKSk7CiAgICAgc3dpdGNoIChwcm9wSUQpIHsKICAgICBjYXNlIFBST1BfTE9DQVRJ T046Ci0gICAgICAgIGdfdmFsdWVfc2V0X3N0cmluZyh2YWx1ZSwgcHJpdi0+dXJpKTsKKyAgICAg ICAgZ192YWx1ZV9zZXRfc3RyaW5nKHZhbHVlLCBwcml2LT5vcmlnaW5hbFVSSS5kYXRhKCkpOwor ICAgICAgICBicmVhazsKKyAgICBjYXNlIFBST1BfUkVTT0xWRURfTE9DQVRJT046CisgICAgICAg IGdfdmFsdWVfc2V0X3N0cmluZyh2YWx1ZSwgcHJpdi0+cmVzb2x2ZWRVUkkuZGF0YSgpKTsKICAg ICAgICAgYnJlYWs7CiAgICAgY2FzZSBQUk9QX0tFRVBfQUxJVkU6CiAgICAgICAgIGdfdmFsdWVf c2V0X2Jvb2xlYW4odmFsdWUsIHByaXYtPmtlZXBBbGl2ZSk7CkBAIC01MDMsNyArNTA2LDcgQEAg c3RhdGljIHZvaWQgd2ViS2l0V2ViU3JjU3RhcnQoV2ViS2l0V2ViU3JjKiBzcmMpCiAKICAgICBw cml2LT5kaWRQYXNzQWNjZXNzQ29udHJvbENoZWNrID0gZmFsc2U7CiAKLSAgICBpZiAoIXByaXYt PnVyaSkgeworICAgIGlmIChwcml2LT5vcmlnaW5hbFVSSS5pc051bGwoKSkgewogICAgICAgICBH U1RfRVJST1JfT0JKRUNUKHNyYywgIk5vIFVSSSBwcm92aWRlZCIpOwogICAgICAgICBsb2NrZXIu dW5sb2NrKCk7CiAgICAgICAgIHdlYktpdFdlYlNyY1N0b3Aoc3JjKTsKQEAgLTUxMiw4ICs1MTUs OCBAQCBzdGF0aWMgdm9pZCB3ZWJLaXRXZWJTcmNTdGFydChXZWJLaXRXZWJTcmMqIHNyYykKIAog ICAgIEFTU0VSVCghcHJpdi0+Y2xpZW50KTsKIAotICAgIEdTVF9ERUJVR19PQkpFQ1Qoc3JjLCAi RmV0Y2hpbmcgJXMiLCBwcml2LT51cmkpOwotICAgIFVSTCB1cmwgPSBVUkwoVVJMKCksIHByaXYt PnVyaSk7CisgICAgR1NUX0RFQlVHX09CSkVDVChzcmMsICJGZXRjaGluZyAlcyIsIHByaXYtPm9y aWdpbmFsVVJJLmRhdGEoKSk7CisgICAgVVJMIHVybCA9IFVSTChVUkwoKSwgcHJpdi0+b3JpZ2lu YWxVUkkuZGF0YSgpKTsKIAogICAgIFJlc291cmNlUmVxdWVzdCByZXF1ZXN0KHVybCk7CiAgICAg cmVxdWVzdC5zZXRBbGxvd0Nvb2tpZXModHJ1ZSk7CkBAIC02NjcsNyArNjcwLDcgQEAgc3RhdGlj IGdib29sZWFuIHdlYktpdFdlYlNyY1F1ZXJ5V2l0aFBhcmVudChHc3RQYWQqIHBhZCwgR3N0T2Jq ZWN0KiBwYXJlbnQsIEdzdFEKICAgICB9CiAgICAgY2FzZSBHU1RfUVVFUllfVVJJOiB7CiAgICAg ICAgIFdURjo6R011dGV4TG9ja2VyPEdNdXRleD4gbG9ja2VyKCpHU1RfT0JKRUNUX0dFVF9MT0NL KHNyYykpOwotICAgICAgICBnc3RfcXVlcnlfc2V0X3VyaShxdWVyeSwgc3JjLT5wcml2LT51cmkp OworICAgICAgICBnc3RfcXVlcnlfc2V0X3VyaShxdWVyeSwgc3JjLT5wcml2LT5vcmlnaW5hbFVS SS5kYXRhKCkpOwogICAgICAgICByZXN1bHQgPSBUUlVFOwogICAgICAgICBicmVhazsKICAgICB9 CkBAIC03MTcsNyArNzIwLDcgQEAgc3RhdGljIGdjaGFyKiB3ZWJLaXRXZWJTcmNHZXRVcmkoR3N0 VVJJSGFuZGxlciogaGFuZGxlcikKICAgICBnY2hhciogcmV0OwogCiAgICAgV1RGOjpHTXV0ZXhM b2NrZXI8R011dGV4PiBsb2NrZXIoKkdTVF9PQkpFQ1RfR0VUX0xPQ0soc3JjKSk7Ci0gICAgcmV0 ID0gZ19zdHJkdXAoc3JjLT5wcml2LT51cmkpOworICAgIHJldCA9IGdfc3RyZHVwKHNyYy0+cHJp di0+b3JpZ2luYWxVUkkuZGF0YSgpKTsKICAgICByZXR1cm4gcmV0OwogfQogCkBAIC03MzMsOSAr NzM2LDcgQEAgc3RhdGljIGdib29sZWFuIHdlYktpdFdlYlNyY1NldFVyaShHc3RVUklIYW5kbGVy KiBoYW5kbGVyLCBjb25zdCBnY2hhciogdXJpLCBHRXIKIAogICAgIFdURjo6R011dGV4TG9ja2Vy PEdNdXRleD4gbG9ja2VyKCpHU1RfT0JKRUNUX0dFVF9MT0NLKHNyYykpOwogCi0gICAgZ19mcmVl KHByaXYtPnVyaSk7Ci0gICAgcHJpdi0+dXJpID0gMDsKLQorICAgIHByaXYtPm9yaWdpbmFsVVJJ ID0gQ1N0cmluZygpOwogICAgIGlmICghdXJpKQogICAgICAgICByZXR1cm4gVFJVRTsKIApAQCAt NzQ1LDcgKzc0Niw3IEBAIHN0YXRpYyBnYm9vbGVhbiB3ZWJLaXRXZWJTcmNTZXRVcmkoR3N0VVJJ SGFuZGxlciogaGFuZGxlciwgY29uc3QgZ2NoYXIqIHVyaSwgR0VyCiAgICAgICAgIHJldHVybiBG QUxTRTsKICAgICB9CiAKLSAgICBwcml2LT51cmkgPSBnX3N0cmR1cCh1cmwuc3RyaW5nKCkudXRm OCgpLmRhdGEoKSk7CisgICAgcHJpdi0+b3JpZ2luYWxVUkkgPSB1cmwuc3RyaW5nKCkudXRmOCgp OwogICAgIHJldHVybiBUUlVFOwogfQogCkBAIC04ODksNiArODkwLDggQEAgdm9pZCBTdHJlYW1p bmdDbGllbnQ6OmhhbmRsZVJlc3BvbnNlUmVjZWl2ZWQoY29uc3QgUmVzb3VyY2VSZXNwb25zZSYg cmVzcG9uc2UpCiAKICAgICBHU1RfREVCVUdfT0JKRUNUKHNyYywgIlJlY2VpdmVkIHJlc3BvbnNl OiAlZCIsIHJlc3BvbnNlLmh0dHBTdGF0dXNDb2RlKCkpOwogCisgICAgcHJpdi0+cmVzb2x2ZWRV UkkgPSByZXNwb25zZS51cmwoKS5zdHJpbmcoKS51dGY4KCk7CisKICAgICBpZiAocmVzcG9uc2Uu aHR0cFN0YXR1c0NvZGUoKSA+PSA0MDApIHsKICAgICAgICAgR1NUX0VMRU1FTlRfRVJST1Ioc3Jj LCBSRVNPVVJDRSwgUkVBRCwgKCJSZWNlaXZlZCAlZCBIVFRQIGVycm9yIGNvZGUiLCByZXNwb25z ZS5odHRwU3RhdHVzQ29kZSgpKSwgKG51bGxwdHIpKTsKICAgICAgICAgZ3N0X2FwcF9zcmNfZW5k X29mX3N0cmVhbShwcml2LT5hcHBzcmMpOwpAQCAtMTE5MSw3ICsxMTk0LDcgQEAgdm9pZCBSZXNv dXJjZUhhbmRsZVN0cmVhbWluZ0NsaWVudDo6d2FzQmxvY2tlZChSZXNvdXJjZUhhbmRsZSopCiAg ICAgR1NUX0VSUk9SX09CSkVDVChzcmMsICJSZXF1ZXN0IHdhcyBibG9ja2VkIik7CiAKICAgICBX VEY6OkdNdXRleExvY2tlcjxHTXV0ZXg+IGxvY2tlcigqR1NUX09CSkVDVF9HRVRfTE9DSyhzcmMp KTsKLSAgICB1cmkucmVzZXQoZ19zdHJkdXAoc3JjLT5wcml2LT51cmkpKTsKKyAgICB1cmkucmVz ZXQoZ19zdHJkdXAoc3JjLT5wcml2LT5vcmlnaW5hbFVSSS5kYXRhKCkpKTsKICAgICBsb2NrZXIu dW5sb2NrKCk7CiAKICAgICBHU1RfRUxFTUVOVF9FUlJPUihzcmMsIFJFU09VUkNFLCBPUEVOX1JF QUQsICgiQWNjZXNzIHRvIFwiJXNcIiB3YXMgYmxvY2tlZCIsIHVyaS5nZXQoKSksICgwKSk7CkBA IC0xMjA1LDcgKzEyMDgsNyBAQCB2b2lkIFJlc291cmNlSGFuZGxlU3RyZWFtaW5nQ2xpZW50Ojpj YW5ub3RTaG93VVJMKFJlc291cmNlSGFuZGxlKikKICAgICBHU1RfRVJST1JfT0JKRUNUKHNyYywg IkNhbm5vdCBzaG93IFVSTCIpOwogCiAgICAgV1RGOjpHTXV0ZXhMb2NrZXI8R011dGV4PiBsb2Nr ZXIoKkdTVF9PQkpFQ1RfR0VUX0xPQ0soc3JjKSk7Ci0gICAgdXJpLnJlc2V0KGdfc3RyZHVwKHNy Yy0+cHJpdi0+dXJpKSk7CisgICAgdXJpLnJlc2V0KGdfc3RyZHVwKHNyYy0+cHJpdi0+b3JpZ2lu YWxVUkkuZGF0YSgpKSk7CiAgICAgbG9ja2VyLnVubG9jaygpOwogCiAgICAgR1NUX0VMRU1FTlRf RVJST1Ioc3JjLCBSRVNPVVJDRSwgT1BFTl9SRUFELCAoIkNhbid0IHNob3cgXCIlc1wiIiwgdXJp LmdldCgpKSwgKDApKTsK