116618 2013-05-22 09:19:17 -0700 [GStreamer] Allow multiple log levels in media player 2013-05-22 11:30:36 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 lori webkit-unassigned commit-queue eric.carlson glenn gustavo jer.noble lori menard mrobinson pnormand oldest_to_newest 892356 0 lori 2013-05-22 09:19:17 -0700 [GStreamer] Allow multiple log levels in media player 892358 1 202567 lori 2013-05-22 09:20:13 -0700 Created attachment 202567 Patch 892363 2 202568 lori 2013-05-22 09:30:12 -0700 Created attachment 202568 Patch 892425 3 202568 commit-queue 2013-05-22 11:30:34 -0700 Comment on attachment 202568 Patch Clearing flags on attachment: 202568 Committed r150524: <http://trac.webkit.org/changeset/150524> 892427 4 commit-queue 2013-05-22 11:30:36 -0700 All reviewed patches have been landed. Closing bug. 202567 2013-05-22 09:20:13 -0700 2013-05-22 09:30:08 -0700 Patch bug-116618-20130522101901.patch text/plain 6965 lori U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwNTE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvR1N0cmVhbWVyVXRpbGl0aWVzLmggYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvR1N0cmVhbWVyVXRpbGl0aWVzLmgK aW5kZXggODdiY2Y2Nzg3ZjVlMGY1MTE2NzFhMDA2MjMzMmQ1ODk5ZmE0NTE3ZC4uYTJiYjFmZGVi MmEwNDIyMjcyOGNmMDAwZTE2ZWNlMTBiOTU5MzAyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0dTdHJlYW1lclV0aWxpdGllcy5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9HU3RyZWFtZXJVdGls aXRpZXMuaApAQCAtMjAsNiArMjAsMTQgQEAKICAgICBHU1RfREVCVUcoX19WQV9BUkdTX18pOyBc CiAgICAgTE9HX1ZFUkJPU0UoTWVkaWEsIF9fVkFfQVJHU19fKTsgfSB3aGlsZSAoMCkKIAorI2Rl ZmluZSBFUlJPUl9NRURJQV9NRVNTQUdFKC4uLikgZG8geyBcCisgICAgR1NUX0VSUk9SKF9fVkFf QVJHU19fKTsgXAorICAgIExPR19WRVJCT1NFKE1lZGlhLCBfX1ZBX0FSR1NfXyk7IH0gd2hpbGUg KDApCisKKyNkZWZpbmUgSU5GT19NRURJQV9NRVNTQUdFKC4uLikgZG8geyBcCisgICAgR1NUX0lO Rk8oX19WQV9BUkdTX18pOyBcCisgICAgTE9HX1ZFUkJPU0UoTWVkaWEsIF9fVkFfQVJHU19fKTsg fSB3aGlsZSAoMCkKKwogbmFtZXNwYWNlIFdlYkNvcmUgewogYm9vbCBpbml0aWFsaXplR1N0cmVh bWVyKCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9n c3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIu Y3BwCmluZGV4IDE4MjQ4MDc1MjdiMGY3YmU2MDQyZmQyNjExZmI2ZjZkNzM3OTQ2YjQuLjA2Zjhh N2RkOWFhZTE4ZGIwMzg3MWE4ZTI4OTU1NWFmZTUwYzk0YzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3Ry ZWFtZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1l ci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCkBAIC0yOTgsNyArMjk4LDcgQEAgdm9p ZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmxvYWQoY29uc3QgU3RyaW5nJiB1cmwpCiAg ICAgbV91cmwgPSBLVVJMKEtVUkwoKSwgY2xlYW5VcmwpOwogICAgIGdfb2JqZWN0X3NldChtX3Bs YXlCaW4uZ2V0KCksICJ1cmkiLCBjbGVhblVybC51dGY4KCkuZGF0YSgpLCBOVUxMKTsKIAotICAg IExPR19NRURJQV9NRVNTQUdFKCJMb2FkICVzIiwgY2xlYW5VcmwudXRmOCgpLmRhdGEoKSk7Cisg ICAgSU5GT19NRURJQV9NRVNTQUdFKCJMb2FkICVzIiwgY2xlYW5VcmwudXRmOCgpLmRhdGEoKSk7 CiAKICAgICBpZiAobV9wcmVsb2FkID09IE1lZGlhUGxheWVyOjpOb25lKSB7CiAgICAgICAgIExP R19NRURJQV9NRVNTQUdFKCJEZWxheWluZyBsb2FkLiIpOwpAQCAtNDE3LDcgKzQxNyw3IEBAIHZv aWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpwYXVzZSgpCiAgICAgICAgIHJldHVybjsK IAogICAgIGlmIChjaGFuZ2VQaXBlbGluZVN0YXRlKEdTVF9TVEFURV9QQVVTRUQpKQotICAgICAg ICBMT0dfTUVESUFfTUVTU0FHRSgiUGF1c2UiKTsKKyAgICAgICAgSU5GT19NRURJQV9NRVNTQUdF KCJQYXVzZSIpOwogfQogCiBmbG9hdCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmR1cmF0 aW9uKCkgY29uc3QKQEAgLTQ4NSw3ICs0ODUsNyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lcjo6c2VlayhmbG9hdCB0aW1lKQogICAgIGlmIChtX2Vycm9yT2NjdXJlZCkKICAgICAg ICAgcmV0dXJuOwogCi0gICAgTE9HX01FRElBX01FU1NBR0UoIltTZWVrXSBzZWVrIGF0dGVtcHQg dG8gJWYgc2VjcyIsIHRpbWUpOworICAgIElORk9fTUVESUFfTUVTU0FHRSgiW1NlZWtdIHNlZWsg YXR0ZW1wdCB0byAlZiBzZWNzIiwgdGltZSk7CiAKICAgICAvLyBBdm9pZCB1c2VsZXNzIHNlZWtp bmcuCiAgICAgaWYgKHRpbWUgPT0gY3VycmVudFRpbWUoKSkKQEAgLTQ5NSw3ICs0OTUsNyBAQCB2 b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6c2VlayhmbG9hdCB0aW1lKQogICAgICAg ICByZXR1cm47CiAKICAgICBHc3RDbG9ja1RpbWUgY2xvY2tUaW1lID0gdG9Hc3RDbG9ja1RpbWUo dGltZSk7Ci0gICAgTE9HX01FRElBX01FU1NBR0UoIltTZWVrXSBzZWVraW5nIHRvICUiIEdTVF9U SU1FX0ZPUk1BVCAiICglZikiLCBHU1RfVElNRV9BUkdTKGNsb2NrVGltZSksIHRpbWUpOworICAg IElORk9fTUVESUFfTUVTU0FHRSgiW1NlZWtdIHNlZWtpbmcgdG8gJSIgR1NUX1RJTUVfRk9STUFU ICIgKCVmKSIsIEdTVF9USU1FX0FSR1MoY2xvY2tUaW1lKSwgdGltZSk7CiAKICAgICBpZiAobV9z ZWVraW5nKSB7CiAgICAgICAgIGlmIChtX3NlZWtJc1BlbmRpbmcpIHsKQEAgLTYxOSw3ICs2MTks NyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6c2V0UmF0ZShmbG9hdCByYXRl KQogICAgIGdpbnQ2NCBzdGFydCwgZW5kOwogICAgIGJvb2wgbXV0ZSA9IGZhbHNlOwogCi0gICAg TE9HX01FRElBX01FU1NBR0UoIlNldCBSYXRlIHRvICVmIiwgcmF0ZSk7CisgICAgSU5GT19NRURJ QV9NRVNTQUdFKCJTZXQgUmF0ZSB0byAlZiIsIHJhdGUpOwogICAgIGlmIChyYXRlID4gMCkgewog ICAgICAgICAvLyBNdXRlIHRoZSBzb3VuZCBpZiB0aGUgcGxheWJhY2sgcmF0ZSBpcyB0b28gZXh0 cmVtZSBhbmQKICAgICAgICAgLy8gYXVkaW8gcGl0Y2ggaXMgbm90IGFkanVzdGVkLgpAQCAtNjM4 LDEyICs2MzgsMTIgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnNldFJhdGUo ZmxvYXQgcmF0ZSkKICAgICAgICAgICAgIGVuZCA9IGN1cnJlbnRQb3NpdGlvbjsKICAgICB9CiAK LSAgICBMT0dfTUVESUFfTUVTU0FHRSgiTmVlZCB0byBtdXRlIGF1ZGlvOiAlZCIsIChpbnQpIG11 dGUpOworICAgIElORk9fTUVESUFfTUVTU0FHRSgiTmVlZCB0byBtdXRlIGF1ZGlvPzogJWQiLCAo aW50KSBtdXRlKTsKIAogICAgIGlmICghZ3N0X2VsZW1lbnRfc2VlayhtX3BsYXlCaW4uZ2V0KCks IHJhdGUsIEdTVF9GT1JNQVRfVElNRSwgZmxhZ3MsCiAgICAgICAgICAgICAgICAgICAgICAgICAg IEdTVF9TRUVLX1RZUEVfU0VULCBzdGFydCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgR1NU X1NFRUtfVFlQRV9TRVQsIGVuZCkpCi0gICAgICAgIExPR19NRURJQV9NRVNTQUdFKCJTZXQgcmF0 ZSB0byAlZiBmYWlsZWQiLCByYXRlKTsKKyAgICAgICAgRVJST1JfTUVESUFfTUVTU0FHRSgiU2V0 IHJhdGUgdG8gJWYgZmFpbGVkIiwgcmF0ZSk7CiAgICAgZWxzZQogICAgICAgICBnX29iamVjdF9z ZXQobV9wbGF5QmluLmdldCgpLCAibXV0ZSIsIG11dGUsIE5VTEwpOwogfQpAQCAtNzI3LDcgKzcy Nyw3IEBAIGdib29sZWFuIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6aGFuZGxlTWVzc2Fn ZShHc3RNZXNzYWdlKiBtZXNzYWdlKQogICAgICAgICBpZiAobV9taXNzaW5nUGx1Z2lucykKICAg ICAgICAgICAgIGJyZWFrOwogICAgICAgICBnc3RfbWVzc2FnZV9wYXJzZV9lcnJvcihtZXNzYWdl LCAmZXJyLm91dFB0cigpLCAmZGVidWcub3V0UHRyKCkpOwotICAgICAgICBMT0dfTUVESUFfTUVT U0FHRSgiRXJyb3IgJWQ6ICVzICh1cmw9JXMpIiwgZXJyLT5jb2RlLCBlcnItPm1lc3NhZ2UsIG1f dXJsLnN0cmluZygpLnV0ZjgoKS5kYXRhKCkpOworICAgICAgICBFUlJPUl9NRURJQV9NRVNTQUdF KCJFcnJvciAlZDogJXMgKHVybD0lcykiLCBlcnItPmNvZGUsIGVyci0+bWVzc2FnZSwgbV91cmwu c3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7CiAKICAgICAgICAgR1NUX0RFQlVHX0JJTl9UT19ET1Rf RklMRV9XSVRIX1RTKEdTVF9CSU4obV9wbGF5QmluLmdldCgpKSwgR1NUX0RFQlVHX0dSQVBIX1NI T1dfQUxMLCAid2Via2l0LXZpZGVvLmVycm9yIik7CiAKQEAgLTc0Myw3ICs3NDMsNyBAQCBnYm9v bGVhbiBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmhhbmRsZU1lc3NhZ2UoR3N0TWVzc2Fn ZSogbWVzc2FnZSkKICAgICAgICAgICAgIC8vIHRoaXMgY2FzZSB0aGUgSFRNTE1lZGlhRWxlbWVu dCB3aWxsIGVtaXQgYSBzdGFsbGVkCiAgICAgICAgICAgICAvLyBldmVudC4KICAgICAgICAgICAg IGlmIChlcnItPmNvZGUgPT0gR1NUX1NUUkVBTV9FUlJPUl9UWVBFX05PVF9GT1VORCkgewotICAg ICAgICAgICAgICAgIExPR19NRURJQV9NRVNTQUdFKCJEZWNvZGUgZXJyb3IsIGxldCB0aGUgTWVk aWEgZWxlbWVudCBlbWl0IGEgc3RhbGxlZCBldmVudC4iKTsKKyAgICAgICAgICAgICAgICBFUlJP Ul9NRURJQV9NRVNTQUdFKCJEZWNvZGUgZXJyb3IsIGxldCB0aGUgTWVkaWEgZWxlbWVudCBlbWl0 IGEgc3RhbGxlZCBldmVudC4iKTsKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAg IH0KICAgICAgICAgICAgIGVycm9yID0gTWVkaWFQbGF5ZXI6OkRlY29kZUVycm9yOwpAQCAtNzkz LDcgKzc5Myw3IEBAIGdib29sZWFuIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6aGFuZGxl TWVzc2FnZShHc3RNZXNzYWdlKiBtZXNzYWdlKQogICAgICAgICBnc3RfZWxlbWVudF9nZXRfc3Rh dGUobV9wbGF5QmluLmdldCgpLCAmY3VycmVudFN0YXRlLCBOVUxMLCAyNTApOwogICAgICAgICBp ZiAocmVxdWVzdGVkU3RhdGUgPCBjdXJyZW50U3RhdGUpIHsKICAgICAgICAgICAgIEdPd25QdHI8 Z2NoYXI+IGVsZW1lbnROYW1lKGdzdF9lbGVtZW50X2dldF9uYW1lKEdTVF9FTEVNRU5UKG1lc3Nh Z2UpKSk7Ci0gICAgICAgICAgICBMT0dfTUVESUFfTUVTU0FHRSgiRWxlbWVudCAlcyByZXF1ZXN0 ZWQgc3RhdGUgY2hhbmdlIHRvICVzIiwgZWxlbWVudE5hbWUuZ2V0KCksCisgICAgICAgICAgICBJ TkZPX01FRElBX01FU1NBR0UoIkVsZW1lbnQgJXMgcmVxdWVzdGVkIHN0YXRlIGNoYW5nZSB0byAl cyIsIGVsZW1lbnROYW1lLmdldCgpLAogICAgICAgICAgICAgICAgIGdzdF9lbGVtZW50X3N0YXRl X2dldF9uYW1lKHJlcXVlc3RlZFN0YXRlKSk7CiAgICAgICAgICAgICBtX3JlcXVlc3RlZFN0YXRl ID0gcmVxdWVzdGVkU3RhdGU7CiAgICAgICAgICAgICBjaGFuZ2VQaXBlbGluZVN0YXRlKHJlcXVl c3RlZFN0YXRlKTsKQEAgLTk2MSw3ICs5NjEsNyBAQCB1bnNpZ25lZCBNZWRpYVBsYXllclByaXZh dGVHU3RyZWFtZXI6OnRvdGFsQnl0ZXMoKSBjb25zdAogI2Vsc2UKICAgICBpZiAoZ3N0X2VsZW1l bnRfcXVlcnlfZHVyYXRpb24obV9zb3VyY2UuZ2V0KCksICZmbXQsICZsZW5ndGgpKSB7CiAjZW5k aWYKLSAgICAgICAgTE9HX01FRElBX01FU1NBR0UoInRvdGFsQnl0ZXMgJSIgR19HSU5UNjRfRk9S TUFULCBsZW5ndGgpOworICAgICAgICBJTkZPX01FRElBX01FU1NBR0UoInRvdGFsQnl0ZXMgJSIg R19HSU5UNjRfRk9STUFULCBsZW5ndGgpOwogICAgICAgICBtX3RvdGFsQnl0ZXMgPSBzdGF0aWNf Y2FzdDx1bnNpZ25lZD4obGVuZ3RoKTsKICAgICAgICAgbV9pc1N0cmVhbWluZyA9ICFsZW5ndGg7 CiAgICAgICAgIHJldHVybiBtX3RvdGFsQnl0ZXM7CkBAIC0xMDExLDcgKzEwMTEsNyBAQCB1bnNp Z25lZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnRvdGFsQnl0ZXMoKSBjb25zdAogCiAg ICAgZ3N0X2l0ZXJhdG9yX2ZyZWUoaXRlcik7CiAKLSAgICBMT0dfTUVESUFfTUVTU0FHRSgidG90 YWxCeXRlcyAlIiBHX0dJTlQ2NF9GT1JNQVQsIGxlbmd0aCk7CisgICAgSU5GT19NRURJQV9NRVNT QUdFKCJ0b3RhbEJ5dGVzICUiIEdfR0lOVDY0X0ZPUk1BVCwgbGVuZ3RoKTsKICAgICBtX3RvdGFs Qnl0ZXMgPSBzdGF0aWNfY2FzdDx1bnNpZ25lZD4obGVuZ3RoKTsKICAgICBtX2lzU3RyZWFtaW5n ID0gIWxlbmd0aDsKICAgICByZXR1cm4gbV90b3RhbEJ5dGVzOwpAQCAtMTMxMyw3ICsxMzEzLDcg QEAgYm9vbCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmxvYWROZXh0TG9jYXRpb24oKQog CiAgICAgICAgIFJlZlB0cjxTZWN1cml0eU9yaWdpbj4gc2VjdXJpdHlPcmlnaW4gPSBTZWN1cml0 eU9yaWdpbjo6Y3JlYXRlKG1fdXJsKTsKICAgICAgICAgaWYgKHNlY3VyaXR5T3JpZ2luLT5jYW5S ZXF1ZXN0KG5ld1VybCkpIHsKLSAgICAgICAgICAgIExPR19NRURJQV9NRVNTQUdFKCJOZXcgbWVk aWEgdXJsOiAlcyIsIG5ld1VybC5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKKyAgICAgICAgICAg IElORk9fTUVESUFfTUVTU0FHRSgiTmV3IG1lZGlhIHVybDogJXMiLCBuZXdVcmwuc3RyaW5nKCku dXRmOCgpLmRhdGEoKSk7CiAKICAgICAgICAgICAgIC8vIFJlc2V0IHBsYXllciBzdGF0ZXMuCiAg ICAgICAgICAgICBtX25ldHdvcmtTdGF0ZSA9IE1lZGlhUGxheWVyOjpMb2FkaW5nOwpAQCAtMTMz NSw3ICsxMzM1LDcgQEAgYm9vbCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmxvYWROZXh0 TG9jYXRpb24oKQogICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICAgICAgfQog ICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgIExPR19NRURJQV9NRVNTQUdFKCJOb3QgYWxsb3dl ZCB0byBsb2FkIG5ldyBtZWRpYSBsb2NhdGlvbjogJXMiLCBuZXdVcmwuc3RyaW5nKCkudXRmOCgp LmRhdGEoKSk7CisgICAgICAgICAgICBJTkZPX01FRElBX01FU1NBR0UoIk5vdCBhbGxvd2VkIHRv IGxvYWQgbmV3IG1lZGlhIGxvY2F0aW9uOiAlcyIsIG5ld1VybC5zdHJpbmcoKS51dGY4KCkuZGF0 YSgpKTsKICAgICB9CiAgICAgbV9tZWRpYUxvY2F0aW9uQ3VycmVudEluZGV4LS07CiAgICAgcmV0 dXJuIGZhbHNlOwo= 202568 2013-05-22 09:30:12 -0700 2013-05-22 11:30:34 -0700 Patch bug-116618-20130522102859.patch text/plain 8026 lori U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwNTE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2M0OTU1OWNmYjMwMWU1 NDU0Yzg5Yjk2NjFmYmY2YTgyZmU3ODhiMC4uNjZjZWNkM2Y5ZDA2MzZlMTIyZGY1MjhmOTRiNTE4 Y2ZhYzRjNDFkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEzLTA1LTIyICBMb3Jp IEFuZGVyc29uICA8bG9yaUBya3ltdG5oaS5jb20+CisKKyAgICAgICAgW0dTdHJlYW1lcl0gQWxs b3cgbXVsdGlwbGUgbG9nIGxldmVscyBpbiBtZWRpYSBwbGF5ZXIKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNjYxOAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywganVzdCBjaGFuZ2lu ZyBsb2dnaW5nLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0dTdHJl YW1lclV0aWxpdGllcy5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9N ZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpsb2FkKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxh eWVyUHJpdmF0ZUdTdHJlYW1lcjo6cGF1c2UpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyOjpzZWVrKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lcjo6c2V0UmF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXI6OmhhbmRsZU1lc3NhZ2UpOgorCiAyMDEzLTA1LTIyICBIdWdvIFBh cmVudGUgTGltYSAgPGh1Z28ubGltYUBvcGVuYm9zc2Eub3JnPgogCiAgICAgICAgIFdlYkNvcmUg ZmFpbHMgdG8gY29tcGlsZSB3aXRoIC1XZXJyb3I9bWF5YmUtdW5pbml0aWFsaXplZCBvbiBHQ0Mg NC44LjAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJl YW1lci9HU3RyZWFtZXJVdGlsaXRpZXMuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2dzdHJlYW1lci9HU3RyZWFtZXJVdGlsaXRpZXMuaAppbmRleCA4N2JjZjY3ODdmNWUwZjUx MTY3MWEwMDYyMzMyZDU4OTlmYTQ1MTdkLi5hMmJiMWZkZWIyYTA0MjIyNzI4Y2YwMDBlMTZlY2Ux MGI5NTkzMDJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9n c3RyZWFtZXIvR1N0cmVhbWVyVXRpbGl0aWVzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0dTdHJlYW1lclV0aWxpdGllcy5oCkBAIC0yMCw2ICsyMCwx NCBAQAogICAgIEdTVF9ERUJVRyhfX1ZBX0FSR1NfXyk7IFwKICAgICBMT0dfVkVSQk9TRShNZWRp YSwgX19WQV9BUkdTX18pOyB9IHdoaWxlICgwKQogCisjZGVmaW5lIEVSUk9SX01FRElBX01FU1NB R0UoLi4uKSBkbyB7IFwKKyAgICBHU1RfRVJST1IoX19WQV9BUkdTX18pOyBcCisgICAgTE9HX1ZF UkJPU0UoTWVkaWEsIF9fVkFfQVJHU19fKTsgfSB3aGlsZSAoMCkKKworI2RlZmluZSBJTkZPX01F RElBX01FU1NBR0UoLi4uKSBkbyB7IFwKKyAgICBHU1RfSU5GTyhfX1ZBX0FSR1NfXyk7IFwKKyAg ICBMT0dfVkVSQk9TRShNZWRpYSwgX19WQV9BUkdTX18pOyB9IHdoaWxlICgwKQorCiBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiBib29sIGluaXRpYWxpemVHU3RyZWFtZXIoKTsKIH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0 cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKaW5kZXggMTgyNDgwNzUyN2Iw ZjdiZTYwNDJmZDI2MTFmYjZmNmQ3Mzc5NDZiNC4uMDZmOGE3ZGQ5YWFlMThkYjAzODcxYThlMjg5 NTU1YWZlNTBjOTRjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lci5jcHAKQEAgLTI5OCw3ICsyOTgsNyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lcjo6bG9hZChjb25zdCBTdHJpbmcmIHVybCkKICAgICBtX3VybCA9IEtVUkwoS1VSTCgp LCBjbGVhblVybCk7CiAgICAgZ19vYmplY3Rfc2V0KG1fcGxheUJpbi5nZXQoKSwgInVyaSIsIGNs ZWFuVXJsLnV0ZjgoKS5kYXRhKCksIE5VTEwpOwogCi0gICAgTE9HX01FRElBX01FU1NBR0UoIkxv YWQgJXMiLCBjbGVhblVybC51dGY4KCkuZGF0YSgpKTsKKyAgICBJTkZPX01FRElBX01FU1NBR0Uo IkxvYWQgJXMiLCBjbGVhblVybC51dGY4KCkuZGF0YSgpKTsKIAogICAgIGlmIChtX3ByZWxvYWQg PT0gTWVkaWFQbGF5ZXI6Ok5vbmUpIHsKICAgICAgICAgTE9HX01FRElBX01FU1NBR0UoIkRlbGF5 aW5nIGxvYWQuIik7CkBAIC00MTcsNyArNDE3LDcgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXI6OnBhdXNlKCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgaWYgKGNoYW5nZVBpcGVs aW5lU3RhdGUoR1NUX1NUQVRFX1BBVVNFRCkpCi0gICAgICAgIExPR19NRURJQV9NRVNTQUdFKCJQ YXVzZSIpOworICAgICAgICBJTkZPX01FRElBX01FU1NBR0UoIlBhdXNlIik7CiB9CiAKIGZsb2F0 IE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6ZHVyYXRpb24oKSBjb25zdApAQCAtNDg1LDcg KzQ4NSw3IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpzZWVrKGZsb2F0IHRp bWUpCiAgICAgaWYgKG1fZXJyb3JPY2N1cmVkKQogICAgICAgICByZXR1cm47CiAKLSAgICBMT0df TUVESUFfTUVTU0FHRSgiW1NlZWtdIHNlZWsgYXR0ZW1wdCB0byAlZiBzZWNzIiwgdGltZSk7Cisg ICAgSU5GT19NRURJQV9NRVNTQUdFKCJbU2Vla10gc2VlayBhdHRlbXB0IHRvICVmIHNlY3MiLCB0 aW1lKTsKIAogICAgIC8vIEF2b2lkIHVzZWxlc3Mgc2Vla2luZy4KICAgICBpZiAodGltZSA9PSBj dXJyZW50VGltZSgpKQpAQCAtNDk1LDcgKzQ5NSw3IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRl R1N0cmVhbWVyOjpzZWVrKGZsb2F0IHRpbWUpCiAgICAgICAgIHJldHVybjsKIAogICAgIEdzdENs b2NrVGltZSBjbG9ja1RpbWUgPSB0b0dzdENsb2NrVGltZSh0aW1lKTsKLSAgICBMT0dfTUVESUFf TUVTU0FHRSgiW1NlZWtdIHNlZWtpbmcgdG8gJSIgR1NUX1RJTUVfRk9STUFUICIgKCVmKSIsIEdT VF9USU1FX0FSR1MoY2xvY2tUaW1lKSwgdGltZSk7CisgICAgSU5GT19NRURJQV9NRVNTQUdFKCJb U2Vla10gc2Vla2luZyB0byAlIiBHU1RfVElNRV9GT1JNQVQgIiAoJWYpIiwgR1NUX1RJTUVfQVJH UyhjbG9ja1RpbWUpLCB0aW1lKTsKIAogICAgIGlmIChtX3NlZWtpbmcpIHsKICAgICAgICAgaWYg KG1fc2Vla0lzUGVuZGluZykgewpAQCAtNjE5LDcgKzYxOSw3IEBAIHZvaWQgTWVkaWFQbGF5ZXJQ cml2YXRlR1N0cmVhbWVyOjpzZXRSYXRlKGZsb2F0IHJhdGUpCiAgICAgZ2ludDY0IHN0YXJ0LCBl bmQ7CiAgICAgYm9vbCBtdXRlID0gZmFsc2U7CiAKLSAgICBMT0dfTUVESUFfTUVTU0FHRSgiU2V0 IFJhdGUgdG8gJWYiLCByYXRlKTsKKyAgICBJTkZPX01FRElBX01FU1NBR0UoIlNldCBSYXRlIHRv ICVmIiwgcmF0ZSk7CiAgICAgaWYgKHJhdGUgPiAwKSB7CiAgICAgICAgIC8vIE11dGUgdGhlIHNv dW5kIGlmIHRoZSBwbGF5YmFjayByYXRlIGlzIHRvbyBleHRyZW1lIGFuZAogICAgICAgICAvLyBh dWRpbyBwaXRjaCBpcyBub3QgYWRqdXN0ZWQuCkBAIC02MzgsMTIgKzYzOCwxMiBAQCB2b2lkIE1l ZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6c2V0UmF0ZShmbG9hdCByYXRlKQogICAgICAgICAg ICAgZW5kID0gY3VycmVudFBvc2l0aW9uOwogICAgIH0KIAotICAgIExPR19NRURJQV9NRVNTQUdF KCJOZWVkIHRvIG11dGUgYXVkaW86ICVkIiwgKGludCkgbXV0ZSk7CisgICAgSU5GT19NRURJQV9N RVNTQUdFKCJOZWVkIHRvIG11dGUgYXVkaW8/OiAlZCIsIChpbnQpIG11dGUpOwogCiAgICAgaWYg KCFnc3RfZWxlbWVudF9zZWVrKG1fcGxheUJpbi5nZXQoKSwgcmF0ZSwgR1NUX0ZPUk1BVF9USU1F LCBmbGFncywKICAgICAgICAgICAgICAgICAgICAgICAgICAgR1NUX1NFRUtfVFlQRV9TRVQsIHN0 YXJ0LAogICAgICAgICAgICAgICAgICAgICAgICAgICBHU1RfU0VFS19UWVBFX1NFVCwgZW5kKSkK LSAgICAgICAgTE9HX01FRElBX01FU1NBR0UoIlNldCByYXRlIHRvICVmIGZhaWxlZCIsIHJhdGUp OworICAgICAgICBFUlJPUl9NRURJQV9NRVNTQUdFKCJTZXQgcmF0ZSB0byAlZiBmYWlsZWQiLCBy YXRlKTsKICAgICBlbHNlCiAgICAgICAgIGdfb2JqZWN0X3NldChtX3BsYXlCaW4uZ2V0KCksICJt dXRlIiwgbXV0ZSwgTlVMTCk7CiB9CkBAIC03MjcsNyArNzI3LDcgQEAgZ2Jvb2xlYW4gTWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpoYW5kbGVNZXNzYWdlKEdzdE1lc3NhZ2UqIG1lc3NhZ2Up CiAgICAgICAgIGlmIChtX21pc3NpbmdQbHVnaW5zKQogICAgICAgICAgICAgYnJlYWs7CiAgICAg ICAgIGdzdF9tZXNzYWdlX3BhcnNlX2Vycm9yKG1lc3NhZ2UsICZlcnIub3V0UHRyKCksICZkZWJ1 Zy5vdXRQdHIoKSk7Ci0gICAgICAgIExPR19NRURJQV9NRVNTQUdFKCJFcnJvciAlZDogJXMgKHVy bD0lcykiLCBlcnItPmNvZGUsIGVyci0+bWVzc2FnZSwgbV91cmwuc3RyaW5nKCkudXRmOCgpLmRh dGEoKSk7CisgICAgICAgIEVSUk9SX01FRElBX01FU1NBR0UoIkVycm9yICVkOiAlcyAodXJsPSVz KSIsIGVyci0+Y29kZSwgZXJyLT5tZXNzYWdlLCBtX3VybC5zdHJpbmcoKS51dGY4KCkuZGF0YSgp KTsKIAogICAgICAgICBHU1RfREVCVUdfQklOX1RPX0RPVF9GSUxFX1dJVEhfVFMoR1NUX0JJTiht X3BsYXlCaW4uZ2V0KCkpLCBHU1RfREVCVUdfR1JBUEhfU0hPV19BTEwsICJ3ZWJraXQtdmlkZW8u ZXJyb3IiKTsKIApAQCAtNzQzLDcgKzc0Myw3IEBAIGdib29sZWFuIE1lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lcjo6aGFuZGxlTWVzc2FnZShHc3RNZXNzYWdlKiBtZXNzYWdlKQogICAgICAgICAg ICAgLy8gdGhpcyBjYXNlIHRoZSBIVE1MTWVkaWFFbGVtZW50IHdpbGwgZW1pdCBhIHN0YWxsZWQK ICAgICAgICAgICAgIC8vIGV2ZW50LgogICAgICAgICAgICAgaWYgKGVyci0+Y29kZSA9PSBHU1Rf U1RSRUFNX0VSUk9SX1RZUEVfTk9UX0ZPVU5EKSB7Ci0gICAgICAgICAgICAgICAgTE9HX01FRElB X01FU1NBR0UoIkRlY29kZSBlcnJvciwgbGV0IHRoZSBNZWRpYSBlbGVtZW50IGVtaXQgYSBzdGFs bGVkIGV2ZW50LiIpOworICAgICAgICAgICAgICAgIEVSUk9SX01FRElBX01FU1NBR0UoIkRlY29k ZSBlcnJvciwgbGV0IHRoZSBNZWRpYSBlbGVtZW50IGVtaXQgYSBzdGFsbGVkIGV2ZW50LiIpOwog ICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgZXJyb3Ig PSBNZWRpYVBsYXllcjo6RGVjb2RlRXJyb3I7CkBAIC03OTMsNyArNzkzLDcgQEAgZ2Jvb2xlYW4g TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpoYW5kbGVNZXNzYWdlKEdzdE1lc3NhZ2UqIG1l c3NhZ2UpCiAgICAgICAgIGdzdF9lbGVtZW50X2dldF9zdGF0ZShtX3BsYXlCaW4uZ2V0KCksICZj dXJyZW50U3RhdGUsIE5VTEwsIDI1MCk7CiAgICAgICAgIGlmIChyZXF1ZXN0ZWRTdGF0ZSA8IGN1 cnJlbnRTdGF0ZSkgewogICAgICAgICAgICAgR093blB0cjxnY2hhcj4gZWxlbWVudE5hbWUoZ3N0 X2VsZW1lbnRfZ2V0X25hbWUoR1NUX0VMRU1FTlQobWVzc2FnZSkpKTsKLSAgICAgICAgICAgIExP R19NRURJQV9NRVNTQUdFKCJFbGVtZW50ICVzIHJlcXVlc3RlZCBzdGF0ZSBjaGFuZ2UgdG8gJXMi LCBlbGVtZW50TmFtZS5nZXQoKSwKKyAgICAgICAgICAgIElORk9fTUVESUFfTUVTU0FHRSgiRWxl bWVudCAlcyByZXF1ZXN0ZWQgc3RhdGUgY2hhbmdlIHRvICVzIiwgZWxlbWVudE5hbWUuZ2V0KCks CiAgICAgICAgICAgICAgICAgZ3N0X2VsZW1lbnRfc3RhdGVfZ2V0X25hbWUocmVxdWVzdGVkU3Rh dGUpKTsKICAgICAgICAgICAgIG1fcmVxdWVzdGVkU3RhdGUgPSByZXF1ZXN0ZWRTdGF0ZTsKICAg ICAgICAgICAgIGNoYW5nZVBpcGVsaW5lU3RhdGUocmVxdWVzdGVkU3RhdGUpOwpAQCAtOTYxLDcg Kzk2MSw3IEBAIHVuc2lnbmVkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6dG90YWxCeXRl cygpIGNvbnN0CiAjZWxzZQogICAgIGlmIChnc3RfZWxlbWVudF9xdWVyeV9kdXJhdGlvbihtX3Nv dXJjZS5nZXQoKSwgJmZtdCwgJmxlbmd0aCkpIHsKICNlbmRpZgotICAgICAgICBMT0dfTUVESUFf TUVTU0FHRSgidG90YWxCeXRlcyAlIiBHX0dJTlQ2NF9GT1JNQVQsIGxlbmd0aCk7CisgICAgICAg IElORk9fTUVESUFfTUVTU0FHRSgidG90YWxCeXRlcyAlIiBHX0dJTlQ2NF9GT1JNQVQsIGxlbmd0 aCk7CiAgICAgICAgIG1fdG90YWxCeXRlcyA9IHN0YXRpY19jYXN0PHVuc2lnbmVkPihsZW5ndGgp OwogICAgICAgICBtX2lzU3RyZWFtaW5nID0gIWxlbmd0aDsKICAgICAgICAgcmV0dXJuIG1fdG90 YWxCeXRlczsKQEAgLTEwMTEsNyArMTAxMSw3IEBAIHVuc2lnbmVkIE1lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lcjo6dG90YWxCeXRlcygpIGNvbnN0CiAKICAgICBnc3RfaXRlcmF0b3JfZnJlZShp dGVyKTsKIAotICAgIExPR19NRURJQV9NRVNTQUdFKCJ0b3RhbEJ5dGVzICUiIEdfR0lOVDY0X0ZP Uk1BVCwgbGVuZ3RoKTsKKyAgICBJTkZPX01FRElBX01FU1NBR0UoInRvdGFsQnl0ZXMgJSIgR19H SU5UNjRfRk9STUFULCBsZW5ndGgpOwogICAgIG1fdG90YWxCeXRlcyA9IHN0YXRpY19jYXN0PHVu c2lnbmVkPihsZW5ndGgpOwogICAgIG1faXNTdHJlYW1pbmcgPSAhbGVuZ3RoOwogICAgIHJldHVy biBtX3RvdGFsQnl0ZXM7CkBAIC0xMzEzLDcgKzEzMTMsNyBAQCBib29sIE1lZGlhUGxheWVyUHJp dmF0ZUdTdHJlYW1lcjo6bG9hZE5leHRMb2NhdGlvbigpCiAKICAgICAgICAgUmVmUHRyPFNlY3Vy aXR5T3JpZ2luPiBzZWN1cml0eU9yaWdpbiA9IFNlY3VyaXR5T3JpZ2luOjpjcmVhdGUobV91cmwp OwogICAgICAgICBpZiAoc2VjdXJpdHlPcmlnaW4tPmNhblJlcXVlc3QobmV3VXJsKSkgewotICAg ICAgICAgICAgTE9HX01FRElBX01FU1NBR0UoIk5ldyBtZWRpYSB1cmw6ICVzIiwgbmV3VXJsLnN0 cmluZygpLnV0ZjgoKS5kYXRhKCkpOworICAgICAgICAgICAgSU5GT19NRURJQV9NRVNTQUdFKCJO ZXcgbWVkaWEgdXJsOiAlcyIsIG5ld1VybC5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKIAogICAg ICAgICAgICAgLy8gUmVzZXQgcGxheWVyIHN0YXRlcy4KICAgICAgICAgICAgIG1fbmV0d29ya1N0 YXRlID0gTWVkaWFQbGF5ZXI6OkxvYWRpbmc7CkBAIC0xMzM1LDcgKzEzMzUsNyBAQCBib29sIE1l ZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6bG9hZE5leHRMb2NhdGlvbigpCiAgICAgICAgICAg ICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0gZWxzZQotICAgICAg ICAgICAgTE9HX01FRElBX01FU1NBR0UoIk5vdCBhbGxvd2VkIHRvIGxvYWQgbmV3IG1lZGlhIGxv Y2F0aW9uOiAlcyIsIG5ld1VybC5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKKyAgICAgICAgICAg IElORk9fTUVESUFfTUVTU0FHRSgiTm90IGFsbG93ZWQgdG8gbG9hZCBuZXcgbWVkaWEgbG9jYXRp b246ICVzIiwgbmV3VXJsLnN0cmluZygpLnV0ZjgoKS5kYXRhKCkpOwogICAgIH0KICAgICBtX21l ZGlhTG9jYXRpb25DdXJyZW50SW5kZXgtLTsKICAgICByZXR1cm4gZmFsc2U7Cg==