From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=ham autolearn_force=no version=3.4.2 Received: from inbox.vuxu.org (localhost [::1]) by inbox.vuxu.org (OpenSMTPD) with ESMTP id 5da159e3 for ; Sun, 2 Feb 2020 06:27:58 +0000 (UTC) Content-Type: multipart/mixed; boundary="===============7259531053514215468==" MIME-Version: 1.0 Subject: [PR PATCH] p7zip: fix CVE-2018-10115. To: ml@inbox.vuxu.org From: voidlinux-github@inbox.vuxu.org Reply-to: ml@inbox.vuxu.org Message-ID: Date: Sun, 02 Feb 2020 07:27:57 +0100 GitHub notification mails are now in MIME to allow UTF8. --===============7259531053514215468== MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 VGhlcmUgaXMgYSBuZXcgcHVsbCByZXF1ZXN0IGJ5IHRyYXZhbmtvciBhZ2FpbnN0IG1hc3RlciBv biB0aGUgdm9pZC1wYWNrYWdlcyByZXBvc2l0b3J5CgpodHRwczovL2dpdGh1Yi5jb20vdHJhdmFu a29yL3ZvaWQtcGFja2FnZXMgcDd6aXAKaHR0cHM6Ly9naXRodWIuY29tL3ZvaWQtbGludXgvdm9p ZC1wYWNrYWdlcy9wdWxsLzE4NzMyCgpwN3ppcDogZml4IENWRS0yMDE4LTEwMTE1LgpOb25lCgpB IHBhdGNoIGZpbGUgZnJvbSBodHRwczovL2dpdGh1Yi5jb20vdm9pZC1saW51eC92b2lkLXBhY2th Z2VzL3B1bGwvMTg3MzIucGF0Y2ggaXMgYXR0YWNoZWQ= --===============7259531053514215468== Content-Type: text/x-diff MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="github-pr-p7zip-18732.patch" RnJvbSBhZmQ5NTVkYWRhY2YxNmEwOTU5ODM0NjU1OWFkZjU4MjY0NzhiNTBkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiB0cmF2YW5rb3IgPHRyYXZhbmtvckB0dXRhLmlvPgpEYXRlOiBT YXQsIDEgRmViIDIwMjAgMjM6MjI6MjggLTA3MDAKU3ViamVjdDogW1BBVENIXSBwN3ppcDogZml4 IENWRS0yMDE4LTEwMTE1LgoKLS0tCiBzcmNwa2dzL3A3emlwL3BhdGNoZXMvQ1ZFLTIwMTgtMTAx MTUucGF0Y2ggfCAzMTEgKysrKysrKysrKysrKysrKysrKysrCiBzcmNwa2dzL3A3emlwL3RlbXBs YXRlICAgICAgICAgICAgICAgICAgICAgfCAgIDQgKy0KIDIgZmlsZXMgY2hhbmdlZCwgMzEzIGlu c2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCiBjcmVhdGUgbW9kZSAxMDA2NDQgc3JjcGtncy9w N3ppcC9wYXRjaGVzL0NWRS0yMDE4LTEwMTE1LnBhdGNoCgpkaWZmIC0tZ2l0IGEvc3JjcGtncy9w N3ppcC9wYXRjaGVzL0NWRS0yMDE4LTEwMTE1LnBhdGNoIGIvc3JjcGtncy9wN3ppcC9wYXRjaGVz L0NWRS0yMDE4LTEwMTE1LnBhdGNoCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw MDAwLi43ZDljNGJmODFmMAotLS0gL2Rldi9udWxsCisrKyBiL3NyY3BrZ3MvcDd6aXAvcGF0Y2hl cy9DVkUtMjAxOC0xMDExNS5wYXRjaApAQCAtMCwwICsxLDMxMSBAQAorRnJvbTogUm9iZXJ0IEx1 YmVyZGEgPHJvYmVydEBkZWJpYW4ub3JnPgorRGF0ZTogVHVlLCAyOSBNYXkgMjAxOCAyMzo1OTow OSArMDIwMAorU3ViamVjdDogRml4IENWRS0yMDE4LTEwMTE1CisKK0FwcGx5ICJwYXRjaCIgdGFr ZW4gZnJvbSBodHRwczovL2xhbmRhdmUuaW8vZmlsZXMvcGF0Y2hfN3ppcF9DVkUtMjAxOC0xMDEx NS50eHQKKworCitCdWdzLURlYmlhbjogaHR0cHM6Ly9idWdzLmRlYmlhbi5vcmcvODk3Njc0Cist LS0KKyBDUFAvN3ppcC9Db21wcmVzcy9SYXIxRGVjb2Rlci5jcHAgfCAxNiArKysrKysrKysrKy0t LS0tCisgQ1BQLzd6aXAvQ29tcHJlc3MvUmFyMURlY29kZXIuaCAgIHwgIDMgKystCisgQ1BQLzd6 aXAvQ29tcHJlc3MvUmFyMkRlY29kZXIuY3BwIHwgMTcgKysrKysrKysrKysrKy0tLS0KKyBDUFAv N3ppcC9Db21wcmVzcy9SYXIyRGVjb2Rlci5oICAgfCAgMyArKy0KKyBDUFAvN3ppcC9Db21wcmVz cy9SYXIzRGVjb2Rlci5jcHAgfCAxOSArKysrKysrKysrKysrKystLS0tCisgQ1BQLzd6aXAvQ29t cHJlc3MvUmFyM0RlY29kZXIuaCAgIHwgIDMgKystCisgQ1BQLzd6aXAvQ29tcHJlc3MvUmFyNURl Y29kZXIuY3BwIHwgIDggKysrKysrKysKKyBDUFAvN3ppcC9Db21wcmVzcy9SYXI1RGVjb2Rlci5o ICAgfCAgMSArCisgOCBmaWxlcyBjaGFuZ2VkLCA1NCBpbnNlcnRpb25zKCspLCAxNiBkZWxldGlv bnMoLSkKKworZGlmZiAtLWdpdCBhL0NQUC83emlwL0NvbXByZXNzL1JhcjFEZWNvZGVyLmNwcCBi L0NQUC83emlwL0NvbXByZXNzL1JhcjFEZWNvZGVyLmNwcAoraW5kZXggNjgwMzBjNy4uOGM4OTBj OCAxMDA2NDQKKy0tLSBhL0NQUC83emlwL0NvbXByZXNzL1JhcjFEZWNvZGVyLmNwcAorKysrIGIv Q1BQLzd6aXAvQ29tcHJlc3MvUmFyMURlY29kZXIuY3BwCitAQCAtMjksNyArMjksNyBAQCBwdWJs aWM6CisgfTsKKyAqLworIAorLUNEZWNvZGVyOjpDRGVjb2RlcigpOiBtX0lzU29saWQoZmFsc2Up LCBfZXJyb3JNb2RlKGZhbHNlKSB7IH0KKytDRGVjb2Rlcjo6Q0RlY29kZXIoKTogX2lzU29saWQo ZmFsc2UpLCBfc29saWRBbGxvd2VkKGZhbHNlKSwgX2Vycm9yTW9kZShmYWxzZSkgeyB9CisgCisg dm9pZCBDRGVjb2Rlcjo6SW5pdFN0cnVjdHVyZXMoKQorIHsKK0BAIC0zNDUsNyArMzQ1LDcgQEAg dm9pZCBDRGVjb2Rlcjo6R2V0RmxhZ3NCdWYoKQorIAorIHZvaWQgQ0RlY29kZXI6OkluaXREYXRh KCkKKyB7CistICBpZiAoIW1fSXNTb2xpZCkKKysgIGlmICghX2lzU29saWQpCisgICB7CisgICAg IEF2clBsY0IgPSBBdnJMbjEgPSBBdnJMbjIgPSBBdnJMbjMgPSBOdW1IdWYgPSBCdWY2MCA9IDA7 CisgICAgIEF2clBsYyA9IDB4MzUwMDsKK0BAIC0zOTEsNiArMzkxLDExIEBAIEhSRVNVTFQgQ0Rl Y29kZXI6OkNvZGVSZWFsKElTZXF1ZW50aWFsSW5TdHJlYW0gKmluU3RyZWFtLCBJU2VxdWVudGlh bE91dFN0cmVhbSAqCisgICBpZiAoaW5TaXplID09IE5VTEwgfHwgb3V0U2l6ZSA9PSBOVUxMKQor ICAgICByZXR1cm4gRV9JTlZBTElEQVJHOworIAorKyAgaWYgKF9pc1NvbGlkICYmICFfc29saWRB bGxvd2VkKQorKyAgICByZXR1cm4gU19GQUxTRTsKKysKKysgIF9zb2xpZEFsbG93ZWQgPSBmYWxz ZTsKKysKKyAgIGlmICghbV9PdXRXaW5kb3dTdHJlYW0uQ3JlYXRlKGtIaXN0b3J5U2l6ZSkpCisg ICAgIHJldHVybiBFX09VVE9GTUVNT1JZOworICAgaWYgKCFtX0luQml0U3RyZWFtLkNyZWF0ZSgx IDw8IDIwKSkKK0BAIC0zOTgsMTMgKzQwMywxMyBAQCBIUkVTVUxUIENEZWNvZGVyOjpDb2RlUmVh bChJU2VxdWVudGlhbEluU3RyZWFtICppblN0cmVhbSwgSVNlcXVlbnRpYWxPdXRTdHJlYW0gKgor IAorICAgbV9VbnBhY2tTaXplID0gKEludDY0KSpvdXRTaXplOworICAgbV9PdXRXaW5kb3dTdHJl YW0uU2V0U3RyZWFtKG91dFN0cmVhbSk7CistICBtX091dFdpbmRvd1N0cmVhbS5Jbml0KG1fSXNT b2xpZCk7CisrICBtX091dFdpbmRvd1N0cmVhbS5Jbml0KF9pc1NvbGlkKTsKKyAgIG1fSW5CaXRT dHJlYW0uU2V0U3RyZWFtKGluU3RyZWFtKTsKKyAgIG1fSW5CaXRTdHJlYW0uSW5pdCgpOworIAor ICAgLy8gQ0NvZGVyUmVsZWFzZXIgY29kZXJSZWxlYXNlcih0aGlzKTsKKyAgIEluaXREYXRhKCk7 CistICBpZiAoIW1fSXNTb2xpZCkKKysgIGlmICghX2lzU29saWQpCisgICB7CisgICAgIF9lcnJv ck1vZGUgPSBmYWxzZTsKKyAgICAgSW5pdFN0cnVjdHVyZXMoKTsKK0BAIC00NzUsNiArNDgwLDcg QEAgSFJFU1VMVCBDRGVjb2Rlcjo6Q29kZVJlYWwoSVNlcXVlbnRpYWxJblN0cmVhbSAqaW5TdHJl YW0sIElTZXF1ZW50aWFsT3V0U3RyZWFtICoKKyAgIH0KKyAgIGlmIChtX1VucGFja1NpemUgPCAw KQorICAgICByZXR1cm4gU19GQUxTRTsKKysgIF9zb2xpZEFsbG93ZWQgPSB0cnVlOworICAgcmV0 dXJuIG1fT3V0V2luZG93U3RyZWFtLkZsdXNoKCk7CisgfQorIAorQEAgLTQ5MSw3ICs0OTcsNyBA QCBTVERNRVRIT0RJTVAgQ0RlY29kZXI6OlNldERlY29kZXJQcm9wZXJ0aWVzMihjb25zdCBCeXRl ICpkYXRhLCBVSW50MzIgc2l6ZSkKKyB7CisgICBpZiAoc2l6ZSA8IDEpCisgICAgIHJldHVybiBF X0lOVkFMSURBUkc7CistICBtX0lzU29saWQgPSAoKGRhdGFbMF0gJiAxKSAhPSAwKTsKKysgIF9p c1NvbGlkID0gKChkYXRhWzBdICYgMSkgIT0gMCk7CisgICByZXR1cm4gU19PSzsKKyB9CisgCitk aWZmIC0tZ2l0IGEvQ1BQLzd6aXAvQ29tcHJlc3MvUmFyMURlY29kZXIuaCBiL0NQUC83emlwL0Nv bXByZXNzL1JhcjFEZWNvZGVyLmgKK2luZGV4IDAxYjYwNmIuLjhhYmIzYTMgMTAwNjQ0CistLS0g YS9DUFAvN3ppcC9Db21wcmVzcy9SYXIxRGVjb2Rlci5oCisrKysgYi9DUFAvN3ppcC9Db21wcmVz cy9SYXIxRGVjb2Rlci5oCitAQCAtMzgsNyArMzgsOCBAQCBwdWJsaWM6CisgICBVSW50MzIgTGFz dExlbmd0aDsKKyAKKyAgIEludDY0IG1fVW5wYWNrU2l6ZTsKKy0gIGJvb2wgbV9Jc1NvbGlkOwor KyAgYm9vbCBfaXNTb2xpZDsKKysgIGJvb2wgX3NvbGlkQWxsb3dlZDsKKyAgIGJvb2wgX2Vycm9y TW9kZTsKKyAKKyAgIFVJbnQzMiBSZWFkQml0cyhpbnQgbnVtQml0cyk7CitkaWZmIC0tZ2l0IGEv Q1BQLzd6aXAvQ29tcHJlc3MvUmFyMkRlY29kZXIuY3BwIGIvQ1BQLzd6aXAvQ29tcHJlc3MvUmFy MkRlY29kZXIuY3BwCitpbmRleCAwNTgwYzhkLi5iZThkODQyIDEwMDY0NAorLS0tIGEvQ1BQLzd6 aXAvQ29tcHJlc3MvUmFyMkRlY29kZXIuY3BwCisrKysgYi9DUFAvN3ppcC9Db21wcmVzcy9SYXIy RGVjb2Rlci5jcHAKK0BAIC04MCw3ICs4MCw4IEBAIHN0YXRpYyBjb25zdCBVSW50MzIga0hpc3Rv cnlTaXplID0gMSA8PCAyMDsKKyBzdGF0aWMgY29uc3QgVUludDMyIGtXaW5kb3dSZXNlcnZTaXpl ID0gKDEgPDwgMjIpICsgMjU2OworIAorIENEZWNvZGVyOjpDRGVjb2RlcigpOgorLSAgbV9Jc1Nv bGlkKGZhbHNlKSwKKysgIF9pc1NvbGlkKGZhbHNlKSwKKysgIF9zb2xpZEFsbG93ZWQoZmFsc2Up LAorICAgbV9UYWJsZXNPSyhmYWxzZSkKKyB7CisgfQorQEAgLTMyMCw2ICszMjEsMTAgQEAgSFJF U1VMVCBDRGVjb2Rlcjo6Q29kZVJlYWwoSVNlcXVlbnRpYWxJblN0cmVhbSAqaW5TdHJlYW0sIElT ZXF1ZW50aWFsT3V0U3RyZWFtICoKKyAgIGlmIChpblNpemUgPT0gTlVMTCB8fCBvdXRTaXplID09 IE5VTEwpCisgICAgIHJldHVybiBFX0lOVkFMSURBUkc7CisgCisrICBpZiAoX2lzU29saWQgJiYg IV9zb2xpZEFsbG93ZWQpCisrICAgIHJldHVybiBTX0ZBTFNFOworKyAgX3NvbGlkQWxsb3dlZCA9 IGZhbHNlOworKworICAgaWYgKCFtX091dFdpbmRvd1N0cmVhbS5DcmVhdGUoa0hpc3RvcnlTaXpl KSkKKyAgICAgcmV0dXJuIEVfT1VUT0ZNRU1PUlk7CisgICBpZiAoIW1fSW5CaXRTdHJlYW0uQ3Jl YXRlKDEgPDwgMjApKQorQEAgLTMzMCwxMiArMzM1LDEyIEBAIEhSRVNVTFQgQ0RlY29kZXI6OkNv ZGVSZWFsKElTZXF1ZW50aWFsSW5TdHJlYW0gKmluU3RyZWFtLCBJU2VxdWVudGlhbE91dFN0cmVh bSAqCisgICBVSW50NjQgcG9zID0gMCwgdW5QYWNrU2l6ZSA9ICpvdXRTaXplOworICAgCisgICBt X091dFdpbmRvd1N0cmVhbS5TZXRTdHJlYW0ob3V0U3RyZWFtKTsKKy0gIG1fT3V0V2luZG93U3Ry ZWFtLkluaXQobV9Jc1NvbGlkKTsKKysgIG1fT3V0V2luZG93U3RyZWFtLkluaXQoX2lzU29saWQp OworICAgbV9JbkJpdFN0cmVhbS5TZXRTdHJlYW0oaW5TdHJlYW0pOworICAgbV9JbkJpdFN0cmVh bS5Jbml0KCk7CisgCisgICAvLyBDQ29kZXJSZWxlYXNlciBjb2RlclJlbGVhc2VyKHRoaXMpOwor LSAgaWYgKCFtX0lzU29saWQpCisrICBpZiAoIV9pc1NvbGlkKQorICAgeworICAgICBJbml0U3Ry dWN0dXJlcygpOworICAgICBpZiAodW5QYWNrU2l6ZSA9PSAwKQorQEAgLTM0Myw2ICszNDgsNyBA QCBIUkVTVUxUIENEZWNvZGVyOjpDb2RlUmVhbChJU2VxdWVudGlhbEluU3RyZWFtICppblN0cmVh bSwgSVNlcXVlbnRpYWxPdXRTdHJlYW0gKgorICAgICAgIGlmIChtX0luQml0U3RyZWFtLkdldFBy b2Nlc3NlZFNpemUoKSArIDIgPD0gbV9QYWNrU2l6ZSkgLy8gdGVzdCBpdDogcHJvYmFibHkgaW5j b3JyZWN0OworICAgICAgICAgaWYgKCFSZWFkVGFibGVzKCkpCisgICAgICAgICAgIHJldHVybiBT X0ZBTFNFOworKyAgICAgIF9zb2xpZEFsbG93ZWQgPSB0cnVlOworICAgICAgIHJldHVybiBTX09L OworICAgICB9CisgICAgIGlmICghUmVhZFRhYmxlcygpKQorQEAgLTM4Niw2ICszOTIsOSBAQCBI UkVTVUxUIENEZWNvZGVyOjpDb2RlUmVhbChJU2VxdWVudGlhbEluU3RyZWFtICppblN0cmVhbSwg SVNlcXVlbnRpYWxPdXRTdHJlYW0gKgorIAorICAgaWYgKCFSZWFkTGFzdFRhYmxlcygpKQorICAg ICByZXR1cm4gU19GQUxTRTsKKysKKysgIF9zb2xpZEFsbG93ZWQgPSB0cnVlOworKworICAgcmV0 dXJuIG1fT3V0V2luZG93U3RyZWFtLkZsdXNoKCk7CisgfQorIAorQEAgLTQwMiw3ICs0MTEsNyBA QCBTVERNRVRIT0RJTVAgQ0RlY29kZXI6OlNldERlY29kZXJQcm9wZXJ0aWVzMihjb25zdCBCeXRl ICpkYXRhLCBVSW50MzIgc2l6ZSkKKyB7CisgICBpZiAoc2l6ZSA8IDEpCisgICAgIHJldHVybiBF X0lOVkFMSURBUkc7CistICBtX0lzU29saWQgPSAoKGRhdGFbMF0gJiAxKSAhPSAwKTsKKysgIF9p c1NvbGlkID0gKChkYXRhWzBdICYgMSkgIT0gMCk7CisgICByZXR1cm4gU19PSzsKKyB9CisgCitk aWZmIC0tZ2l0IGEvQ1BQLzd6aXAvQ29tcHJlc3MvUmFyMkRlY29kZXIuaCBiL0NQUC83emlwL0Nv bXByZXNzL1JhcjJEZWNvZGVyLmgKK2luZGV4IDBlOTAwNWYuLjM3MGJjZTIgMTAwNjQ0CistLS0g YS9DUFAvN3ppcC9Db21wcmVzcy9SYXIyRGVjb2Rlci5oCisrKysgYi9DUFAvN3ppcC9Db21wcmVz cy9SYXIyRGVjb2Rlci5oCitAQCAtMTM4LDcgKzEzOCw4IEBAIGNsYXNzIENEZWNvZGVyIDoKKyAg IEJ5dGUgbV9MYXN0TGV2ZWxzW2tNYXhUYWJsZVNpemVdOworIAorICAgVUludDY0IG1fUGFja1Np emU7CistICBib29sIG1fSXNTb2xpZDsKKysgIGJvb2wgX2lzU29saWQ7CisrICBib29sIF9zb2xp ZEFsbG93ZWQ7CisgICBib29sIG1fVGFibGVzT0s7CisgCisgICB2b2lkIEluaXRTdHJ1Y3R1cmVz KCk7CitkaWZmIC0tZ2l0IGEvQ1BQLzd6aXAvQ29tcHJlc3MvUmFyM0RlY29kZXIuY3BwIGIvQ1BQ Lzd6aXAvQ29tcHJlc3MvUmFyM0RlY29kZXIuY3BwCitpbmRleCA2Y2I4YTZhLi43Yjg1ODMzIDEw MDY0NAorLS0tIGEvQ1BQLzd6aXAvQ29tcHJlc3MvUmFyM0RlY29kZXIuY3BwCisrKysgYi9DUFAv N3ppcC9Db21wcmVzcy9SYXIzRGVjb2Rlci5jcHAKK0BAIC05Miw3ICs5Miw4IEBAIENEZWNvZGVy OjpDRGVjb2RlcigpOgorICAgX3dyaXR0ZW5GaWxlU2l6ZSgwKSwKKyAgIF92bURhdGEoMCksCisg ICBfdm1Db2RlKDApLAorLSAgbV9Jc1NvbGlkKGZhbHNlKSwKKysgIF9pc1NvbGlkKGZhbHNlKSwK KysgIF9zb2xpZEFsbG93ZWQoZmFsc2UpLAorICAgX2Vycm9yTW9kZShmYWxzZSkKKyB7CisgICBQ cG1kN19Db25zdHJ1Y3QoJl9wcG1kKTsKK0BAIC04MjEsNyArODIyLDcgQEAgSFJFU1VMVCBDRGVj b2Rlcjo6Q29kZVJlYWwoSUNvbXByZXNzUHJvZ3Jlc3NJbmZvICpwcm9ncmVzcykKKyB7CisgICBf d3JpdHRlbkZpbGVTaXplID0gMDsKKyAgIF91bnN1cHBvcnRlZEZpbHRlciA9IGZhbHNlOworLSAg aWYgKCFtX0lzU29saWQpCisrICBpZiAoIV9pc1NvbGlkKQorICAgeworICAgICBfbHpTaXplID0g MDsKKyAgICAgX3dpblBvcyA9IDA7CitAQCAtODQwLDEyICs4NDEsMTUgQEAgSFJFU1VMVCBDRGVj b2Rlcjo6Q29kZVJlYWwoSUNvbXByZXNzUHJvZ3Jlc3NJbmZvICpwcm9ncmVzcykKKyAgIGlmIChf ZXJyb3JNb2RlKQorICAgICByZXR1cm4gU19GQUxTRTsKKyAKKy0gIGlmICghbV9Jc1NvbGlkIHx8 ICFUYWJsZXNSZWFkKQorKyAgaWYgKCFfaXNTb2xpZCB8fCAhVGFibGVzUmVhZCkKKyAgIHsKKyAg ICAgYm9vbCBrZWVwRGVjb21wcmVzc2luZzsKKyAgICAgUklOT0soUmVhZFRhYmxlcyhrZWVwRGVj b21wcmVzc2luZykpOworICAgICBpZiAoIWtlZXBEZWNvbXByZXNzaW5nKQorKyAgICB7CisrICAg ICAgX3NvbGlkQWxsb3dlZCA9IHRydWU7CisgICAgICAgcmV0dXJuIFNfT0s7CisrICAgIH0KKyAg IH0KKyAKKyAgIGZvciAoOzspCitAQCAtODcwLDYgKzg3NCw5IEBAIEhSRVNVTFQgQ0RlY29kZXI6 OkNvZGVSZWFsKElDb21wcmVzc1Byb2dyZXNzSW5mbyAqcHJvZ3Jlc3MpCisgICAgIGlmICgha2Vl cERlY29tcHJlc3NpbmcpCisgICAgICAgYnJlYWs7CisgICB9CisrCisrICBfc29saWRBbGxvd2Vk ID0gdHJ1ZTsKKysKKyAgIFJJTk9LKFdyaXRlQnVmKCkpOworICAgVUludDY0IHBhY2tTaXplID0g bV9JbkJpdFN0cmVhbS5CaXREZWNvZGVyLkdldFByb2Nlc3NlZFNpemUoKTsKKyAgIFJJTk9LKHBy b2dyZXNzLT5TZXRSYXRpb0luZm8oJnBhY2tTaXplLCAmX3dyaXR0ZW5GaWxlU2l6ZSkpOworQEAg LTg5MCw2ICs4OTcsMTAgQEAgU1RETUVUSE9ESU1QIENEZWNvZGVyOjpDb2RlKElTZXF1ZW50aWFs SW5TdHJlYW0gKmluU3RyZWFtLCBJU2VxdWVudGlhbE91dFN0cmVhbQorICAgICBpZiAoIWluU2l6 ZSkKKyAgICAgICByZXR1cm4gRV9JTlZBTElEQVJHOworIAorKyAgICBpZiAoX2lzU29saWQgJiYg IV9zb2xpZEFsbG93ZWQpCisrICAgICAgcmV0dXJuIFNfRkFMU0U7CisrICAgIF9zb2xpZEFsbG93 ZWQgPSBmYWxzZTsKKysKKyAgICAgaWYgKCFfdm1EYXRhKQorICAgICB7CisgICAgICAgX3ZtRGF0 YSA9IChCeXRlICopOjpNaWRBbGxvYyhrVm1EYXRhU2l6ZU1heCArIGtWbUNvZGVTaXplTWF4KTsK K0BAIC05MjgsNyArOTM5LDcgQEAgU1RETUVUSE9ESU1QIENEZWNvZGVyOjpTZXREZWNvZGVyUHJv cGVydGllczIoY29uc3QgQnl0ZSAqZGF0YSwgVUludDMyIHNpemUpCisgeworICAgaWYgKHNpemUg PCAxKQorICAgICByZXR1cm4gRV9JTlZBTElEQVJHOworLSAgbV9Jc1NvbGlkID0gKChkYXRhWzBd ICYgMSkgIT0gMCk7CisrICBfaXNTb2xpZCA9ICgoZGF0YVswXSAmIDEpICE9IDApOworICAgcmV0 dXJuIFNfT0s7CisgfQorIAorZGlmZiAtLWdpdCBhL0NQUC83emlwL0NvbXByZXNzL1JhcjNEZWNv ZGVyLmggYi9DUFAvN3ppcC9Db21wcmVzcy9SYXIzRGVjb2Rlci5oCitpbmRleCAyZjcyZDdkLi4z MmM4OTQzIDEwMDY0NAorLS0tIGEvQ1BQLzd6aXAvQ29tcHJlc3MvUmFyM0RlY29kZXIuaAorKysr IGIvQ1BQLzd6aXAvQ29tcHJlc3MvUmFyM0RlY29kZXIuaAorQEAgLTE5MSw3ICsxOTEsOCBAQCBj bGFzcyBDRGVjb2RlcjoKKyAgIENSZWNvcmRWZWN0b3I8Q1RlbXBGaWx0ZXIgKj4gIF90ZW1wRmls dGVyczsKKyAgIFVJbnQzMiBfbGFzdEZpbHRlcjsKKyAKKy0gIGJvb2wgbV9Jc1NvbGlkOworKyAg Ym9vbCBfaXNTb2xpZDsKKysgIGJvb2wgX3NvbGlkQWxsb3dlZDsKKyAgIGJvb2wgX2Vycm9yTW9k ZTsKKyAKKyAgIGJvb2wgX2x6TW9kZTsKK2RpZmYgLS1naXQgYS9DUFAvN3ppcC9Db21wcmVzcy9S YXI1RGVjb2Rlci5jcHAgYi9DUFAvN3ppcC9Db21wcmVzcy9SYXI1RGVjb2Rlci5jcHAKK2luZGV4 IGRjODgzMGYuLmE4MjZkNWEgMTAwNjQ0CistLS0gYS9DUFAvN3ppcC9Db21wcmVzcy9SYXI1RGVj b2Rlci5jcHAKKysrKyBiL0NQUC83emlwL0NvbXByZXNzL1JhcjVEZWNvZGVyLmNwcAorQEAgLTcy LDYgKzcyLDcgQEAgQ0RlY29kZXI6OkNEZWNvZGVyKCk6CisgICAgIF93cml0dGVuRmlsZVNpemUo MCksCisgICAgIF9kaWN0U2l6ZUxvZygwKSwKKyAgICAgX2lzU29saWQoZmFsc2UpLAorKyAgICBf c29saWRBbGxvd2VkKGZhbHNlKSwKKyAgICAgX3dhc0luaXQoZmFsc2UpLAorICAgICBfaW5wdXRC dWYoTlVMTCkKKyB7CitAQCAtODAxLDcgKzgwMiwxMCBAQCBIUkVTVUxUIENEZWNvZGVyOjpDb2Rl UmVhbCgpCisgICAqLworIAorICAgaWYgKHJlcyA9PSBTX09LKQorKyAgeworKyAgICBfc29saWRB bGxvd2VkID0gdHJ1ZTsKKyAgICAgcmVzID0gcmVzMjsKKysgIH0KKyAgICAgIAorICAgaWYgKHJl cyA9PSBTX09LICYmIF91bnBhY2tTaXplX0RlZmluZWQgJiYgX3dyaXR0ZW5GaWxlU2l6ZSAhPSBf dW5wYWNrU2l6ZSkKKyAgICAgcmV0dXJuIFNfRkFMU0U7CitAQCAtODIxLDYgKzgyNSwxMCBAQCBT VERNRVRIT0RJTVAgQ0RlY29kZXI6OkNvZGUoSVNlcXVlbnRpYWxJblN0cmVhbSAqaW5TdHJlYW0s IElTZXF1ZW50aWFsT3V0U3RyZWFtCisgeworICAgdHJ5CisgICB7CisrICAgIGlmIChfaXNTb2xp ZCAmJiAhX3NvbGlkQWxsb3dlZCkKKysgICAgICByZXR1cm4gU19GQUxTRTsKKysgICAgX3NvbGlk QWxsb3dlZCA9IGZhbHNlOworKworICAgICBpZiAoX2RpY3RTaXplTG9nID49IHNpemVvZihzaXpl X3QpICogOCkKKyAgICAgICByZXR1cm4gRV9OT1RJTVBMOworIAorZGlmZiAtLWdpdCBhL0NQUC83 emlwL0NvbXByZXNzL1JhcjVEZWNvZGVyLmggYi9DUFAvN3ppcC9Db21wcmVzcy9SYXI1RGVjb2Rl ci5oCitpbmRleCBiMGE0ZGQxLi4zZGI1MDE4IDEwMDY0NAorLS0tIGEvQ1BQLzd6aXAvQ29tcHJl c3MvUmFyNURlY29kZXIuaAorKysrIGIvQ1BQLzd6aXAvQ29tcHJlc3MvUmFyNURlY29kZXIuaAor QEAgLTI3MSw2ICsyNzEsNyBAQCBjbGFzcyBDRGVjb2RlcjoKKyAgIEJ5dGUgX2RpY3RTaXplTG9n OworICAgYm9vbCBfdGFibGVXYXNGaWxsZWQ7CisgICBib29sIF9pc1NvbGlkOworKyAgYm9vbCBf c29saWRBbGxvd2VkOworICAgYm9vbCBfd2FzSW5pdDsKKyAKKyAgIFVJbnQzMiBfcmVwc1trTnVt UmVwc107CmRpZmYgLS1naXQgYS9zcmNwa2dzL3A3emlwL3RlbXBsYXRlIGIvc3JjcGtncy9wN3pp cC90ZW1wbGF0ZQppbmRleCAxNWM1ZjdjYWJiYS4uNzAzNzU2OWNjNjggMTAwNjQ0Ci0tLSBhL3Ny Y3BrZ3MvcDd6aXAvdGVtcGxhdGUKKysrIGIvc3JjcGtncy9wN3ppcC90ZW1wbGF0ZQpAQCAtMSwx MiArMSwxMiBAQAogIyBUZW1wbGF0ZSBmaWxlIGZvciAncDd6aXAnCiBwa2duYW1lPXA3emlwCiB2 ZXJzaW9uPTE2LjAyCi1yZXZpc2lvbj00CityZXZpc2lvbj01CiB3cmtzcmM9IiR7cGtnbmFtZX1f JHt2ZXJzaW9ufSIKIGhvc3RtYWtlZGVwZW5kcz0ieWFzbSBuYXNtIgogc2hvcnRfZGVzYz0iQ29t bWFuZC1saW5lIHZlcnNpb24gb2YgdGhlIDd6aXAgY29tcHJlc3NlZCBmaWxlIGFyY2hpdmUiCiBo b21lcGFnZT0iaHR0cDovL3A3emlwLnNvdXJjZWZvcmdlLm5ldC8iCi1saWNlbnNlPSJMR1BMLTIu MSIKK2xpY2Vuc2U9IkxHUEwtMi4xLW9yLWxhdGVyIgogbWFpbnRhaW5lcj0iT3JwaGFuZWQgPG9y cGhhbkB2b2lkbGludXgub3JnPiIKIGRpc3RmaWxlcz0iJHtTT1VSQ0VGT1JHRV9TSVRFfS8ke3Br Z25hbWV9LyR7cGtnbmFtZX1fJHt2ZXJzaW9ufV9zcmNfYWxsLnRhci5iejIiCiBjaGVja3N1bT01 ZWIyMGFjMGUyOTQ0ZjZjYjljMmQ1MWRkNmM0NTE4OTQxYzE4NTM0N2Q0MDg5ZWE4OTA4N2ZmZGQ2 ZTIzNDFmCg== --===============7259531053514215468==--