Date: Tue, 29 Jun 2010 16:58:40 +0800 From: wen heping <wenheping@gmail.com> To: Martin Wilke <miwi@freebsd.org>, python@freebsd.org, Li-Wen Hsu <lwhsu@freebsd.org> Subject: The patch of security fix of CVE-2010-2089 to lang/python26 Message-ID: <AANLkTin5jimQIXSiD2SRubusu4cMOGOZnpuzpQDiup8X@mail.gmail.com>
next in thread | raw e-mail | index | archive | help
--0016e6509d30978b56048a27718a Content-Type: text/plain; charset=ISO-8859-1 Hi, Here is a patch to fix the audioop security issue, which document as CVE-2010-2089. More detail please visit: http://bugs.python.org/issue7673 Would you have a test of it ? Thanks. wen --0016e6509d30978b56048a27718a Content-Type: text/plain; charset=US-ASCII; name="python2651.diff.txt" Content-Disposition: attachment; filename="python2651.diff.txt" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gb0ibdgm0 ZGlmZiAtdXJOIHB5dGhvbjI2Lm9yaWcvTWFrZWZpbGUgcHl0aG9uMjYvTWFrZWZpbGUKLS0tIHB5 dGhvbjI2Lm9yaWcvTWFrZWZpbGUJMjAxMC0wNi0yOSAxNjo1MTozOS4wMDAwMDAwMDAgKzA4MDAK KysrIHB5dGhvbjI2L01ha2VmaWxlCTIwMTAtMDYtMjkgMTY6NTA6MDYuMDAwMDAwMDAwICswODAw CkBAIC02LDYgKzYsNyBAQAogCiBQT1JUTkFNRT0JcHl0aG9uMjYKIFBPUlRWRVJTSU9OPQkyLjYu NQorUE9SVFJFVklTSU9OPQkxCiBDQVRFR09SSUVTPQlsYW5nIHB5dGhvbiBpcHY2CiBNQVNURVJf U0lURVM9CSR7UFlUSE9OX01BU1RFUl9TSVRFU30KIE1BU1RFUl9TSVRFX1NVQkRJUj0JJHtQWVRI T05fTUFTVEVSX1NJVEVfU1VCRElSfQpkaWZmIC11ck4gcHl0aG9uMjYub3JpZy9maWxlcy9wYXRj aC1Nb2R1bGVzLWF1ZGlvb3AuYyBweXRob24yNi9maWxlcy9wYXRjaC1Nb2R1bGVzLWF1ZGlvb3Au YwotLS0gcHl0aG9uMjYub3JpZy9maWxlcy9wYXRjaC1Nb2R1bGVzLWF1ZGlvb3AuYwkxOTcwLTAx LTAxIDA4OjAwOjAwLjAwMDAwMDAwMCArMDgwMAorKysgcHl0aG9uMjYvZmlsZXMvcGF0Y2gtTW9k dWxlcy1hdWRpb29wLmMJMjAxMC0wNi0yOSAxNjo0MDo0NS4wMDAwMDAwMDAgKzA4MDAKQEAgLTAs MCArMSwzMTkgQEAKKy0tLSBNb2R1bGVzL2F1ZGlvb3AuYy5vcmlnCTIwMDgtMDctMDggMDE6MDI6 NTkuMDAwMDAwMDAwICswODAwCisrKysgTW9kdWxlcy9hdWRpb29wLmMJMjAxMC0wNi0yOSAxNjo0 MDoyMy4wMDAwMDAwMDAgKzA4MDAKK0BAIC0yOTUsNiArMjk1LDI5IEBACisgCisgc3RhdGljIFB5 T2JqZWN0ICpBdWRpb29wRXJyb3I7CisgCisrc3RhdGljIGludAorK2F1ZGlvb3BfY2hlY2tfc2l6 ZShpbnQgc2l6ZSkKKyt7CisrICAgICAgICBpZiAoIHNpemUgIT0gMSAmJiBzaXplICE9IDIgJiYg c2l6ZSAhPSA0ICkgeworKyAgICAgICAgICAgICAgICBQeUVycl9TZXRTdHJpbmcoQXVkaW9vcEVy cm9yLCAiU2l6ZSBzaG91bGQgYmUgMSwgMiBvciA0Iik7CisrICAgICAgICAgICAgICAgIHJldHVy biAwOworKyAgICAgICAgfSBlbHNlIHsKKysgICAgICAgICAgICAgICAgcmV0dXJuIDE7CisrICAg ICAgICB9CisrfQorKworK3N0YXRpYyBpbnQKKythdWRpb29wX2NoZWNrX3BhcmFtZXRlcnMoaW50 IGxlbiwgaW50IHNpemUpCisreworKyAgICAgICAgaWYgKCFhdWRpb29wX2NoZWNrX3NpemUoc2l6 ZSkpCisrICAgICAgICAgICAgICAgIHJldHVybiAwOworKyAgICAgICAgaWYgKCBsZW4gJSBzaXpl ICE9IDAgKSB7CisrICAgICAgICAgICAgICAgIFB5RXJyX1NldFN0cmluZyhBdWRpb29wRXJyb3Is ICJub3QgYSB3aG9sZSBudW1iZXIgb2YgZnJhbWVzIik7CisrICAgICAgICAgICAgICAgIHJldHVy biAwOworKyAgICAgICAgfQorKyAgICAgICAgcmV0dXJuIDE7CisrfQorKworIHN0YXRpYyBQeU9i amVjdCAqCisgYXVkaW9vcF9nZXRzYW1wbGUoUHlPYmplY3QgKnNlbGYsIFB5T2JqZWN0ICphcmdz KQorIHsKK0BAIC0zMDQsMTAgKzMyNyw4IEBACisgCisgICAgICAgICBpZiAoICFQeUFyZ19QYXJz ZVR1cGxlKGFyZ3MsICJzI2lpOmdldHNhbXBsZSIsICZjcCwgJmxlbiwgJnNpemUsICZpKSApCisg ICAgICAgICAgICAgICAgIHJldHVybiAwOworLSAgICAgICAgaWYgKCBzaXplICE9IDEgJiYgc2l6 ZSAhPSAyICYmIHNpemUgIT0gNCApIHsKKy0gICAgICAgICAgICAgICAgUHlFcnJfU2V0U3RyaW5n KEF1ZGlvb3BFcnJvciwgIlNpemUgc2hvdWxkIGJlIDEsIDIgb3IgNCIpOworLSAgICAgICAgICAg ICAgICByZXR1cm4gMDsKKy0gICAgICAgIH0KKysgICAgICAgIGlmICghYXVkaW9vcF9jaGVja19w YXJhbWV0ZXJzKGxlbiwgc2l6ZSkpCisrICAgICAgICAgICAgICAgIHJldHVybiBOVUxMOworICAg ICAgICAgaWYgKCBpIDwgMCB8fCBpID49IGxlbi9zaXplICkgeworICAgICAgICAgICAgICAgICBQ eUVycl9TZXRTdHJpbmcoQXVkaW9vcEVycm9yLCAiSW5kZXggb3V0IG9mIHJhbmdlIik7CisgICAg ICAgICAgICAgICAgIHJldHVybiAwOworQEAgLTMyOCwxMCArMzQ5LDggQEAKKyAKKyAgICAgICAg IGlmICggIVB5QXJnX1BhcnNlVHVwbGUoYXJncywgInMjaTptYXgiLCAmY3AsICZsZW4sICZzaXpl KSApCisgICAgICAgICAgICAgICAgIHJldHVybiAwOworLSAgICAgICAgaWYgKCBzaXplICE9IDEg JiYgc2l6ZSAhPSAyICYmIHNpemUgIT0gNCApIHsKKy0gICAgICAgICAgICAgICAgUHlFcnJfU2V0 U3RyaW5nKEF1ZGlvb3BFcnJvciwgIlNpemUgc2hvdWxkIGJlIDEsIDIgb3IgNCIpOworLSAgICAg ICAgICAgICAgICByZXR1cm4gMDsKKy0gICAgICAgIH0KKysgICAgICAgIGlmICghYXVkaW9vcF9j aGVja19wYXJhbWV0ZXJzKGxlbiwgc2l6ZSkpCisrICAgICAgICAgICAgICAgIHJldHVybiBOVUxM OworICAgICAgICAgZm9yICggaT0wOyBpPGxlbjsgaSs9IHNpemUpIHsKKyAgICAgICAgICAgICAg ICAgaWYgKCBzaXplID09IDEgKSAgICAgIHZhbCA9IChpbnQpKkNIQVJQKGNwLCBpKTsKKyAgICAg ICAgICAgICAgICAgZWxzZSBpZiAoIHNpemUgPT0gMiApIHZhbCA9IChpbnQpKlNIT1JUUChjcCwg aSk7CitAQCAtMzUyLDEwICszNzEsOCBAQAorIAorICAgICAgICAgaWYgKCFQeUFyZ19QYXJzZVR1 cGxlKGFyZ3MsICJzI2k6bWlubWF4IiwgJmNwLCAmbGVuLCAmc2l6ZSkpCisgICAgICAgICAgICAg ICAgIHJldHVybiBOVUxMOworLSAgICAgICAgaWYgKHNpemUgIT0gMSAmJiBzaXplICE9IDIgJiYg c2l6ZSAhPSA0KSB7CistICAgICAgICAgICAgICAgIFB5RXJyX1NldFN0cmluZyhBdWRpb29wRXJy b3IsICJTaXplIHNob3VsZCBiZSAxLCAyIG9yIDQiKTsKKysgICAgICAgIGlmICghYXVkaW9vcF9j aGVja19wYXJhbWV0ZXJzKGxlbiwgc2l6ZSkpCisgICAgICAgICAgICAgICAgIHJldHVybiBOVUxM OworLSAgICAgICAgfQorICAgICAgICAgZm9yIChpID0gMDsgaSA8IGxlbjsgaSArPSBzaXplKSB7 CisgICAgICAgICAgICAgICAgIGlmIChzaXplID09IDEpIHZhbCA9IChpbnQpICpDSEFSUChjcCwg aSk7CisgICAgICAgICAgICAgICAgIGVsc2UgaWYgKHNpemUgPT0gMikgdmFsID0gKGludCkgKlNI T1JUUChjcCwgaSk7CitAQCAtMzc2LDEwICszOTMsOCBAQAorIAorICAgICAgICAgaWYgKCAhUHlB cmdfUGFyc2VUdXBsZShhcmdzLCAicyNpOmF2ZyIsICZjcCwgJmxlbiwgJnNpemUpICkKKyAgICAg ICAgICAgICAgICAgcmV0dXJuIDA7CistICAgICAgICBpZiAoIHNpemUgIT0gMSAmJiBzaXplICE9 IDIgJiYgc2l6ZSAhPSA0ICkgeworLSAgICAgICAgICAgICAgICBQeUVycl9TZXRTdHJpbmcoQXVk aW9vcEVycm9yLCAiU2l6ZSBzaG91bGQgYmUgMSwgMiBvciA0Iik7CistICAgICAgICAgICAgICAg IHJldHVybiAwOworLSAgICAgICAgfQorKyAgICAgICAgaWYgKCFhdWRpb29wX2NoZWNrX3BhcmFt ZXRlcnMobGVuLCBzaXplKSkKKysgICAgICAgICAgICAgICAgcmV0dXJuIE5VTEw7CisgICAgICAg ICBmb3IgKCBpPTA7IGk8bGVuOyBpKz0gc2l6ZSkgeworICAgICAgICAgICAgICAgICBpZiAoIHNp emUgPT0gMSApICAgICAgdmFsID0gKGludCkqQ0hBUlAoY3AsIGkpOworICAgICAgICAgICAgICAg ICBlbHNlIGlmICggc2l6ZSA9PSAyICkgdmFsID0gKGludCkqU0hPUlRQKGNwLCBpKTsKK0BAIC00 MDMsMTAgKzQxOCw4IEBACisgCisgICAgICAgICBpZiAoICFQeUFyZ19QYXJzZVR1cGxlKGFyZ3Ms ICJzI2k6cm1zIiwgJmNwLCAmbGVuLCAmc2l6ZSkgKQorICAgICAgICAgICAgICAgICByZXR1cm4g MDsKKy0gICAgICAgIGlmICggc2l6ZSAhPSAxICYmIHNpemUgIT0gMiAmJiBzaXplICE9IDQgKSB7 CistICAgICAgICAgICAgICAgIFB5RXJyX1NldFN0cmluZyhBdWRpb29wRXJyb3IsICJTaXplIHNo b3VsZCBiZSAxLCAyIG9yIDQiKTsKKy0gICAgICAgICAgICAgICAgcmV0dXJuIDA7CistICAgICAg ICB9CisrICAgICAgICBpZiAoIWF1ZGlvb3BfY2hlY2tfcGFyYW1ldGVycyhsZW4sIHNpemUpKQor KyAgICAgICAgICAgICAgICByZXR1cm4gTlVMTDsKKyAgICAgICAgIGZvciAoIGk9MDsgaTxsZW47 IGkrPSBzaXplKSB7CisgICAgICAgICAgICAgICAgIGlmICggc2l6ZSA9PSAxICkgICAgICB2YWwg PSAoaW50KSpDSEFSUChjcCwgaSk7CisgICAgICAgICAgICAgICAgIGVsc2UgaWYgKCBzaXplID09 IDIgKSB2YWwgPSAoaW50KSpTSE9SVFAoY3AsIGkpOworQEAgLTYxNCwxMCArNjI3LDggQEAKKyAK KyAgICAgICAgIGlmICggIVB5QXJnX1BhcnNlVHVwbGUoYXJncywgInMjaTphdmdwcCIsICZjcCwg JmxlbiwgJnNpemUpICkKKyAgICAgICAgICAgICAgICAgcmV0dXJuIDA7CistICAgICAgICBpZiAo IHNpemUgIT0gMSAmJiBzaXplICE9IDIgJiYgc2l6ZSAhPSA0ICkgeworLSAgICAgICAgICAgICAg ICBQeUVycl9TZXRTdHJpbmcoQXVkaW9vcEVycm9yLCAiU2l6ZSBzaG91bGQgYmUgMSwgMiBvciA0 Iik7CistICAgICAgICAgICAgICAgIHJldHVybiAwOworLSAgICAgICAgfQorKyAgICAgICAgaWYg KCFhdWRpb29wX2NoZWNrX3BhcmFtZXRlcnMobGVuLCBzaXplKSkKKysgICAgICAgICAgICAgICAg cmV0dXJuIE5VTEw7CisgICAgICAgICAvKiBDb21wdXRlIGZpcnN0IGRlbHRhIHZhbHVlIGFoZWFk LiBBbHNvIGF1dG9tYXRpY2FsbHkgbWFrZXMgdXMKKyAgICAgICAgICoqIHNraXAgdGhlIGZpcnN0 IGV4dHJlbWUgdmFsdWUKKyAgICAgICAgICovCitAQCAtNjcxLDEwICs2ODIsOCBAQAorIAorICAg ICAgICAgaWYgKCAhUHlBcmdfUGFyc2VUdXBsZShhcmdzLCAicyNpOm1heHBwIiwgJmNwLCAmbGVu LCAmc2l6ZSkgKQorICAgICAgICAgICAgICAgICByZXR1cm4gMDsKKy0gICAgICAgIGlmICggc2l6 ZSAhPSAxICYmIHNpemUgIT0gMiAmJiBzaXplICE9IDQgKSB7CistICAgICAgICAgICAgICAgIFB5 RXJyX1NldFN0cmluZyhBdWRpb29wRXJyb3IsICJTaXplIHNob3VsZCBiZSAxLCAyIG9yIDQiKTsK Ky0gICAgICAgICAgICAgICAgcmV0dXJuIDA7CistICAgICAgICB9CisrICAgICAgICBpZiAoIWF1 ZGlvb3BfY2hlY2tfcGFyYW1ldGVycyhsZW4sIHNpemUpKQorKyAgICAgICAgICAgICAgICByZXR1 cm4gTlVMTDsKKyAgICAgICAgIC8qIENvbXB1dGUgZmlyc3QgZGVsdGEgdmFsdWUgYWhlYWQuIEFs c28gYXV0b21hdGljYWxseSBtYWtlcyB1cworICAgICAgICAgKiogc2tpcCB0aGUgZmlyc3QgZXh0 cmVtZSB2YWx1ZQorICAgICAgICAgKi8KK0BAIC03MjIsMTAgKzczMSw4IEBACisgCisgICAgICAg ICBpZiAoICFQeUFyZ19QYXJzZVR1cGxlKGFyZ3MsICJzI2k6Y3Jvc3MiLCAmY3AsICZsZW4sICZz aXplKSApCisgICAgICAgICAgICAgICAgIHJldHVybiAwOworLSAgICAgICAgaWYgKCBzaXplICE9 IDEgJiYgc2l6ZSAhPSAyICYmIHNpemUgIT0gNCApIHsKKy0gICAgICAgICAgICAgICAgUHlFcnJf U2V0U3RyaW5nKEF1ZGlvb3BFcnJvciwgIlNpemUgc2hvdWxkIGJlIDEsIDIgb3IgNCIpOworLSAg ICAgICAgICAgICAgICByZXR1cm4gMDsKKy0gICAgICAgIH0KKysgICAgICAgIGlmICghYXVkaW9v cF9jaGVja19wYXJhbWV0ZXJzKGxlbiwgc2l6ZSkpCisrICAgICAgICAgICAgICAgIHJldHVybiBO VUxMOworICAgICAgICAgbmNyb3NzID0gLTE7CisgICAgICAgICBwcmV2dmFsID0gMTc7IC8qIEFu eXRoaW5nIDw+IDAsMSAqLworICAgICAgICAgZm9yICggaT0wOyBpPGxlbjsgaSs9IHNpemUpIHsK K0BAIC03NTAsNiArNzU3LDggQEAKKyAKKyAgICAgICAgIGlmICggIVB5QXJnX1BhcnNlVHVwbGUo YXJncywgInMjaWQ6bXVsIiwgJmNwLCAmbGVuLCAmc2l6ZSwgJmZhY3RvciApICkKKyAgICAgICAg ICAgICAgICAgcmV0dXJuIDA7CisrICAgICAgICBpZiAoIWF1ZGlvb3BfY2hlY2tfcGFyYW1ldGVy cyhsZW4sIHNpemUpKQorKyAgICAgICAgICAgICAgICByZXR1cm4gTlVMTDsKKyAgICAgCisgICAg ICAgICBpZiAoIHNpemUgPT0gMSApIG1heHZhbCA9IChkb3VibGUpIDB4N2Y7CisgICAgICAgICBl bHNlIGlmICggc2l6ZSA9PSAyICkgbWF4dmFsID0gKGRvdWJsZSkgMHg3ZmZmOworQEAgLTc5Miw2 ICs4MDEsMTIgQEAKKyAgICAgICAgIGlmICggIVB5QXJnX1BhcnNlVHVwbGUoYXJncywgInMjaWRk OnRvbW9ubyIsCisgCSAgICAgICAgICAgICAgICAgICAgICAgJmNwLCAmbGVuLCAmc2l6ZSwgJmZh YzEsICZmYWMyICkgKQorICAgICAgICAgICAgICAgICByZXR1cm4gMDsKKysgICAgICAgIGlmICgh YXVkaW9vcF9jaGVja19wYXJhbWV0ZXJzKGxlbiwgc2l6ZSkpCisrICAgICAgICAgICAgICAgIHJl dHVybiBOVUxMOworKyAgICAgICAgaWYgKCAoKGxlbiAvIHNpemUpICYgMSkgIT0gMCApIHsKKysg ICAgICAgICAgICAgICAgUHlFcnJfU2V0U3RyaW5nKEF1ZGlvb3BFcnJvciwgIm5vdCBhIHdob2xl IG51bWJlciBvZiBmcmFtZXMiKTsKKysgICAgICAgICAgICAgICAgcmV0dXJuIE5VTEw7CisrICAg ICAgICB9CisgICAgIAorICAgICAgICAgaWYgKCBzaXplID09IDEgKSBtYXh2YWwgPSAoZG91Ymxl KSAweDdmOworICAgICAgICAgZWxzZSBpZiAoIHNpemUgPT0gMiApIG1heHZhbCA9IChkb3VibGUp IDB4N2ZmZjsKK0BAIC04MzcsNiArODUyLDggQEAKKyAgICAgICAgIGlmICggIVB5QXJnX1BhcnNl VHVwbGUoYXJncywgInMjaWRkOnRvc3RlcmVvIiwKKyAJICAgICAgICAgICAgICAgICAgICAgICAm Y3AsICZsZW4sICZzaXplLCAmZmFjMSwgJmZhYzIgKSApCisgICAgICAgICAgICAgICAgIHJldHVy biAwOworKyAgICAgICAgaWYgKCFhdWRpb29wX2NoZWNrX3BhcmFtZXRlcnMobGVuLCBzaXplKSkK KysgICAgICAgICAgICAgICAgcmV0dXJuIE5VTEw7CisgICAgIAorICAgICAgICAgaWYgKCBzaXpl ID09IDEgKSBtYXh2YWwgPSAoZG91YmxlKSAweDdmOworICAgICAgICAgZWxzZSBpZiAoIHNpemUg PT0gMiApIG1heHZhbCA9IChkb3VibGUpIDB4N2ZmZjsKK0BAIC04OTYsNyArOTEzLDggQEAKKyAg ICAgICAgIGlmICggIVB5QXJnX1BhcnNlVHVwbGUoYXJncywgInMjcyNpOmFkZCIsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAmY3AxLCAmbGVuMSwgJmNwMiwgJmxlbjIsICZzaXplICkgKQor ICAgICAgICAgICAgICAgICByZXR1cm4gMDsKKy0KKysgICAgICAgIGlmICghYXVkaW9vcF9jaGVj a19wYXJhbWV0ZXJzKGxlbjEsIHNpemUpKQorKyAgICAgICAgICAgICAgICByZXR1cm4gTlVMTDsK KyAgICAgICAgIGlmICggbGVuMSAhPSBsZW4yICkgeworICAgICAgICAgICAgICAgICBQeUVycl9T ZXRTdHJpbmcoQXVkaW9vcEVycm9yLCAiTGVuZ3RocyBzaG91bGQgYmUgdGhlIHNhbWUiKTsKKyAg ICAgICAgICAgICAgICAgcmV0dXJuIDA7CitAQCAtOTUwLDExICs5NjgsOCBAQAorICAgICAgICAg aWYgKCAhUHlBcmdfUGFyc2VUdXBsZShhcmdzLCAicyNpaTpiaWFzIiwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICZjcCwgJmxlbiwgJnNpemUgLCAmYmlhcykgKQorICAgICAgICAgICAgICAg ICByZXR1cm4gMDsKKy0KKy0gICAgICAgIGlmICggc2l6ZSAhPSAxICYmIHNpemUgIT0gMiAmJiBz aXplICE9IDQpIHsKKy0gICAgICAgICAgICAgICAgUHlFcnJfU2V0U3RyaW5nKEF1ZGlvb3BFcnJv ciwgIlNpemUgc2hvdWxkIGJlIDEsIDIgb3IgNCIpOworLSAgICAgICAgICAgICAgICByZXR1cm4g MDsKKy0gICAgICAgIH0KKysgICAgICAgIGlmICghYXVkaW9vcF9jaGVja19wYXJhbWV0ZXJzKGxl biwgc2l6ZSkpCisrICAgICAgICAgICAgICAgIHJldHVybiBOVUxMOworICAgICAKKyAgICAgICAg IHJ2ID0gUHlTdHJpbmdfRnJvbVN0cmluZ0FuZFNpemUoTlVMTCwgbGVuKTsKKyAgICAgICAgIGlm ICggcnYgPT0gMCApCitAQCAtOTg2LDEyICsxMDAxLDkgQEAKKyAgICAgICAgIGlmICggIVB5QXJn X1BhcnNlVHVwbGUoYXJncywgInMjaTpyZXZlcnNlIiwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICZjcCwgJmxlbiwgJnNpemUpICkKKyAgICAgICAgICAgICAgICAgcmV0dXJuIDA7CisrICAg ICAgICBpZiAoIWF1ZGlvb3BfY2hlY2tfcGFyYW1ldGVycyhsZW4sIHNpemUpKQorKyAgICAgICAg ICAgICAgICByZXR1cm4gTlVMTDsKKyAKKy0gICAgICAgIGlmICggc2l6ZSAhPSAxICYmIHNpemUg IT0gMiAmJiBzaXplICE9IDQgKSB7CistICAgICAgICAgICAgICAgIFB5RXJyX1NldFN0cmluZyhB dWRpb29wRXJyb3IsICJTaXplIHNob3VsZCBiZSAxLCAyIG9yIDQiKTsKKy0gICAgICAgICAgICAg ICAgcmV0dXJuIDA7CistICAgICAgICB9CistICAgIAorICAgICAgICAgcnYgPSBQeVN0cmluZ19G cm9tU3RyaW5nQW5kU2l6ZShOVUxMLCBsZW4pOworICAgICAgICAgaWYgKCBydiA9PSAwICkKKyAg ICAgICAgICAgICAgICAgcmV0dXJuIDA7CitAQCAtMTAyMywxMiArMTAzNSwxMCBAQAorICAgICAg ICAgaWYgKCAhUHlBcmdfUGFyc2VUdXBsZShhcmdzLCAicyNpaTpsaW4ybGluIiwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICZjcCwgJmxlbiwgJnNpemUsICZzaXplMikgKQorICAgICAgICAg ICAgICAgICByZXR1cm4gMDsKKy0KKy0gICAgICAgIGlmICggKHNpemUgIT0gMSAmJiBzaXplICE9 IDIgJiYgc2l6ZSAhPSA0KSB8fAorLSAgICAgICAgICAgICAoc2l6ZTIgIT0gMSAmJiBzaXplMiAh PSAyICYmIHNpemUyICE9IDQpKSB7CistICAgICAgICAgICAgICAgIFB5RXJyX1NldFN0cmluZyhB dWRpb29wRXJyb3IsICJTaXplIHNob3VsZCBiZSAxLCAyIG9yIDQiKTsKKy0gICAgICAgICAgICAg ICAgcmV0dXJuIDA7CistICAgICAgICB9CisrICAgICAgICBpZiAoIWF1ZGlvb3BfY2hlY2tfcGFy YW1ldGVycyhsZW4sIHNpemUpKQorKyAgICAgICAgICAgICAgICByZXR1cm4gTlVMTDsKKysgICAg ICAgIGlmICghYXVkaW9vcF9jaGVja19zaXplKHNpemUyKSkKKysgICAgICAgICAgICAgICAgcmV0 dXJuIE5VTEw7CisgICAgIAorICAgICAgICAgbmV3X2xlbiA9IChsZW4vc2l6ZSkqc2l6ZTI7Cisg ICAgICAgICBpZiAobmV3X2xlbiA8IDApIHsKK0BAIC0xMDgwLDEwICsxMDkwLDggQEAKKyAJICAg ICAgICAgICAgICAgICAgICAgICZuY2hhbm5lbHMsICZpbnJhdGUsICZvdXRyYXRlLCAmc3RhdGUs CisgCQkJICAgICAgJndlaWdodEEsICZ3ZWlnaHRCKSkKKyAgICAgICAgICAgICAgICAgcmV0dXJu IE5VTEw7CistICAgICAgICBpZiAoc2l6ZSAhPSAxICYmIHNpemUgIT0gMiAmJiBzaXplICE9IDQp IHsKKy0gICAgICAgICAgICAgICAgUHlFcnJfU2V0U3RyaW5nKEF1ZGlvb3BFcnJvciwgIlNpemUg c2hvdWxkIGJlIDEsIDIgb3IgNCIpOworKyAgICAgICAgaWYgKCFhdWRpb29wX2NoZWNrX3NpemUo c2l6ZSkpCisgICAgICAgICAgICAgICAgIHJldHVybiBOVUxMOworLSAgICAgICAgfQorICAgICAg ICAgaWYgKG5jaGFubmVscyA8IDEpIHsKKyAgICAgICAgICAgICAgICAgUHlFcnJfU2V0U3RyaW5n KEF1ZGlvb3BFcnJvciwgIiMgb2YgY2hhbm5lbHMgc2hvdWxkIGJlID49IDEiKTsKKyAgICAgICAg ICAgICAgICAgcmV0dXJuIE5VTEw7CitAQCAtMTI2OSwxMSArMTI3Nyw4IEBACisgICAgICAgICBp ZiAoICFQeUFyZ19QYXJzZVR1cGxlKGFyZ3MsICJzI2k6bGluMnVsYXciLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAmY3AsICZsZW4sICZzaXplKSApCisgICAgICAgICAgICAgICAg IHJldHVybiAwIDsKKy0KKy0gICAgICAgIGlmICggc2l6ZSAhPSAxICYmIHNpemUgIT0gMiAmJiBz aXplICE9IDQpIHsKKy0gICAgICAgICAgICAgICAgUHlFcnJfU2V0U3RyaW5nKEF1ZGlvb3BFcnJv ciwgIlNpemUgc2hvdWxkIGJlIDEsIDIgb3IgNCIpOworLSAgICAgICAgICAgICAgICByZXR1cm4g MDsKKy0gICAgICAgIH0KKysgICAgICAgIGlmICghYXVkaW9vcF9jaGVja19wYXJhbWV0ZXJzKGxl biwgc2l6ZSkpCisrICAgICAgICAgICAgICAgIHJldHVybiBOVUxMOworICAgICAKKyAgICAgICAg IHJ2ID0gUHlTdHJpbmdfRnJvbVN0cmluZ0FuZFNpemUoTlVMTCwgbGVuL3NpemUpOworICAgICAg ICAgaWYgKCBydiA9PSAwICkKK0BAIC0xMzAzLDExICsxMzA4LDggQEAKKyAgICAgICAgIGlmICgg IVB5QXJnX1BhcnNlVHVwbGUoYXJncywgInMjaTp1bGF3MmxpbiIsCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICZjcCwgJmxlbiwgJnNpemUpICkKKyAgICAgICAgICAgICAgICAgcmV0 dXJuIDA7CistCistICAgICAgICBpZiAoIHNpemUgIT0gMSAmJiBzaXplICE9IDIgJiYgc2l6ZSAh PSA0KSB7CistICAgICAgICAgICAgICAgIFB5RXJyX1NldFN0cmluZyhBdWRpb29wRXJyb3IsICJT aXplIHNob3VsZCBiZSAxLCAyIG9yIDQiKTsKKy0gICAgICAgICAgICAgICAgcmV0dXJuIDA7Cist ICAgICAgICB9CisrICAgICAgICBpZiAoIWF1ZGlvb3BfY2hlY2tfc2l6ZShzaXplKSkKKysgICAg ICAgICAgICAgICAgcmV0dXJuIE5VTEw7CisgICAgIAorICAgICAgICAgbmV3X2xlbiA9IGxlbipz aXplOworICAgICAgICAgaWYgKG5ld19sZW4gPCAwKSB7CitAQCAtMTM0MywxMSArMTM0NSw4IEBA CisgICAgICAgICBpZiAoICFQeUFyZ19QYXJzZVR1cGxlKGFyZ3MsICJzI2k6bGluMmFsYXciLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmY3AsICZsZW4sICZzaXplKSApCisgICAg ICAgICAgICAgICAgIHJldHVybiAwOworLQorLSAgICAgICAgaWYgKCBzaXplICE9IDEgJiYgc2l6 ZSAhPSAyICYmIHNpemUgIT0gNCkgeworLSAgICAgICAgICAgICAgICBQeUVycl9TZXRTdHJpbmco QXVkaW9vcEVycm9yLCAiU2l6ZSBzaG91bGQgYmUgMSwgMiBvciA0Iik7CistICAgICAgICAgICAg ICAgIHJldHVybiAwOworLSAgICAgICAgfQorKyAgICAgICAgaWYgKCFhdWRpb29wX2NoZWNrX3Bh cmFtZXRlcnMobGVuLCBzaXplKSkKKysgICAgICAgICAgICAgICAgcmV0dXJuIE5VTEw7CisgICAg IAorICAgICAgICAgcnYgPSBQeVN0cmluZ19Gcm9tU3RyaW5nQW5kU2l6ZShOVUxMLCBsZW4vc2l6 ZSk7CisgICAgICAgICBpZiAoIHJ2ID09IDAgKQorQEAgLTEzNzcsMTEgKzEzNzYsOCBAQAorICAg ICAgICAgaWYgKCAhUHlBcmdfUGFyc2VUdXBsZShhcmdzLCAicyNpOmFsYXcybGluIiwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgJmNwLCAmbGVuLCAmc2l6ZSkgKQorICAgICAgICAg ICAgICAgICByZXR1cm4gMDsKKy0KKy0gICAgICAgIGlmICggc2l6ZSAhPSAxICYmIHNpemUgIT0g MiAmJiBzaXplICE9IDQpIHsKKy0gICAgICAgICAgICAgICAgUHlFcnJfU2V0U3RyaW5nKEF1ZGlv b3BFcnJvciwgIlNpemUgc2hvdWxkIGJlIDEsIDIgb3IgNCIpOworLSAgICAgICAgICAgICAgICBy ZXR1cm4gMDsKKy0gICAgICAgIH0KKysgICAgICAgIGlmICghYXVkaW9vcF9jaGVja19zaXplKHNp emUpKQorKyAgICAgICAgICAgICAgICByZXR1cm4gTlVMTDsKKyAgICAgCisgICAgICAgICBuZXdf bGVuID0gbGVuKnNpemU7CisgICAgICAgICBpZiAobmV3X2xlbiA8IDApIHsKK0BAIC0xNDE4LDEy ICsxNDE0LDggQEAKKyAgICAgICAgIGlmICggIVB5QXJnX1BhcnNlVHVwbGUoYXJncywgInMjaU86 bGluMmFkcGNtIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJmNwLCAmbGVuLCAm c2l6ZSwgJnN0YXRlKSApCisgICAgICAgICAgICAgICAgIHJldHVybiAwOworLSAgICAKKy0KKy0g ICAgICAgIGlmICggc2l6ZSAhPSAxICYmIHNpemUgIT0gMiAmJiBzaXplICE9IDQpIHsKKy0gICAg ICAgICAgICAgICAgUHlFcnJfU2V0U3RyaW5nKEF1ZGlvb3BFcnJvciwgIlNpemUgc2hvdWxkIGJl IDEsIDIgb3IgNCIpOworLSAgICAgICAgICAgICAgICByZXR1cm4gMDsKKy0gICAgICAgIH0KKysg ICAgICAgIGlmICghYXVkaW9vcF9jaGVja19wYXJhbWV0ZXJzKGxlbiwgc2l6ZSkpCisrICAgICAg ICAgICAgICAgIHJldHVybiBOVUxMOworICAgICAKKyAgICAgICAgIHN0ciA9IFB5U3RyaW5nX0Zy b21TdHJpbmdBbmRTaXplKE5VTEwsIGxlbi8oc2l6ZSoyKSk7CisgICAgICAgICBpZiAoIHN0ciA9 PSAwICkKK0BAIC0xNTI2LDExICsxNTE4LDggQEAKKyAgICAgICAgIGlmICggIVB5QXJnX1BhcnNl VHVwbGUoYXJncywgInMjaU86YWRwY20ybGluIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgJmNwLCAmbGVuLCAmc2l6ZSwgJnN0YXRlKSApCisgICAgICAgICAgICAgICAgIHJldHVy biAwOworLQorLSAgICAgICAgaWYgKCBzaXplICE9IDEgJiYgc2l6ZSAhPSAyICYmIHNpemUgIT0g NCkgeworLSAgICAgICAgICAgICAgICBQeUVycl9TZXRTdHJpbmcoQXVkaW9vcEVycm9yLCAiU2l6 ZSBzaG91bGQgYmUgMSwgMiBvciA0Iik7CistICAgICAgICAgICAgICAgIHJldHVybiAwOworLSAg ICAgICAgfQorKyAgICAgICAgaWYgKCFhdWRpb29wX2NoZWNrX3NpemUoc2l6ZSkpCisrICAgICAg ICAgICAgICAgIHJldHVybiBOVUxMOworICAgICAKKyAgICAgICAgIC8qIERlY29kZSBzdGF0ZSwg c2hvdWxkIGhhdmUgKHZhbHVlLCBzdGVwKSAqLworICAgICAgICAgaWYgKCBzdGF0ZSA9PSBQeV9O b25lICkgewo= --0016e6509d30978b56048a27718a--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?AANLkTin5jimQIXSiD2SRubusu4cMOGOZnpuzpQDiup8X>