218957 2020-11-15 07:23:59 -0800 [GStreamer] Clean-up Audio{Data,StreamDescription} implementations 2020-11-16 04:48:19 -0800 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pnormand pnormand calvaris eric.carlson ews-watchlist glenn hta jer.noble philipj sergio tommyw vjaquez webkit-bug-importer oldest_to_newest 1707601 0 pnormand 2020-11-15 07:23:59 -0800 https://bugs.webkit.org/show_bug.cgi?id=218335#c2 1707722 1 414203 pnormand 2020-11-16 01:45:13 -0800 Created attachment 414203 Patch 1707766 2 ews-feeder 2020-11-16 04:47:02 -0800 Committed r269849: <https://trac.webkit.org/changeset/269849> All reviewed patches have been landed. Closing bug and clearing flags on attachment 414203. 1707767 3 webkit-bug-importer 2020-11-16 04:48:19 -0800 <rdar://problem/71435181> 414203 2020-11-16 01:45:13 -0800 2020-11-16 04:47:03 -0800 Patch bug-218957-20201116014511.patch text/plain 20756 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5ODM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzM5OGIxNThkYjUyMTgz NTNjMjRjN2RlNDM5ODk2NTlmODIzNzBmYi4uMmQ1OGNlZGYxOTJhNWNjMDExZGIxNGQ3ZDkxZDcw ZTBiYWRkMjY1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDIwLTExLTE2ICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBDbGVhbi11cCBBdWRpb3tEYXRhLFN0cmVhbURlc2NyaXB0aW9ufSBpbXBsZW1lbnRhdGlvbnMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxODk1Nwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlZmFjdG9y IHRoZSBHU3RyZWFtZXJBdWRpb0RhdGEgYW5kIEdTdHJlYW1lclN0cmVhbURlc2NyaXB0aW9uIGlt cGxlbWVudGF0aW9ucyBpbiBvcmRlciB0bworICAgICAgICBhdm9pZCB1bi1uZWNlc3NhcnkgY29w aWVzLiBUaGUgY2FsbC1zaXRlcyB3ZXJlIGFkYXB0ZWQgYWNjb3JkaW5nbHkuIFNvbWUgdXNhZ2Ug b2YgdGhlIGxhdHRlcgorICAgICAgICBjbGFzcyB3YXMgcmVtb3ZlZCBiZWNhdXNlIGl0IHdhcyBz aW1wbGVyIHRvIHVzZSB0aGUgR3N0QXVkaW9JbmZvIEFQSSBkaXJlY3RseS4KKworICAgICAgICAq IE1vZHVsZXMvd2ViYXVkaW8vTWVkaWFTdHJlYW1BdWRpb1NvdXJjZUdTdHJlYW1lci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbUF1ZGlvU291cmNlOjpjb25zdW1lQXVkaW8pOgor ICAgICAgICAqIHBsYXRmb3JtL2F1ZGlvL2dzdHJlYW1lci9HU3RyZWFtZXJBdWRpb0RhdGEuaDoK KyAgICAgICAgKiBwbGF0Zm9ybS9hdWRpby9nc3RyZWFtZXIvR1N0cmVhbWVyQXVkaW9TdHJlYW1E ZXNjcmlwdGlvbi5oOgorICAgICAgICAqIHBsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9H U3RyZWFtZXJBdWRpb0NhcHR1cmVTb3VyY2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R1N0cmVh bWVyQXVkaW9DYXB0dXJlU291cmNlOjpuZXdTYW1wbGVDYWxsYmFjayk6CisgICAgICAgICogcGxh dGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL0dTdHJlYW1lck1lZGlhU3RyZWFtU291cmNlLmNw cDoKKyAgICAgICAgKHdlYmtpdE1lZGlhU3RyZWFtU3JjUHVzaEF1ZGlvU2FtcGxlKToKKyAgICAg ICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvTW9ja1JlYWx0aW1lQXVkaW9Tb3Vy Y2VHU3RyZWFtZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TW9ja1JlYWx0aW1lQXVkaW9Tb3Vy Y2VHU3RyZWFtZXI6OnJlbmRlcik6CisgICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0 cmVhbWVyL1JlYWx0aW1lSW5jb21pbmdBdWRpb1NvdXJjZUxpYldlYlJUQy5jcHA6CisgICAgICAg IChXZWJDb3JlOjpSZWFsdGltZUluY29taW5nQXVkaW9Tb3VyY2VMaWJXZWJSVEM6Ok9uRGF0YSk6 CisgICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL1JlYWx0aW1lT3V0Z29p bmdBdWRpb1NvdXJjZUxpYldlYlJUQy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpsaWJ3ZWJydGNB dWRpb0Zvcm1hdCk6CisgICAgICAgIChXZWJDb3JlOjpSZWFsdGltZU91dGdvaW5nQXVkaW9Tb3Vy Y2VMaWJXZWJSVEM6OmF1ZGlvU2FtcGxlc0F2YWlsYWJsZSk6CisgICAgICAgIChXZWJDb3JlOjpS ZWFsdGltZU91dGdvaW5nQXVkaW9Tb3VyY2VMaWJXZWJSVEM6OnB1bGxBdWRpb0RhdGEpOgorICAg ICAgICAqIHBsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9SZWFsdGltZU91dGdvaW5nQXVk aW9Tb3VyY2VMaWJXZWJSVEMuaDoKKwogMjAyMC0xMS0xNiAgUGhpbGlwcGUgTm9ybWFuZCAgPHBu b3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dTdHJlYW1lcl0gU3dpdGNoIHRoZSBJbWFn ZURlY29kZXIgdG8gZGVjb2RlYmluMwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxl cy93ZWJhdWRpby9NZWRpYVN0cmVhbUF1ZGlvU291cmNlR1N0cmVhbWVyLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8vTWVkaWFTdHJlYW1BdWRpb1NvdXJjZUdTdHJlYW1lci5j cHAKaW5kZXggZjQ4MzQ3ZjZjOGNiNTUxYjM4ZThiMGQ3MWNiNDczNmNiYTNlYTRlYy4uYTY0OGU2 OTMwYTdmZDhhMDY4NzVjM2NlMmQ4YTczOWE5OGMyYWMxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy93ZWJhdWRpby9NZWRpYVN0cmVhbUF1ZGlvU291cmNlR1N0cmVhbWVyLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1ZGlvL01lZGlhU3RyZWFtQXVkaW9T b3VyY2VHU3RyZWFtZXIuY3BwCkBAIC01Miw3ICs1Miw3IEBAIHZvaWQgTWVkaWFTdHJlYW1BdWRp b1NvdXJjZTo6Y29uc3VtZUF1ZGlvKEF1ZGlvQnVzJiBidXMsIHNpemVfdCBudW1iZXJPZkZyYW1l cykKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIGF1dG8gbWVkaWFUaW1lID0gTWVkaWFU aW1lKChtX251bWJlck9mRnJhbWVzICogR19VU0VDX1BFUl9TRUMpIC8gbV9jdXJyZW50U2V0dGlu Z3Muc2FtcGxlUmF0ZSgpLCBHX1VTRUNfUEVSX1NFQyk7CisgICAgTWVkaWFUaW1lIG1lZGlhVGlt ZSgobV9udW1iZXJPZkZyYW1lcyAqIEdfVVNFQ19QRVJfU0VDKSAvIG1fY3VycmVudFNldHRpbmdz LnNhbXBsZVJhdGUoKSwgR19VU0VDX1BFUl9TRUMpOwogICAgIG1fbnVtYmVyT2ZGcmFtZXMgKz0g bnVtYmVyT2ZGcmFtZXM7CiAKICAgICBHc3RBdWRpb0luZm8gaW5mbzsKQEAgLTY0LDEwICs2NCw5 IEBAIHZvaWQgTWVkaWFTdHJlYW1BdWRpb1NvdXJjZTo6Y29uc3VtZUF1ZGlvKEF1ZGlvQnVzJiBi dXMsIHNpemVfdCBudW1iZXJPZkZyYW1lcykKICAgICBhdXRvIGJ1ZmZlciA9IGFkb3B0R1JlZihn c3RfYnVmZmVyX25ld19hbGxvY2F0ZShudWxscHRyLCBzaXplLCBudWxscHRyKSk7CiAgICAgY29w eUJ1c0RhdGEoYnVzLCBidWZmZXIuZ2V0KCksIG11dGVkKCkpOwogICAgIGF1dG8gc2FtcGxlID0g YWRvcHRHUmVmKGdzdF9zYW1wbGVfbmV3KGJ1ZmZlci5nZXQoKSwgY2Fwcy5nZXQoKSwgbnVsbHB0 ciwgbnVsbHB0cikpOwotICAgIG1fYXVkaW9CdWZmZXIgPSBtYWtlVW5pcXVlPEdTdHJlYW1lckF1 ZGlvRGF0YT4oV1RGTW92ZShzYW1wbGUpLCBpbmZvKTsKLQotICAgIEdTdHJlYW1lckF1ZGlvU3Ry ZWFtRGVzY3JpcHRpb24gZGVzY3JpcHRpb24oaW5mbyk7Ci0gICAgYXVkaW9TYW1wbGVzQXZhaWxh YmxlKG1lZGlhVGltZSwgKm1fYXVkaW9CdWZmZXIsIGRlc2NyaXB0aW9uLCBudW1iZXJPZkZyYW1l cyk7CisgICAgR1N0cmVhbWVyQXVkaW9EYXRhIGF1ZGlvQnVmZmVyKFdURk1vdmUoc2FtcGxlKSwg aW5mbyk7CisgICAgR1N0cmVhbWVyQXVkaW9TdHJlYW1EZXNjcmlwdGlvbiBkZXNjcmlwdGlvbigm aW5mbyk7CisgICAgYXVkaW9TYW1wbGVzQXZhaWxhYmxlKG1lZGlhVGltZSwgYXVkaW9CdWZmZXIs IGRlc2NyaXB0aW9uLCBudW1iZXJPZkZyYW1lcyk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNv cmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2dzdHJlYW1lci9H U3RyZWFtZXJBdWRpb0RhdGEuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2dzdHJl YW1lci9HU3RyZWFtZXJBdWRpb0RhdGEuaAppbmRleCAxYWYwYzY2NmZkOTY4NTEyZWRmZTk1ZDcy MzE2MTkyY2NiMDczNTEyLi5iZWE3OWJkZGU5OTliYTkzZGE3MjEyMDQ2MjJkNjIxYWE5YmExMWY3 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9nc3RyZWFtZXIvR1N0 cmVhbWVyQXVkaW9EYXRhLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vZ3N0 cmVhbWVyL0dTdHJlYW1lckF1ZGlvRGF0YS5oCkBAIC0zMiw3ICszMiwxMyBAQCBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKIGNsYXNzIEdTdHJlYW1lckF1ZGlvRGF0YSBmaW5hbCA6IHB1YmxpYyBQbGF0 Zm9ybUF1ZGlvRGF0YSB7CiBwdWJsaWM6Ci0gICAgR1N0cmVhbWVyQXVkaW9EYXRhKEdSZWZQdHI8 R3N0U2FtcGxlPiYmIHNhbXBsZSwgR3N0QXVkaW9JbmZvIGluZm8pCisgICAgR1N0cmVhbWVyQXVk aW9EYXRhKEdSZWZQdHI8R3N0U2FtcGxlPiYmIHNhbXBsZSwgR3N0QXVkaW9JbmZvJiYgaW5mbykK KyAgICAgICAgOiBtX3NhbXBsZShXVEZNb3ZlKHNhbXBsZSkpCisgICAgICAgICwgbV9hdWRpb0lu Zm8oV1RGTW92ZShpbmZvKSkKKyAgICB7CisgICAgfQorCisgICAgR1N0cmVhbWVyQXVkaW9EYXRh KEdSZWZQdHI8R3N0U2FtcGxlPiYmIHNhbXBsZSwgY29uc3QgR3N0QXVkaW9JbmZvJiBpbmZvKQog ICAgICAgICA6IG1fc2FtcGxlKFdURk1vdmUoc2FtcGxlKSkKICAgICAgICAgLCBtX2F1ZGlvSW5m byhpbmZvKQogICAgIHsKQEAgLTQ1LDggKzUxLDggQEAgcHVibGljOgogICAgIH0KIAogICAgIHZv aWQgc2V0U2FtcGxlKEdSZWZQdHI8R3N0U2FtcGxlPiYmIHNhbXBsZSkgeyBtX3NhbXBsZSA9IFdU Rk1vdmUoc2FtcGxlKTsgfQotICAgIEdzdFNhbXBsZSogZ2V0U2FtcGxlKCkgeyByZXR1cm4gbV9z YW1wbGUuZ2V0KCk7IH0KLSAgICBHc3RBdWRpb0luZm8gZ2V0QXVkaW9JbmZvKCkgeyByZXR1cm4g bV9hdWRpb0luZm87IH0KKyAgICBjb25zdCBHUmVmUHRyPEdzdFNhbXBsZT4mIGdldFNhbXBsZSgp IGNvbnN0IHsgcmV0dXJuIG1fc2FtcGxlOyB9CisgICAgY29uc3QgR3N0QXVkaW9JbmZvJiBnZXRB dWRpb0luZm8oKSBjb25zdCB7IHJldHVybiBtX2F1ZGlvSW5mbzsgfQogICAgIHVpbnQzMl90IGNo YW5uZWxDb3VudCgpIGNvbnN0IHsgcmV0dXJuIEdTVF9BVURJT19JTkZPX0NIQU5ORUxTKCZtX2F1 ZGlvSW5mbyk7IH0KIAogcHJpdmF0ZToKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2F1ZGlvL2dzdHJlYW1lci9HU3RyZWFtZXJBdWRpb1N0cmVhbURlc2NyaXB0aW9uLmggYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9nc3RyZWFtZXIvR1N0cmVhbWVyQXVkaW9TdHJl YW1EZXNjcmlwdGlvbi5oCmluZGV4IDkzNjQ4ZWJlYWU2OTdhZTQxOGRmN2E0MmQ0Y2IyYWM2NDFl YzVkYTguLjZmMjg4NzJhZmIxMTc2ZTUxM2QyYmRmNTVhNjIyMWQ0ZjZmYjBhZTcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2dzdHJlYW1lci9HU3RyZWFtZXJBdWRp b1N0cmVhbURlc2NyaXB0aW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8v Z3N0cmVhbWVyL0dTdHJlYW1lckF1ZGlvU3RyZWFtRGVzY3JpcHRpb24uaApAQCAtMzAsMTMgKzMw LDE5IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogY2xhc3MgR1N0cmVhbWVyQXVkaW9TdHJlYW1E ZXNjcmlwdGlvbiBmaW5hbDogcHVibGljIEF1ZGlvU3RyZWFtRGVzY3JpcHRpb24gewogcHVibGlj OgotICAgIEdTdHJlYW1lckF1ZGlvU3RyZWFtRGVzY3JpcHRpb24oR3N0QXVkaW9JbmZvIGluZm8p CisgICAgR1N0cmVhbWVyQXVkaW9TdHJlYW1EZXNjcmlwdGlvbihHc3RBdWRpb0luZm8mJiBpbmZv KQorICAgICAgICA6IG1faW5mbyhXVEZNb3ZlKGluZm8pKQorICAgICAgICAsIG1fY2FwcyhhZG9w dEdSZWYoZ3N0X2F1ZGlvX2luZm9fdG9fY2FwcygmbV9pbmZvKSkpCisgICAgeworICAgIH0KKwor ICAgIEdTdHJlYW1lckF1ZGlvU3RyZWFtRGVzY3JpcHRpb24oY29uc3QgR3N0QXVkaW9JbmZvJiBp bmZvKQogICAgICAgICA6IG1faW5mbyhpbmZvKQogICAgICAgICAsIG1fY2FwcyhhZG9wdEdSZWYo Z3N0X2F1ZGlvX2luZm9fdG9fY2FwcygmbV9pbmZvKSkpCiAgICAgewogICAgIH0KIAotICAgIEdT dHJlYW1lckF1ZGlvU3RyZWFtRGVzY3JpcHRpb24oR3N0QXVkaW9JbmZvICppbmZvKQorICAgIEdT dHJlYW1lckF1ZGlvU3RyZWFtRGVzY3JpcHRpb24oR3N0QXVkaW9JbmZvKiBpbmZvKQogICAgICAg ICA6IG1faW5mbygqaW5mbykKICAgICAgICAgLCBtX2NhcHMoYWRvcHRHUmVmKGdzdF9hdWRpb19p bmZvX3RvX2NhcHMoJm1faW5mbykpKQogICAgIHsKQEAgLTkzLDggKzk5LDggQEAgcHVibGljOgog ICAgIGJvb2wgb3BlcmF0b3I9PShjb25zdCBHU3RyZWFtZXJBdWRpb1N0cmVhbURlc2NyaXB0aW9u JiBvdGhlcikgeyByZXR1cm4gZ3N0X2F1ZGlvX2luZm9faXNfZXF1YWwoJm1faW5mbywgJm90aGVy Lm1faW5mbyk7IH0KICAgICBib29sIG9wZXJhdG9yIT0oY29uc3QgR1N0cmVhbWVyQXVkaW9TdHJl YW1EZXNjcmlwdGlvbiYgb3RoZXIpIHsgcmV0dXJuICFvcGVyYXRvciA9PSAob3RoZXIpOyB9CiAK LSAgICBHc3RDYXBzKiBjYXBzKCkgeyByZXR1cm4gbV9jYXBzLmdldCgpOyB9Ci0gICAgR3N0QXVk aW9JbmZvKiBnZXRJbmZvKCkgeyByZXR1cm4gJm1faW5mbzsgfQorICAgIGNvbnN0IEdSZWZQdHI8 R3N0Q2Fwcz4mIGNhcHMoKSBjb25zdCB7IHJldHVybiBtX2NhcHM7IH0KKyAgICBjb25zdCBHc3RB dWRpb0luZm8mIGdldEluZm8oKSBjb25zdCB7IHJldHVybiBtX2luZm87IH0KIAogcHJpdmF0ZToK ICAgICBHc3RBdWRpb0luZm8gbV9pbmZvOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL0dTdHJlYW1lckF1ZGlvQ2FwdHVyZVNvdXJjZS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvR1N0cmVh bWVyQXVkaW9DYXB0dXJlU291cmNlLmNwcAppbmRleCA2NmI5Y2VlYmY5ZDEzMmIxYzM3MjE0NGQ0 YjMyZmU3ZjRlNmE1ZmRjLi5hMTEwMzNlODI0OGMyM2E4YTIxZTdkZDBhYjhjYWNkMjIyMmNlYzlh IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFt ZXIvR1N0cmVhbWVyQXVkaW9DYXB0dXJlU291cmNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvR1N0cmVhbWVyQXVkaW9DYXB0dXJlU291cmNl LmNwcApAQCAtMTI0LDEzICsxMjQsMTMgQEAgR3N0Rmxvd1JldHVybiBHU3RyZWFtZXJBdWRpb0Nh cHR1cmVTb3VyY2U6Om5ld1NhbXBsZUNhbGxiYWNrKEdzdEVsZW1lbnQqIHNpbmssIEcKICAgICBh dXRvIHNhbXBsZSA9IGFkb3B0R1JlZihnc3RfYXBwX3NpbmtfcHVsbF9zYW1wbGUoR1NUX0FQUF9T SU5LKHNpbmspKSk7CiAKICAgICAvLyBGSVhNRSAtIGZpZ3VyZSBvdXQgYSB3YXkgdG8gYXZvaWQg Y29weWluZyAob24gd3JpdGUpIHRoZSBkYXRhLgotICAgIEdzdEJ1ZmZlciogYnVmID0gZ3N0X3Nh bXBsZV9nZXRfYnVmZmVyKHNhbXBsZS5nZXQoKSk7Ci0gICAgYXV0byBmcmFtZXMoc3RkOjp1bmlx dWVfcHRyPEdTdHJlYW1lckF1ZGlvRGF0YT4obmV3IEdTdHJlYW1lckF1ZGlvRGF0YShXVEZNb3Zl KHNhbXBsZSkpKSk7Ci0gICAgYXV0byBzdHJlYW1EZXNjKHN0ZDo6dW5pcXVlX3B0cjxHU3RyZWFt ZXJBdWRpb1N0cmVhbURlc2NyaXB0aW9uPihuZXcgR1N0cmVhbWVyQXVkaW9TdHJlYW1EZXNjcmlw dGlvbihmcmFtZXMtPmdldEF1ZGlvSW5mbygpKSkpOworICAgIGF1dG8qIGJ1ZmZlciA9IGdzdF9z YW1wbGVfZ2V0X2J1ZmZlcihzYW1wbGUuZ2V0KCkpOworICAgIEdTdHJlYW1lckF1ZGlvRGF0YSBm cmFtZXMoV1RGTW92ZShzYW1wbGUpKTsKKyAgICBHU3RyZWFtZXJBdWRpb1N0cmVhbURlc2NyaXB0 aW9uIGRlc2NyaXB0aW9uKGZyYW1lcy5nZXRBdWRpb0luZm8oKSk7CiAKICAgICBzb3VyY2UtPmF1 ZGlvU2FtcGxlc0F2YWlsYWJsZSgKLSAgICAgICAgTWVkaWFUaW1lKEdTVF9USU1FX0FTX1VTRUNP TkRTKEdTVF9CVUZGRVJfUFRTKGJ1ZikpLCBHX1VTRUNfUEVSX1NFQyksCi0gICAgICAgICpmcmFt ZXMsICpzdHJlYW1EZXNjLCBnc3RfYnVmZmVyX2dldF9zaXplKGJ1ZikgLyBmcmFtZXMtPmdldEF1 ZGlvSW5mbygpLmJwZik7CisgICAgICAgIE1lZGlhVGltZShHU1RfVElNRV9BU19VU0VDT05EUyhH U1RfQlVGRkVSX1BUUyhidWZmZXIpKSwgR19VU0VDX1BFUl9TRUMpLAorICAgICAgICBmcmFtZXMs IGRlc2NyaXB0aW9uLCBnc3RfYnVmZmVyX2dldF9zaXplKGJ1ZmZlcikgLyBkZXNjcmlwdGlvbi5n ZXRJbmZvKCkuYnBmKTsKIAogICAgIHJldHVybiBHU1RfRkxPV19PSzsKIH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9HU3RyZWFtZXJN ZWRpYVN0cmVhbVNvdXJjZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVh bS9nc3RyZWFtZXIvR1N0cmVhbWVyTWVkaWFTdHJlYW1Tb3VyY2UuY3BwCmluZGV4IDkzZWNjYzg0 OGZmYTA4MWUwYmZjY2FlM2FiYjIxNTBlZTQ5YjVmNDkuLmNiYWI4YThjNmUzY2EzNzIzMWNhMmNk Mjk3OWFkMmQyNjY1MmE5ZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21l ZGlhc3RyZWFtL2dzdHJlYW1lci9HU3RyZWFtZXJNZWRpYVN0cmVhbVNvdXJjZS5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL0dTdHJlYW1lck1l ZGlhU3RyZWFtU291cmNlLmNwcApAQCAtNDAsNyArNDAsNyBAQAogdXNpbmcgbmFtZXNwYWNlIFdl YkNvcmU7CiAKIHN0YXRpYyB2b2lkIHdlYmtpdE1lZGlhU3RyZWFtU3JjUHVzaFZpZGVvU2FtcGxl KFdlYktpdE1lZGlhU3RyZWFtU3JjKiwgR3N0U2FtcGxlKik7Ci1zdGF0aWMgdm9pZCB3ZWJraXRN ZWRpYVN0cmVhbVNyY1B1c2hBdWRpb1NhbXBsZShXZWJLaXRNZWRpYVN0cmVhbVNyYyosIEdzdFNh bXBsZSopOworc3RhdGljIHZvaWQgd2Via2l0TWVkaWFTdHJlYW1TcmNQdXNoQXVkaW9TYW1wbGUo V2ViS2l0TWVkaWFTdHJlYW1TcmMqLCBjb25zdCBHUmVmUHRyPEdzdFNhbXBsZT4mKTsKIHN0YXRp YyB2b2lkIHdlYmtpdE1lZGlhU3RyZWFtU3JjVHJhY2tFbmRlZChXZWJLaXRNZWRpYVN0cmVhbVNy YyosIE1lZGlhU3RyZWFtVHJhY2tQcml2YXRlJik7CiBzdGF0aWMgdm9pZCB3ZWJraXRNZWRpYVN0 cmVhbVNyY1JlbW92ZVRyYWNrQnlUeXBlKFdlYktpdE1lZGlhU3RyZWFtU3JjKiwgUmVhbHRpbWVN ZWRpYVNvdXJjZTo6VHlwZSk7CiAKQEAgLTU5MSwxMCArNTkxLDEwIEBAIHN0YXRpYyB2b2lkIHdl YmtpdE1lZGlhU3RyZWFtU3JjUHVzaFZpZGVvU2FtcGxlKFdlYktpdE1lZGlhU3RyZWFtU3JjKiBz ZWxmLCBHc3RTCiAgICAgICAgIHNlbGYtPnByaXYtPnZpZGVvU3JjLT5wdXNoU2FtcGxlKHNhbXBs ZSk7CiB9CiAKLXN0YXRpYyB2b2lkIHdlYmtpdE1lZGlhU3RyZWFtU3JjUHVzaEF1ZGlvU2FtcGxl KFdlYktpdE1lZGlhU3RyZWFtU3JjKiBzZWxmLCBHc3RTYW1wbGUqIHNhbXBsZSkKK3N0YXRpYyB2 b2lkIHdlYmtpdE1lZGlhU3RyZWFtU3JjUHVzaEF1ZGlvU2FtcGxlKFdlYktpdE1lZGlhU3RyZWFt U3JjKiBzZWxmLCBjb25zdCBHUmVmUHRyPEdzdFNhbXBsZT4mIHNhbXBsZSkKIHsKICAgICBpZiAo c2VsZi0+cHJpdi0+YXVkaW9TcmMpCi0gICAgICAgIHNlbGYtPnByaXYtPmF1ZGlvU3JjLT5wdXNo U2FtcGxlKHNhbXBsZSk7CisgICAgICAgIHNlbGYtPnByaXYtPmF1ZGlvU3JjLT5wdXNoU2FtcGxl KHNhbXBsZS5nZXQoKSk7CiB9CiAKIHN0YXRpYyB2b2lkIHdlYmtpdE1lZGlhU3RyZWFtU3JjVHJh Y2tFbmRlZChXZWJLaXRNZWRpYVN0cmVhbVNyYyogc2VsZiwgTWVkaWFTdHJlYW1UcmFja1ByaXZh dGUmIHRyYWNrKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJl YW0vZ3N0cmVhbWVyL01vY2tSZWFsdGltZUF1ZGlvU291cmNlR1N0cmVhbWVyLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9Nb2NrUmVhbHRpbWVBdWRp b1NvdXJjZUdTdHJlYW1lci5jcHAKaW5kZXggMWJmNWEzYzJkNDkzMTlmYzFhZGJmYzY0MDk3YzFi NzIwNDY1NjNhNi4uYTY4ODg2YmIxMTA5ZDE2Mjk4NWI5ZTUwNDEzNzk4NzJhNzFiOGM0OCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL01v Y2tSZWFsdGltZUF1ZGlvU291cmNlR1N0cmVhbWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvTW9ja1JlYWx0aW1lQXVkaW9Tb3VyY2VHU3Ry ZWFtZXIuY3BwCkBAIC04MSwxMyArODEsMTMgQEAgdm9pZCBNb2NrUmVhbHRpbWVBdWRpb1NvdXJj ZUdTdHJlYW1lcjo6cmVuZGVyKFNlY29uZHMgZGVsdGEpCiAgICAgICAgIHVpbnQzMl90IGJpcEJv cENvdW50ID0gc3RkOjptaW4oZnJhbWVDb3VudCwgYmlwQm9wUmVtYWluKTsKIAogICAgICAgICBB U1NFUlQobV9zdHJlYW1Gb3JtYXQpOwotICAgICAgICBHc3RBdWRpb0luZm8qIGluZm8gPSBtX3N0 cmVhbUZvcm1hdC0+Z2V0SW5mbygpOworICAgICAgICBjb25zdCBhdXRvJiBpbmZvID0gbV9zdHJl YW1Gb3JtYXQtPmdldEluZm8oKTsKICAgICAgICAgR1JlZlB0cjxHc3RCdWZmZXI+IGJ1ZmZlciA9 IGFkb3B0R1JlZihnc3RfYnVmZmVyX25ld19hbGxvY2F0ZShudWxscHRyLCBiaXBCb3BDb3VudCAq IG1fc3RyZWFtRm9ybWF0LT5ieXRlc1BlckZyYW1lKCksIG51bGxwdHIpKTsKICAgICAgICAgewog ICAgICAgICAgICAgR3N0TWFwcGVkQnVmZmVyIG1hcChidWZmZXIuZ2V0KCksIEdTVF9NQVBfV1JJ VEUpOwogCiAgICAgICAgICAgICBpZiAobXV0ZWQoKSkKLSAgICAgICAgICAgICAgICBnc3RfYXVk aW9fZm9ybWF0X2ZpbGxfc2lsZW5jZShpbmZvLT5maW5mbywgbWFwLmRhdGEoKSwgbWFwLnNpemUo KSk7CisgICAgICAgICAgICAgICAgZ3N0X2F1ZGlvX2Zvcm1hdF9maWxsX3NpbGVuY2UoaW5mby5m aW5mbywgbWFwLmRhdGEoKSwgbWFwLnNpemUoKSk7CiAgICAgICAgICAgICBlbHNlIHsKICAgICAg ICAgICAgICAgICBtZW1jcHkobWFwLmRhdGEoKSwgJm1fYmlwQm9wQnVmZmVyW2JpcEJvcFN0YXJ0 XSwgc2l6ZW9mKGZsb2F0KSAqIGJpcEJvcENvdW50KTsKICAgICAgICAgICAgICAgICBhZGRIdW0o c19IdW1Wb2x1bWUsIHNfSHVtRnJlcXVlbmN5LCBzYW1wbGVSYXRlKCksIG1fc2FtcGxlc1JlbmRl cmVkLCByZWludGVycHJldF9jYXN0PGZsb2F0Kj4obWFwLmRhdGEoKSksIGJpcEJvcENvdW50KTsK QEAgLTk4LDExICs5OCwxMSBAQCB2b2lkIE1vY2tSZWFsdGltZUF1ZGlvU291cmNlR1N0cmVhbWVy OjpyZW5kZXIoU2Vjb25kcyBkZWx0YSkKICAgICAgICAgdG90YWxGcmFtZUNvdW50IC09IGJpcEJv cENvdW50OwogICAgICAgICBmcmFtZUNvdW50ID0gc3RkOjptaW4odG90YWxGcmFtZUNvdW50LCBt X21heGltaXVtRnJhbWVDb3VudCk7CiAKLSAgICAgICAgR1JlZlB0cjxHc3RDYXBzPiBjYXBzID0g YWRvcHRHUmVmKGdzdF9hdWRpb19pbmZvX3RvX2NhcHMoaW5mbykpOworICAgICAgICBhdXRvIGNh cHMgPSBhZG9wdEdSZWYoZ3N0X2F1ZGlvX2luZm9fdG9fY2FwcygmaW5mbykpOwogICAgICAgICBh dXRvIHNhbXBsZSA9IGFkb3B0R1JlZihnc3Rfc2FtcGxlX25ldyhidWZmZXIuZ2V0KCksIGNhcHMu Z2V0KCksIG51bGxwdHIsIG51bGxwdHIpKTsKLSAgICAgICAgYXV0byBkYXRhKHN0ZDo6dW5pcXVl X3B0cjxHU3RyZWFtZXJBdWRpb0RhdGE+KG5ldyBHU3RyZWFtZXJBdWRpb0RhdGEoV1RGTW92ZShz YW1wbGUpLCAqaW5mbykpKTsKLSAgICAgICAgYXV0byBtZWRpYVRpbWUgPSBNZWRpYVRpbWUoKG1f c2FtcGxlc1JlbmRlcmVkICogR19VU0VDX1BFUl9TRUMpIC8gc2FtcGxlUmF0ZSgpLCBHX1VTRUNf UEVSX1NFQyk7Ci0gICAgICAgIGF1ZGlvU2FtcGxlc0F2YWlsYWJsZShtZWRpYVRpbWUsICpkYXRh LmdldCgpLCAqbV9zdHJlYW1Gb3JtYXQsIGJpcEJvcENvdW50KTsKKyAgICAgICAgR1N0cmVhbWVy QXVkaW9EYXRhIGRhdGEoV1RGTW92ZShzYW1wbGUpLCBpbmZvKTsKKyAgICAgICAgTWVkaWFUaW1l IG1lZGlhVGltZSgobV9zYW1wbGVzUmVuZGVyZWQgKiBHX1VTRUNfUEVSX1NFQykgLyBzYW1wbGVS YXRlKCksIEdfVVNFQ19QRVJfU0VDKTsKKyAgICAgICAgYXVkaW9TYW1wbGVzQXZhaWxhYmxlKG1l ZGlhVGltZSwgZGF0YSwgKm1fc3RyZWFtRm9ybWF0LCBiaXBCb3BDb3VudCk7CiAgICAgfQogfQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFt ZXIvUmVhbHRpbWVJbmNvbWluZ0F1ZGlvU291cmNlTGliV2ViUlRDLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9SZWFsdGltZUluY29taW5nQXVkaW9T b3VyY2VMaWJXZWJSVEMuY3BwCmluZGV4IDEyN2M2YzBmMDQyMzZiNmQzMTcwYmQ2NmVhMWVmZTdk YThhZmFiZmEuLmE5MDFmMjllOGI0ZjdjNGE3OTMwZDgyNTFjNzUzMjM3ZTMyNDExNTggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9SZWFs dGltZUluY29taW5nQXVkaW9Tb3VyY2VMaWJXZWJSVEMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9SZWFsdGltZUluY29taW5nQXVkaW9Tb3Vy Y2VMaWJXZWJSVEMuY3BwCkBAIC03MiwxMiArNzIsMTEgQEAgdm9pZCBSZWFsdGltZUluY29taW5n QXVkaW9Tb3VyY2VMaWJXZWJSVEM6Ok9uRGF0YShjb25zdCB2b2lkKiBhdWRpb0RhdGEsIGludCwg aW4KICAgICAgICAgbWVtY3B5KGJ1ZmZlckRhdGEsIGF1ZGlvRGF0YSwgYnVmZmVyU2l6ZSk7CiAK ICAgICBhdXRvIGJ1ZmZlciA9IGFkb3B0R1JlZihnc3RfYnVmZmVyX25ld193cmFwcGVkKGJ1ZmZl ckRhdGEsIGJ1ZmZlclNpemUpKTsKLSAgICBHUmVmUHRyPEdzdENhcHM+IGNhcHMgPSBhZG9wdEdS ZWYoZ3N0X2F1ZGlvX2luZm9fdG9fY2FwcygmaW5mbykpOworICAgIGF1dG8gY2FwcyA9IGFkb3B0 R1JlZihnc3RfYXVkaW9faW5mb190b19jYXBzKCZpbmZvKSk7CiAgICAgYXV0byBzYW1wbGUgPSBh ZG9wdEdSZWYoZ3N0X3NhbXBsZV9uZXcoYnVmZmVyLmdldCgpLCBjYXBzLmdldCgpLCBudWxscHRy LCBudWxscHRyKSk7Ci0gICAgYXV0byBkYXRhKHN0ZDo6dW5pcXVlX3B0cjxHU3RyZWFtZXJBdWRp b0RhdGE+KG5ldyBHU3RyZWFtZXJBdWRpb0RhdGEoV1RGTW92ZShzYW1wbGUpLCBpbmZvKSkpOwot Ci0gICAgYXV0byBtZWRpYVRpbWUgPSBNZWRpYVRpbWUoKG1fbnVtYmVyT2ZGcmFtZXMgKiBHX1VT RUNfUEVSX1NFQykgLyBzYW1wbGVSYXRlLCBHX1VTRUNfUEVSX1NFQyk7Ci0gICAgYXVkaW9TYW1w bGVzQXZhaWxhYmxlKG1lZGlhVGltZSwgKmRhdGEuZ2V0KCksIEdTdHJlYW1lckF1ZGlvU3RyZWFt RGVzY3JpcHRpb24oaW5mbyksIG51bWJlck9mRnJhbWVzKTsKKyAgICBHU3RyZWFtZXJBdWRpb0Rh dGEgZGF0YShXVEZNb3ZlKHNhbXBsZSksIGluZm8pOworICAgIE1lZGlhVGltZSBtZWRpYVRpbWUo KG1fbnVtYmVyT2ZGcmFtZXMgKiBHX1VTRUNfUEVSX1NFQykgLyBzYW1wbGVSYXRlLCBHX1VTRUNf UEVSX1NFQyk7CisgICAgYXVkaW9TYW1wbGVzQXZhaWxhYmxlKG1lZGlhVGltZSwgZGF0YSwgR1N0 cmVhbWVyQXVkaW9TdHJlYW1EZXNjcmlwdGlvbihpbmZvKSwgbnVtYmVyT2ZGcmFtZXMpOwogCiAg ICAgbV9udW1iZXJPZkZyYW1lcyArPSBudW1iZXJPZkZyYW1lczsKIH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9SZWFsdGltZU91dGdv aW5nQXVkaW9Tb3VyY2VMaWJXZWJSVEMuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVk aWFzdHJlYW0vZ3N0cmVhbWVyL1JlYWx0aW1lT3V0Z29pbmdBdWRpb1NvdXJjZUxpYldlYlJUQy5j cHAKaW5kZXggOWJmZDY2MmM4YzM5MjA2ZTIxNzA5N2U2YjI3N2I1NmVkNTNjMzNjYy4uM2NiNzVm MDBhZmU0NjIxYjc1OTU3YWMzNTI1NDNjZWUxYjVlNzliZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL1JlYWx0aW1lT3V0Z29pbmdBdWRp b1NvdXJjZUxpYldlYlJUQy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFz dHJlYW0vZ3N0cmVhbWVyL1JlYWx0aW1lT3V0Z29pbmdBdWRpb1NvdXJjZUxpYldlYlJUQy5jcHAK QEAgLTIyLDEwICsyMiwxMSBAQAogI2lmIFVTRShMSUJXRUJSVEMpICYmIFVTRShHU1RSRUFNRVIp CiAjaW5jbHVkZSAiUmVhbHRpbWVPdXRnb2luZ0F1ZGlvU291cmNlTGliV2ViUlRDLmgiCiAKKyNp bmNsdWRlICJHU3RyZWFtZXJBdWRpb0RhdGEuaCIKKyNpbmNsdWRlICJHU3RyZWFtZXJBdWRpb1N0 cmVhbURlc2NyaXB0aW9uLmgiCiAjaW5jbHVkZSAiTGliV2ViUlRDQXVkaW9Gb3JtYXQuaCIKICNp bmNsdWRlICJMaWJXZWJSVENQcm92aWRlci5oIgogI2luY2x1ZGUgIk5vdEltcGxlbWVudGVkLmgi Ci0jaW5jbHVkZSAiZ3N0cmVhbWVyL0dTdHJlYW1lckF1ZGlvRGF0YS5oIgogCiBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKQEAgLTQ2LDggKzQ3LDcgQEAgUmVmPFJlYWx0aW1lT3V0Z29pbmdBdWRpb1Nv dXJjZT4gUmVhbHRpbWVPdXRnb2luZ0F1ZGlvU291cmNlOjpjcmVhdGUoUmVmPE1lZGlhU3QKICAg ICByZXR1cm4gUmVhbHRpbWVPdXRnb2luZ0F1ZGlvU291cmNlTGliV2ViUlRDOjpjcmVhdGUoV1RG TW92ZShhdWRpb1NvdXJjZSkpOwogfQogCi1zdGF0aWMgaW5saW5lIHN0ZDo6dW5pcXVlX3B0cjxH U3RyZWFtZXJBdWRpb1N0cmVhbURlc2NyaXB0aW9uPiBsaWJ3ZWJydGNBdWRpb0Zvcm1hdChpbnQg c2FtcGxlUmF0ZSwKLSAgICBzaXplX3QgY2hhbm5lbENvdW50KQorc3RhdGljIGlubGluZSBHc3RB dWRpb0luZm8gbGlid2VicnRjQXVkaW9Gb3JtYXQoaW50IHNhbXBsZVJhdGUsIHNpemVfdCBjaGFu bmVsQ291bnQpCiB7CiAgICAgR3N0QXVkaW9Gb3JtYXQgZm9ybWF0ID0gZ3N0X2F1ZGlvX2Zvcm1h dF9idWlsZF9pbnRlZ2VyKAogICAgICAgICBMaWJXZWJSVENBdWRpb0Zvcm1hdDo6aXNTaWduZWQs CkBAIC01OSwzNCArNTksMzAgQEAgc3RhdGljIGlubGluZSBzdGQ6OnVuaXF1ZV9wdHI8R1N0cmVh bWVyQXVkaW9TdHJlYW1EZXNjcmlwdGlvbj4gbGlid2VicnRjQXVkaW9Gb3IKIAogICAgIHNpemVf dCBsaWJXZWJSVENDaGFubmVsQ291bnQgPSBjaGFubmVsQ291bnQgPj0gMiA/IDIgOiBjaGFubmVs Q291bnQ7CiAgICAgZ3N0X2F1ZGlvX2luZm9fc2V0X2Zvcm1hdCgmaW5mbywgZm9ybWF0LCBzYW1w bGVSYXRlLCBsaWJXZWJSVENDaGFubmVsQ291bnQsIG51bGxwdHIpOwotCi0gICAgcmV0dXJuIHN0 ZDo6dW5pcXVlX3B0cjxHU3RyZWFtZXJBdWRpb1N0cmVhbURlc2NyaXB0aW9uPihuZXcgR1N0cmVh bWVyQXVkaW9TdHJlYW1EZXNjcmlwdGlvbihpbmZvKSk7CisgICAgcmV0dXJuIGluZm87CiB9CiAK LXZvaWQgUmVhbHRpbWVPdXRnb2luZ0F1ZGlvU291cmNlTGliV2ViUlRDOjphdWRpb1NhbXBsZXNB dmFpbGFibGUoY29uc3QgTWVkaWFUaW1lJiwKLSAgICBjb25zdCBQbGF0Zm9ybUF1ZGlvRGF0YSYg YXVkaW9EYXRhLCBjb25zdCBBdWRpb1N0cmVhbURlc2NyaXB0aW9uJiBzdHJlYW1EZXNjcmlwdGlv biwKLSAgICBzaXplX3QgLyogc2FtcGxlQ291bnQgKi8pCit2b2lkIFJlYWx0aW1lT3V0Z29pbmdB dWRpb1NvdXJjZUxpYldlYlJUQzo6YXVkaW9TYW1wbGVzQXZhaWxhYmxlKGNvbnN0IE1lZGlhVGlt ZSYsIGNvbnN0IFBsYXRmb3JtQXVkaW9EYXRhJiBhdWRpb0RhdGEsIGNvbnN0IEF1ZGlvU3RyZWFt RGVzY3JpcHRpb24mIHN0cmVhbURlc2NyaXB0aW9uLCBzaXplX3QgLyogc2FtcGxlQ291bnQgKi8p CiB7CiAgICAgYXV0byBkYXRhID0gc3RhdGljX2Nhc3Q8Y29uc3QgR1N0cmVhbWVyQXVkaW9EYXRh Jj4oYXVkaW9EYXRhKTsKICAgICBhdXRvIGRlc2MgPSBzdGF0aWNfY2FzdDxjb25zdCBHU3RyZWFt ZXJBdWRpb1N0cmVhbURlc2NyaXB0aW9uJj4oc3RyZWFtRGVzY3JpcHRpb24pOwogCi0gICAgaWYg KG1fc2FtcGxlQ29udmVydGVyICYmICFnc3RfYXVkaW9faW5mb19pc19lcXVhbChtX2lucHV0U3Ry ZWFtRGVzY3JpcHRpb24tPmdldEluZm8oKSwgZGVzYy5nZXRJbmZvKCkpKSB7CisgICAgaWYgKG1f c2FtcGxlQ29udmVydGVyICYmICFnc3RfYXVkaW9faW5mb19pc19lcXVhbCgmbV9pbnB1dFN0cmVh bURlc2NyaXB0aW9uLCAmZGVzYy5nZXRJbmZvKCkpKSB7CiAgICAgICAgIEdTVF9FUlJPUl9PQkpF Q1QodGhpcywgIkZJWE1FIC0gQXVkaW8gZm9ybWF0IHJlbmVnb3RpYXRpb24gaXMgbm90IHBvc3Np YmxlIHlldCEiKTsKICAgICAgICAgbV9zYW1wbGVDb252ZXJ0ZXIgPSBudWxscHRyOwogICAgIH0K IAogICAgIGlmICghbV9zYW1wbGVDb252ZXJ0ZXIpIHsKLSAgICAgICAgbV9pbnB1dFN0cmVhbURl c2NyaXB0aW9uID0gc3RkOjp1bmlxdWVfcHRyPEdTdHJlYW1lckF1ZGlvU3RyZWFtRGVzY3JpcHRp b24+KG5ldyBHU3RyZWFtZXJBdWRpb1N0cmVhbURlc2NyaXB0aW9uKGRlc2MuZ2V0SW5mbygpKSk7 Ci0gICAgICAgIG1fb3V0cHV0U3RyZWFtRGVzY3JpcHRpb24gPSBsaWJ3ZWJydGNBdWRpb0Zvcm1h dChMaWJXZWJSVENBdWRpb0Zvcm1hdDo6c2FtcGxlUmF0ZSwgc3RyZWFtRGVzY3JpcHRpb24ubnVt YmVyT2ZDaGFubmVscygpKTsKLSAgICAgICAgbV9zYW1wbGVDb252ZXJ0ZXIucmVzZXQoZ3N0X2F1 ZGlvX2NvbnZlcnRlcl9uZXcoR1NUX0FVRElPX0NPTlZFUlRFUl9GTEFHX0lOX1dSSVRBQkxFLAot ICAgICAgICAgICAgbV9pbnB1dFN0cmVhbURlc2NyaXB0aW9uLT5nZXRJbmZvKCksCi0gICAgICAg ICAgICBtX291dHB1dFN0cmVhbURlc2NyaXB0aW9uLT5nZXRJbmZvKCksCi0gICAgICAgICAgICBu dWxscHRyKSk7CisgICAgICAgIG1faW5wdXRTdHJlYW1EZXNjcmlwdGlvbiA9IGRlc2MuZ2V0SW5m bygpOworICAgICAgICBtX291dHB1dFN0cmVhbURlc2NyaXB0aW9uID0gbGlid2VicnRjQXVkaW9G b3JtYXQoTGliV2ViUlRDQXVkaW9Gb3JtYXQ6OnNhbXBsZVJhdGUsIGRlc2MubnVtYmVyT2ZDaGFu bmVscygpKTsKKyAgICAgICAgbV9zYW1wbGVDb252ZXJ0ZXIucmVzZXQoZ3N0X2F1ZGlvX2NvbnZl cnRlcl9uZXcoR1NUX0FVRElPX0NPTlZFUlRFUl9GTEFHX0lOX1dSSVRBQkxFLCAmbV9pbnB1dFN0 cmVhbURlc2NyaXB0aW9uLAorICAgICAgICAgICAgJm1fb3V0cHV0U3RyZWFtRGVzY3JpcHRpb24s IG51bGxwdHIpKTsKICAgICB9CiAKICAgICB7CiAgICAgICAgIExvY2tIb2xkZXIgbG9ja2VyKG1f YWRhcHRlck11dGV4KTsKLSAgICAgICAgYXV0byogYnVmZmVyID0gZ3N0X3NhbXBsZV9nZXRfYnVm ZmVyKGRhdGEuZ2V0U2FtcGxlKCkpOworICAgICAgICBjb25zdCBhdXRvJiBzYW1wbGUgPSBkYXRh LmdldFNhbXBsZSgpOworICAgICAgICBhdXRvKiBidWZmZXIgPSBnc3Rfc2FtcGxlX2dldF9idWZm ZXIoc2FtcGxlLmdldCgpKTsKICAgICAgICAgZ3N0X2FkYXB0ZXJfcHVzaChtX2FkYXB0ZXIuZ2V0 KCksIGdzdF9idWZmZXJfcmVmKGJ1ZmZlcikpOwogICAgIH0KICAgICBMaWJXZWJSVENQcm92aWRl cjo6Y2FsbE9uV2ViUlRDU2lnbmFsaW5nVGhyZWFkKFtwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigq dGhpcyldIHsKQEAgLTk2LDI0ICs5MiwyMyBAQCB2b2lkIFJlYWx0aW1lT3V0Z29pbmdBdWRpb1Nv dXJjZUxpYldlYlJUQzo6YXVkaW9TYW1wbGVzQXZhaWxhYmxlKGNvbnN0IE1lZGlhVGltZQogCiB2 b2lkIFJlYWx0aW1lT3V0Z29pbmdBdWRpb1NvdXJjZUxpYldlYlJUQzo6cHVsbEF1ZGlvRGF0YSgp CiB7Ci0gICAgaWYgKCFtX2lucHV0U3RyZWFtRGVzY3JpcHRpb24gfHwgIW1fb3V0cHV0U3RyZWFt RGVzY3JpcHRpb24pIHsKKyAgICBpZiAoIUdTVF9BVURJT19JTkZPX0lTX1ZBTElEKCZtX2lucHV0 U3RyZWFtRGVzY3JpcHRpb24pIHx8ICFHU1RfQVVESU9fSU5GT19JU19WQUxJRCgmbV9vdXRwdXRT dHJlYW1EZXNjcmlwdGlvbikpIHsKICAgICAgICAgR1NUX0lORk8oIk5vIHN0cmVhbSBkZXNjcmlw dGlvbiBzZXQgeWV0LiIpOwotCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKICAgICBzaXplX3Qg b3V0Q2h1bmtTYW1wbGVDb3VudCA9IExpYldlYlJUQ0F1ZGlvRm9ybWF0OjpjaHVua1NhbXBsZUNv dW50OwotICAgIHNpemVfdCBvdXRCdWZmZXJTaXplID0gb3V0Q2h1bmtTYW1wbGVDb3VudCAqIG1f b3V0cHV0U3RyZWFtRGVzY3JpcHRpb24tPmdldEluZm8oKS0+YnBmOworICAgIHNpemVfdCBvdXRC dWZmZXJTaXplID0gb3V0Q2h1bmtTYW1wbGVDb3VudCAqIG1fb3V0cHV0U3RyZWFtRGVzY3JpcHRp b24uYnBmOwogCiAgICAgTG9ja0hvbGRlciBsb2NrZXIobV9hZGFwdGVyTXV0ZXgpOwogICAgIHNp emVfdCBpbkNodW5rU2FtcGxlQ291bnQgPSBnc3RfYXVkaW9fY29udmVydGVyX2dldF9pbl9mcmFt ZXMobV9zYW1wbGVDb252ZXJ0ZXIuZ2V0KCksIG91dENodW5rU2FtcGxlQ291bnQpOwotICAgIHNp emVfdCBpbkJ1ZmZlclNpemUgPSBpbkNodW5rU2FtcGxlQ291bnQgKiBtX2lucHV0U3RyZWFtRGVz Y3JpcHRpb24tPmdldEluZm8oKS0+YnBmOworICAgIHNpemVfdCBpbkJ1ZmZlclNpemUgPSBpbkNo dW5rU2FtcGxlQ291bnQgKiBtX2lucHV0U3RyZWFtRGVzY3JpcHRpb24uYnBmOwogCiAgICAgd2hp bGUgKGdzdF9hZGFwdGVyX2F2YWlsYWJsZShtX2FkYXB0ZXIuZ2V0KCkpID4gaW5CdWZmZXJTaXpl KSB7CiAgICAgICAgIGF1dG8gaW5CdWZmZXIgPSBhZG9wdEdSZWYoZ3N0X2FkYXB0ZXJfdGFrZV9i dWZmZXIobV9hZGFwdGVyLmdldCgpLCBpbkJ1ZmZlclNpemUpKTsKICAgICAgICAgbV9hdWRpb0J1 ZmZlci5ncm93KG91dEJ1ZmZlclNpemUpOwogICAgICAgICBpZiAoaXNTaWxlbmNlZCgpKQotICAg ICAgICAgICAgZ3N0X2F1ZGlvX2Zvcm1hdF9maWxsX3NpbGVuY2UobV9vdXRwdXRTdHJlYW1EZXNj cmlwdGlvbi0+Z2V0SW5mbygpLT5maW5mbywgbV9hdWRpb0J1ZmZlci5kYXRhKCksIG91dEJ1ZmZl clNpemUpOworICAgICAgICAgICAgZ3N0X2F1ZGlvX2Zvcm1hdF9maWxsX3NpbGVuY2UobV9vdXRw dXRTdHJlYW1EZXNjcmlwdGlvbi5maW5mbywgbV9hdWRpb0J1ZmZlci5kYXRhKCksIG91dEJ1ZmZl clNpemUpOwogICAgICAgICBlbHNlIHsKICAgICAgICAgICAgIEdzdE1hcHBlZEJ1ZmZlciBpbk1h cChpbkJ1ZmZlci5nZXQoKSwgR1NUX01BUF9SRUFEKTsKIApAQCAtMTI2LDggKzEyMSw4IEBAIHZv aWQgUmVhbHRpbWVPdXRnb2luZ0F1ZGlvU291cmNlTGliV2ViUlRDOjpwdWxsQXVkaW9EYXRhKCkK ICAgICAgICAgICAgIH0KICAgICAgICAgfQogCi0gICAgICAgIHNlbmRBdWRpb0ZyYW1lcyhtX2F1 ZGlvQnVmZmVyLmRhdGEoKSwgTGliV2ViUlRDQXVkaW9Gb3JtYXQ6OnNhbXBsZVNpemUsIHN0YXRp Y19jYXN0PGludD4obV9vdXRwdXRTdHJlYW1EZXNjcmlwdGlvbi0+c2FtcGxlUmF0ZSgpKSwKLSAg ICAgICAgICAgIHN0YXRpY19jYXN0PGludD4obV9vdXRwdXRTdHJlYW1EZXNjcmlwdGlvbi0+bnVt YmVyT2ZDaGFubmVscygpKSwgb3V0Q2h1bmtTYW1wbGVDb3VudCk7CisgICAgICAgIHNlbmRBdWRp b0ZyYW1lcyhtX2F1ZGlvQnVmZmVyLmRhdGEoKSwgTGliV2ViUlRDQXVkaW9Gb3JtYXQ6OnNhbXBs ZVNpemUsIEdTVF9BVURJT19JTkZPX1JBVEUoJm1fb3V0cHV0U3RyZWFtRGVzY3JpcHRpb24pLAor ICAgICAgICAgICAgR1NUX0FVRElPX0lORk9fQ0hBTk5FTFMoJm1fb3V0cHV0U3RyZWFtRGVzY3Jp cHRpb24pLCBvdXRDaHVua1NhbXBsZUNvdW50KTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9SZWFsdGltZU91dGdv aW5nQXVkaW9Tb3VyY2VMaWJXZWJSVEMuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlh c3RyZWFtL2dzdHJlYW1lci9SZWFsdGltZU91dGdvaW5nQXVkaW9Tb3VyY2VMaWJXZWJSVEMuaApp bmRleCAzOWNlODhiNjExYTY0MWEzMzIxZGUxZDY5NWZiMTBhOTllZGZjMmQ4Li5kZTZlZmU5ZjFh NTI1NzE1YmY3YmQ5MGQ4ZTExODE3MWQxZWJlMmRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvUmVhbHRpbWVPdXRnb2luZ0F1ZGlvU291 cmNlTGliV2ViUlRDLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0v Z3N0cmVhbWVyL1JlYWx0aW1lT3V0Z29pbmdBdWRpb1NvdXJjZUxpYldlYlJUQy5oCkBAIC0yMSw3 ICsyMSw2IEBACiAKICNpZiBVU0UoTElCV0VCUlRDKQogCi0jaW5jbHVkZSAiR1N0cmVhbWVyQXVk aW9TdHJlYW1EZXNjcmlwdGlvbi5oIgogI2luY2x1ZGUgIkdTdHJlYW1lckNvbW1vbi5oIgogI2lu Y2x1ZGUgIlJlYWx0aW1lT3V0Z29pbmdBdWRpb1NvdXJjZS5oIgogCkBAIC00OSw4ICs0OCw4IEBA IHByaXZhdGU6CiAgICAgdm9pZCBwdWxsQXVkaW9EYXRhKCk7CiAKICAgICBHVW5pcXVlUHRyPEdz dEF1ZGlvQ29udmVydGVyPiBtX3NhbXBsZUNvbnZlcnRlcjsKLSAgICBzdGQ6OnVuaXF1ZV9wdHI8 R1N0cmVhbWVyQXVkaW9TdHJlYW1EZXNjcmlwdGlvbj4gbV9pbnB1dFN0cmVhbURlc2NyaXB0aW9u OwotICAgIHN0ZDo6dW5pcXVlX3B0cjxHU3RyZWFtZXJBdWRpb1N0cmVhbURlc2NyaXB0aW9uPiBt X291dHB1dFN0cmVhbURlc2NyaXB0aW9uOworICAgIEdzdEF1ZGlvSW5mbyBtX2lucHV0U3RyZWFt RGVzY3JpcHRpb247CisgICAgR3N0QXVkaW9JbmZvIG1fb3V0cHV0U3RyZWFtRGVzY3JpcHRpb247 CiAKICAgICBMb2NrIG1fYWRhcHRlck11dGV4OwogICAgIEdSZWZQdHI8R3N0QWRhcHRlcj4gbV9h ZGFwdGVyOwo=