117924 2013-06-24 02:29:04 -0700 REGRESSION(r151021): caused regressions on Qt and GTK (#117141 and #117688) (Requested by philn on #webkit). 2013-06-27 06:01:17 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 115352 1 commit-queue commit-queue pnormand slomo oldest_to_newest 902885 0 commit-queue 2013-06-24 02:29:04 -0700 http://trac.webkit.org/changeset/151021 broke the build: caused regressions on Qt and GTK (#117141 and #117688) (Requested by philn on #webkit). This is an automatic bug report generated by the sheriff-bot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests case pain. "Only you can prevent forest fires." -- Smokey the Bear 902887 1 205279 commit-queue 2013-06-24 02:29:31 -0700 Created attachment 205279 ROLLOUT of r151021 Any committer can land this patch automatically by marking it commit-queue+. The commit-queue will build and test the patch before landing to ensure that the rollout will be successful. This process takes approximately 15 minutes. If you would like to land the rollout faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID where ATTACHMENT_ID is the ID of this attachment. 902889 2 205279 commit-queue 2013-06-24 02:33:21 -0700 Comment on attachment 205279 ROLLOUT of r151021 Clearing flags on attachment: 205279 Committed r151903: <http://trac.webkit.org/changeset/151903> 902890 3 commit-queue 2013-06-24 02:33:23 -0700 All reviewed patches have been landed. Closing bug. 904195 4 slomo 2013-06-27 05:55:31 -0700 Shouldn't we keep this bug open until the original patch is fixed to not cause regressions? Because the original patch was actually fixing a quite serious bug... 904196 5 pnormand 2013-06-27 06:01:17 -0700 Bug 115352 was reopened, the patch can be updated there. 205279 2013-06-24 02:29:31 -0700 2013-06-24 02:33:21 -0700 ROLLOUT of r151021 bug-117924-20130624022736.patch text/plain 22715 commit-queue U3VidmVyc2lvbiBSZXZpc2lvbjogMTUxODk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWVkNzZmMGI3ZmYzNGZl MmJjNWM5OWVkZGJhNDc4NTQ2MTM3MzY1ZC4uOWY1NTY1NDFkMjRkMWVmMjYzOTQ4NWEzZTM1NDVj NGQyZmJlNDc1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDEzLTA2LTI0ICBDb21t aXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KKworICAgICAgICBVbnJldmlld2Vk LCByb2xsaW5nIG91dCByMTUxMDIxLgorICAgICAgICBodHRwOi8vdHJhYy53ZWJraXQub3JnL2No YW5nZXNldC8xNTEwMjEKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTExNzkyNAorCisgICAgICAgIGNhdXNlZCByZWdyZXNzaW9ucyBvbiBRdCBhbmQgR1RL ICgjMTE3MTQxIGFuZCAjMTE3Njg4KQorICAgICAgICAoUmVxdWVzdGVkIGJ5IHBoaWxuIG9uICN3 ZWJraXQpLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdl YlNvdXJjZUdTdHJlYW1lci5jcHA6CisgICAgICAgICh3ZWJraXRfd2ViX3NyY19pbml0KToKKyAg ICAgICAgKHdlYktpdFdlYlNyY0ZpbmFsaXplKToKKyAgICAgICAgKHdlYktpdFdlYlNyY1NldFBy b3BlcnR5KToKKyAgICAgICAgKHdlYktpdFdlYlNyY0dldFByb3BlcnR5KToKKyAgICAgICAgKHdl YktpdFdlYlNyY1N0b3ApOgorICAgICAgICAod2ViS2l0V2ViU3JjU3RhcnQpOgorICAgICAgICAo d2ViS2l0V2ViU3JjQ2hhbmdlU3RhdGUpOgorICAgICAgICAod2ViS2l0V2ViU3JjUXVlcnlXaXRo UGFyZW50KToKKyAgICAgICAgKHdlYktpdFdlYlNyY0dldFVyaSk6CisgICAgICAgICh3ZWJLaXRX ZWJTcmNTZXRVcmkpOgorICAgICAgICAod2ViS2l0V2ViU3JjTmVlZERhdGFNYWluQ2IpOgorICAg ICAgICAod2ViS2l0V2ViU3JjRW5vdWdoRGF0YU1haW5DYik6CisgICAgICAgICh3ZWJLaXRXZWJT cmNTZWVrTWFpbkNiKToKKyAgICAgICAgKHdlYktpdFdlYlNyY1NlZWtEYXRhQ2IpOgorICAgICAg ICAoU3RyZWFtaW5nQ2xpZW50OjpTdHJlYW1pbmdDbGllbnQpOgorICAgICAgICAoU3RyZWFtaW5n Q2xpZW50Ojp+U3RyZWFtaW5nQ2xpZW50KToKKyAgICAgICAgKFN0cmVhbWluZ0NsaWVudDo6ZGlk UmVjZWl2ZVJlc3BvbnNlKToKKyAgICAgICAgKFN0cmVhbWluZ0NsaWVudDo6ZGlkUmVjZWl2ZURh dGEpOgorICAgICAgICAoU3RyZWFtaW5nQ2xpZW50OjpkaWRGaW5pc2hMb2FkaW5nKToKKyAgICAg ICAgKFN0cmVhbWluZ0NsaWVudDo6d2FzQmxvY2tlZCk6CisgICAgICAgIChTdHJlYW1pbmdDbGll bnQ6OmNhbm5vdFNob3dVUkwpOgorCiAyMDEzLTA2LTI0ICBDaHJpc3RvcGhlIER1bWV6ICA8Y2gu ZHVtZXpAc2lzYS5zYW1zdW5nLmNvbT4KIAogICAgICAgICBNb3ZlIElETCBpbXBsZW1lbnRzIHN0 YXRlbWVudHMgdG8gSURMIGZpbGVzIHRoYXQgaW1wbGVtZW50IHRoZSBpbnRlcmZhY2UKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9XZWJLaXRX ZWJTb3VyY2VHU3RyZWFtZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5jcHAKaW5kZXggODcxODk4MjUzYTA3 ZjRjYWQyMjQ2ZTE3ODZlZDQ0MmE3Njc2NGQ5ZC4uYjI2ZDY5NzE3ODM4NGExNTY3NzkzMzA3YjY3 MmVlOWI1N2Q3ZmIyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1l ci5jcHAKQEAgLTQyLDE2ICs0Miw2IEBACiAjaW5jbHVkZSA8d3RmL2dvYmplY3QvR1JlZlB0ci5o PgogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KIAotLyogUHJlbWlzc2VzOgotICogLSB3 ZWJraXRzcmMgbWF5IGJlIGNyZWF0ZWQgZnJvbSBhbnkgdGhyZWFkIGluc2lkZSBnc3RyZWFtZXIK LSAqIC0gY2xpZW50IGhvbGRzIHJlZmVyZW5jZSB0byBzcmMsIHNvIHRoYXQgc3JjIGlzIG5ldmVy IGRlbGV0ZWQgd2hpbGUgY2xpZW50IGV4aXN0cwotICogLSBpZiB0aGUgc3JjIGV4aXN0cywgYXBw c3JjIGFsc28gZXhpc3RzCi0gKiAtIGNsaWVudCBpcyBjcmVhdGVkIG9uIHN0YXJ0Ci0gKiAtIGNs aWVudCBpcyBkZWxldGVkIG9uIHN0b3AgYWZ0ZXIgY2FuY2VsbGluZyByZXNvdXJjZSBoYW5kbGUK LSAqIC0gY2xpZW50IGNhbGxiYWNrcyBhcmUgYWx3YXlzIGludm9rZWQgZnJvbSBtYWluIHRocmVh ZAotICogLSByZXNvdXJjZSBoYW5kbGUgbWV0aG9kcyBtdXN0IGFsd2F5cyBiZSBjYWxsZWQgZnJv bSBtYWluIHRocmVhZAotICovCi0KIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBjbGFzcyBT dHJlYW1pbmdDbGllbnQgOiBwdWJsaWMgUmVzb3VyY2VIYW5kbGVDbGllbnQgewpAQCAtOTQsOCAr ODQsNiBAQCBzdHJ1Y3QgX1dlYktpdFdlYlNyY1ByaXZhdGUgewogCiAgICAgZ3VpbnQ2NCByZXF1 ZXN0ZWRPZmZzZXQ7CiAKLSAgICBndWludCBzdGFydElEOwotICAgIGd1aW50IHN0b3BJRDsKICAg ICBndWludCBuZWVkRGF0YUlEOwogICAgIGd1aW50IGVub3VnaERhdGFJRDsKICAgICBndWludCBz ZWVrSUQ7CkBAIC0xNDgsNiArMTM2LDggQEAgc3RhdGljIHZvaWQgd2ViS2l0V2ViU3JjTmVlZERh dGFDYihHc3RBcHBTcmMqLCBndWludCBsZW5ndGgsIGdwb2ludGVyIHVzZXJEYXRhKTsKIHN0YXRp YyB2b2lkIHdlYktpdFdlYlNyY0Vub3VnaERhdGFDYihHc3RBcHBTcmMqLCBncG9pbnRlciB1c2Vy RGF0YSk7CiBzdGF0aWMgZ2Jvb2xlYW4gd2ViS2l0V2ViU3JjU2Vla0RhdGFDYihHc3RBcHBTcmMq LCBndWludDY0IG9mZnNldCwgZ3BvaW50ZXIgdXNlckRhdGEpOwogCitzdGF0aWMgdm9pZCB3ZWJL aXRXZWJTcmNTdG9wKFdlYktpdFdlYlNyYyosIGJvb2wpOworCiBzdGF0aWMgR3N0QXBwU3JjQ2Fs bGJhY2tzIGFwcHNyY0NhbGxiYWNrcyA9IHsKICAgICB3ZWJLaXRXZWJTcmNOZWVkRGF0YUNiLAog ICAgIHdlYktpdFdlYlNyY0Vub3VnaERhdGFDYiwKQEAgLTIzOSw2ICsyMjksOCBAQCBzdGF0aWMg dm9pZCB3ZWJraXRfd2ViX3NyY19pbml0KFdlYktpdFdlYlNyYyogc3JjKQogCiAgICAgc3JjLT5w cml2ID0gcHJpdjsKIAorICAgIHByaXYtPmNsaWVudCA9IG5ldyBTdHJlYW1pbmdDbGllbnQoc3Jj KTsKKwogICAgIHByaXYtPmFwcHNyYyA9IEdTVF9BUFBfU1JDKGdzdF9lbGVtZW50X2ZhY3Rvcnlf bWFrZSgiYXBwc3JjIiwgMCkpOwogICAgIGlmICghcHJpdi0+YXBwc3JjKSB7CiAgICAgICAgIEdT VF9FUlJPUl9PQkpFQ1Qoc3JjLCAiRmFpbGVkIHRvIGNyZWF0ZSBhcHBzcmMiKTsKQEAgLTI4Nyw4 ICsyNzksNyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3NyY19pbml0KFdlYktpdFdlYlNyYyog c3JjKQogICAgIGlmIChwcml2LT5oYXZlQXBwU3JjMjcpCiAgICAgICAgIGdfb2JqZWN0X3NldChw cml2LT5hcHBzcmMsICJtaW4tcGVyY2VudCIsIDIwLCBOVUxMKTsKIAotICAgIGdzdF9hcHBfc3Jj X3NldF9jYXBzKHByaXYtPmFwcHNyYywgMCk7Ci0gICAgZ3N0X2FwcF9zcmNfc2V0X3NpemUocHJp di0+YXBwc3JjLCAtMSk7CisgICAgd2ViS2l0V2ViU3JjU3RvcChzcmMsIGZhbHNlKTsKIH0KIAog c3RhdGljIHZvaWQgd2ViS2l0V2ViU3JjRGlzcG9zZShHT2JqZWN0KiBvYmplY3QpCkBAIC0zMTEs NiArMzAyLDggQEAgc3RhdGljIHZvaWQgd2ViS2l0V2ViU3JjRmluYWxpemUoR09iamVjdCogb2Jq ZWN0KQogICAgIFdlYktpdFdlYlNyYyogc3JjID0gV0VCS0lUX1dFQl9TUkMob2JqZWN0KTsKICAg ICBXZWJLaXRXZWJTcmNQcml2YXRlKiBwcml2ID0gc3JjLT5wcml2OwogCisgICAgZGVsZXRlIHBy aXYtPmNsaWVudDsKKwogICAgIGdfZnJlZShwcml2LT51cmkpOwogCiAgICAgR1NUX0NBTExfUEFS RU5UKEdfT0JKRUNUX0NMQVNTLCBmaW5hbGl6ZSwgKG9iamVjdCkpOwpAQCAtMzIzLDkgKzMxNiw3 IEBAIHN0YXRpYyB2b2lkIHdlYktpdFdlYlNyY1NldFByb3BlcnR5KEdPYmplY3QqIG9iamVjdCwg Z3VpbnQgcHJvcElELCBjb25zdCBHVmFsdWUqCiAKICAgICBzd2l0Y2ggKHByb3BJRCkgewogICAg IGNhc2UgUFJPUF9JUkFESU9fTU9ERToKLSAgICAgICAgR1NUX09CSkVDVF9MT0NLKHNyYyk7CiAg ICAgICAgIHByaXYtPmlyYWRpb01vZGUgPSBnX3ZhbHVlX2dldF9ib29sZWFuKHZhbHVlKTsKLSAg ICAgICAgR1NUX09CSkVDVF9VTkxPQ0soc3JjKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBQ Uk9QX0xPQ0FUSU9OOgogI2lmZGVmIEdTVF9BUElfVkVSU0lPTl8xCkBAIC0zNDUsNyArMzM2LDYg QEAgc3RhdGljIHZvaWQgd2ViS2l0V2ViU3JjR2V0UHJvcGVydHkoR09iamVjdCogb2JqZWN0LCBn dWludCBwcm9wSUQsIEdWYWx1ZSogdmFsdWUKICAgICBXZWJLaXRXZWJTcmMqIHNyYyA9IFdFQktJ VF9XRUJfU1JDKG9iamVjdCk7CiAgICAgV2ViS2l0V2ViU3JjUHJpdmF0ZSogcHJpdiA9IHNyYy0+ cHJpdjsKIAotICAgIEdTVF9PQkpFQ1RfTE9DSyhzcmMpOwogICAgIHN3aXRjaCAocHJvcElEKSB7 CiAgICAgY2FzZSBQUk9QX0lSQURJT19NT0RFOgogICAgICAgICBnX3ZhbHVlX3NldF9ib29sZWFu KHZhbHVlLCBwcml2LT5pcmFkaW9Nb2RlKTsKQEAgLTM2OSwyMyArMzU5LDEyIEBAIHN0YXRpYyB2 b2lkIHdlYktpdFdlYlNyY0dldFByb3BlcnR5KEdPYmplY3QqIG9iamVjdCwgZ3VpbnQgcHJvcElE LCBHVmFsdWUqIHZhbHVlCiAgICAgICAgIEdfT0JKRUNUX1dBUk5fSU5WQUxJRF9QUk9QRVJUWV9J RChvYmplY3QsIHByb3BJRCwgcHNwZWMpOwogICAgICAgICBicmVhazsKICAgICB9Ci0gICAgR1NU X09CSkVDVF9VTkxPQ0soc3JjKTsKIH0KIAotLy8gbXVzdCBiZSBjYWxsZWQgb24gbWFpbiB0aHJl YWQgYW5kIHdpdGggb2JqZWN0IHVubG9ja2VkCi1zdGF0aWMgZ2Jvb2xlYW4gd2ViS2l0V2ViU3Jj U3RvcChXZWJLaXRXZWJTcmMqIHNyYykKKworc3RhdGljIHZvaWQgd2ViS2l0V2ViU3JjU3RvcChX ZWJLaXRXZWJTcmMqIHNyYywgYm9vbCBzZWVraW5nKQogewogICAgIFdlYktpdFdlYlNyY1ByaXZh dGUqIHByaXYgPSBzcmMtPnByaXY7Ci0gICAgZ2Jvb2xlYW4gc2Vla2luZzsKLQotICAgIEdTVF9P QkpFQ1RfTE9DSyhzcmMpOwotCi0gICAgc2Vla2luZyA9IHByaXYtPnNlZWtJRDsKLQotICAgIGlm IChwcml2LT5zdGFydElEKSB7Ci0gICAgICAgIGdfc291cmNlX3JlbW92ZShwcml2LT5zdGFydElE KTsKLSAgICAgICAgcHJpdi0+c3RhcnRJRCA9IDA7Ci0gICAgfQogCiAgICAgaWYgKHByaXYtPnJl c291cmNlSGFuZGxlKSB7CiAgICAgICAgIHByaXYtPnJlc291cmNlSGFuZGxlLT5jYW5jZWwoKTsK QEAgLTM5MywxMSArMzcyLDYgQEAgc3RhdGljIGdib29sZWFuIHdlYktpdFdlYlNyY1N0b3AoV2Vi S2l0V2ViU3JjKiBzcmMpCiAgICAgfQogICAgIHByaXYtPnJlc291cmNlSGFuZGxlID0gMDsKIAot ICAgIGlmIChwcml2LT5jbGllbnQpIHsKLSAgICAgICAgZGVsZXRlIHByaXYtPmNsaWVudDsKLSAg ICAgICAgcHJpdi0+Y2xpZW50ID0gMDsKLSAgICB9Ci0KICAgICBpZiAocHJpdi0+ZnJhbWUgJiYg IXNlZWtpbmcpCiAgICAgICAgIHByaXYtPmZyYW1lLmNsZWFyKCk7CiAKQEAgLTQxMCw2ICszODQs NyBAQCBzdGF0aWMgZ2Jvb2xlYW4gd2ViS2l0V2ViU3JjU3RvcChXZWJLaXRXZWJTcmMqIHNyYykK ICAgICAgICAgcHJpdi0+YnVmZmVyLmNsZWFyKCk7CiAgICAgfQogCisgICAgR1NUX09CSkVDVF9M T0NLKHNyYyk7CiAgICAgaWYgKHByaXYtPm5lZWREYXRhSUQpCiAgICAgICAgIGdfc291cmNlX3Jl bW92ZShwcml2LT5uZWVkRGF0YUlEKTsKICAgICBwcml2LT5uZWVkRGF0YUlEID0gMDsKQEAgLTQy Myw2ICszOTgsNyBAQCBzdGF0aWMgZ2Jvb2xlYW4gd2ViS2l0V2ViU3JjU3RvcChXZWJLaXRXZWJT cmMqIHNyYykKICAgICBwcml2LT5zZWVrSUQgPSAwOwogCiAgICAgcHJpdi0+cGF1c2VkID0gRkFM U0U7CisgICAgR1NUX09CSkVDVF9VTkxPQ0soc3JjKTsKIAogICAgIGdfZnJlZShwcml2LT5pcmFk aW9OYW1lKTsKICAgICBwcml2LT5pcmFkaW9OYW1lID0gMDsKQEAgLTQzNiw2ICs0MTIsMTIgQEAg c3RhdGljIGdib29sZWFuIHdlYktpdFdlYlNyY1N0b3AoV2ViS2l0V2ViU3JjKiBzcmMpCiAgICAg Z19mcmVlKHByaXYtPmlyYWRpb1RpdGxlKTsKICAgICBwcml2LT5pcmFkaW9UaXRsZSA9IDA7CiAK KyAgICBpZiAocHJpdi0+YXBwc3JjKSB7CisgICAgICAgIGdzdF9hcHBfc3JjX3NldF9jYXBzKHBy aXYtPmFwcHNyYywgMCk7CisgICAgICAgIGlmICghc2Vla2luZykKKyAgICAgICAgICAgIGdzdF9h cHBfc3JjX3NldF9zaXplKHByaXYtPmFwcHNyYywgLTEpOworICAgIH0KKwogICAgIHByaXYtPm9m ZnNldCA9IDA7CiAgICAgcHJpdi0+c2Vla2FibGUgPSBGQUxTRTsKIApAQCAtNDQ0LDMzICs0MjYs MTggQEAgc3RhdGljIGdib29sZWFuIHdlYktpdFdlYlNyY1N0b3AoV2ViS2l0V2ViU3JjKiBzcmMp CiAgICAgICAgIHByaXYtPnJlcXVlc3RlZE9mZnNldCA9IDA7CiAgICAgfQogCi0gICAgcHJpdi0+ c3RvcElEID0gMDsKLSAgICBHU1RfT0JKRUNUX1VOTE9DSyhzcmMpOwotCi0gICAgaWYgKHByaXYt PmFwcHNyYykgewotICAgICAgICBnc3RfYXBwX3NyY19zZXRfY2Fwcyhwcml2LT5hcHBzcmMsIDAp OwotICAgICAgICBpZiAoIXNlZWtpbmcpCi0gICAgICAgICAgICBnc3RfYXBwX3NyY19zZXRfc2l6 ZShwcml2LT5hcHBzcmMsIC0xKTsKLSAgICB9Ci0KICAgICBHU1RfREVCVUdfT0JKRUNUKHNyYywg IlN0b3BwZWQgcmVxdWVzdCIpOwotCi0gICAgcmV0dXJuIEZBTFNFOwogfQogCi0vLyBtdXN0IGJl IGNhbGxlZCBvbiBtYWluIHRocmVhZCBhbmQgd2l0aCBvYmplY3QgdW5sb2NrZWQKLXN0YXRpYyBn Ym9vbGVhbiB3ZWJLaXRXZWJTcmNTdGFydChXZWJLaXRXZWJTcmMqIHNyYykKK3N0YXRpYyBib29s IHdlYktpdFdlYlNyY1N0YXJ0KFdlYktpdFdlYlNyYyogc3JjKQogewogICAgIFdlYktpdFdlYlNy Y1ByaXZhdGUqIHByaXYgPSBzcmMtPnByaXY7CiAKLSAgICBHU1RfT0JKRUNUX0xPQ0soc3JjKTsK ICAgICBpZiAoIXByaXYtPnVyaSkgewogICAgICAgICBHU1RfRVJST1JfT0JKRUNUKHNyYywgIk5v IFVSSSBwcm92aWRlZCIpOwotICAgICAgICBHU1RfT0JKRUNUX1VOTE9DSyhzcmMpOwotICAgICAg ICB3ZWJLaXRXZWJTcmNTdG9wKHNyYyk7Ci0gICAgICAgIHJldHVybiBGQUxTRTsKKyAgICAgICAg cmV0dXJuIGZhbHNlOwogICAgIH0KLQorICAgIAogICAgIEtVUkwgdXJsID0gS1VSTChLVVJMKCks IHByaXYtPnVyaSk7CiAKICAgICBSZXNvdXJjZVJlcXVlc3QgcmVxdWVzdCh1cmwpOwpAQCAtNTA1 LDE3ICs0NzIsMTUgQEAgc3RhdGljIGdib29sZWFuIHdlYktpdFdlYlNyY1N0YXJ0KFdlYktpdFdl YlNyYyogc3JjKQogICAgIC8vIE5lZWRlZCB0byB1c2UgRExOQSBzdHJlYW1pbmcgc2VydmVycwog ICAgIHJlcXVlc3Quc2V0SFRUUEhlYWRlckZpZWxkKCJ0cmFuc2Zlck1vZGUuZGxuYSIsICJTdHJl YW1pbmciKTsKIAotICAgIHByaXYtPmNsaWVudCA9IG5ldyBTdHJlYW1pbmdDbGllbnQoc3JjKTsK ICAgICBwcml2LT5yZXNvdXJjZUhhbmRsZSA9IFJlc291cmNlSGFuZGxlOjpjcmVhdGUoY29udGV4 dCwgcmVxdWVzdCwgcHJpdi0+Y2xpZW50LCBmYWxzZSwgZmFsc2UpOwogICAgIGlmICghcHJpdi0+ cmVzb3VyY2VIYW5kbGUpIHsKICAgICAgICAgR1NUX0VSUk9SX09CSkVDVChzcmMsICJGYWlsZWQg dG8gY3JlYXRlIFJlc291cmNlSGFuZGxlIik7Ci0gICAgICAgIEdTVF9PQkpFQ1RfVU5MT0NLKHNy Yyk7Ci0gICAgICAgIHdlYktpdFdlYlNyY1N0b3Aoc3JjKTsKLSAgICB9IGVsc2UgewotICAgICAg ICBHU1RfT0JKRUNUX1VOTE9DSyhzcmMpOwotICAgICAgICBHU1RfREVCVUdfT0JKRUNUKHNyYywg IlN0YXJ0ZWQgcmVxdWVzdCIpOworICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQotICAgIHJl dHVybiBGQUxTRTsKKworICAgIEdTVF9ERUJVR19PQkpFQ1Qoc3JjLCAiU3RhcnRlZCByZXF1ZXN0 Iik7CisKKyAgICByZXR1cm4gdHJ1ZTsKIH0KIAogc3RhdGljIEdzdFN0YXRlQ2hhbmdlUmV0dXJu IHdlYktpdFdlYlNyY0NoYW5nZVN0YXRlKEdzdEVsZW1lbnQqIGVsZW1lbnQsIEdzdFN0YXRlQ2hh bmdlIHRyYW5zaXRpb24pCkBAIC01NDYsMTUgKzUxMSwxMiBAQCBzdGF0aWMgR3N0U3RhdGVDaGFu Z2VSZXR1cm4gd2ViS2l0V2ViU3JjQ2hhbmdlU3RhdGUoR3N0RWxlbWVudCogZWxlbWVudCwgR3N0 U3RhdAogICAgIHN3aXRjaCAodHJhbnNpdGlvbikgewogICAgIGNhc2UgR1NUX1NUQVRFX0NIQU5H RV9SRUFEWV9UT19QQVVTRUQ6CiAgICAgICAgIEdTVF9ERUJVR19PQkpFQ1Qoc3JjLCAiUkVBRFkt PlBBVVNFRCIpOwotICAgICAgICBHU1RfT0JKRUNUX0xPQ0soc3JjKTsKLSAgICAgICAgcHJpdi0+ c3RhcnRJRCA9IGdfdGltZW91dF9hZGRfZnVsbChHX1BSSU9SSVRZX0RFRkFVTFQsIDAsIChHU291 cmNlRnVuYykgd2ViS2l0V2ViU3JjU3RhcnQsIGdzdF9vYmplY3RfcmVmKHNyYyksIChHRGVzdHJv eU5vdGlmeSkgZ3N0X29iamVjdF91bnJlZik7Ci0gICAgICAgIEdTVF9PQkpFQ1RfVU5MT0NLKHNy Yyk7CisgICAgICAgIGlmICghd2ViS2l0V2ViU3JjU3RhcnQoc3JjKSkKKyAgICAgICAgICAgIHJl dCA9IEdTVF9TVEFURV9DSEFOR0VfRkFJTFVSRTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBH U1RfU1RBVEVfQ0hBTkdFX1BBVVNFRF9UT19SRUFEWToKICAgICAgICAgR1NUX0RFQlVHX09CSkVD VChzcmMsICJQQVVTRUQtPlJFQURZIik7Ci0gICAgICAgIEdTVF9PQkpFQ1RfTE9DSyhzcmMpOwot ICAgICAgICBwcml2LT5zdG9wSUQgPSBnX3RpbWVvdXRfYWRkX2Z1bGwoR19QUklPUklUWV9ERUZB VUxULCAwLCAoR1NvdXJjZUZ1bmMpIHdlYktpdFdlYlNyY1N0b3AsIGdzdF9vYmplY3RfcmVmKHNy YyksIChHRGVzdHJveU5vdGlmeSkgZ3N0X29iamVjdF91bnJlZik7Ci0gICAgICAgIEdTVF9PQkpF Q1RfVU5MT0NLKHNyYyk7CisgICAgICAgIHdlYktpdFdlYlNyY1N0b3Aoc3JjLCBmYWxzZSk7CiAg ICAgICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6CiAgICAgICAgIGJyZWFrOwpAQCAtNTY1LDcgKzUy Nyw3IEBAIHN0YXRpYyBHc3RTdGF0ZUNoYW5nZVJldHVybiB3ZWJLaXRXZWJTcmNDaGFuZ2VTdGF0 ZShHc3RFbGVtZW50KiBlbGVtZW50LCBHc3RTdGF0CiAKIHN0YXRpYyBnYm9vbGVhbiB3ZWJLaXRX ZWJTcmNRdWVyeVdpdGhQYXJlbnQoR3N0UGFkKiBwYWQsIEdzdE9iamVjdCogcGFyZW50LCBHc3RR dWVyeSogcXVlcnkpCiB7Ci0gICAgV2ViS2l0V2ViU3JjKiBzcmMgPSBXRUJLSVRfV0VCX1NSQyhH U1RfRUxFTUVOVChwYXJlbnQpKTsKKyAgICBXZWJLaXRXZWJTcmMqIHdlYmtpdFNyYyA9IFdFQktJ VF9XRUJfU1JDKEdTVF9FTEVNRU5UKHBhcmVudCkpOwogICAgIGdib29sZWFuIHJlc3VsdCA9IEZB TFNFOwogCiAgICAgc3dpdGNoIChHU1RfUVVFUllfVFlQRShxdWVyeSkpIHsKQEAgLTU3NCwxOSAr NTM2LDE1IEBAIHN0YXRpYyBnYm9vbGVhbiB3ZWJLaXRXZWJTcmNRdWVyeVdpdGhQYXJlbnQoR3N0 UGFkKiBwYWQsIEdzdE9iamVjdCogcGFyZW50LCBHc3RRCiAKICAgICAgICAgZ3N0X3F1ZXJ5X3Bh cnNlX2R1cmF0aW9uKHF1ZXJ5LCAmZm9ybWF0LCBOVUxMKTsKIAotICAgICAgICBHU1RfREVCVUdf T0JKRUNUKHNyYywgImR1cmF0aW9uIHF1ZXJ5IGluIGZvcm1hdCAlcyIsIGdzdF9mb3JtYXRfZ2V0 X25hbWUoZm9ybWF0KSk7Ci0gICAgICAgIEdTVF9PQkpFQ1RfTE9DSyhzcmMpOwotICAgICAgICBp ZiAoKGZvcm1hdCA9PSBHU1RfRk9STUFUX0JZVEVTKSAmJiAoc3JjLT5wcml2LT5zaXplID4gMCkp IHsKLSAgICAgICAgICAgIGdzdF9xdWVyeV9zZXRfZHVyYXRpb24ocXVlcnksIGZvcm1hdCwgc3Jj LT5wcml2LT5zaXplKTsKKyAgICAgICAgR1NUX0RFQlVHX09CSkVDVCh3ZWJraXRTcmMsICJkdXJh dGlvbiBxdWVyeSBpbiBmb3JtYXQgJXMiLCBnc3RfZm9ybWF0X2dldF9uYW1lKGZvcm1hdCkpOwor ICAgICAgICBpZiAoKGZvcm1hdCA9PSBHU1RfRk9STUFUX0JZVEVTKSAmJiAod2Via2l0U3JjLT5w cml2LT5zaXplID4gMCkpIHsKKyAgICAgICAgICAgIGdzdF9xdWVyeV9zZXRfZHVyYXRpb24ocXVl cnksIGZvcm1hdCwgd2Via2l0U3JjLT5wcml2LT5zaXplKTsKICAgICAgICAgICAgIHJlc3VsdCA9 IFRSVUU7CiAgICAgICAgIH0KLSAgICAgICAgR1NUX09CSkVDVF9VTkxPQ0soc3JjKTsKICAgICAg ICAgYnJlYWs7CiAgICAgfQogICAgIGNhc2UgR1NUX1FVRVJZX1VSSTogewotICAgICAgICBHU1Rf T0JKRUNUX0xPQ0soc3JjKTsKLSAgICAgICAgZ3N0X3F1ZXJ5X3NldF91cmkocXVlcnksIHNyYy0+ cHJpdi0+dXJpKTsKLSAgICAgICAgR1NUX09CSkVDVF9VTkxPQ0soc3JjKTsKKyAgICAgICAgZ3N0 X3F1ZXJ5X3NldF91cmkocXVlcnksIHdlYmtpdFNyYy0+cHJpdi0+dXJpKTsKICAgICAgICAgcmVz dWx0ID0gVFJVRTsKICAgICAgICAgYnJlYWs7CiAgICAgfQpAQCAtNjI3LDEzICs1ODUsNyBAQCBj b25zdCBnY2hhciogY29uc3QqIHdlYktpdFdlYlNyY0dldFByb3RvY29scyhHVHlwZSkKIAogc3Rh dGljIGdjaGFyKiB3ZWJLaXRXZWJTcmNHZXRVcmkoR3N0VVJJSGFuZGxlciogaGFuZGxlcikKIHsK LSAgICBXZWJLaXRXZWJTcmMqIHNyYyA9IFdFQktJVF9XRUJfU1JDKGhhbmRsZXIpOwotICAgIGdj aGFyKiByZXQ7Ci0KLSAgICBHU1RfT0JKRUNUX0xPQ0soc3JjKTsKLSAgICByZXQgPSBnX3N0cmR1 cChzcmMtPnByaXYtPnVyaSk7Ci0gICAgR1NUX09CSkVDVF9VTkxPQ0soc3JjKTsKLSAgICByZXR1 cm4gcmV0OworICAgIHJldHVybiBnX3N0cmR1cChXRUJLSVRfV0VCX1NSQyhoYW5kbGVyKS0+cHJp di0+dXJpKTsKIH0KIAogc3RhdGljIGdib29sZWFuIHdlYktpdFdlYlNyY1NldFVyaShHc3RVUklI YW5kbGVyKiBoYW5kbGVyLCBjb25zdCBnY2hhciogdXJpLCBHRXJyb3IqKiBlcnJvcikKQEAgLTY0 NiwyNSArNTk4LDIwIEBAIHN0YXRpYyBnYm9vbGVhbiB3ZWJLaXRXZWJTcmNTZXRVcmkoR3N0VVJJ SGFuZGxlciogaGFuZGxlciwgY29uc3QgZ2NoYXIqIHVyaSwgR0VyCiAgICAgICAgIHJldHVybiBG QUxTRTsKICAgICB9CiAKLSAgICBHU1RfT0JKRUNUX0xPQ0soc3JjKTsKICAgICBnX2ZyZWUocHJp di0+dXJpKTsKICAgICBwcml2LT51cmkgPSAwOwogCi0gICAgaWYgKCF1cmkpIHsKLSAgICAgICAg R1NUX09CSkVDVF9VTkxPQ0soc3JjKTsKKyAgICBpZiAoIXVyaSkKICAgICAgICAgcmV0dXJuIFRS VUU7Ci0gICAgfQogCiAgICAgS1VSTCB1cmwoS1VSTCgpLCB1cmkpOwogCiAgICAgaWYgKCF1cmwu aXNWYWxpZCgpIHx8ICF1cmwucHJvdG9jb2xJc0luSFRUUEZhbWlseSgpKSB7Ci0gICAgICAgIEdT VF9PQkpFQ1RfVU5MT0NLKHNyYyk7CiAgICAgICAgIGdfc2V0X2Vycm9yKGVycm9yLCBHU1RfVVJJ X0VSUk9SLCBHU1RfVVJJX0VSUk9SX0JBRF9VUkksICJJbnZhbGlkIFVSSSAnJXMnIiwgdXJpKTsK ICAgICAgICAgcmV0dXJuIEZBTFNFOwogICAgIH0KIAogICAgIHByaXYtPnVyaSA9IGdfc3RyZHVw KHVybC5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKLSAgICBHU1RfT0JKRUNUX1VOTE9DSyhzcmMp OwogICAgIHJldHVybiBUUlVFOwogfQogCkBAIC02ODIsMTMgKzYyOSw3IEBAIHN0YXRpYyBnY2hh cioqIHdlYktpdFdlYlNyY0dldFByb3RvY29scyh2b2lkKQogCiBzdGF0aWMgY29uc3QgZ2NoYXIq IHdlYktpdFdlYlNyY0dldFVyaShHc3RVUklIYW5kbGVyKiBoYW5kbGVyKQogewotICAgIFdlYktp dFdlYlNyYyogc3JjID0gV0VCS0lUX1dFQl9TUkMoaGFuZGxlcik7Ci0gICAgZ2NoYXIqIHJldDsK LQotICAgIEdTVF9PQkpFQ1RfTE9DSyhzcmMpOwotICAgIHJldCA9IGdfc3RyZHVwKHNyYy0+cHJp di0+dXJpKTsKLSAgICBHU1RfT0JKRUNUX1VOTE9DSyhzcmMpOwotICAgIHJldHVybiByZXQ7Cisg ICAgcmV0dXJuIGdfc3RyZHVwKFdFQktJVF9XRUJfU1JDKGhhbmRsZXIpLT5wcml2LT51cmkpOwog fQogCiBzdGF0aWMgZ2Jvb2xlYW4gd2ViS2l0V2ViU3JjU2V0VXJpKEdzdFVSSUhhbmRsZXIqIGhh bmRsZXIsIGNvbnN0IGdjaGFyKiB1cmkpCkBAIC03MDEsMjUgKzY0MiwyMCBAQCBzdGF0aWMgZ2Jv b2xlYW4gd2ViS2l0V2ViU3JjU2V0VXJpKEdzdFVSSUhhbmRsZXIqIGhhbmRsZXIsIGNvbnN0IGdj aGFyKiB1cmkpCiAgICAgICAgIHJldHVybiBGQUxTRTsKICAgICB9CiAKLSAgICBHU1RfT0JKRUNU X0xPQ0soc3JjKTsKICAgICBnX2ZyZWUocHJpdi0+dXJpKTsKICAgICBwcml2LT51cmkgPSAwOwog Ci0gICAgaWYgKCF1cmkpIHsKLSAgICAgICAgR1NUX09CSkVDVF9VTkxPQ0soc3JjKTsKKyAgICBp ZiAoIXVyaSkKICAgICAgICAgcmV0dXJuIFRSVUU7Ci0gICAgfQogCiAgICAgS1VSTCB1cmwoS1VS TCgpLCB1cmkpOwogCiAgICAgaWYgKCF1cmwuaXNWYWxpZCgpIHx8ICF1cmwucHJvdG9jb2xJc0lu SFRUUEZhbWlseSgpKSB7Ci0gICAgICAgIEdTVF9PQkpFQ1RfVU5MT0NLKHNyYyk7CiAgICAgICAg IEdTVF9FUlJPUl9PQkpFQ1Qoc3JjLCAiSW52YWxpZCBVUkkgJyVzJyIsIHVyaSk7CiAgICAgICAg IHJldHVybiBGQUxTRTsKICAgICB9CiAKICAgICBwcml2LT51cmkgPSBnX3N0cmR1cCh1cmwuc3Ry aW5nKCkudXRmOCgpLmRhdGEoKSk7Ci0gICAgR1NUX09CSkVDVF9VTkxPQ0soc3JjKTsKICAgICBy ZXR1cm4gVFJVRTsKIH0KICNlbmRpZgpAQCAtNzQwLDE5ICs2NzYsMTIgQEAgc3RhdGljIGdib29s ZWFuIHdlYktpdFdlYlNyY05lZWREYXRhTWFpbkNiKFdlYktpdFdlYlNyYyogc3JjKQogewogICAg IFdlYktpdFdlYlNyY1ByaXZhdGUqIHByaXYgPSBzcmMtPnByaXY7CiAKLSAgICBHU1RfT0JKRUNU X0xPQ0soc3JjKTsKLSAgICAvLyBhbHJlYWR5IHN0b3BwZWQKLSAgICBpZiAoIXByaXYtPm5lZWRE YXRhSUQpIHsKLSAgICAgICAgR1NUX09CSkVDVF9VTkxPQ0soc3JjKTsKLSAgICAgICAgcmV0dXJu IEZBTFNFOwotICAgIH0KKyAgICBwcml2LT5yZXNvdXJjZUhhbmRsZS0+c2V0RGVmZXJzTG9hZGlu ZyhmYWxzZSk7CiAKKyAgICBHU1RfT0JKRUNUX0xPQ0soc3JjKTsKICAgICBwcml2LT5wYXVzZWQg PSBGQUxTRTsKICAgICBwcml2LT5uZWVkRGF0YUlEID0gMDsKICAgICBHU1RfT0JKRUNUX1VOTE9D SyhzcmMpOwotCi0gICAgaWYgKHByaXYtPnJlc291cmNlSGFuZGxlKQotICAgICAgICBwcml2LT5y ZXNvdXJjZUhhbmRsZS0+c2V0RGVmZXJzTG9hZGluZyhmYWxzZSk7CiAgICAgcmV0dXJuIEZBTFNF OwogfQogCkBAIC03NzcsMTkgKzcwNiwxMyBAQCBzdGF0aWMgZ2Jvb2xlYW4gd2ViS2l0V2ViU3Jj RW5vdWdoRGF0YU1haW5DYihXZWJLaXRXZWJTcmMqIHNyYykKIHsKICAgICBXZWJLaXRXZWJTcmNQ cml2YXRlKiBwcml2ID0gc3JjLT5wcml2OwogCi0gICAgR1NUX09CSkVDVF9MT0NLKHNyYyk7Ci0g ICAgLy8gYWxyZWFkeSBzdG9wcGVkCi0gICAgaWYgKCFwcml2LT5lbm91Z2hEYXRhSUQpIHsKLSAg ICAgICAgR1NUX09CSkVDVF9VTkxPQ0soc3JjKTsKLSAgICAgICAgcmV0dXJuIEZBTFNFOwotICAg IH0KKyAgICBwcml2LT5yZXNvdXJjZUhhbmRsZS0+c2V0RGVmZXJzTG9hZGluZyh0cnVlKTsKIAor ICAgIEdTVF9PQkpFQ1RfTE9DSyhzcmMpOwogICAgIHByaXYtPnBhdXNlZCA9IFRSVUU7CiAgICAg cHJpdi0+ZW5vdWdoRGF0YUlEID0gMDsKICAgICBHU1RfT0JKRUNUX1VOTE9DSyhzcmMpOwogCi0g ICAgaWYgKHByaXYtPnJlc291cmNlSGFuZGxlKQotICAgICAgICBwcml2LT5yZXNvdXJjZUhhbmRs ZS0+c2V0RGVmZXJzTG9hZGluZyh0cnVlKTsKICAgICByZXR1cm4gRkFMU0U7CiB9CiAKQEAgLTgx Miw3ICs3MzUsNyBAQCBzdGF0aWMgdm9pZCB3ZWJLaXRXZWJTcmNFbm91Z2hEYXRhQ2IoR3N0QXBw U3JjKiwgZ3BvaW50ZXIgdXNlckRhdGEpCiAKIHN0YXRpYyBnYm9vbGVhbiB3ZWJLaXRXZWJTcmNT ZWVrTWFpbkNiKFdlYktpdFdlYlNyYyogc3JjKQogewotICAgIHdlYktpdFdlYlNyY1N0b3Aoc3Jj KTsKKyAgICB3ZWJLaXRXZWJTcmNTdG9wKHNyYywgdHJ1ZSk7CiAgICAgd2ViS2l0V2ViU3JjU3Rh cnQoc3JjKTsKIAogICAgIHJldHVybiBGQUxTRTsKQEAgLTgyNCwyOSArNzQ3LDIzIEBAIHN0YXRp YyBnYm9vbGVhbiB3ZWJLaXRXZWJTcmNTZWVrRGF0YUNiKEdzdEFwcFNyYyosIGd1aW50NjQgb2Zm c2V0LCBncG9pbnRlciB1c2VyCiAgICAgV2ViS2l0V2ViU3JjUHJpdmF0ZSogcHJpdiA9IHNyYy0+ cHJpdjsKIAogICAgIEdTVF9ERUJVR19PQkpFQ1Qoc3JjLCAiU2Vla2luZyB0byBvZmZzZXQ6ICUi IEdfR1VJTlQ2NF9GT1JNQVQsIG9mZnNldCk7Ci0gICAgR1NUX09CSkVDVF9MT0NLKHNyYyk7Ci0g ICAgaWYgKG9mZnNldCA9PSBwcml2LT5vZmZzZXQgJiYgcHJpdi0+cmVxdWVzdGVkT2Zmc2V0ID09 IHByaXYtPm9mZnNldCkgewotICAgICAgICBHU1RfT0JKRUNUX1VOTE9DSyhzcmMpOworICAgIGlm IChvZmZzZXQgPT0gcHJpdi0+b2Zmc2V0ICYmIHByaXYtPnJlcXVlc3RlZE9mZnNldCA9PSBwcml2 LT5vZmZzZXQpCiAgICAgICAgIHJldHVybiBUUlVFOwotICAgIH0KIAotICAgIGlmICghcHJpdi0+ c2Vla2FibGUpIHsKLSAgICAgICAgR1NUX09CSkVDVF9VTkxPQ0soc3JjKTsKKyAgICBpZiAoIXBy aXYtPnNlZWthYmxlKQogICAgICAgICByZXR1cm4gRkFMU0U7Ci0gICAgfQotICAgIGlmIChvZmZz ZXQgPiBwcml2LT5zaXplKSB7Ci0gICAgICAgIEdTVF9PQkpFQ1RfVU5MT0NLKHNyYyk7CisgICAg aWYgKG9mZnNldCA+IHByaXYtPnNpemUpCiAgICAgICAgIHJldHVybiBGQUxTRTsKLSAgICB9CiAK ICAgICBHU1RfREVCVUdfT0JKRUNUKHNyYywgIkRvaW5nIHJhbmdlLXJlcXVlc3Qgc2VlayIpOwog ICAgIHByaXYtPnJlcXVlc3RlZE9mZnNldCA9IG9mZnNldDsKIAorICAgIEdTVF9PQkpFQ1RfTE9D SyhzcmMpOwogICAgIGlmIChwcml2LT5zZWVrSUQpCiAgICAgICAgIGdfc291cmNlX3JlbW92ZShw cml2LT5zZWVrSUQpOwogICAgIHByaXYtPnNlZWtJRCA9IGdfdGltZW91dF9hZGRfZnVsbChHX1BS SU9SSVRZX0RFRkFVTFQsIDAsIChHU291cmNlRnVuYykgd2ViS2l0V2ViU3JjU2Vla01haW5DYiwg Z3N0X29iamVjdF9yZWYoc3JjKSwgKEdEZXN0cm95Tm90aWZ5KSBnc3Rfb2JqZWN0X3VucmVmKTsK ICAgICBHU1RfT0JKRUNUX1VOTE9DSyhzcmMpOwotCisgICAgCiAgICAgcmV0dXJuIFRSVUU7CiB9 CiAKQEAgLTg2Myw1MSArNzgwLDcxIEBAIHZvaWQgd2ViS2l0V2ViU3JjU2V0TWVkaWFQbGF5ZXIo V2ViS2l0V2ViU3JjKiBzcmMsIFdlYkNvcmU6Ok1lZGlhUGxheWVyKiBwbGF5ZXIpCiAgICAgcHJp di0+cGxheWVyID0gcGxheWVyOwogfQogCi1TdHJlYW1pbmdDbGllbnQ6OlN0cmVhbWluZ0NsaWVu dChXZWJLaXRXZWJTcmMqIHNyYykKLSAgICA6IG1fc3JjKHN0YXRpY19jYXN0PFdlYktpdFdlYlNy Yyo+KGdzdF9vYmplY3RfcmVmKHNyYykpKQorU3RyZWFtaW5nQ2xpZW50OjpTdHJlYW1pbmdDbGll bnQoV2ViS2l0V2ViU3JjKiBzcmMpIDogbV9zcmMoc3JjKQogewogCiB9CiAKIFN0cmVhbWluZ0Ns aWVudDo6flN0cmVhbWluZ0NsaWVudCgpCiB7Ci0gICAgZ3N0X29iamVjdF91bnJlZihtX3NyYyk7 CisKIH0KIAogdm9pZCBTdHJlYW1pbmdDbGllbnQ6OndpbGxTZW5kUmVxdWVzdChSZXNvdXJjZUhh bmRsZSosIFJlc291cmNlUmVxdWVzdCYsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmKQogewogfQog Ci12b2lkIFN0cmVhbWluZ0NsaWVudDo6ZGlkUmVjZWl2ZVJlc3BvbnNlKFJlc291cmNlSGFuZGxl ICpoYW5kbGUsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlKQordm9pZCBTdHJlYW1p bmdDbGllbnQ6OmRpZFJlY2VpdmVSZXNwb25zZShSZXNvdXJjZUhhbmRsZSosIGNvbnN0IFJlc291 cmNlUmVzcG9uc2UmIHJlc3BvbnNlKQogewogICAgIFdlYktpdFdlYlNyY1ByaXZhdGUqIHByaXYg PSBtX3NyYy0+cHJpdjsKIAogICAgIEdTVF9ERUJVR19PQkpFQ1QobV9zcmMsICJSZWNlaXZlZCBy ZXNwb25zZTogJWQiLCByZXNwb25zZS5odHRwU3RhdHVzQ29kZSgpKTsKIAotICAgIEdTVF9PQkpF Q1RfTE9DSyhtX3NyYyk7Ci0KICAgICAvLyBJZiB3ZSBzZWVrZWQgd2UgbmVlZCAyMDYgPT0gUEFS VElBTF9DT05URU5UCi0gICAgaWYgKGhhbmRsZSAhPSBwcml2LT5yZXNvdXJjZUhhbmRsZSB8fCAo cHJpdi0+cmVxdWVzdGVkT2Zmc2V0ICYmIHJlc3BvbnNlLmh0dHBTdGF0dXNDb2RlKCkgIT0gMjA2 KSkgewotICAgICAgICBHU1RfT0JKRUNUX1VOTE9DSyhtX3NyYyk7CisgICAgaWYgKHByaXYtPnJl cXVlc3RlZE9mZnNldCAmJiByZXNwb25zZS5odHRwU3RhdHVzQ29kZSgpICE9IDIwNikgewogICAg ICAgICBHU1RfRUxFTUVOVF9FUlJPUihtX3NyYywgUkVTT1VSQ0UsIFJFQUQsICgwKSwgKDApKTsK ICAgICAgICAgZ3N0X2FwcF9zcmNfZW5kX29mX3N0cmVhbShwcml2LT5hcHBzcmMpOwotICAgICAg ICB3ZWJLaXRXZWJTcmNTdG9wKG1fc3JjKTsKKyAgICAgICAgd2ViS2l0V2ViU3JjU3RvcChtX3Ny YywgZmFsc2UpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCiAgICAgbG9uZyBsb25nIGxlbmd0 aCA9IHJlc3BvbnNlLmV4cGVjdGVkQ29udGVudExlbmd0aCgpOwotICAgIGlmIChsZW5ndGggPiAw KQorICAgIGlmIChsZW5ndGggPiAwKSB7CiAgICAgICAgIGxlbmd0aCArPSBwcml2LT5yZXF1ZXN0 ZWRPZmZzZXQ7CisgICAgICAgIGdzdF9hcHBfc3JjX3NldF9zaXplKHByaXYtPmFwcHNyYywgbGVu Z3RoKTsKKworI2lmbmRlZiBHU1RfQVBJX1ZFUlNJT05fMQorICAgICAgICBpZiAoIXByaXYtPmhh dmVBcHBTcmMyNykgeworICAgICAgICAgICAgZ3N0X3NlZ21lbnRfc2V0X2R1cmF0aW9uKCZHU1Rf QkFTRV9TUkMocHJpdi0+YXBwc3JjKS0+c2VnbWVudCwgR1NUX0ZPUk1BVF9CWVRFUywgbGVuZ3Ro KTsKKyAgICAgICAgICAgIGdzdF9lbGVtZW50X3Bvc3RfbWVzc2FnZShHU1RfRUxFTUVOVChwcml2 LT5hcHBzcmMpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdzdF9tZXNz YWdlX25ld19kdXJhdGlvbihHU1RfT0JKRUNUKHByaXYtPmFwcHNyYyksCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdTVF9GT1JN QVRfQllURVMsIGxlbmd0aCkpOworICAgICAgICB9CisjZW5kaWYKKyAgICB9CiAKICAgICBwcml2 LT5zaXplID0gbGVuZ3RoID49IDAgPyBsZW5ndGggOiAwOwogICAgIHByaXYtPnNlZWthYmxlID0g bGVuZ3RoID4gMCAmJiBnX2FzY2lpX3N0cmNhc2VjbXAoIm5vbmUiLCByZXNwb25zZS5odHRwSGVh ZGVyRmllbGQoIkFjY2VwdC1SYW5nZXMiKS51dGY4KCkuZGF0YSgpKTsKIAorICAgIC8vIGljZWNh c3Qgc3R1ZmYKKyAgICBTdHJpbmcgdmFsdWUgPSByZXNwb25zZS5odHRwSGVhZGVyRmllbGQoImlj eS1tZXRhaW50Iik7CisgICAgaWYgKCF2YWx1ZS5pc0VtcHR5KCkpIHsKKyAgICAgICAgZ2NoYXIq IGVuZHB0ciA9IDA7CisgICAgICAgIGdpbnQ2NCBpY3lNZXRhSW50ID0gZ19hc2NpaV9zdHJ0b2xs KHZhbHVlLnV0ZjgoKS5kYXRhKCksICZlbmRwdHIsIDEwKTsKKyAgICAgICAgICAgIAorICAgICAg ICBpZiAoZW5kcHRyICYmICplbmRwdHIgPT0gJ1wwJyAmJiBpY3lNZXRhSW50ID4gMCkgeworICAg ICAgICAgICAgR1JlZlB0cjxHc3RDYXBzPiBjYXBzID0gYWRvcHRHUmVmKGdzdF9jYXBzX25ld19z aW1wbGUoImFwcGxpY2F0aW9uL3gtaWN5IiwgIm1ldGFkYXRhLWludGVydmFsIiwgR19UWVBFX0lO VCwgKGdpbnQpIGljeU1ldGFJbnQsIE5VTEwpKTsKKworICAgICAgICAgICAgZ3N0X2FwcF9zcmNf c2V0X2NhcHMocHJpdi0+YXBwc3JjLCBjYXBzLmdldCgpKTsKKyAgICAgICAgfQorICAgIH0KKwog I2lmZGVmIEdTVF9BUElfVkVSU0lPTl8xCiAgICAgR3N0VGFnTGlzdCogdGFncyA9IGdzdF90YWdf bGlzdF9uZXdfZW1wdHkoKTsKICNlbHNlCiAgICAgR3N0VGFnTGlzdCogdGFncyA9IGdzdF90YWdf bGlzdF9uZXcoKTsKICNlbmRpZgotICAgIFN0cmluZyB2YWx1ZSA9IHJlc3BvbnNlLmh0dHBIZWFk ZXJGaWVsZCgiaWN5LW5hbWUiKTsKKyAgICB2YWx1ZSA9IHJlc3BvbnNlLmh0dHBIZWFkZXJGaWVs ZCgiaWN5LW5hbWUiKTsKICAgICBpZiAoIXZhbHVlLmlzRW1wdHkoKSkgewogICAgICAgICBnX2Zy ZWUocHJpdi0+aXJhZGlvTmFtZSk7CiAgICAgICAgIHByaXYtPmlyYWRpb05hbWUgPSBnX3N0cmR1 cCh2YWx1ZS51dGY4KCkuZGF0YSgpKTsKQEAgLTkzNiwzOCArODczLDYgQEAgdm9pZCBTdHJlYW1p bmdDbGllbnQ6OmRpZFJlY2VpdmVSZXNwb25zZShSZXNvdXJjZUhhbmRsZSAqaGFuZGxlLCBjb25z dCBSZXNvdXJjZVIKICAgICAgICAgZ3N0X3RhZ19saXN0X2FkZCh0YWdzLCBHU1RfVEFHX01FUkdF X1JFUExBQ0UsIEdTVF9UQUdfVElUTEUsIHByaXYtPmlyYWRpb1RpdGxlLCBOVUxMKTsKICAgICB9 CiAKLSAgICBHU1RfT0JKRUNUX1VOTE9DSyhtX3NyYyk7Ci0KLSAgICAvLyBub3RpZnkgc2l6ZS9k dXJhdGlvbgotICAgIGlmIChsZW5ndGggPiAwKSB7Ci0gICAgICAgIGdzdF9hcHBfc3JjX3NldF9z aXplKHByaXYtPmFwcHNyYywgbGVuZ3RoKTsKLQotI2lmbmRlZiBHU1RfQVBJX1ZFUlNJT05fMQot ICAgICAgICBpZiAoIXByaXYtPmhhdmVBcHBTcmMyNykgewotICAgICAgICAgICAgZ3N0X3NlZ21l bnRfc2V0X2R1cmF0aW9uKCZHU1RfQkFTRV9TUkMocHJpdi0+YXBwc3JjKS0+c2VnbWVudCwgR1NU X0ZPUk1BVF9CWVRFUywgbGVuZ3RoKTsKLSAgICAgICAgICAgIGdzdF9lbGVtZW50X3Bvc3RfbWVz c2FnZShHU1RfRUxFTUVOVChwcml2LT5hcHBzcmMpLAotICAgICAgICAgICAgICAgIGdzdF9tZXNz YWdlX25ld19kdXJhdGlvbihHU1RfT0JKRUNUKHByaXYtPmFwcHNyYyksCi0gICAgICAgICAgICAg ICAgICAgIEdTVF9GT1JNQVRfQllURVMsIGxlbmd0aCkpOwotICAgICAgICB9Ci0jZW5kaWYKLSAg ICB9IGVsc2UKLSAgICAgICAgZ3N0X2FwcF9zcmNfc2V0X3NpemUocHJpdi0+YXBwc3JjLCAtMSk7 Ci0KLSAgICAvLyBpY2VjYXN0IHN0dWZmCi0gICAgdmFsdWUgPSByZXNwb25zZS5odHRwSGVhZGVy RmllbGQoImljeS1tZXRhaW50Iik7Ci0gICAgaWYgKCF2YWx1ZS5pc0VtcHR5KCkpIHsKLSAgICAg ICAgZ2NoYXIqIGVuZHB0ciA9IDA7Ci0gICAgICAgIGdpbnQ2NCBpY3lNZXRhSW50ID0gZ19hc2Np aV9zdHJ0b2xsKHZhbHVlLnV0ZjgoKS5kYXRhKCksICZlbmRwdHIsIDEwKTsKLQotICAgICAgICBp ZiAoZW5kcHRyICYmICplbmRwdHIgPT0gJ1wwJyAmJiBpY3lNZXRhSW50ID4gMCkgewotICAgICAg ICAgICAgR1JlZlB0cjxHc3RDYXBzPiBjYXBzID0gYWRvcHRHUmVmKGdzdF9jYXBzX25ld19zaW1w bGUoImFwcGxpY2F0aW9uL3gtaWN5IiwgIm1ldGFkYXRhLWludGVydmFsIiwgR19UWVBFX0lOVCwg KGdpbnQpIGljeU1ldGFJbnQsIE5VTEwpKTsKLQotICAgICAgICAgICAgZ3N0X2FwcF9zcmNfc2V0 X2NhcHMocHJpdi0+YXBwc3JjLCBjYXBzLmdldCgpKTsKLSAgICAgICAgfQotICAgIH0gZWxzZQot ICAgICAgICBnc3RfYXBwX3NyY19zZXRfY2Fwcyhwcml2LT5hcHBzcmMsIDApOwotCi0gICAgLy8g bm90aWZ5IHRhZ3MKICAgICBpZiAoZ3N0X3RhZ19saXN0X2lzX2VtcHR5KHRhZ3MpKQogI2lmZGVm IEdTVF9BUElfVkVSU0lPTl8xCiAgICAgICAgIGdzdF90YWdfbGlzdF91bnJlZih0YWdzKTsKQEAg LTk3NSwxNSArODgwLDEzIEBAIHZvaWQgU3RyZWFtaW5nQ2xpZW50OjpkaWRSZWNlaXZlUmVzcG9u c2UoUmVzb3VyY2VIYW5kbGUgKmhhbmRsZSwgY29uc3QgUmVzb3VyY2VSCiAgICAgICAgIGdzdF90 YWdfbGlzdF9mcmVlKHRhZ3MpOwogI2VuZGlmCiAgICAgZWxzZQotICAgICAgICBub3RpZnlHc3RU YWdzT25QYWQoR1NUX0VMRU1FTlQobV9zcmMpLCBwcml2LT5zcmNwYWQsIHRhZ3MpOworICAgICAg ICBub3RpZnlHc3RUYWdzT25QYWQoR1NUX0VMRU1FTlQobV9zcmMpLCBtX3NyYy0+cHJpdi0+c3Jj cGFkLCB0YWdzKTsKIH0KIAogdm9pZCBTdHJlYW1pbmdDbGllbnQ6OmRpZFJlY2VpdmVEYXRhKFJl c291cmNlSGFuZGxlKiBoYW5kbGUsIGNvbnN0IGNoYXIqIGRhdGEsIGludCBsZW5ndGgsIGludCkK IHsKICAgICBXZWJLaXRXZWJTcmNQcml2YXRlKiBwcml2ID0gbV9zcmMtPnByaXY7CiAKLSAgICBH U1RfT0JKRUNUX0xPQ0sobV9zcmMpOwotCiAgICAgR1NUX0xPR19PQkpFQ1QobV9zcmMsICJIYXZl ICVkIGJ5dGVzIG9mIGRhdGEiLCBwcml2LT5idWZmZXIgPyBnZXRHc3RCdWZmZXJTaXplKHByaXYt PmJ1ZmZlci5nZXQoKSkgOiBsZW5ndGgpOwogCiAgICAgQVNTRVJUKCFwcml2LT5idWZmZXIgfHwg ZGF0YSA9PSBnZXRHc3RCdWZmZXJEYXRhUG9pbnRlcihwcml2LT5idWZmZXIuZ2V0KCkpKTsKQEAg LTk5NCw3ICs4OTcsNiBAQCB2b2lkIFN0cmVhbWluZ0NsaWVudDo6ZGlkUmVjZWl2ZURhdGEoUmVz b3VyY2VIYW5kbGUqIGhhbmRsZSwgY29uc3QgY2hhciogZGF0YSwgaQogI2VuZGlmCiAKICAgICBp ZiAocHJpdi0+c2Vla0lEIHx8IGhhbmRsZSAhPSBwcml2LT5yZXNvdXJjZUhhbmRsZSkgewotICAg ICAgICBHU1RfT0JKRUNUX1VOTE9DSyhtX3NyYyk7CiAgICAgICAgIEdTVF9ERUJVR19PQkpFQ1Qo bV9zcmMsICJTZWVrIGluIHByb2dyZXNzLCBpZ25vcmluZyBkYXRhIik7CiAgICAgICAgIHByaXYt PmJ1ZmZlci5jbGVhcigpOwogICAgICAgICByZXR1cm47CkBAIC0xMDE5LDggKzkyMSw2IEBAIHZv aWQgU3RyZWFtaW5nQ2xpZW50OjpkaWRSZWNlaXZlRGF0YShSZXNvdXJjZUhhbmRsZSogaGFuZGxl LCBjb25zdCBjaGFyKiBkYXRhLCBpCiAgICAgfQogICAgIEdTVF9CVUZGRVJfT0ZGU0VUX0VORChw cml2LT5idWZmZXIuZ2V0KCkpID0gcHJpdi0+b2Zmc2V0OwogCi0gICAgR1NUX09CSkVDVF9VTkxP Q0sobV9zcmMpOwotCiAgICAgR3N0Rmxvd1JldHVybiByZXQgPSBnc3RfYXBwX3NyY19wdXNoX2J1 ZmZlcihwcml2LT5hcHBzcmMsIHByaXYtPmJ1ZmZlci5sZWFrUmVmKCkpOwogI2lmZGVmIEdTVF9B UElfVkVSU0lPTl8xCiAgICAgaWYgKHJldCAhPSBHU1RfRkxPV19PSyAmJiByZXQgIT0gR1NUX0ZM T1dfRU9TKQpAQCAtMTA1NCwxMiArOTU0LDggQEAgdm9pZCBTdHJlYW1pbmdDbGllbnQ6OmRpZEZp bmlzaExvYWRpbmcoUmVzb3VyY2VIYW5kbGUqLCBkb3VibGUpCiAKICAgICBHU1RfREVCVUdfT0JK RUNUKG1fc3JjLCAiSGF2ZSBFT1MiKTsKIAotICAgIEdTVF9PQkpFQ1RfTE9DSyhtX3NyYyk7Ci0g ICAgaWYgKCFwcml2LT5zZWVrSUQpIHsKLSAgICAgICAgR1NUX09CSkVDVF9VTkxPQ0sobV9zcmMp OworICAgIGlmICghcHJpdi0+c2Vla0lEKQogICAgICAgICBnc3RfYXBwX3NyY19lbmRfb2Zfc3Ry ZWFtKG1fc3JjLT5wcml2LT5hcHBzcmMpOwotICAgIH0gZWxzZQotICAgICAgICBHU1RfT0JKRUNU X1VOTE9DSyhtX3NyYyk7CiB9CiAKIHZvaWQgU3RyZWFtaW5nQ2xpZW50OjpkaWRGYWlsKFJlc291 cmNlSGFuZGxlKiwgY29uc3QgUmVzb3VyY2VFcnJvciYgZXJyb3IpCkBAIC0xMDcxLDI4ICs5Njcs MTQgQEAgdm9pZCBTdHJlYW1pbmdDbGllbnQ6OmRpZEZhaWwoUmVzb3VyY2VIYW5kbGUqLCBjb25z dCBSZXNvdXJjZUVycm9yJiBlcnJvcikKIAogdm9pZCBTdHJlYW1pbmdDbGllbnQ6Ondhc0Jsb2Nr ZWQoUmVzb3VyY2VIYW5kbGUqKQogewotICAgIEdPd25QdHI8Z2NoYXI+IHVyaTsKLQogICAgIEdT VF9FUlJPUl9PQkpFQ1QobV9zcmMsICJSZXF1ZXN0IHdhcyBibG9ja2VkIik7Ci0KLSAgICBHU1Rf T0JKRUNUX0xPQ0sobV9zcmMpOwotICAgIHVyaS5zZXQoZ19zdHJkdXAobV9zcmMtPnByaXYtPnVy aSkpOwotICAgIEdTVF9PQkpFQ1RfVU5MT0NLKG1fc3JjKTsKLQotICAgIEdTVF9FTEVNRU5UX0VS Uk9SKG1fc3JjLCBSRVNPVVJDRSwgT1BFTl9SRUFELCAoIkFjY2VzcyB0byBcIiVzXCIgd2FzIGJs b2NrZWQiLCB1cmkuZ2V0KCkpLCAoMCkpOworICAgIEdTVF9FTEVNRU5UX0VSUk9SKG1fc3JjLCBS RVNPVVJDRSwgT1BFTl9SRUFELCAoIkFjY2VzcyB0byBcIiVzXCIgd2FzIGJsb2NrZWQiLCBtX3Ny Yy0+cHJpdi0+dXJpKSwgKDApKTsKIH0KIAogdm9pZCBTdHJlYW1pbmdDbGllbnQ6OmNhbm5vdFNo b3dVUkwoUmVzb3VyY2VIYW5kbGUqKQogewotICAgIEdPd25QdHI8Z2NoYXI+IHVyaTsKLQogICAg IEdTVF9FUlJPUl9PQkpFQ1QobV9zcmMsICJDYW5ub3Qgc2hvdyBVUkwiKTsKLQotICAgIEdTVF9P QkpFQ1RfTE9DSyhtX3NyYyk7Ci0gICAgdXJpLnNldChnX3N0cmR1cChtX3NyYy0+cHJpdi0+dXJp KSk7Ci0gICAgR1NUX09CSkVDVF9VTkxPQ0sobV9zcmMpOwotCi0gICAgR1NUX0VMRU1FTlRfRVJS T1IobV9zcmMsIFJFU09VUkNFLCBPUEVOX1JFQUQsICgiQ2FuJ3Qgc2hvdyBcIiVzXCIiLCB1cmku Z2V0KCkpLCAoMCkpOworICAgIEdTVF9FTEVNRU5UX0VSUk9SKG1fc3JjLCBSRVNPVVJDRSwgT1BF Tl9SRUFELCAoIkNhbid0IHNob3cgXCIlc1wiIiwgbV9zcmMtPnByaXYtPnVyaSksICgwKSk7CiB9 CiAKICNlbmRpZiAvLyBVU0UoR1NUUkVBTUVSKQo=