188194 2018-07-31 06:50:57 -0700 [GStreamer] Dynamically adjust blocksize 2018-08-02 05:22:02 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=188193 P2 Normal --- 1 cturner cturner bugs-noreply calvaris commit-queue oldest_to_newest 1446538 0 cturner 2018-07-31 06:50:57 -0700 [GStreamer] Dynamically adjust blocksize 1446539 1 346165 cturner 2018-07-31 06:53:48 -0700 Created attachment 346165 Patch 1446540 2 cturner 2018-07-31 06:54:21 -0700 Depends on https://bugs.webkit.org/show_bug.cgi?id=188193 landing first. 1446837 3 346165 calvaris 2018-08-01 00:01:29 -0700 Comment on attachment 346165 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=346165&action=review > Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:60 > + static constexpr int growBlocksizeLimit { 1 }; > + static constexpr int growBlocksizeCount { 1 }; > + static constexpr int growBlocksizeFactor { 2 }; > + static constexpr float reduceBlocksizeLimit { 0.20 }; > + static constexpr int reduceBlocksizeCount { 2 }; > + static constexpr float reduceBlocksizeFactor { 0.5 }; These should be prefixed with s_ > Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:784 > + m_reduceBlocksizeCount = m_increaseBlocksizeCount = 0; Please, write this in two lines. 1447220 4 346374 cturner 2018-08-02 04:38:32 -0700 Created attachment 346374 Patch Fix code style violations 1447221 5 346375 cturner 2018-08-02 04:40:26 -0700 Created attachment 346375 Patch Fix code style violations 1447226 6 346375 commit-queue 2018-08-02 05:22:00 -0700 Comment on attachment 346375 Patch Clearing flags on attachment: 346375 Committed r234498: <https://trac.webkit.org/changeset/234498> 1447227 7 commit-queue 2018-08-02 05:22:02 -0700 All reviewed patches have been landed. Closing bug. 346165 2018-07-31 06:53:48 -0700 2018-08-02 04:38:29 -0700 Patch bug-188194-20180731145347.patch text/plain 6079 cturner U3VidmVyc2lvbiBSZXZpc2lvbjogMjM0MTkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWM1MmU2ZDNkZjRkOTJh ZWE0NDNlOGI5OWQ5YjlkZDU1ZWZkYmU4MS4uODMxMTdjNTE4YzEzODA5ZTE4MDc5NjMxZDQ3NmQy MTZlYzMyNThjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE4LTA3LTMxICBDaGFy bGllIFR1cm5lciAgPGN0dXJuZXJAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVyXSBE eW5hbWljYWxseSBhZGp1c3QgYmxvY2tzaXplCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xODgxOTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBVcGRhdGUgdGhlIGJsb2Nrc2l6ZSBkZXBlbmRpbmcgb24gaG93 IG11Y2ggaXMgb2J0YWluZWQgZnJvbSBhIHJlYWQKKyAgICAgICAgb2YgdGhlIGlucHV0IHN0cmVh bS4gVGhpcyBhdm9pZHMgZG9pbmcgdG9vIG1hbnkgcmVhZHMgaW4gc21hbGwKKyAgICAgICAgY2h1 bmtzIHdoZW4gbGFyZ2VyIGFtb3VudHMgb2YgZGF0YSBhcmUgYXZhaWxhYmxlIGFuZCBhbHNvIHBy ZXZlbnRzCisgICAgICAgIHVzaW5nIGEgdmVyeSBsYXJnZSBtZW1vcnkgYXJlYSB0byByZWFkIGEg c21hbGwgY2h1bmsgb2YgZGF0YS4KKworICAgICAgICBBZGFwdGVkIGZyb20gaHR0cHM6Ly9idWd6 aWxsYS5nbm9tZS5vcmcvc2hvd19idWcuY2dpP2lkPTc2NzgzMworCisgICAgICAgIE5vIHRlc3Rz IG5ldyB0ZXN0cyBzaW5jZSBubyBjaGFuZ2UgaW4gZnVuY3Rpb25hbGl0eS4KKworICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9XZWJLaXRXZWJTb3VyY2VHU3RyZWFtZXIuY3Bw OgorICAgICAgICAod2Via2l0X3dlYl9zcmNfaW5pdCk6CisgICAgICAgIChDYWNoZWRSZXNvdXJj ZVN0cmVhbWluZ0NsaWVudDo6Y2hlY2tVcGRhdGVCbG9ja3NpemUpOgorICAgICAgICAoQ2FjaGVk UmVzb3VyY2VTdHJlYW1pbmdDbGllbnQ6OmRhdGFSZWNlaXZlZCk6CisKIDIwMTgtMDctMzEgIENo YXJsaWUgVHVybmVyICA8Y3R1cm5lckBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHU3RyZWFtZXJd IFN0b3AgcHVzaGluZyBidWZmZXJzIHdoZW4gc2Vla2luZyBzdGF0dXMgY2hhbmdlcwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdl YlNvdXJjZUdTdHJlYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9n c3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNwcAppbmRleCAxN2UwNGZiZTU0OTJk YmU5ZmI4YWE5MjliODI1MjcyYmY3MmNlZmU2Li5kNTYzYzkxYjM4MmFmYTFlZTIxOGQ5ODQ3YTQ4 YTUxMTE1Yjk5ZmM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVy LmNwcApAQCAtNDMsNiArNDMsOCBAQCBwdWJsaWM6CiAgICAgQ2FjaGVkUmVzb3VyY2VTdHJlYW1p bmdDbGllbnQoV2ViS2l0V2ViU3JjKiwgUmVzb3VyY2VSZXF1ZXN0JiYpOwogICAgIHZpcnR1YWwg fkNhY2hlZFJlc291cmNlU3RyZWFtaW5nQ2xpZW50KCk7CiBwcml2YXRlOgorICAgIHZvaWQgY2hl Y2tVcGRhdGVCbG9ja3NpemUodWludDY0X3QgYnl0ZXNSZWFkKTsKKwogICAgIC8vIFBsYXRmb3Jt TWVkaWFSZXNvdXJjZUNsaWVudCB2aXJ0dWFsIG1ldGhvZHMuCiAgICAgdm9pZCByZXNwb25zZVJl Y2VpdmVkKFBsYXRmb3JtTWVkaWFSZXNvdXJjZSYsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmKSBv dmVycmlkZTsKICAgICB2b2lkIGRhdGFSZWNlaXZlZChQbGF0Zm9ybU1lZGlhUmVzb3VyY2UmLCBj b25zdCBjaGFyKiwgaW50KSBvdmVycmlkZTsKQEAgLTUwLDYgKzUyLDE1IEBAIHByaXZhdGU6CiAg ICAgdm9pZCBsb2FkRmFpbGVkKFBsYXRmb3JtTWVkaWFSZXNvdXJjZSYsIGNvbnN0IFJlc291cmNl RXJyb3ImKSBvdmVycmlkZTsKICAgICB2b2lkIGxvYWRGaW5pc2hlZChQbGF0Zm9ybU1lZGlhUmVz b3VyY2UmKSBvdmVycmlkZTsKIAorICAgIHN0YXRpYyBjb25zdGV4cHIgaW50IGdyb3dCbG9ja3Np emVMaW1pdCB7IDEgfTsKKyAgICBzdGF0aWMgY29uc3RleHByIGludCBncm93QmxvY2tzaXplQ291 bnQgeyAxIH07CisgICAgc3RhdGljIGNvbnN0ZXhwciBpbnQgZ3Jvd0Jsb2Nrc2l6ZUZhY3RvciB7 IDIgfTsKKyAgICBzdGF0aWMgY29uc3RleHByIGZsb2F0IHJlZHVjZUJsb2Nrc2l6ZUxpbWl0IHsg MC4yMCB9OworICAgIHN0YXRpYyBjb25zdGV4cHIgaW50IHJlZHVjZUJsb2Nrc2l6ZUNvdW50IHsg MiB9OworICAgIHN0YXRpYyBjb25zdGV4cHIgZmxvYXQgcmVkdWNlQmxvY2tzaXplRmFjdG9yIHsg MC41IH07CisgICAgaW50IG1fcmVkdWNlQmxvY2tzaXplQ291bnQgeyAwIH07CisgICAgaW50IG1f aW5jcmVhc2VCbG9ja3NpemVDb3VudCB7IDAgfTsKKwogICAgIEdSZWZQdHI8R3N0RWxlbWVudD4g bV9zcmM7CiAgICAgUmVzb3VyY2VSZXF1ZXN0IG1fcmVxdWVzdDsKIH07CkBAIC04OSw2ICsxMDAs OCBAQCBzdHJ1Y3QgX1dlYktpdFdlYlNyY1ByaXZhdGUgewogCiAgICAgZ3VpbnQ2NCByZXF1ZXN0 ZWRPZmZzZXQ7CiAKKyAgICB1aW50NjRfdCBtaW5pbXVtQmxvY2tzaXplOworCiAgICAgUmVmUHRy PE1haW5UaHJlYWROb3RpZmllcjxNYWluVGhyZWFkU291cmNlTm90aWZpY2F0aW9uPj4gbm90aWZp ZXI7CiAgICAgR1JlZlB0cjxHc3RCdWZmZXI+IGJ1ZmZlcjsKIH07CkBAIC0yNDgsNiArMjYxLDgg QEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl9zcmNfaW5pdChXZWJLaXRXZWJTcmMqIHNyYykKICAg ICBnc3RfYmFzZV9zcmNfc2V0X2F1dG9tYXRpY19lb3MoR1NUX0JBU0VfU1JDKHByaXYtPmFwcHNy YyksIEZBTFNFKTsKIAogICAgIGdzdF9hcHBfc3JjX3NldF9jYXBzKHByaXYtPmFwcHNyYywgbnVs bHB0cik7CisKKyAgICBwcml2LT5taW5pbXVtQmxvY2tzaXplID0gZ3N0X2Jhc2Vfc3JjX2dldF9i bG9ja3NpemUoR1NUX0JBU0VfU1JDX0NBU1QocHJpdi0+YXBwc3JjKSk7CiB9CiAKIHN0YXRpYyB2 b2lkIHdlYktpdFdlYlNyY0Rpc3Bvc2UoR09iamVjdCogb2JqZWN0KQpAQCAtNzM2LDYgKzc1MSwz OSBAQCBDYWNoZWRSZXNvdXJjZVN0cmVhbWluZ0NsaWVudDo6Q2FjaGVkUmVzb3VyY2VTdHJlYW1p bmdDbGllbnQoV2ViS2l0V2ViU3JjKiBzcmMsCiAKIENhY2hlZFJlc291cmNlU3RyZWFtaW5nQ2xp ZW50Ojp+Q2FjaGVkUmVzb3VyY2VTdHJlYW1pbmdDbGllbnQoKSA9IGRlZmF1bHQ7CiAKK3ZvaWQg Q2FjaGVkUmVzb3VyY2VTdHJlYW1pbmdDbGllbnQ6OmNoZWNrVXBkYXRlQmxvY2tzaXplKHVpbnQ2 NF90IGJ5dGVzUmVhZCkKK3sKKyAgICBXZWJLaXRXZWJTcmMqIHNyYyA9IFdFQktJVF9XRUJfU1JD KG1fc3JjLmdldCgpKTsKKyAgICBXZWJLaXRXZWJTcmNQcml2YXRlKiBwcml2ID0gc3JjLT5wcml2 OworCisgICAgdWludDY0X3QgYmxvY2tzaXplID0gZ3N0X2Jhc2Vfc3JjX2dldF9ibG9ja3NpemUo R1NUX0JBU0VfU1JDX0NBU1QocHJpdi0+YXBwc3JjKSk7CisgICAgR1NUX0xPR19PQkpFQ1Qoc3Jj LCAiQ2hlY2tpbmcgdG8gdXBkYXRlIGJsb2Nrc2l6ZS4gUmVhZDolIiBQUkl1NjQgIiBibG9ja3Np emU6JSIgUFJJdTY0LCBieXRlc1JlYWQsIGJsb2Nrc2l6ZSk7CisKKyAgICBpZiAoYnl0ZXNSZWFk ID49IGJsb2Nrc2l6ZSAqIGdyb3dCbG9ja3NpemVMaW1pdCkgeworICAgICAgICBtX3JlZHVjZUJs b2Nrc2l6ZUNvdW50ID0gMDsKKyAgICAgICAgbV9pbmNyZWFzZUJsb2Nrc2l6ZUNvdW50Kys7CisK KyAgICAgICAgaWYgKG1faW5jcmVhc2VCbG9ja3NpemVDb3VudCA+PSBncm93QmxvY2tzaXplQ291 bnQpIHsKKyAgICAgICAgICAgIGJsb2Nrc2l6ZSAqPSBncm93QmxvY2tzaXplRmFjdG9yOworICAg ICAgICAgICAgR1NUX0RFQlVHX09CSkVDVChzcmMsICJJbmNyZWFzZWQgYmxvY2tzaXplIHRvICUi IFBSSXU2NCwgYmxvY2tzaXplKTsKKyAgICAgICAgICAgIGdzdF9iYXNlX3NyY19zZXRfYmxvY2tz aXplKEdTVF9CQVNFX1NSQ19DQVNUKHByaXYtPmFwcHNyYyksIGJsb2Nrc2l6ZSk7CisgICAgICAg ICAgICBtX2luY3JlYXNlQmxvY2tzaXplQ291bnQgPSAwOworICAgICAgICB9CisgICAgfSBlbHNl IGlmIChieXRlc1JlYWQgPCBibG9ja3NpemUgKiByZWR1Y2VCbG9ja3NpemVMaW1pdCkgeworICAg ICAgICBtX3JlZHVjZUJsb2Nrc2l6ZUNvdW50Kys7CisgICAgICAgIG1faW5jcmVhc2VCbG9ja3Np emVDb3VudCA9IDA7CisKKyAgICAgICAgaWYgKG1fcmVkdWNlQmxvY2tzaXplQ291bnQgPj0gcmVk dWNlQmxvY2tzaXplQ291bnQpIHsKKyAgICAgICAgICAgIGJsb2Nrc2l6ZSAqPSByZWR1Y2VCbG9j a3NpemVGYWN0b3I7CisgICAgICAgICAgICBibG9ja3NpemUgPSBzdGQ6Om1heChibG9ja3NpemUs IHByaXYtPm1pbmltdW1CbG9ja3NpemUpOworICAgICAgICAgICAgR1NUX0RFQlVHX09CSkVDVChz cmMsICJEZWNyZWFzZWQgYmxvY2tzaXplIHRvICUiIFBSSXU2NCwgYmxvY2tzaXplKTsKKyAgICAg ICAgICAgIGdzdF9iYXNlX3NyY19zZXRfYmxvY2tzaXplKEdTVF9CQVNFX1NSQ19DQVNUKHByaXYt PmFwcHNyYyksIGJsb2Nrc2l6ZSk7CisgICAgICAgICAgICBtX3JlZHVjZUJsb2Nrc2l6ZUNvdW50 ID0gMDsKKyAgICAgICAgfQorICAgIH0gZWxzZQorICAgICAgICBtX3JlZHVjZUJsb2Nrc2l6ZUNv dW50ID0gbV9pbmNyZWFzZUJsb2Nrc2l6ZUNvdW50ID0gMDsKK30KKwogdm9pZCBDYWNoZWRSZXNv dXJjZVN0cmVhbWluZ0NsaWVudDo6cmVzcG9uc2VSZWNlaXZlZChQbGF0Zm9ybU1lZGlhUmVzb3Vy Y2UmLCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSkKIHsKICAgICBXZWJLaXRXZWJT cmMqIHNyYyA9IFdFQktJVF9XRUJfU1JDKG1fc3JjLmdldCgpKTsKQEAgLTg4Miw2ICs5MzAsOCBA QCB2b2lkIENhY2hlZFJlc291cmNlU3RyZWFtaW5nQ2xpZW50OjpkYXRhUmVjZWl2ZWQoUGxhdGZv cm1NZWRpYVJlc291cmNlJiwgY29uc3QgYwogICAgIGVsc2UKICAgICAgICAgZ3N0X2J1ZmZlcl9z ZXRfc2l6ZShwcml2LT5idWZmZXIuZ2V0KCksIHN0YXRpY19jYXN0PGdzc2l6ZT4obGVuZ3RoKSk7 CiAKKyAgICBjaGVja1VwZGF0ZUJsb2Nrc2l6ZShsZW5ndGgpOworCiAgICAgdWludDY0X3Qgc3Rh cnRpbmdPZmZzZXQgPSBwcml2LT5vZmZzZXQ7CiAKICAgICBpZiAocHJpdi0+cmVxdWVzdGVkT2Zm c2V0ID09IHByaXYtPm9mZnNldCkKQEAgLTg5OCw3ICs5NDgsNiBAQCB2b2lkIENhY2hlZFJlc291 cmNlU3RyZWFtaW5nQ2xpZW50OjpkYXRhUmVjZWl2ZWQoUGxhdGZvcm1NZWRpYVJlc291cmNlJiwg Y29uc3QgYwogICAgIC8vIHRvIHB1c2ggYnVmZmVycyB0aGF0IGFyZSB0b28gbGFyZ2UsIG90aGVy d2lzZSBpbmNvcnJlY3QgYnVmZmVyaW5nIG1lc3NhZ2VzIGNhbiBiZSBzZW50IGZyb20gdGhlCiAg ICAgLy8gcGlwZWxpbmUuCiAgICAgdWludDY0X3QgYnVmZmVyU2l6ZSA9IHN0YXRpY19jYXN0PHVp bnQ2NF90PihsZW5ndGgpOwotICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQgYWRhcHRpdmUgYmxvY2sg cmVzaXppbmcKICAgICB1aW50NjRfdCBibG9ja1NpemUgPSBzdGF0aWNfY2FzdDx1aW50NjRfdD4o Z3N0X2Jhc2Vfc3JjX2dldF9ibG9ja3NpemUoR1NUX0JBU0VfU1JDX0NBU1QocHJpdi0+YXBwc3Jj KSkpOwogICAgIEdTVF9MT0dfT0JKRUNUKHNyYywgIlNwbGl0dGluZyB0aGUgcmVjZWl2ZWQgYnVm ZmVyIGludG8gJSIgUFJJdTY0ICIgYmxvY2tzIiwgYnVmZmVyU2l6ZSAvIGJsb2NrU2l6ZSk7CiAg ICAgZm9yICh1aW50NjRfdCBjdXJyZW50T2Zmc2V0ID0gMDsgY3VycmVudE9mZnNldCA8IGJ1ZmZl clNpemU7IGN1cnJlbnRPZmZzZXQgKz0gYmxvY2tTaXplKSB7Cg== 346374 2018-08-02 04:38:32 -0700 2018-08-02 04:40:23 -0700 Patch bug-188194-20180802123831.patch text/plain 6103 cturner U3VidmVyc2lvbiBSZXZpc2lvbjogMjM0NDk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTJlYTc2Yjk4MjFhNmEy MWY4YWE5ZThhOTQ1YmYwNjM0ZTFmNzYxMy4uMDZhMmIyMzVlZDk3ODJkMjZmNDk4YjJlZTk5MjEz ZTI4YWJmNjhjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE4LTA3LTMxICBDaGFy bGllIFR1cm5lciAgPGN0dXJuZXJAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVyXSBE eW5hbWljYWxseSBhZGp1c3QgYmxvY2tzaXplCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xODgxOTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBVcGRhdGUgdGhlIGJsb2Nrc2l6ZSBkZXBlbmRpbmcgb24gaG93 IG11Y2ggaXMgb2J0YWluZWQgZnJvbSBhIHJlYWQKKyAgICAgICAgb2YgdGhlIGlucHV0IHN0cmVh bS4gVGhpcyBhdm9pZHMgZG9pbmcgdG9vIG1hbnkgcmVhZHMgaW4gc21hbGwKKyAgICAgICAgY2h1 bmtzIHdoZW4gbGFyZ2VyIGFtb3VudHMgb2YgZGF0YSBhcmUgYXZhaWxhYmxlIGFuZCBhbHNvIHBy ZXZlbnRzCisgICAgICAgIHVzaW5nIGEgdmVyeSBsYXJnZSBtZW1vcnkgYXJlYSB0byByZWFkIGEg c21hbGwgY2h1bmsgb2YgZGF0YS4KKworICAgICAgICBBZGFwdGVkIGZyb20gaHR0cHM6Ly9idWd6 aWxsYS5nbm9tZS5vcmcvc2hvd19idWcuY2dpP2lkPTc2NzgzMworCisgICAgICAgIE5vIHRlc3Rz IG5ldyB0ZXN0cyBzaW5jZSBubyBjaGFuZ2UgaW4gZnVuY3Rpb25hbGl0eS4KKworICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9XZWJLaXRXZWJTb3VyY2VHU3RyZWFtZXIuY3Bw OgorICAgICAgICAod2Via2l0X3dlYl9zcmNfaW5pdCk6CisgICAgICAgIChDYWNoZWRSZXNvdXJj ZVN0cmVhbWluZ0NsaWVudDo6Y2hlY2tVcGRhdGVCbG9ja3NpemUpOgorICAgICAgICAoQ2FjaGVk UmVzb3VyY2VTdHJlYW1pbmdDbGllbnQ6OmRhdGFSZWNlaXZlZCk6CisKIDIwMTgtMDgtMDIgIENo YXJsaWUgVHVybmVyICA8Y3R1cm5lckBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHU3RyZWFtZXJd IFN0b3AgcHVzaGluZyBidWZmZXJzIHdoZW4gc2Vla2luZyBzdGF0dXMgY2hhbmdlcwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdl YlNvdXJjZUdTdHJlYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9n c3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNwcAppbmRleCBkMjBhZTU1NWJkZWZi YTcwMjI3NWIzMDBjZWZjMDU5NTg0MzUwNWVhLi40ZDU3MzRiZDAwYzA0NTM1YzIxOTU3YmViMWU0 NTVlMDU5MDczMzQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVy LmNwcApAQCAtNDMsNiArNDMsOCBAQCBwdWJsaWM6CiAgICAgQ2FjaGVkUmVzb3VyY2VTdHJlYW1p bmdDbGllbnQoV2ViS2l0V2ViU3JjKiwgUmVzb3VyY2VSZXF1ZXN0JiYpOwogICAgIHZpcnR1YWwg fkNhY2hlZFJlc291cmNlU3RyZWFtaW5nQ2xpZW50KCk7CiBwcml2YXRlOgorICAgIHZvaWQgY2hl Y2tVcGRhdGVCbG9ja3NpemUodWludDY0X3QgYnl0ZXNSZWFkKTsKKwogICAgIC8vIFBsYXRmb3Jt TWVkaWFSZXNvdXJjZUNsaWVudCB2aXJ0dWFsIG1ldGhvZHMuCiAgICAgdm9pZCByZXNwb25zZVJl Y2VpdmVkKFBsYXRmb3JtTWVkaWFSZXNvdXJjZSYsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmKSBv dmVycmlkZTsKICAgICB2b2lkIGRhdGFSZWNlaXZlZChQbGF0Zm9ybU1lZGlhUmVzb3VyY2UmLCBj b25zdCBjaGFyKiwgaW50KSBvdmVycmlkZTsKQEAgLTUwLDYgKzUyLDE1IEBAIHByaXZhdGU6CiAg ICAgdm9pZCBsb2FkRmFpbGVkKFBsYXRmb3JtTWVkaWFSZXNvdXJjZSYsIGNvbnN0IFJlc291cmNl RXJyb3ImKSBvdmVycmlkZTsKICAgICB2b2lkIGxvYWRGaW5pc2hlZChQbGF0Zm9ybU1lZGlhUmVz b3VyY2UmKSBvdmVycmlkZTsKIAorICAgIHN0YXRpYyBjb25zdGV4cHIgaW50IHNfZ3Jvd0Jsb2Nr c2l6ZUxpbWl0IHsgMSB9OworICAgIHN0YXRpYyBjb25zdGV4cHIgaW50IHNfZ3Jvd0Jsb2Nrc2l6 ZUNvdW50IHsgMSB9OworICAgIHN0YXRpYyBjb25zdGV4cHIgaW50IHNfZ3Jvd0Jsb2Nrc2l6ZUZh Y3RvciB7IDIgfTsKKyAgICBzdGF0aWMgY29uc3RleHByIGZsb2F0IHNfcmVkdWNlQmxvY2tzaXpl TGltaXQgeyAwLjIwIH07CisgICAgc3RhdGljIGNvbnN0ZXhwciBpbnQgc19yZWR1Y2VCbG9ja3Np emVDb3VudCB7IDIgfTsKKyAgICBzdGF0aWMgY29uc3RleHByIGZsb2F0IHNfcmVkdWNlQmxvY2tz aXplRmFjdG9yIHsgMC41IH07CisgICAgaW50IG1fcmVkdWNlQmxvY2tzaXplQ291bnQgeyAwIH07 CisgICAgaW50IG1faW5jcmVhc2VCbG9ja3NpemVDb3VudCB7IDAgfTsKKwogICAgIEdSZWZQdHI8 R3N0RWxlbWVudD4gbV9zcmM7CiAgICAgUmVzb3VyY2VSZXF1ZXN0IG1fcmVxdWVzdDsKIH07CkBA IC04OSw2ICsxMDAsOCBAQCBzdHJ1Y3QgX1dlYktpdFdlYlNyY1ByaXZhdGUgewogCiAgICAgZ3Vp bnQ2NCByZXF1ZXN0ZWRPZmZzZXQ7CiAKKyAgICB1aW50NjRfdCBtaW5pbXVtQmxvY2tzaXplOwor CiAgICAgUmVmUHRyPE1haW5UaHJlYWROb3RpZmllcjxNYWluVGhyZWFkU291cmNlTm90aWZpY2F0 aW9uPj4gbm90aWZpZXI7CiAgICAgR1JlZlB0cjxHc3RCdWZmZXI+IGJ1ZmZlcjsKIH07CkBAIC0y NDgsNiArMjYxLDggQEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl9zcmNfaW5pdChXZWJLaXRXZWJT cmMqIHNyYykKICAgICBnc3RfYmFzZV9zcmNfc2V0X2F1dG9tYXRpY19lb3MoR1NUX0JBU0VfU1JD KHByaXYtPmFwcHNyYyksIEZBTFNFKTsKIAogICAgIGdzdF9hcHBfc3JjX3NldF9jYXBzKHByaXYt PmFwcHNyYywgbnVsbHB0cik7CisKKyAgICBwcml2LT5taW5pbXVtQmxvY2tzaXplID0gZ3N0X2Jh c2Vfc3JjX2dldF9ibG9ja3NpemUoR1NUX0JBU0VfU1JDX0NBU1QocHJpdi0+YXBwc3JjKSk7CiB9 CiAKIHN0YXRpYyB2b2lkIHdlYktpdFdlYlNyY0Rpc3Bvc2UoR09iamVjdCogb2JqZWN0KQpAQCAt NzM2LDYgKzc1MSwzOSBAQCBDYWNoZWRSZXNvdXJjZVN0cmVhbWluZ0NsaWVudDo6Q2FjaGVkUmVz b3VyY2VTdHJlYW1pbmdDbGllbnQoV2ViS2l0V2ViU3JjKiBzcmMsCiAKIENhY2hlZFJlc291cmNl U3RyZWFtaW5nQ2xpZW50Ojp+Q2FjaGVkUmVzb3VyY2VTdHJlYW1pbmdDbGllbnQoKSA9IGRlZmF1 bHQ7CiAKK3ZvaWQgQ2FjaGVkUmVzb3VyY2VTdHJlYW1pbmdDbGllbnQ6OmNoZWNrVXBkYXRlQmxv Y2tzaXplKHVpbnQ2NF90IGJ5dGVzUmVhZCkKK3sKKyAgICBXZWJLaXRXZWJTcmMqIHNyYyA9IFdF QktJVF9XRUJfU1JDKG1fc3JjLmdldCgpKTsKKyAgICBXZWJLaXRXZWJTcmNQcml2YXRlKiBwcml2 ID0gc3JjLT5wcml2OworCisgICAgdWludDY0X3QgYmxvY2tzaXplID0gZ3N0X2Jhc2Vfc3JjX2dl dF9ibG9ja3NpemUoR1NUX0JBU0VfU1JDX0NBU1QocHJpdi0+YXBwc3JjKSk7CisgICAgR1NUX0xP R19PQkpFQ1Qoc3JjLCAiQ2hlY2tpbmcgdG8gdXBkYXRlIGJsb2Nrc2l6ZS4gUmVhZDolIiBQUkl1 NjQgIiBibG9ja3NpemU6JSIgUFJJdTY0LCBieXRlc1JlYWQsIGJsb2Nrc2l6ZSk7CisKKyAgICBp ZiAoYnl0ZXNSZWFkID49IGJsb2Nrc2l6ZSAqIHNfZ3Jvd0Jsb2Nrc2l6ZUxpbWl0KSB7CisgICAg ICAgIG1fcmVkdWNlQmxvY2tzaXplQ291bnQgPSAwOworICAgICAgICBtX2luY3JlYXNlQmxvY2tz aXplQ291bnQrKzsKKworICAgICAgICBpZiAobV9pbmNyZWFzZUJsb2Nrc2l6ZUNvdW50ID49IHNf Z3Jvd0Jsb2Nrc2l6ZUNvdW50KSB7CisgICAgICAgICAgICBibG9ja3NpemUgKj0gc19ncm93Qmxv Y2tzaXplRmFjdG9yOworICAgICAgICAgICAgR1NUX0RFQlVHX09CSkVDVChzcmMsICJJbmNyZWFz ZWQgYmxvY2tzaXplIHRvICUiIFBSSXU2NCwgYmxvY2tzaXplKTsKKyAgICAgICAgICAgIGdzdF9i YXNlX3NyY19zZXRfYmxvY2tzaXplKEdTVF9CQVNFX1NSQ19DQVNUKHByaXYtPmFwcHNyYyksIGJs b2Nrc2l6ZSk7CisgICAgICAgICAgICBtX2luY3JlYXNlQmxvY2tzaXplQ291bnQgPSAwOworICAg ICAgICB9CisgICAgfSBlbHNlIGlmIChieXRlc1JlYWQgPCBibG9ja3NpemUgKiBzX3JlZHVjZUJs b2Nrc2l6ZUxpbWl0KSB7CisgICAgICAgIG1fcmVkdWNlQmxvY2tzaXplQ291bnQrKzsKKyAgICAg ICAgbV9pbmNyZWFzZUJsb2Nrc2l6ZUNvdW50ID0gMDsKKworICAgICAgICBpZiAobV9yZWR1Y2VC bG9ja3NpemVDb3VudCA+PSBzX3JlZHVjZUJsb2Nrc2l6ZUNvdW50KSB7CisgICAgICAgICAgICBi bG9ja3NpemUgKj0gc19yZWR1Y2VCbG9ja3NpemVGYWN0b3I7CisgICAgICAgICAgICBibG9ja3Np emUgPSBzdGQ6Om1heChibG9ja3NpemUsIHByaXYtPm1pbmltdW1CbG9ja3NpemUpOworICAgICAg ICAgICAgR1NUX0RFQlVHX09CSkVDVChzcmMsICJEZWNyZWFzZWQgYmxvY2tzaXplIHRvICUiIFBS SXU2NCwgYmxvY2tzaXplKTsKKyAgICAgICAgICAgIGdzdF9iYXNlX3NyY19zZXRfYmxvY2tzaXpl KEdTVF9CQVNFX1NSQ19DQVNUKHByaXYtPmFwcHNyYyksIGJsb2Nrc2l6ZSk7CisgICAgICAgICAg ICBtX3JlZHVjZUJsb2Nrc2l6ZUNvdW50ID0gMDsKKyAgICAgICAgfQorICAgIH0gZWxzZQorICAg ICAgICBtX3JlZHVjZUJsb2Nrc2l6ZUNvdW50ID0gbV9pbmNyZWFzZUJsb2Nrc2l6ZUNvdW50ID0g MDsKK30KKwogdm9pZCBDYWNoZWRSZXNvdXJjZVN0cmVhbWluZ0NsaWVudDo6cmVzcG9uc2VSZWNl aXZlZChQbGF0Zm9ybU1lZGlhUmVzb3VyY2UmLCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNw b25zZSkKIHsKICAgICBXZWJLaXRXZWJTcmMqIHNyYyA9IFdFQktJVF9XRUJfU1JDKG1fc3JjLmdl dCgpKTsKQEAgLTg4Miw2ICs5MzAsOCBAQCB2b2lkIENhY2hlZFJlc291cmNlU3RyZWFtaW5nQ2xp ZW50OjpkYXRhUmVjZWl2ZWQoUGxhdGZvcm1NZWRpYVJlc291cmNlJiwgY29uc3QgYwogICAgIGVs c2UKICAgICAgICAgZ3N0X2J1ZmZlcl9zZXRfc2l6ZShwcml2LT5idWZmZXIuZ2V0KCksIHN0YXRp Y19jYXN0PGdzc2l6ZT4obGVuZ3RoKSk7CiAKKyAgICBjaGVja1VwZGF0ZUJsb2Nrc2l6ZShsZW5n dGgpOworCiAgICAgdWludDY0X3Qgc3RhcnRpbmdPZmZzZXQgPSBwcml2LT5vZmZzZXQ7CiAKICAg ICBpZiAocHJpdi0+cmVxdWVzdGVkT2Zmc2V0ID09IHByaXYtPm9mZnNldCkKQEAgLTg5OCw3ICs5 NDgsNiBAQCB2b2lkIENhY2hlZFJlc291cmNlU3RyZWFtaW5nQ2xpZW50OjpkYXRhUmVjZWl2ZWQo UGxhdGZvcm1NZWRpYVJlc291cmNlJiwgY29uc3QgYwogICAgIC8vIHRvIHB1c2ggYnVmZmVycyB0 aGF0IGFyZSB0b28gbGFyZ2UsIG90aGVyd2lzZSBpbmNvcnJlY3QgYnVmZmVyaW5nIG1lc3NhZ2Vz IGNhbiBiZSBzZW50IGZyb20gdGhlCiAgICAgLy8gcGlwZWxpbmUuCiAgICAgdWludDY0X3QgYnVm ZmVyU2l6ZSA9IHN0YXRpY19jYXN0PHVpbnQ2NF90PihsZW5ndGgpOwotICAgIC8vIEZJWE1FOiBJ bXBsZW1lbnQgYWRhcHRpdmUgYmxvY2sgcmVzaXppbmcKICAgICB1aW50NjRfdCBibG9ja1NpemUg PSBzdGF0aWNfY2FzdDx1aW50NjRfdD4oZ3N0X2Jhc2Vfc3JjX2dldF9ibG9ja3NpemUoR1NUX0JB U0VfU1JDX0NBU1QocHJpdi0+YXBwc3JjKSkpOwogICAgIEdTVF9MT0dfT0JKRUNUKHNyYywgIlNw bGl0dGluZyB0aGUgcmVjZWl2ZWQgYnVmZmVyIGludG8gJSIgUFJJdTY0ICIgYmxvY2tzIiwgYnVm ZmVyU2l6ZSAvIGJsb2NrU2l6ZSk7CiAgICAgZm9yICh1aW50NjRfdCBjdXJyZW50T2Zmc2V0ID0g MDsgY3VycmVudE9mZnNldCA8IGJ1ZmZlclNpemU7IGN1cnJlbnRPZmZzZXQgKz0gYmxvY2tTaXpl KSB7Cg== 346375 2018-08-02 04:40:26 -0700 2018-08-02 05:22:00 -0700 Patch bug-188194-20180802124025.patch text/plain 6124 cturner U3VidmVyc2lvbiBSZXZpc2lvbjogMjM0NDk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTJlYTc2Yjk4MjFhNmEy MWY4YWE5ZThhOTQ1YmYwNjM0ZTFmNzYxMy4uMDZhMmIyMzVlZDk3ODJkMjZmNDk4YjJlZTk5MjEz ZTI4YWJmNjhjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE4LTA3LTMxICBDaGFy bGllIFR1cm5lciAgPGN0dXJuZXJAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVyXSBE eW5hbWljYWxseSBhZGp1c3QgYmxvY2tzaXplCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xODgxOTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBVcGRhdGUgdGhlIGJsb2Nrc2l6ZSBkZXBlbmRpbmcgb24gaG93 IG11Y2ggaXMgb2J0YWluZWQgZnJvbSBhIHJlYWQKKyAgICAgICAgb2YgdGhlIGlucHV0IHN0cmVh bS4gVGhpcyBhdm9pZHMgZG9pbmcgdG9vIG1hbnkgcmVhZHMgaW4gc21hbGwKKyAgICAgICAgY2h1 bmtzIHdoZW4gbGFyZ2VyIGFtb3VudHMgb2YgZGF0YSBhcmUgYXZhaWxhYmxlIGFuZCBhbHNvIHBy ZXZlbnRzCisgICAgICAgIHVzaW5nIGEgdmVyeSBsYXJnZSBtZW1vcnkgYXJlYSB0byByZWFkIGEg c21hbGwgY2h1bmsgb2YgZGF0YS4KKworICAgICAgICBBZGFwdGVkIGZyb20gaHR0cHM6Ly9idWd6 aWxsYS5nbm9tZS5vcmcvc2hvd19idWcuY2dpP2lkPTc2NzgzMworCisgICAgICAgIE5vIHRlc3Rz IG5ldyB0ZXN0cyBzaW5jZSBubyBjaGFuZ2UgaW4gZnVuY3Rpb25hbGl0eS4KKworICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9XZWJLaXRXZWJTb3VyY2VHU3RyZWFtZXIuY3Bw OgorICAgICAgICAod2Via2l0X3dlYl9zcmNfaW5pdCk6CisgICAgICAgIChDYWNoZWRSZXNvdXJj ZVN0cmVhbWluZ0NsaWVudDo6Y2hlY2tVcGRhdGVCbG9ja3NpemUpOgorICAgICAgICAoQ2FjaGVk UmVzb3VyY2VTdHJlYW1pbmdDbGllbnQ6OmRhdGFSZWNlaXZlZCk6CisKIDIwMTgtMDgtMDIgIENo YXJsaWUgVHVybmVyICA8Y3R1cm5lckBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHU3RyZWFtZXJd IFN0b3AgcHVzaGluZyBidWZmZXJzIHdoZW4gc2Vla2luZyBzdGF0dXMgY2hhbmdlcwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdl YlNvdXJjZUdTdHJlYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9n c3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNwcAppbmRleCBkMjBhZTU1NWJkZWZi YTcwMjI3NWIzMDBjZWZjMDU5NTg0MzUwNWVhLi40ZjFhMDJmZDJlYjNhNmQyMDA0ZDRhOGJmNTUw NjgwMzhmODlmMDEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVy LmNwcApAQCAtNDMsNiArNDMsOCBAQCBwdWJsaWM6CiAgICAgQ2FjaGVkUmVzb3VyY2VTdHJlYW1p bmdDbGllbnQoV2ViS2l0V2ViU3JjKiwgUmVzb3VyY2VSZXF1ZXN0JiYpOwogICAgIHZpcnR1YWwg fkNhY2hlZFJlc291cmNlU3RyZWFtaW5nQ2xpZW50KCk7CiBwcml2YXRlOgorICAgIHZvaWQgY2hl Y2tVcGRhdGVCbG9ja3NpemUodWludDY0X3QgYnl0ZXNSZWFkKTsKKwogICAgIC8vIFBsYXRmb3Jt TWVkaWFSZXNvdXJjZUNsaWVudCB2aXJ0dWFsIG1ldGhvZHMuCiAgICAgdm9pZCByZXNwb25zZVJl Y2VpdmVkKFBsYXRmb3JtTWVkaWFSZXNvdXJjZSYsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmKSBv dmVycmlkZTsKICAgICB2b2lkIGRhdGFSZWNlaXZlZChQbGF0Zm9ybU1lZGlhUmVzb3VyY2UmLCBj b25zdCBjaGFyKiwgaW50KSBvdmVycmlkZTsKQEAgLTUwLDYgKzUyLDE1IEBAIHByaXZhdGU6CiAg ICAgdm9pZCBsb2FkRmFpbGVkKFBsYXRmb3JtTWVkaWFSZXNvdXJjZSYsIGNvbnN0IFJlc291cmNl RXJyb3ImKSBvdmVycmlkZTsKICAgICB2b2lkIGxvYWRGaW5pc2hlZChQbGF0Zm9ybU1lZGlhUmVz b3VyY2UmKSBvdmVycmlkZTsKIAorICAgIHN0YXRpYyBjb25zdGV4cHIgaW50IHNfZ3Jvd0Jsb2Nr c2l6ZUxpbWl0IHsgMSB9OworICAgIHN0YXRpYyBjb25zdGV4cHIgaW50IHNfZ3Jvd0Jsb2Nrc2l6 ZUNvdW50IHsgMSB9OworICAgIHN0YXRpYyBjb25zdGV4cHIgaW50IHNfZ3Jvd0Jsb2Nrc2l6ZUZh Y3RvciB7IDIgfTsKKyAgICBzdGF0aWMgY29uc3RleHByIGZsb2F0IHNfcmVkdWNlQmxvY2tzaXpl TGltaXQgeyAwLjIwIH07CisgICAgc3RhdGljIGNvbnN0ZXhwciBpbnQgc19yZWR1Y2VCbG9ja3Np emVDb3VudCB7IDIgfTsKKyAgICBzdGF0aWMgY29uc3RleHByIGZsb2F0IHNfcmVkdWNlQmxvY2tz aXplRmFjdG9yIHsgMC41IH07CisgICAgaW50IG1fcmVkdWNlQmxvY2tzaXplQ291bnQgeyAwIH07 CisgICAgaW50IG1faW5jcmVhc2VCbG9ja3NpemVDb3VudCB7IDAgfTsKKwogICAgIEdSZWZQdHI8 R3N0RWxlbWVudD4gbV9zcmM7CiAgICAgUmVzb3VyY2VSZXF1ZXN0IG1fcmVxdWVzdDsKIH07CkBA IC04OSw2ICsxMDAsOCBAQCBzdHJ1Y3QgX1dlYktpdFdlYlNyY1ByaXZhdGUgewogCiAgICAgZ3Vp bnQ2NCByZXF1ZXN0ZWRPZmZzZXQ7CiAKKyAgICB1aW50NjRfdCBtaW5pbXVtQmxvY2tzaXplOwor CiAgICAgUmVmUHRyPE1haW5UaHJlYWROb3RpZmllcjxNYWluVGhyZWFkU291cmNlTm90aWZpY2F0 aW9uPj4gbm90aWZpZXI7CiAgICAgR1JlZlB0cjxHc3RCdWZmZXI+IGJ1ZmZlcjsKIH07CkBAIC0y NDgsNiArMjYxLDggQEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl9zcmNfaW5pdChXZWJLaXRXZWJT cmMqIHNyYykKICAgICBnc3RfYmFzZV9zcmNfc2V0X2F1dG9tYXRpY19lb3MoR1NUX0JBU0VfU1JD KHByaXYtPmFwcHNyYyksIEZBTFNFKTsKIAogICAgIGdzdF9hcHBfc3JjX3NldF9jYXBzKHByaXYt PmFwcHNyYywgbnVsbHB0cik7CisKKyAgICBwcml2LT5taW5pbXVtQmxvY2tzaXplID0gZ3N0X2Jh c2Vfc3JjX2dldF9ibG9ja3NpemUoR1NUX0JBU0VfU1JDX0NBU1QocHJpdi0+YXBwc3JjKSk7CiB9 CiAKIHN0YXRpYyB2b2lkIHdlYktpdFdlYlNyY0Rpc3Bvc2UoR09iamVjdCogb2JqZWN0KQpAQCAt NzM2LDYgKzc1MSw0MSBAQCBDYWNoZWRSZXNvdXJjZVN0cmVhbWluZ0NsaWVudDo6Q2FjaGVkUmVz b3VyY2VTdHJlYW1pbmdDbGllbnQoV2ViS2l0V2ViU3JjKiBzcmMsCiAKIENhY2hlZFJlc291cmNl U3RyZWFtaW5nQ2xpZW50Ojp+Q2FjaGVkUmVzb3VyY2VTdHJlYW1pbmdDbGllbnQoKSA9IGRlZmF1 bHQ7CiAKK3ZvaWQgQ2FjaGVkUmVzb3VyY2VTdHJlYW1pbmdDbGllbnQ6OmNoZWNrVXBkYXRlQmxv Y2tzaXplKHVpbnQ2NF90IGJ5dGVzUmVhZCkKK3sKKyAgICBXZWJLaXRXZWJTcmMqIHNyYyA9IFdF QktJVF9XRUJfU1JDKG1fc3JjLmdldCgpKTsKKyAgICBXZWJLaXRXZWJTcmNQcml2YXRlKiBwcml2 ID0gc3JjLT5wcml2OworCisgICAgdWludDY0X3QgYmxvY2tzaXplID0gZ3N0X2Jhc2Vfc3JjX2dl dF9ibG9ja3NpemUoR1NUX0JBU0VfU1JDX0NBU1QocHJpdi0+YXBwc3JjKSk7CisgICAgR1NUX0xP R19PQkpFQ1Qoc3JjLCAiQ2hlY2tpbmcgdG8gdXBkYXRlIGJsb2Nrc2l6ZS4gUmVhZDolIiBQUkl1 NjQgIiBibG9ja3NpemU6JSIgUFJJdTY0LCBieXRlc1JlYWQsIGJsb2Nrc2l6ZSk7CisKKyAgICBp ZiAoYnl0ZXNSZWFkID49IGJsb2Nrc2l6ZSAqIHNfZ3Jvd0Jsb2Nrc2l6ZUxpbWl0KSB7CisgICAg ICAgIG1fcmVkdWNlQmxvY2tzaXplQ291bnQgPSAwOworICAgICAgICBtX2luY3JlYXNlQmxvY2tz aXplQ291bnQrKzsKKworICAgICAgICBpZiAobV9pbmNyZWFzZUJsb2Nrc2l6ZUNvdW50ID49IHNf Z3Jvd0Jsb2Nrc2l6ZUNvdW50KSB7CisgICAgICAgICAgICBibG9ja3NpemUgKj0gc19ncm93Qmxv Y2tzaXplRmFjdG9yOworICAgICAgICAgICAgR1NUX0RFQlVHX09CSkVDVChzcmMsICJJbmNyZWFz ZWQgYmxvY2tzaXplIHRvICUiIFBSSXU2NCwgYmxvY2tzaXplKTsKKyAgICAgICAgICAgIGdzdF9i YXNlX3NyY19zZXRfYmxvY2tzaXplKEdTVF9CQVNFX1NSQ19DQVNUKHByaXYtPmFwcHNyYyksIGJs b2Nrc2l6ZSk7CisgICAgICAgICAgICBtX2luY3JlYXNlQmxvY2tzaXplQ291bnQgPSAwOworICAg ICAgICB9CisgICAgfSBlbHNlIGlmIChieXRlc1JlYWQgPCBibG9ja3NpemUgKiBzX3JlZHVjZUJs b2Nrc2l6ZUxpbWl0KSB7CisgICAgICAgIG1fcmVkdWNlQmxvY2tzaXplQ291bnQrKzsKKyAgICAg ICAgbV9pbmNyZWFzZUJsb2Nrc2l6ZUNvdW50ID0gMDsKKworICAgICAgICBpZiAobV9yZWR1Y2VC bG9ja3NpemVDb3VudCA+PSBzX3JlZHVjZUJsb2Nrc2l6ZUNvdW50KSB7CisgICAgICAgICAgICBi bG9ja3NpemUgKj0gc19yZWR1Y2VCbG9ja3NpemVGYWN0b3I7CisgICAgICAgICAgICBibG9ja3Np emUgPSBzdGQ6Om1heChibG9ja3NpemUsIHByaXYtPm1pbmltdW1CbG9ja3NpemUpOworICAgICAg ICAgICAgR1NUX0RFQlVHX09CSkVDVChzcmMsICJEZWNyZWFzZWQgYmxvY2tzaXplIHRvICUiIFBS SXU2NCwgYmxvY2tzaXplKTsKKyAgICAgICAgICAgIGdzdF9iYXNlX3NyY19zZXRfYmxvY2tzaXpl KEdTVF9CQVNFX1NSQ19DQVNUKHByaXYtPmFwcHNyYyksIGJsb2Nrc2l6ZSk7CisgICAgICAgICAg ICBtX3JlZHVjZUJsb2Nrc2l6ZUNvdW50ID0gMDsKKyAgICAgICAgfQorICAgIH0gZWxzZSB7Cisg ICAgICAgIG1fcmVkdWNlQmxvY2tzaXplQ291bnQgPSAwOworICAgICAgICBtX2luY3JlYXNlQmxv Y2tzaXplQ291bnQgPSAwOworICAgIH0KK30KKwogdm9pZCBDYWNoZWRSZXNvdXJjZVN0cmVhbWlu Z0NsaWVudDo6cmVzcG9uc2VSZWNlaXZlZChQbGF0Zm9ybU1lZGlhUmVzb3VyY2UmLCBjb25zdCBS ZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSkKIHsKICAgICBXZWJLaXRXZWJTcmMqIHNyYyA9IFdF QktJVF9XRUJfU1JDKG1fc3JjLmdldCgpKTsKQEAgLTg4Miw2ICs5MzIsOCBAQCB2b2lkIENhY2hl ZFJlc291cmNlU3RyZWFtaW5nQ2xpZW50OjpkYXRhUmVjZWl2ZWQoUGxhdGZvcm1NZWRpYVJlc291 cmNlJiwgY29uc3QgYwogICAgIGVsc2UKICAgICAgICAgZ3N0X2J1ZmZlcl9zZXRfc2l6ZShwcml2 LT5idWZmZXIuZ2V0KCksIHN0YXRpY19jYXN0PGdzc2l6ZT4obGVuZ3RoKSk7CiAKKyAgICBjaGVj a1VwZGF0ZUJsb2Nrc2l6ZShsZW5ndGgpOworCiAgICAgdWludDY0X3Qgc3RhcnRpbmdPZmZzZXQg PSBwcml2LT5vZmZzZXQ7CiAKICAgICBpZiAocHJpdi0+cmVxdWVzdGVkT2Zmc2V0ID09IHByaXYt Pm9mZnNldCkKQEAgLTg5OCw3ICs5NTAsNiBAQCB2b2lkIENhY2hlZFJlc291cmNlU3RyZWFtaW5n Q2xpZW50OjpkYXRhUmVjZWl2ZWQoUGxhdGZvcm1NZWRpYVJlc291cmNlJiwgY29uc3QgYwogICAg IC8vIHRvIHB1c2ggYnVmZmVycyB0aGF0IGFyZSB0b28gbGFyZ2UsIG90aGVyd2lzZSBpbmNvcnJl Y3QgYnVmZmVyaW5nIG1lc3NhZ2VzIGNhbiBiZSBzZW50IGZyb20gdGhlCiAgICAgLy8gcGlwZWxp bmUuCiAgICAgdWludDY0X3QgYnVmZmVyU2l6ZSA9IHN0YXRpY19jYXN0PHVpbnQ2NF90PihsZW5n dGgpOwotICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQgYWRhcHRpdmUgYmxvY2sgcmVzaXppbmcKICAg ICB1aW50NjRfdCBibG9ja1NpemUgPSBzdGF0aWNfY2FzdDx1aW50NjRfdD4oZ3N0X2Jhc2Vfc3Jj X2dldF9ibG9ja3NpemUoR1NUX0JBU0VfU1JDX0NBU1QocHJpdi0+YXBwc3JjKSkpOwogICAgIEdT VF9MT0dfT0JKRUNUKHNyYywgIlNwbGl0dGluZyB0aGUgcmVjZWl2ZWQgYnVmZmVyIGludG8gJSIg UFJJdTY0ICIgYmxvY2tzIiwgYnVmZmVyU2l6ZSAvIGJsb2NrU2l6ZSk7CiAgICAgZm9yICh1aW50 NjRfdCBjdXJyZW50T2Zmc2V0ID0gMDsgY3VycmVudE9mZnNldCA8IGJ1ZmZlclNpemU7IGN1cnJl bnRPZmZzZXQgKz0gYmxvY2tTaXplKSB7Cg==