54692 2011-02-17 15:32:56 -0800 Made MarkedBlock variable-sized 2011-02-17 22:31:07 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 ggaren ggaren abarth eric webkit.review.bot oldest_to_newest 353208 0 ggaren 2011-02-17 15:32:56 -0800 Made MarkedBlock variable-sized 353215 1 82870 ggaren 2011-02-17 15:42:55 -0800 Created attachment 82870 Patch 353218 2 82870 oliver 2011-02-17 15:47:00 -0800 Comment on attachment 82870 Patch r=me 353223 3 ggaren 2011-02-17 15:50:43 -0800 Committed r78924: <http://trac.webkit.org/changeset/78924> 353232 4 webkit.review.bot 2011-02-17 16:11:24 -0800 http://trac.webkit.org/changeset/78924 might have broken Leopard Intel Release (Build) 353424 5 82921 ukai 2011-02-17 22:30:14 -0800 Created attachment 82921 Patch 353425 6 82921 ukai 2011-02-17 22:31:07 -0800 Comment on attachment 82921 Patch sorry \, wrong bug 82870 2011-02-17 15:42:55 -0800 2011-02-17 22:30:09 -0800 Patch bug-54692-20110217154254.patch text/plain 18302 ggaren SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gNzg5MjEpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNTYgQEAK KzIwMTEtMDItMTcgIEdlb2ZmcmV5IEdhcmVuICA8Z2dhcmVuQGFwcGxlLmNvbT4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWRlIE1hcmtlZEJsb2Nr IHZhcmlhYmxlLXNpemVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD01NDY5MgorICAgICAgICAKKyAgICAgICAgU3VuU3BpZGVyIHJlcG9ydHMgbm8gY2hh bmdlLgorICAgICAgICAKKyAgICAgICAgRWFjaCBNYXJrZWRCbG9jayBpcyBub3cgY29tcG9zZWQg b2YgYSBzZXQgb2YgZml4ZWQtc2l6ZWQgYXRvbXMsIHdpdGggb25lCisgICAgICAgIG1hcmsgYml0 IHBlciBhdG9tLiBBIGdpdmVuIGNlbGwgbWF5IGJlIGNvbXBvc2VkIG9mIG9uZSBvciBtb3JlIGF0 b21zLgorICAgICAgICAKKyAgICAgICAgKiBydW50aW1lL0hlYXAuY3BwOgorICAgICAgICAoSlND OjpIZWFwOjphbGxvY2F0ZSk6IE1hZGUgZml4ZWQtc2l6ZWRuZXNzIGEgcHJvcGVydHkgb2YgTWFy a2VkU3BhY2UsCisgICAgICAgIGJ1YmJsaW5nIGl0IHVwIGZyb20gTWFya2VkQmxvY2ssIHNpbmNl IE1hcmtlZEJsb2NrIG5vdyBzdXBwb3J0cyB2YXJpYWJsZS0KKyAgICAgICAgc2l6ZWRuZXNzLgor CisgICAgICAgICogcnVudGltZS9KU0NlbGwuaDoKKyAgICAgICAgKEpTQzo6SlNDZWxsOjpNYXJr ZWRCbG9jazo6YWxsb2NhdGUpOiBSZW1vdmVkIHVzZSBvZiBDRUxMU19QRVJfQkxPQ0sgYW5kCisg ICAgICAgIChpbXBsaWNpdCkgb25lIGNvbnN0YW50cyAtLSB0aGVzZSBxdWFudGl0aWVzIGFyZSBu b3QgY29uc3RhbnQgYW55bW9yZS4KKyAgICAgICAgVXBkYXRlZCBmb3Igc3dpdGNoIGZyb20gY2Vs bCB0byBhdG9tLgorCisgICAgICAgICogcnVudGltZS9NYXJrZWRCbG9jay5jcHA6CisgICAgICAg IChKU0M6Ok1hcmtlZEJsb2NrOjpjcmVhdGUpOgorICAgICAgICAoSlNDOjpNYXJrZWRCbG9jazo6 ZGVzdHJveSk6CisgICAgICAgIChKU0M6Ok1hcmtlZEJsb2NrOjpNYXJrZWRCbG9jayk6CisgICAg ICAgIChKU0M6Ok1hcmtlZEJsb2NrOjpzd2VlcCk6CisgICAgICAgICogcnVudGltZS9NYXJrZWRC bG9jay5oOgorICAgICAgICAoSlNDOjpNYXJrZWRCbG9jazo6Zmlyc3RBdG9tKToKKyAgICAgICAg KEpTQzo6TWFya2VkQmxvY2s6OmF0b21zKToKKyAgICAgICAgKEpTQzo6TWFya2VkQmxvY2s6Omlz QXRvbUFsaWduZWQpOgorICAgICAgICAoSlNDOjpNYXJrZWRCbG9jazo6YmxvY2tGb3IpOgorICAg ICAgICAoSlNDOjpNYXJrZWRCbG9jazo6aXNFbXB0eSk6CisgICAgICAgIChKU0M6Ok1hcmtlZEJs b2NrOjpjbGVhck1hcmtzKToKKyAgICAgICAgKEpTQzo6TWFya2VkQmxvY2s6OnNpemUpOgorICAg ICAgICAoSlNDOjpNYXJrZWRCbG9jazo6Y2FwYWNpdHkpOgorICAgICAgICAoSlNDOjpNYXJrZWRC bG9jazo6YXRvbU51bWJlcik6CisgICAgICAgIChKU0M6Ok1hcmtlZEJsb2NrOjppc01hcmtlZCk6 CisgICAgICAgIChKU0M6Ok1hcmtlZEJsb2NrOjp0ZXN0QW5kU2V0TWFya2VkKToKKyAgICAgICAg KEpTQzo6TWFya2VkQmxvY2s6OnNldE1hcmtlZCk6CisgICAgICAgIChKU0M6Ok1hcmtlZEJsb2Nr Ojpmb3JFYWNoKTogU2FtZSBhcyBhYm92ZS4gQWxzbyByZW1vdmVkIHVzZSBvZiBDRUxMX1NJWkUK KyAgICAgICAgYW5kIEJMT0NLX1NJWkUsIGFuZCBzd2l0Y2hlZCBhd2F5IGZyb20gY2FsbGluZyBh cmJpdHJhcnkgcG9pbnRlcnMgY2VsbHMuCisKKyAgICAgICAgKiBydW50aW1lL01hcmtlZFNwYWNl LmNwcDoKKyAgICAgICAgKEpTQzo6TWFya2VkU3BhY2U6Ok1hcmtlZFNwYWNlKToKKyAgICAgICAg KEpTQzo6TWFya2VkU3BhY2U6OmFsbG9jYXRlQmxvY2spOgorICAgICAgICAoSlNDOjpNYXJrZWRT cGFjZTo6YWxsb2NhdGUpOgorICAgICAgICAoSlNDOjpNYXJrZWRTcGFjZTo6cmVzZXQpOgorICAg ICAgICAqIHJ1bnRpbWUvTWFya2VkU3BhY2UuaDoKKyAgICAgICAgKEpTQzo6Q29sbGVjdG9ySGVh cDo6Q29sbGVjdG9ySGVhcCk6CisgICAgICAgIChKU0M6Ok1hcmtlZFNwYWNlOjpjb250YWlucyk6 IFVwZGF0ZWQgZm9yIHJlbmFtZXMuIE1hZGUgZml4ZWQtc2l6ZWRuZXNzCisgICAgICAgIGEgcHJv cGVydHkgb2YgTWFya2VkU3BhY2UuCisKIDIwMTEtMDItMTcgIE9saXZlciBIdW50ICA8b2xpdmVy QGFwcGxlLmNvbT4KIAogICAgICAgICBBdHRlbXB0IHRvIGZpeCB3aW5kb3dzIGJ1aWxkCkluZGV4 OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9IZWFwLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9IZWFwLmNwcAkocmV2aXNpb24gNzg4NDkpCisr KyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9IZWFwLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMTA2LDcgKzEwNiw3IEBAIHZvaWQqIEhlYXA6OmFsbG9jYXRlKHNpemVfdCBzKQogICAgIEFT U0VSVChnbG9iYWxEYXRhKCktPmlkZW50aWZpZXJUYWJsZSA9PSB3dGZUaHJlYWREYXRhKCkuY3Vy cmVudElkZW50aWZpZXJUYWJsZSgpKTsKICAgICBBU1NFUlQoSlNMb2NrOjpsb2NrQ291bnQoKSA+ IDApOwogICAgIEFTU0VSVChKU0xvY2s6OmN1cnJlbnRUaHJlYWRJc0hvbGRpbmdMb2NrKCkpOwot ICAgIEFTU0VSVF9VTlVTRUQocywgcyA8PSBNYXJrZWRCbG9jazo6Q0VMTF9TSVpFKTsKKyAgICBB U1NFUlRfVU5VU0VEKHMsIHMgPD0gTWFya2VkU3BhY2U6OmNlbGxTaXplKTsKICAgICBBU1NFUlQo bV9vcGVyYXRpb25JblByb2dyZXNzID09IE5vT3BlcmF0aW9uKTsKIAogI2lmIENPTExFQ1RfT05f RVZFUllfQUxMT0NBVElPTgpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlND ZWxsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNDZWxs LmgJKHJldmlzaW9uIDc4ODQ5KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlND ZWxsLmgJKHdvcmtpbmcgY29weSkKQEAgLTQwMiwxOSArNDAyLDIwIEBAIG5hbWVzcGFjZSBKU0Mg ewogICAgIH0KICNlbmRpZgogCi0gICAgaW5saW5lIHZvaWQqIE1hcmtlZEJsb2NrOjphbGxvY2F0 ZShzaXplX3QmIG5leHRDZWxsKQorICAgIGlubGluZSB2b2lkKiBNYXJrZWRCbG9jazo6YWxsb2Nh dGUoc2l6ZV90JiBuZXh0QXRvbSkKICAgICB7CiAgICAgICAgIGRvIHsKLSAgICAgICAgICAgIEFT U0VSVChuZXh0Q2VsbCA8IENFTExTX1BFUl9CTE9DSyk7Ci0gICAgICAgICAgICBpZiAoIW1fbWFy a3MudGVzdEFuZFNldChuZXh0Q2VsbCkpIHsgLy8gQWx3YXlzIGZhbHNlIGZvciB0aGUgbGFzdCBj ZWxsIGluIHRoZSBibG9jawotICAgICAgICAgICAgICAgIEpTQ2VsbCogY2VsbCA9IHJlaW50ZXJw cmV0X2Nhc3Q8SlNDZWxsKj4oJmNlbGxzKClbbmV4dENlbGwrK10pOworICAgICAgICAgICAgQVNT RVJUKG5leHRBdG9tIDwgbV9lbmRBdG9tKTsKKyAgICAgICAgICAgIGlmICghbV9tYXJrcy50ZXN0 QW5kU2V0KG5leHRBdG9tKSkgeyAvLyBBbHdheXMgZmFsc2UgZm9yIHRoZSBsYXN0IGNlbGwgaW4g dGhlIGJsb2NrCisgICAgICAgICAgICAgICAgSlNDZWxsKiBjZWxsID0gcmVpbnRlcnByZXRfY2Fz dDxKU0NlbGwqPigmYXRvbXMoKVtuZXh0QXRvbV0pOworICAgICAgICAgICAgICAgIG5leHRBdG9t ICs9IG1fYXRvbXNQZXJDZWxsOwogICAgICAgICAgICAgICAgIGNlbGwtPn5KU0NlbGwoKTsKICAg ICAgICAgICAgICAgICByZXR1cm4gY2VsbDsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIG5l eHRDZWxsID0gbV9tYXJrcy5uZXh0UG9zc2libHlVbnNldChuZXh0Q2VsbCk7Ci0gICAgICAgIH0g d2hpbGUgKG5leHRDZWxsICE9IENFTExTX1BFUl9CTE9DSyk7CisgICAgICAgICAgICBuZXh0QXRv bSArPSBtX2F0b21zUGVyQ2VsbDsKKyAgICAgICAgfSB3aGlsZSAobmV4dEF0b20gIT0gbV9lbmRB dG9tKTsKIAotICAgICAgICBuZXh0Q2VsbCA9IGZpcnN0Q2VsbCgpOworICAgICAgICBuZXh0QXRv bSA9IGZpcnN0QXRvbSgpOwogICAgICAgICByZXR1cm4gMDsKICAgICB9CiAKSW5kZXg6IFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL01hcmtlZEJsb2NrLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9NYXJrZWRCbG9jay5jcHAJKHJldmlzaW9uIDc4 ODQ5KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvTWFya2VkQmxvY2suY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0zMCwzMCArMzAsMzMgQEAKIAogbmFtZXNwYWNlIEpTQyB7CiAKLU1h cmtlZEJsb2NrKiBNYXJrZWRCbG9jazo6Y3JlYXRlKEpTR2xvYmFsRGF0YSogZ2xvYmFsRGF0YSkK K01hcmtlZEJsb2NrKiBNYXJrZWRCbG9jazo6Y3JlYXRlKEpTR2xvYmFsRGF0YSogZ2xvYmFsRGF0 YSwgc2l6ZV90IGNlbGxTaXplKQogewotICAgIFBhZ2VBbGxvY2F0aW9uQWxpZ25lZCBhbGxvY2F0 aW9uID0gUGFnZUFsbG9jYXRpb25BbGlnbmVkOjphbGxvY2F0ZShCTE9DS19TSVpFLCBCTE9DS19T SVpFLCBPU0FsbG9jYXRvcjo6SlNHQ0hlYXBQYWdlcyk7CisgICAgUGFnZUFsbG9jYXRpb25BbGln bmVkIGFsbG9jYXRpb24gPSBQYWdlQWxsb2NhdGlvbkFsaWduZWQ6OmFsbG9jYXRlKGJsb2NrU2l6 ZSwgYmxvY2tTaXplLCBPU0FsbG9jYXRvcjo6SlNHQ0hlYXBQYWdlcyk7CiAgICAgaWYgKCFzdGF0 aWNfY2FzdDxib29sPihhbGxvY2F0aW9uKSkKICAgICAgICAgQ1JBU0goKTsKLSAgICByZXR1cm4g bmV3IChhbGxvY2F0aW9uLmJhc2UoKSkgTWFya2VkQmxvY2soYWxsb2NhdGlvbiwgZ2xvYmFsRGF0 YSk7CisgICAgcmV0dXJuIG5ldyAoYWxsb2NhdGlvbi5iYXNlKCkpIE1hcmtlZEJsb2NrKGFsbG9j YXRpb24sIGdsb2JhbERhdGEsIGNlbGxTaXplKTsKIH0KIAogdm9pZCBNYXJrZWRCbG9jazo6ZGVz dHJveShNYXJrZWRCbG9jayogYmxvY2spCiB7Ci0gICAgZm9yIChzaXplX3QgaSA9IGJsb2NrLT5m aXJzdENlbGwoKTsgaSA8IENFTExTX1BFUl9CTE9DSzsgKytpKQotICAgICAgICByZWludGVycHJl dF9jYXN0PEpTQ2VsbCo+KCZibG9jay0+Y2VsbHMoKVtpXSktPn5KU0NlbGwoKTsKKyAgICBmb3Ig KHNpemVfdCBpID0gYmxvY2stPmZpcnN0QXRvbSgpOyBpIDwgYmxvY2stPm1fZW5kQXRvbTsgaSAr PSBibG9jay0+bV9hdG9tc1BlckNlbGwpCisgICAgICAgIHJlaW50ZXJwcmV0X2Nhc3Q8SlNDZWxs Kj4oJmJsb2NrLT5hdG9tcygpW2ldKS0+fkpTQ2VsbCgpOwogICAgIGJsb2NrLT5tX2FsbG9jYXRp b24uZGVhbGxvY2F0ZSgpOwogfQogCi1NYXJrZWRCbG9jazo6TWFya2VkQmxvY2soY29uc3QgUGFn ZUFsbG9jYXRpb25BbGlnbmVkJiBhbGxvY2F0aW9uLCBKU0dsb2JhbERhdGEqIGdsb2JhbERhdGEp Ci0gICAgOiBtX2FsbG9jYXRpb24oYWxsb2NhdGlvbikKK01hcmtlZEJsb2NrOjpNYXJrZWRCbG9j ayhjb25zdCBQYWdlQWxsb2NhdGlvbkFsaWduZWQmIGFsbG9jYXRpb24sIEpTR2xvYmFsRGF0YSog Z2xvYmFsRGF0YSwgc2l6ZV90IGNlbGxTaXplKQorICAgIDogbV9hdG9tc1BlckNlbGwoY2VsbFNp emUgLyBhdG9tU2l6ZSkKKyAgICAsIG1fZW5kQXRvbSgoYWxsb2NhdGlvbi5zaXplKCkgLSBzaXpl b2YoTWFya2VkQmxvY2spKSAvIGNlbGxTaXplKSAvLyBJbnRlbnRpb25hbGx5IHJvdW5kcyBkb3du LgorICAgICwgbV9hbGxvY2F0aW9uKGFsbG9jYXRpb24pCiAgICAgLCBtX2hlYXAoJmdsb2JhbERh dGEtPmhlYXApCiB7Ci0gICAgbV9tYXJrcy5zZXQoQ0VMTFNfUEVSX0JMT0NLIC0gMSk7CisgICAg QVNTRVJUKGNlbGxTaXplIDw9IGF0b21TaXplKTsKKyAgICBtX21hcmtzLnNldChtX2VuZEF0b20g LSAxKTsKIAogICAgIFN0cnVjdHVyZSogZHVtbXlNYXJrYWJsZUNlbGxTdHJ1Y3R1cmUgPSBnbG9i YWxEYXRhLT5kdW1teU1hcmthYmxlQ2VsbFN0cnVjdHVyZS5nZXQoKTsKLSAgICBmb3IgKHNpemVf dCBpID0gZmlyc3RDZWxsKCk7IGkgPCBDRUxMU19QRVJfQkxPQ0s7ICsraSkKLSAgICAgICAgbmV3 ICgmY2VsbHMoKVtpXSkgSlNDZWxsKGR1bW15TWFya2FibGVDZWxsU3RydWN0dXJlKTsKKyAgICBm b3IgKHNpemVfdCBpID0gZmlyc3RBdG9tKCk7IGkgPCBtX2VuZEF0b207IGkgKz0gbV9hdG9tc1Bl ckNlbGwpCisgICAgICAgIG5ldyAoJmF0b21zKClbaV0pIEpTQ2VsbChkdW1teU1hcmthYmxlQ2Vs bFN0cnVjdHVyZSk7CiB9CiAKIHZvaWQgTWFya2VkQmxvY2s6OnN3ZWVwKCkKQEAgLTYyLDExICs2 NSwxMSBAQCB2b2lkIE1hcmtlZEJsb2NrOjpzd2VlcCgpCiAgICAgU3RydWN0dXJlKiBkdW1teU1h cmthYmxlQ2VsbFN0cnVjdHVyZSA9IG1faGVhcC0+Z2xvYmFsRGF0YSgpLT5kdW1teU1hcmthYmxl Q2VsbFN0cnVjdHVyZS5nZXQoKTsKICNlbmRpZgogCi0gICAgZm9yIChzaXplX3QgaSA9IGZpcnN0 Q2VsbCgpOyBpIDwgQ0VMTFNfUEVSX0JMT0NLOyArK2kpIHsKKyAgICBmb3IgKHNpemVfdCBpID0g Zmlyc3RBdG9tKCk7IGkgPCBtX2VuZEF0b20gLSAxOyBpICs9IG1fYXRvbXNQZXJDZWxsKSB7CiAg ICAgICAgIGlmIChtX21hcmtzLmdldChpKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogCi0gICAg ICAgIEpTQ2VsbCogY2VsbCA9IHJlaW50ZXJwcmV0X2Nhc3Q8SlNDZWxsKj4oJmNlbGxzKClbaV0p OworICAgICAgICBKU0NlbGwqIGNlbGwgPSByZWludGVycHJldF9jYXN0PEpTQ2VsbCo+KCZhdG9t cygpW2ldKTsKICNpZiBFTkFCTEUoSlNDX1pPTUJJRVMpCiAgICAgICAgIGlmICghY2VsbC0+aXNa b21iaWUoKSkgewogICAgICAgICAgICAgY29uc3QgQ2xhc3NJbmZvKiBpbmZvID0gY2VsbC0+Y2xh c3NJbmZvKCk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9NYXJrZWRCbG9j ay5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL01hcmtlZEJs b2NrLmgJKHJldmlzaW9uIDc4ODQ5KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv TWFya2VkQmxvY2suaAkod29ya2luZyBjb3B5KQpAQCAtMjMsMTggKzIzLDE4IEBACiAjZGVmaW5l IE1hcmtlZEJsb2NrX2gKIAogI2luY2x1ZGUgPHd0Zi9CaXRtYXAuaD4KLSNpbmNsdWRlIDx3dGYv Rml4ZWRBcnJheS5oPgogI2luY2x1ZGUgPHd0Zi9QYWdlQWxsb2NhdGlvbkFsaWduZWQuaD4KIAot I2RlZmluZSBBU1NFUlRfQ0xBU1NfRklUU19JTl9DRUxMKGNsYXNzKSBDT01QSUxFX0FTU0VSVChz aXplb2YoY2xhc3MpIDw9IE1hcmtlZEJsb2NrOjpDRUxMX1NJWkUsIGNsYXNzX2ZpdHNfaW5fY2Vs bCkKLSNkZWZpbmUgQVNTRVJUX0NMQVNTX0ZJTExTX0NFTEwoY2xhc3MpIENPTVBJTEVfQVNTRVJU KHNpemVvZihjbGFzcykgPT0gTWFya2VkQmxvY2s6OkNFTExfU0laRSwgY2xhc3NfZmlsbHNfY2Vs bCkKLQogbmFtZXNwYWNlIEpTQyB7CiAKICAgICBjbGFzcyBIZWFwOwogICAgIGNsYXNzIEpTQ2Vs bDsKICAgICBjbGFzcyBKU0dsb2JhbERhdGE7CiAKKyAgICB0eXBlZGVmIHVpbnRwdHJfdCBCaXRz OworCisgICAgc3RhdGljIGNvbnN0IHNpemVfdCBLQiA9IDEwMjQ7CisKICAgICAvLyBFZmZpY2ll bnQgaW1wbGVtZW50YXRpb24gdGhhdCB0YWtlcyBhZHZhbnRhZ2Ugb2YgcG93ZXJzIG9mIHR3by4K ICAgICB0ZW1wbGF0ZTxzaXplX3QgZGl2aXNvcj4gaW5saW5lIHNpemVfdCByb3VuZFVwVG9NdWx0 aXBsZU9mKHNpemVfdCB4KQogICAgIHsKQEAgLTQ1LDM3ICs0NSwxMSBAQCBuYW1lc3BhY2UgSlND IHsKICAgICB9CiAKICAgICBjbGFzcyBNYXJrZWRCbG9jayB7Ci0jaWYgT1MoV0lOQ0UpIHx8IE9T KFNZTUJJQU4pIHx8IFBMQVRGT1JNKEJSRVdNUCkKLSAgICAgICAgc3RhdGljIGNvbnN0IHNpemVf dCBCTE9DS19TSVpFID0gNjQgKiAxMDI0OyAvLyA2NGsKLSNlbHNlCi0gICAgICAgIHN0YXRpYyBj b25zdCBzaXplX3QgQkxPQ0tfU0laRSA9IDI1NiAqIDEwMjQ7IC8vIDI1NmsKLSNlbmRpZgotCi0g ICAgICAgIHN0YXRpYyBjb25zdCBzaXplX3QgQkxPQ0tfTUFTSyA9IH4oQkxPQ0tfU0laRSAtIDEp OwotICAgICAgICBzdGF0aWMgY29uc3Qgc2l6ZV90IE1JTklNVU1fQ0VMTF9TSVpFID0gNjQ7Ci0g ICAgICAgIHN0YXRpYyBjb25zdCBzaXplX3QgQ0VMTF9BUlJBWV9MRU5HVEggPSAoTUlOSU1VTV9D RUxMX1NJWkUgLyBzaXplb2YoZG91YmxlKSkgKyAoTUlOSU1VTV9DRUxMX1NJWkUgJSBzaXplb2Yo ZG91YmxlKSAhPSAwID8gc2l6ZW9mKGRvdWJsZSkgOiAwKTsKICAgICBwdWJsaWM6Ci0gICAgICAg IC8vIFRoaXMgaXMgc3RpbGwgcHVibGljIGZvciBub3csIGZvciB1c2UgaW4gYXNzZXJ0aW9ucy4K LSAgICAgICAgc3RhdGljIGNvbnN0IHNpemVfdCBDRUxMX1NJWkUgPSBDRUxMX0FSUkFZX0xFTkdU SCAqIHNpemVvZihkb3VibGUpOwotICAgIHByaXZhdGU6Ci0gICAgICAgIHN0YXRpYyBjb25zdCBz aXplX3QgU01BTExfQ0VMTF9TSVpFID0gQ0VMTF9TSVpFIC8gMjsKLSAgICAgICAgc3RhdGljIGNv bnN0IHNpemVfdCBDRUxMX01BU0sgPSBDRUxMX1NJWkUgLSAxOwotICAgICAgICBzdGF0aWMgY29u c3Qgc2l6ZV90IENFTExfQUxJR05fTUFTSyA9IH5DRUxMX01BU0s7Ci0gICAgICAgIHN0YXRpYyBj b25zdCBzaXplX3QgQklUU19QRVJfQkxPQ0sgPSBCTE9DS19TSVpFIC8gQ0VMTF9TSVpFOwotICAg ICAgICBzdGF0aWMgY29uc3Qgc2l6ZV90IENFTExTX1BFUl9CTE9DSyA9IChCTE9DS19TSVpFIC0g c2l6ZW9mKFdURjo6Qml0bWFwPEJJVFNfUEVSX0JMT0NLPikgLSBzaXplb2YoUGFnZUFsbG9jYXRp b25BbGlnbmVkKSAtIHNpemVvZihIZWFwKikpIC8gQ0VMTF9TSVpFOyAvLyBEaXZpc2lvbiByb3Vu ZHMgZG93biBpbnRlbnRpb25hbGx5LgotICAgICAgICAKLSAgICAgICAgc3RydWN0IENvbGxlY3Rv ckNlbGwgewotICAgICAgICAgICAgRml4ZWRBcnJheTxkb3VibGUsIENFTExfQVJSQVlfTEVOR1RI PiBtZW1vcnk7Ci0gICAgICAgIH07Ci0KLSAgICAgICAgLy8gQ2VsbCBzaXplIG5lZWRzIHRvIGJl IGEgcG93ZXIgb2YgdHdvIGZvciBDRUxMX01BU0sgdG8gYmUgdmFsaWQuCi0gICAgICAgIENPTVBJ TEVfQVNTRVJUKCEoc2l6ZW9mKENvbGxlY3RvckNlbGwpICUgMiksIENvbGxlY3Rvcl9jZWxsX3Np emVfaXNfcG93ZXJfb2ZfdHdvKTsKLQotICAgIHB1YmxpYzoKLSAgICAgICAgc3RhdGljIE1hcmtl ZEJsb2NrKiBjcmVhdGUoSlNHbG9iYWxEYXRhKik7CisgICAgICAgIHN0YXRpYyBNYXJrZWRCbG9j ayogY3JlYXRlKEpTR2xvYmFsRGF0YSosIHNpemVfdCBjZWxsU2l6ZSk7CiAgICAgICAgIHN0YXRp YyB2b2lkIGRlc3Ryb3koTWFya2VkQmxvY2sqKTsKIAotICAgICAgICBzdGF0aWMgYm9vbCBpc0Nl bGxBbGlnbmVkKGNvbnN0IHZvaWQqKTsKKyAgICAgICAgc3RhdGljIGJvb2wgaXNBdG9tQWxpZ25l ZChjb25zdCB2b2lkKik7CiAgICAgICAgIHN0YXRpYyBNYXJrZWRCbG9jayogYmxvY2tGb3IoY29u c3Qgdm9pZCopOwogICAgICAgICAKICAgICAgICAgSGVhcCogaGVhcCgpIGNvbnN0OwpAQCAtODcs MTIgKzYxLDEzIEBAIG5hbWVzcGFjZSBKU0MgewogCiAgICAgICAgIHZvaWQgY2xlYXJNYXJrcygp OwogICAgICAgICBzaXplX3QgbWFya0NvdW50KCk7CisKICAgICAgICAgc2l6ZV90IHNpemUoKTsK ICAgICAgICAgc2l6ZV90IGNhcGFjaXR5KCk7CiAKLSAgICAgICAgc2l6ZV90IGZpcnN0Q2VsbCgp OworICAgICAgICBzaXplX3QgZmlyc3RBdG9tKCk7CiAKLSAgICAgICAgc2l6ZV90IGNlbGxOdW1i ZXIoY29uc3Qgdm9pZCopOworICAgICAgICBzaXplX3QgYXRvbU51bWJlcihjb25zdCB2b2lkKik7 CiAgICAgICAgIGJvb2wgaXNNYXJrZWQoY29uc3Qgdm9pZCopOwogICAgICAgICBib29sIHRlc3RB bmRTZXRNYXJrZWQoY29uc3Qgdm9pZCopOwogICAgICAgICB2b2lkIHNldE1hcmtlZChjb25zdCB2 b2lkKik7CkBAIC0xMDAsMzIgKzc1LDQ2IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICB0ZW1w bGF0ZSA8dHlwZW5hbWUgRnVuY3Rvcj4gdm9pZCBmb3JFYWNoKEZ1bmN0b3ImKTsKIAogICAgIHBy aXZhdGU6Ci0gICAgICAgIE1hcmtlZEJsb2NrKGNvbnN0IFBhZ2VBbGxvY2F0aW9uQWxpZ25lZCYs IEpTR2xvYmFsRGF0YSopOwotICAgICAgICBDb2xsZWN0b3JDZWxsKiBjZWxscygpOworI2lmIE9T KFdJTkNFKSB8fCBPUyhTWU1CSUFOKSB8fCBQTEFURk9STShCUkVXTVApCisgICAgICAgIHN0YXRp YyBjb25zdCBzaXplX3QgYmxvY2tTaXplID0gNjQgKiBLQjsKKyNlbHNlCisgICAgICAgIHN0YXRp YyBjb25zdCBzaXplX3QgYmxvY2tTaXplID0gMjU2ICogS0I7CisjZW5kaWYKKyAgICAgICAgc3Rh dGljIGNvbnN0IHNpemVfdCBibG9ja01hc2sgPSB+KGJsb2NrU2l6ZSAtIDEpOyAvLyBibG9ja1Np emUgbXVzdCBiZSBhIHBvd2VyIG9mIHR3by4KKworICAgICAgICBzdGF0aWMgY29uc3Qgc2l6ZV90 IGF0b21TaXplID0gNjQ7CisgICAgICAgIHN0YXRpYyBjb25zdCBzaXplX3QgYXRvbU1hc2sgPSB+ KGF0b21TaXplIC0gMSk7IC8vIGF0b21TaXplIG11c3QgYmUgYSBwb3dlciBvZiB0d28uCisKKyAg ICAgICAgdHlwZWRlZiBjaGFyIEF0b21bYXRvbVNpemVdOworCisgICAgICAgIE1hcmtlZEJsb2Nr KGNvbnN0IFBhZ2VBbGxvY2F0aW9uQWxpZ25lZCYsIEpTR2xvYmFsRGF0YSosIHNpemVfdCBjZWxs U2l6ZSk7CisgICAgICAgIEF0b20qIGF0b21zKCk7CiAKLSAgICAgICAgV1RGOjpCaXRtYXA8QklU U19QRVJfQkxPQ0s+IG1fbWFya3M7CisgICAgICAgIFdURjo6Qml0bWFwPGJsb2NrU2l6ZSAvIGF0 b21TaXplPiBtX21hcmtzOworICAgICAgICBzaXplX3QgbV9hdG9tc1BlckNlbGw7CisgICAgICAg IHNpemVfdCBtX2VuZEF0b207IC8vIFdlIGFsbG9jYXRlIFswLCBtX2VuZEF0b20gLSAxKS4gbV9l bmRBdG9tIC0gMSBpcyBhIGR1bW15IHVudXNhYmxlIGNlbGwgdG8gYXZvaWQgYSBicmFuY2ggaW4g YWxsb2NhdGUoKS4KICAgICAgICAgUGFnZUFsbG9jYXRpb25BbGlnbmVkIG1fYWxsb2NhdGlvbjsK ICAgICAgICAgSGVhcCogbV9oZWFwOwogICAgIH07CiAKLSAgICBpbmxpbmUgc2l6ZV90IE1hcmtl ZEJsb2NrOjpmaXJzdENlbGwoKQorICAgIGlubGluZSBzaXplX3QgTWFya2VkQmxvY2s6OmZpcnN0 QXRvbSgpCiAgICAgewotICAgICAgICByZXR1cm4gcm91bmRVcFRvTXVsdGlwbGVPZjxDRUxMX1NJ WkU+KHNpemVvZihNYXJrZWRCbG9jaykpIC8gQ0VMTF9TSVpFOworICAgICAgICByZXR1cm4gcm91 bmRVcFRvTXVsdGlwbGVPZjxhdG9tU2l6ZT4oc2l6ZW9mKE1hcmtlZEJsb2NrKSkgLyBhdG9tU2l6 ZTsKICAgICB9CiAKLSAgICBpbmxpbmUgTWFya2VkQmxvY2s6OkNvbGxlY3RvckNlbGwqIE1hcmtl ZEJsb2NrOjpjZWxscygpCisgICAgaW5saW5lIE1hcmtlZEJsb2NrOjpBdG9tKiBNYXJrZWRCbG9j azo6YXRvbXMoKQogICAgIHsKLSAgICAgICAgcmV0dXJuIHJlaW50ZXJwcmV0X2Nhc3Q8Q29sbGVj dG9yQ2VsbCo+KHRoaXMpOworICAgICAgICByZXR1cm4gcmVpbnRlcnByZXRfY2FzdDxBdG9tKj4o dGhpcyk7CiAgICAgfQogCi0gICAgaW5saW5lIGJvb2wgTWFya2VkQmxvY2s6OmlzQ2VsbEFsaWdu ZWQoY29uc3Qgdm9pZCogcCkKKyAgICBpbmxpbmUgYm9vbCBNYXJrZWRCbG9jazo6aXNBdG9tQWxp Z25lZChjb25zdCB2b2lkKiBwKQogICAgIHsKLSAgICAgICAgcmV0dXJuICEoKGludHB0cl90KShw KSAmIENFTExfTUFTSyk7CisgICAgICAgIHJldHVybiAhKChpbnRwdHJfdCkocCkgJiB+YXRvbU1h c2spOwogICAgIH0KIAogICAgIGlubGluZSBNYXJrZWRCbG9jayogTWFya2VkQmxvY2s6OmJsb2Nr Rm9yKGNvbnN0IHZvaWQqIHApCiAgICAgewotICAgICAgICByZXR1cm4gcmVpbnRlcnByZXRfY2Fz dDxNYXJrZWRCbG9jayo+KHJlaW50ZXJwcmV0X2Nhc3Q8dWludHB0cl90PihwKSAmIEJMT0NLX01B U0spOworICAgICAgICByZXR1cm4gcmVpbnRlcnByZXRfY2FzdDxNYXJrZWRCbG9jayo+KHJlaW50 ZXJwcmV0X2Nhc3Q8dWludHB0cl90PihwKSAmIGJsb2NrTWFzayk7CiAgICAgfQogCiAgICAgaW5s aW5lIEhlYXAqIE1hcmtlZEJsb2NrOjpoZWFwKCkgY29uc3QKQEAgLTEzNSw5ICsxMjQsOSBAQCBu YW1lc3BhY2UgSlNDIHsKIAogICAgIGlubGluZSBib29sIE1hcmtlZEJsb2NrOjppc0VtcHR5KCkK ICAgICB7Ci0gICAgICAgIG1fbWFya3MuY2xlYXIoQ0VMTFNfUEVSX0JMT0NLIC0gMSk7IC8vIENs ZWFyIHRoZSBhbHdheXMtc2V0IGxhc3QgYml0IHRvIGF2b2lkIGNvbmZ1c2luZyBpc0VtcHR5KCku CisgICAgICAgIG1fbWFya3MuY2xlYXIobV9lbmRBdG9tIC0gMSk7IC8vIENsZWFyIHRoZSBhbHdh eXMtc2V0IGxhc3QgYml0IHRvIGF2b2lkIGNvbmZ1c2luZyBpc0VtcHR5KCkuCiAgICAgICAgIGJv b2wgcmVzdWx0ID0gbV9tYXJrcy5pc0VtcHR5KCk7Ci0gICAgICAgIG1fbWFya3Muc2V0KENFTExT X1BFUl9CTE9DSyAtIDEpOworICAgICAgICBtX21hcmtzLnNldChtX2VuZEF0b20gLSAxKTsKICAg ICAgICAgcmV0dXJuIHJlc3VsdDsKICAgICB9CiAKQEAgLTE0NSw3ICsxMzQsNyBAQCBuYW1lc3Bh Y2UgSlNDIHsKICAgICB7CiAgICAgICAgIC8vIGFsbG9jYXRlKCkgYXNzdW1lcyB0aGF0IHRoZSBs YXN0IG1hcmsgYml0IGlzIGFsd2F5cyBzZXQuCiAgICAgICAgIG1fbWFya3MuY2xlYXJBbGwoKTsK LSAgICAgICAgbV9tYXJrcy5zZXQoQ0VMTFNfUEVSX0JMT0NLIC0gMSk7CisgICAgICAgIG1fbWFy a3Muc2V0KG1fZW5kQXRvbSAtIDEpOwogICAgIH0KICAgICAKICAgICBpbmxpbmUgc2l6ZV90IE1h cmtlZEJsb2NrOjptYXJrQ291bnQoKQpAQCAtMTU1LDQwICsxNDQsNDAgQEAgbmFtZXNwYWNlIEpT QyB7CiAKICAgICBpbmxpbmUgc2l6ZV90IE1hcmtlZEJsb2NrOjpzaXplKCkKICAgICB7Ci0gICAg ICAgIHJldHVybiBtYXJrQ291bnQoKSAqIENFTExfU0laRTsKKyAgICAgICAgcmV0dXJuIG1hcmtD b3VudCgpICogbV9hdG9tc1BlckNlbGwgKiBhdG9tU2l6ZTsKICAgICB9CiAKICAgICBpbmxpbmUg c2l6ZV90IE1hcmtlZEJsb2NrOjpjYXBhY2l0eSgpCiAgICAgewotICAgICAgICByZXR1cm4gQkxP Q0tfU0laRTsKKyAgICAgICAgcmV0dXJuIG1fYWxsb2NhdGlvbi5zaXplKCk7CiAgICAgfQogCi0g ICAgaW5saW5lIHNpemVfdCBNYXJrZWRCbG9jazo6Y2VsbE51bWJlcihjb25zdCB2b2lkKiBjZWxs KQorICAgIGlubGluZSBzaXplX3QgTWFya2VkQmxvY2s6OmF0b21OdW1iZXIoY29uc3Qgdm9pZCog cCkKICAgICB7Ci0gICAgICAgIHJldHVybiAocmVpbnRlcnByZXRfY2FzdDx1aW50cHRyX3Q+KGNl bGwpIC0gcmVpbnRlcnByZXRfY2FzdDx1aW50cHRyX3Q+KHRoaXMpKSAvIENFTExfU0laRTsKKyAg ICAgICAgcmV0dXJuIChyZWludGVycHJldF9jYXN0PHVpbnRwdHJfdD4ocCkgLSByZWludGVycHJl dF9jYXN0PHVpbnRwdHJfdD4odGhpcykpIC8gYXRvbVNpemU7CiAgICAgfQogCi0gICAgaW5saW5l IGJvb2wgTWFya2VkQmxvY2s6OmlzTWFya2VkKGNvbnN0IHZvaWQqIGNlbGwpCisgICAgaW5saW5l IGJvb2wgTWFya2VkQmxvY2s6OmlzTWFya2VkKGNvbnN0IHZvaWQqIHApCiAgICAgewotICAgICAg ICByZXR1cm4gbV9tYXJrcy5nZXQoY2VsbE51bWJlcihjZWxsKSk7CisgICAgICAgIHJldHVybiBt X21hcmtzLmdldChhdG9tTnVtYmVyKHApKTsKICAgICB9CiAKLSAgICBpbmxpbmUgYm9vbCBNYXJr ZWRCbG9jazo6dGVzdEFuZFNldE1hcmtlZChjb25zdCB2b2lkKiBjZWxsKQorICAgIGlubGluZSBi b29sIE1hcmtlZEJsb2NrOjp0ZXN0QW5kU2V0TWFya2VkKGNvbnN0IHZvaWQqIHApCiAgICAgewot ICAgICAgICByZXR1cm4gbV9tYXJrcy50ZXN0QW5kU2V0KGNlbGxOdW1iZXIoY2VsbCkpOworICAg ICAgICByZXR1cm4gbV9tYXJrcy50ZXN0QW5kU2V0KGF0b21OdW1iZXIocCkpOwogICAgIH0KIAot ICAgIGlubGluZSB2b2lkIE1hcmtlZEJsb2NrOjpzZXRNYXJrZWQoY29uc3Qgdm9pZCogY2VsbCkK KyAgICBpbmxpbmUgdm9pZCBNYXJrZWRCbG9jazo6c2V0TWFya2VkKGNvbnN0IHZvaWQqIHApCiAg ICAgewotICAgICAgICBtX21hcmtzLnNldChjZWxsTnVtYmVyKGNlbGwpKTsKKyAgICAgICAgbV9t YXJrcy5zZXQoYXRvbU51bWJlcihwKSk7CiAgICAgfQogCiAgICAgdGVtcGxhdGUgPHR5cGVuYW1l IEZ1bmN0b3I+IGlubGluZSB2b2lkIE1hcmtlZEJsb2NrOjpmb3JFYWNoKEZ1bmN0b3ImIGZ1bmN0 b3IpCiAgICAgewotICAgICAgICBmb3IgKHNpemVfdCBpID0gZmlyc3RDZWxsKCk7IGkgPCBDRUxM U19QRVJfQkxPQ0sgLSAxOyArK2kpIHsgLy8gVGhlIGxhc3QgY2VsbCBpcyBhIGR1bW15IHBsYWNl LWhvbGRlci4KKyAgICAgICAgZm9yIChzaXplX3QgaSA9IGZpcnN0QXRvbSgpOyBpIDwgbV9lbmRB dG9tIC0gMTsgaSArPSBtX2F0b21zUGVyQ2VsbCkgeyAvLyBUaGUgbGFzdCBjZWxsIGlzIGEgZHVt bXkgcGxhY2UtaG9sZGVyLgogICAgICAgICAgICAgaWYgKCFtX21hcmtzLmdldChpKSkKICAgICAg ICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgIGZ1bmN0b3IocmVpbnRlcnByZXRfY2Fz dDxKU0NlbGwqPigmY2VsbHMoKVtpXSkpOworICAgICAgICAgICAgZnVuY3RvcihyZWludGVycHJl dF9jYXN0PEpTQ2VsbCo+KCZhdG9tcygpW2ldKSk7CiAgICAgICAgIH0KICAgICB9CiAKSW5kZXg6 IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL01hcmtlZFNwYWNlLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9NYXJrZWRTcGFjZS5jcHAJKHJldmlz aW9uIDc4ODQ5KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvTWFya2VkU3BhY2Uu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNSw3ICszNSw3IEBAIE1hcmtlZFNwYWNlOjpNYXJrZWRT cGFjZShKU0dsb2JhbERhdGEqIGcKICAgICAsIG1fZ2xvYmFsRGF0YShnbG9iYWxEYXRhKQogewog ICAgIGFsbG9jYXRlQmxvY2soKTsKLSAgICBtX2hlYXAubmV4dENlbGwgPSBtX2hlYXAuY29sbGVj dG9yQmxvY2soMCktPmZpcnN0Q2VsbCgpOworICAgIG1faGVhcC5uZXh0QXRvbSA9IG1faGVhcC5j b2xsZWN0b3JCbG9jaygwKS0+Zmlyc3RBdG9tKCk7CiB9CiAKIHZvaWQgTWFya2VkU3BhY2U6OmRl c3Ryb3koKQpAQCAtNDksNyArNDksNyBAQCB2b2lkIE1hcmtlZFNwYWNlOjpkZXN0cm95KCkKIAog TkVWRVJfSU5MSU5FIE1hcmtlZEJsb2NrKiBNYXJrZWRTcGFjZTo6YWxsb2NhdGVCbG9jaygpCiB7 Ci0gICAgTWFya2VkQmxvY2sqIGJsb2NrID0gTWFya2VkQmxvY2s6OmNyZWF0ZShnbG9iYWxEYXRh KCkpOworICAgIE1hcmtlZEJsb2NrKiBibG9jayA9IE1hcmtlZEJsb2NrOjpjcmVhdGUoZ2xvYmFs RGF0YSgpLCBjZWxsU2l6ZSk7CiAgICAgbV9oZWFwLmJsb2Nrcy5hcHBlbmQoYmxvY2spOwogICAg IHJldHVybiBibG9jazsKIH0KQEAgLTY4LDE0ICs2OCwxNCBAQCB2b2lkKiBNYXJrZWRTcGFjZTo6 YWxsb2NhdGUoc2l6ZV90KQogICAgIGRvIHsKICAgICAgICAgQVNTRVJUKG1faGVhcC5uZXh0Qmxv Y2sgPCBtX2hlYXAuYmxvY2tzLnNpemUoKSk7CiAgICAgICAgIE1hcmtlZEJsb2NrKiBibG9jayA9 IG1faGVhcC5jb2xsZWN0b3JCbG9jayhtX2hlYXAubmV4dEJsb2NrKTsKLSAgICAgICAgaWYgKHZv aWQqIHJlc3VsdCA9IGJsb2NrLT5hbGxvY2F0ZShtX2hlYXAubmV4dENlbGwpKQorICAgICAgICBp ZiAodm9pZCogcmVzdWx0ID0gYmxvY2stPmFsbG9jYXRlKG1faGVhcC5uZXh0QXRvbSkpCiAgICAg ICAgICAgICByZXR1cm4gcmVzdWx0OwogCiAgICAgICAgIG1fd2F0ZXJNYXJrICs9IGJsb2NrLT5j YXBhY2l0eSgpOwogICAgIH0gd2hpbGUgKCsrbV9oZWFwLm5leHRCbG9jayAhPSBtX2hlYXAuYmxv Y2tzLnNpemUoKSk7CiAKICAgICBpZiAobV93YXRlck1hcmsgPCBtX2hpZ2hXYXRlck1hcmspCi0g ICAgICAgIHJldHVybiBhbGxvY2F0ZUJsb2NrKCktPmFsbG9jYXRlKG1faGVhcC5uZXh0Q2VsbCk7 CisgICAgICAgIHJldHVybiBhbGxvY2F0ZUJsb2NrKCktPmFsbG9jYXRlKG1faGVhcC5uZXh0QXRv bSk7CiAKICAgICByZXR1cm4gMDsKIH0KQEAgLTEyOSw3ICsxMjksNyBAQCBzaXplX3QgTWFya2Vk U3BhY2U6OmNhcGFjaXR5KCkgY29uc3QKIHZvaWQgTWFya2VkU3BhY2U6OnJlc2V0KCkKIHsKICAg ICBtX2hlYXAubmV4dEJsb2NrID0gMDsKLSAgICBtX2hlYXAubmV4dENlbGwgPSBtX2hlYXAuY29s bGVjdG9yQmxvY2soMCktPmZpcnN0Q2VsbCgpOworICAgIG1faGVhcC5uZXh0QXRvbSA9IG1faGVh cC5jb2xsZWN0b3JCbG9jaygwKS0+Zmlyc3RBdG9tKCk7CiAgICAgbV93YXRlck1hcmsgPSAwOwog I2lmIEVOQUJMRShKU0NfWk9NQklFUykKICAgICBzd2VlcCgpOwpJbmRleDogU291cmNlL0phdmFT Y3JpcHRDb3JlL3J1bnRpbWUvTWFya2VkU3BhY2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9NYXJrZWRTcGFjZS5oCShyZXZpc2lvbiA3ODg0OSkKKysrIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL01hcmtlZFNwYWNlLmgJKHdvcmtpbmcgY29weSkK QEAgLTMxLDYgKzMxLDkgQEAKICNpbmNsdWRlIDx3dGYvTm9uY29weWFibGUuaD4KICNpbmNsdWRl IDx3dGYvVmVjdG9yLmg+CiAKKyNkZWZpbmUgQVNTRVJUX0NMQVNTX0ZJVFNfSU5fQ0VMTChjbGFz cykgQ09NUElMRV9BU1NFUlQoc2l6ZW9mKGNsYXNzKSA8PSBNYXJrZWRTcGFjZTo6Y2VsbFNpemUs IGNsYXNzX2ZpdHNfaW5fY2VsbCkKKyNkZWZpbmUgQVNTRVJUX0NMQVNTX0ZJTExTX0NFTEwoY2xh c3MpIENPTVBJTEVfQVNTRVJUKHNpemVvZihjbGFzcykgPT0gTWFya2VkU3BhY2U6OmNlbGxTaXpl LCBjbGFzc19maWxsc19jZWxsKQorCiBuYW1lc3BhY2UgSlNDIHsKIAogICAgIGNsYXNzIEhlYXA7 CkBAIC00Myw3ICs0Niw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgIHN0cnVjdCBDb2xsZWN0b3JI ZWFwIHsKICAgICAgICAgQ29sbGVjdG9ySGVhcCgpCiAgICAgICAgICAgICA6IG5leHRCbG9jaygw KQotICAgICAgICAgICAgLCBuZXh0Q2VsbCgwKQorICAgICAgICAgICAgLCBuZXh0QXRvbSgwKQog ICAgICAgICB7CiAgICAgICAgIH0KICAgICAgICAgCkBAIC01MywxMyArNTYsMTYgQEAgbmFtZXNw YWNlIEpTQyB7CiAgICAgICAgIH0KIAogICAgICAgICBzaXplX3QgbmV4dEJsb2NrOwotICAgICAg ICBzaXplX3QgbmV4dENlbGw7CisgICAgICAgIHNpemVfdCBuZXh0QXRvbTsKICAgICAgICAgVmVj dG9yPE1hcmtlZEJsb2NrKj4gYmxvY2tzOwogICAgIH07CiAKICAgICBjbGFzcyBNYXJrZWRTcGFj ZSB7CiAgICAgICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKE1hcmtlZFNwYWNlKTsKICAgICBwdWJs aWM6CisgICAgICAgIC8vIEN1cnJlbnRseSBwdWJsaWMgZm9yIHVzZSBpbiBhc3NlcnRpb25zLgor ICAgICAgICBzdGF0aWMgY29uc3Qgc2l6ZV90IGNlbGxTaXplID0gNjQ7CisKICAgICAgICAgc3Rh dGljIEhlYXAqIGhlYXAoSlNDZWxsKik7CiAKICAgICAgICAgc3RhdGljIGJvb2wgaXNNYXJrZWQo Y29uc3QgSlNDZWxsKik7CkBAIC0xMjQsNyArMTMwLDcgQEAgbmFtZXNwYWNlIEpTQyB7CiAKICAg ICBpbmxpbmUgYm9vbCBNYXJrZWRTcGFjZTo6Y29udGFpbnMoY29uc3Qgdm9pZCogeCkKICAgICB7 Ci0gICAgICAgIGlmICghTWFya2VkQmxvY2s6OmlzQ2VsbEFsaWduZWQoeCkpCisgICAgICAgIGlm ICghTWFya2VkQmxvY2s6OmlzQXRvbUFsaWduZWQoeCkpCiAgICAgICAgICAgICByZXR1cm4gZmFs c2U7CiAKICAgICAgICAgTWFya2VkQmxvY2sqIGJsb2NrID0gTWFya2VkQmxvY2s6OmJsb2NrRm9y KHgpOwo= 82921 2011-02-17 22:30:14 -0800 2011-02-17 22:31:06 -0800 Patch bug-54692-20110218153012.patch text/plain 4615 ukai U3VidmVyc2lvbiBSZXZpc2lvbjogNzg5NDkKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDI3 MGVjYWI0Yzc4YzQ2ZDQ0N2Q3YTliNGMyYTEyN2FkMGExYzhjOGYuLjNjMjFiZDQ1NTc0ZGNhNjdl NTdiNzU4YWJiNGRlN2ZjMWY5NWQ3YTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDEyIEBACisyMDExLTAyLTE3ICBGdW1pdG9zaGkgVWthaSAgPHVrYWlAY2hyb21pdW0ub3Jn PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYlNv Y2tldCB1c2VzIGluc2VjdXJlIHJhbmRvbSBudW1iZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NDY5MgorCisgICAgICAgICogSmF2YVNjcmlwdENv cmUuZXhwOiBFeHBvcnQgV1RGOjpjcnlwdG9ncmFwaGljYWxseVJhbmRvbU51bWJlcigpCisKIDIw MTEtMDItMTcgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAg ICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI3ODg1NiBhbmQgcjc4OTA3LgpkaWZmIC0t Z2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLmV4cCBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS5leHAKaW5kZXggNDY0NWFmMzI1YWE2ZTM1YTQ3 Nzc1ODBkMTJhODRjYWM5MzgyMDIxMi4uMWIxZWE3ZDQ5ZjAyMzc2MDZlMGMwYzE3NGRkZjY5MTY4 YjBlMmE0OCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3Jl LmV4cAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUuZXhwCkBAIC00 MzAsNiArNDMwLDcgQEAgX19aTjNXVEYyM2RheUluTW9udGhGcm9tRGF5SW5ZZWFyRWliCiBfX1pO M1dURjIzd2FpdEZvclRocmVhZENvbXBsZXRpb25FalBQdgogX19aTjNXVEYyN3JlbGVhc2VGYXN0 TWFsbG9jRnJlZU1lbW9yeUV2CiBfX1pOM1dURjI4c2V0TWFpblRocmVhZENhbGxiYWNrc1BhdXNl ZEViCitfX1pOM1dURjI5Y3J5cHRvZ3JhcGhpY2FsbHlSYW5kb21OdW1iZXJFdgogX19aTjNXVEYy OWNyeXB0b2dyYXBoaWNhbGx5UmFuZG9tVmFsdWVzRVB2bQogX19aTjNXVEYzNmxvY2tBdG9taWNh bGx5SW5pdGlhbGl6ZWRTdGF0aWNNdXRleEV2CiBfX1pOM1dURjM3cGFyc2VEYXRlRnJvbU51bGxU ZXJtaW5hdGVkQ2hhcmFjdGVyc0VQS2MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAwNTdkYTZhYTRkZDJiY2RmMGUz YTllMzg3NjFiZmQwMTc0Y2I0ZGQ0Li4xOGZkZjhkOTJjNzRhMWFmOWRiNjY1MWVmOTRlZDdiMDYx ZDU1ZGVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDItMTcgIEZ1bWl0b3No aSBVa2FpICA8dWthaUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgV2ViU29ja2V0IHVzZXMgaW5zZWN1cmUgcmFuZG9tIG51bWJl cnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU0Njky CisKKyAgICAgICAgKiB3ZWJzb2NrZXRzL1dlYlNvY2tldEhhbmRzaGFrZS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpyYW5kb21OdW1iZXJMZXNzVGhhbik6CisgICAgICAgIChXZWJDb3JlOjpnZW5l cmF0ZVNlY1dlYlNvY2tldEtleSk6CisgICAgICAgIChXZWJDb3JlOjpnZW5lcmF0ZUtleTMpOgor CiAyMDExLTAyLTE3ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IFNhbSBXZWluaWcuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS93ZWJzb2NrZXRzL1dlYlNvY2tldEhhbmRzaGFrZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS93ZWJz b2NrZXRzL1dlYlNvY2tldEhhbmRzaGFrZS5jcHAKaW5kZXggODQ3NzlmNTc2OWY4OWNmYzc2MGI2 M2EyMWJjYzFiMDZkOTNhNjkwZC4uN2EyOTQ0N2ExYWVkNWQzYjM2OWQ1MGIyYjMyYWU3YzEwZDFl OGI5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvd2Vic29ja2V0cy9XZWJTb2NrZXRIYW5k c2hha2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3dlYnNvY2tldHMvV2ViU29ja2V0SGFuZHNo YWtlLmNwcApAQCAtNDQsOCArNDQsOCBAQAogI2luY2x1ZGUgIlNjcmlwdENhbGxTdGFjay5oIgog I2luY2x1ZGUgIlNjcmlwdEV4ZWN1dGlvbkNvbnRleHQuaCIKICNpbmNsdWRlICJTZWN1cml0eU9y aWdpbi5oIgorI2luY2x1ZGUgPHd0Zi9DcnlwdG9ncmFwaGljYWxseVJhbmRvbU51bWJlci5oPgog I2luY2x1ZGUgPHd0Zi9NRDUuaD4KLSNpbmNsdWRlIDx3dGYvUmFuZG9tTnVtYmVyLmg+CiAjaW5j bHVkZSA8d3RmL1N0ZExpYkV4dHJhcy5oPgogI2luY2x1ZGUgPHd0Zi9TdHJpbmdFeHRyYXMuaD4K ICNpbmNsdWRlIDx3dGYvVmVjdG9yLmg+CkBAIC05MiwyNCArOTIsMzYgQEAgc3RhdGljIFN0cmlu ZyB0cmltQ29uc29sZU1lc3NhZ2UoY29uc3QgY2hhciogcCwgc2l6ZV90IGxlbikKICAgICByZXR1 cm4gczsKIH0KIAorc3RhdGljIHVpbnQzMl90IHJhbmRvbU51bWJlckxlc3NUaGFuKHVpbnQzMl90 IG4pCit7CisgICAgaWYgKG4gPD0gMCkKKyAgICAgICAgcmV0dXJuIDA7CisgICAgdWludDMyX3Qg bWF4ID0gKDEgPDwgMzEpIC0gMSAtICgoMSA8PCAzMSkgJSBuKTsKKyAgICB1aW50MzJfdCB2Owor ICAgIGRvIHsKKyAgICAgICAgdiA9IGNyeXB0b2dyYXBoaWNhbGx5UmFuZG9tTnVtYmVyKCk7Cisg ICAgfSB3aGlsZSAodiA+IG1heCk7CisgICAgcmV0dXJuIHYgJSBuOworfQorCiBzdGF0aWMgdm9p ZCBnZW5lcmF0ZVNlY1dlYlNvY2tldEtleSh1aW50MzJfdCYgbnVtYmVyLCBTdHJpbmcmIGtleSkK IHsKLSAgICB1aW50MzJfdCBzcGFjZSA9IHN0YXRpY19jYXN0PHVpbnQzMl90PihyYW5kb21OdW1i ZXIoKSAqIDEyKSArIDE7CisgICAgdWludDMyX3Qgc3BhY2UgPSByYW5kb21OdW1iZXJMZXNzVGhh bigxMikgKyAxOwogICAgIHVpbnQzMl90IG1heCA9IDQyOTQ5NjcyOTVVIC8gc3BhY2U7Ci0gICAg bnVtYmVyID0gc3RhdGljX2Nhc3Q8dWludDMyX3Q+KHJhbmRvbU51bWJlcigpICogbWF4KTsKKyAg ICBudW1iZXIgPSByYW5kb21OdW1iZXJMZXNzVGhhbihtYXgpOwogICAgIHVpbnQzMl90IHByb2R1 Y3QgPSBudW1iZXIgKiBzcGFjZTsKIAogICAgIFN0cmluZyBzID0gU3RyaW5nOjpudW1iZXIocHJv ZHVjdCk7Ci0gICAgaW50IG4gPSBzdGF0aWNfY2FzdDxpbnQ+KHJhbmRvbU51bWJlcigpICogMTIp ICsgMTsKKyAgICBpbnQgbiA9IHJhbmRvbU51bWJlckxlc3NUaGFuKDEyKSArIDE7CiAgICAgREVG SU5FX1NUQVRJQ19MT0NBTChTdHJpbmcsIHJhbmRvbUNoYXJzLCAocmFuZG9tQ2hhcmFjdGVySW5T ZWNXZWJTb2NrZXRLZXkpKTsKICAgICBmb3IgKGludCBpID0gMDsgaSA8IG47IGkrKykgewotICAg ICAgICBpbnQgcG9zID0gc3RhdGljX2Nhc3Q8aW50PihyYW5kb21OdW1iZXIoKSAqIChzLmxlbmd0 aCgpICsgMSkpOwotICAgICAgICBpbnQgY2hwb3MgPSBzdGF0aWNfY2FzdDxpbnQ+KHJhbmRvbU51 bWJlcigpICogcmFuZG9tQ2hhcnMubGVuZ3RoKCkpOworICAgICAgICBpbnQgcG9zID0gcmFuZG9t TnVtYmVyTGVzc1RoYW4ocy5sZW5ndGgoKSArIDEpOworICAgICAgICBpbnQgY2hwb3MgPSByYW5k b21OdW1iZXJMZXNzVGhhbihyYW5kb21DaGFycy5sZW5ndGgoKSk7CiAgICAgICAgIHMuaW5zZXJ0 KHJhbmRvbUNoYXJzLnN1YnN0cmluZyhjaHBvcywgMSksIHBvcyk7CiAgICAgfQogICAgIERFRklO RV9TVEFUSUNfTE9DQUwoU3RyaW5nLCBzcGFjZUNoYXIsICgiICIpKTsKICAgICBmb3IgKHVpbnQz Ml90IGkgPSAwOyBpIDwgc3BhY2U7IGkrKykgewotICAgICAgICBpbnQgcG9zID0gc3RhdGljX2Nh c3Q8aW50PihyYW5kb21OdW1iZXIoKSAqIChzLmxlbmd0aCgpIC0gMSkpICsgMTsKKyAgICAgICAg aW50IHBvcyA9IHJhbmRvbU51bWJlckxlc3NUaGFuKHMubGVuZ3RoKCkgLSAxKSArIDE7CiAgICAg ICAgIHMuaW5zZXJ0KHNwYWNlQ2hhciwgcG9zKTsKICAgICB9CiAgICAgQVNTRVJUKHNbMF0gIT0g JyAnKTsKQEAgLTExOSw4ICsxMzEsNyBAQCBzdGF0aWMgdm9pZCBnZW5lcmF0ZVNlY1dlYlNvY2tl dEtleSh1aW50MzJfdCYgbnVtYmVyLCBTdHJpbmcmIGtleSkKIAogc3RhdGljIHZvaWQgZ2VuZXJh dGVLZXkzKHVuc2lnbmVkIGNoYXIga2V5M1s4XSkKIHsKLSAgICBmb3IgKGludCBpID0gMDsgaSA8 IDg7IGkrKykKLSAgICAgICAga2V5M1tpXSA9IHJhbmRvbU51bWJlcigpICogMjU2OworICAgIGNy eXB0b2dyYXBoaWNhbGx5UmFuZG9tVmFsdWVzKGtleTMsIDgpOwogfQogCiBzdGF0aWMgdm9pZCBz ZXRDaGFsbGVuZ2VOdW1iZXIodW5zaWduZWQgY2hhciogYnVmLCB1aW50MzJfdCBudW1iZXIpCg==