57342 2011-03-29 07:55:29 -0700 Rename InlineIterator::pos to m_pos to match modern style 2011-03-29 08:31:09 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric eric abarth commit-queue rniwa zimmermann oldest_to_newest 375337 0 eric 2011-03-29 07:55:29 -0700 Rename InlineIterator::pos to m_pos to match modern style 375339 1 87329 eric 2011-03-29 07:57:32 -0700 Created attachment 87329 Patch 375342 2 87329 zimmermann 2011-03-29 08:00:12 -0700 Comment on attachment 87329 Patch r=me. 375368 3 87329 commit-queue 2011-03-29 08:31:03 -0700 Comment on attachment 87329 Patch Clearing flags on attachment: 87329 Committed r82256: <http://trac.webkit.org/changeset/82256> 375369 4 commit-queue 2011-03-29 08:31:09 -0700 All reviewed patches have been landed. Closing bug. 87329 2011-03-29 07:57:32 -0700 2011-03-29 08:31:03 -0700 Patch bug-57342-20110329165729.patch text/plain 23096 eric U3VidmVyc2lvbiBSZXZpc2lvbjogODIyNTAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA1MzlhNGI2ZmIxYWMwMzdl YjI4ZTk1OTVmZGU0N2VmYjc1NjNmYjY5Li5iOThhMDMxM2E4ZjNjMTA3MGUxYjQ4YWU4ZmFiZmFk NDVmZjAwNzFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMzAgQEAKIAogICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBSZW5hbWUgSW5saW5lSXRlcmF0b3I6OnBv cyB0byBtX3BvcyB0byBtYXRjaCBtb2Rlcm4gc3R5bGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3MzQyCisKKyAgICAgICAgU29tZWhvdyBJIGZhaWxl ZCB0byB1cGxvYWQgdGhpcyBvbmUgZWFybGllciwgbm8gd29uZGVyIGxhdGVyIHBhdGNoZXMgZGlk bid0IGFwcGx5LgorCisgICAgICAgICogcmVuZGVyaW5nL0lubGluZUl0ZXJhdG9yLmg6CisgICAg ICAgIChXZWJDb3JlOjpJbmxpbmVJdGVyYXRvcjo6SW5saW5lSXRlcmF0b3IpOgorICAgICAgICAo V2ViQ29yZTo6b3BlcmF0b3I9PSk6CisgICAgICAgIChXZWJDb3JlOjpvcGVyYXRvciE9KToKKyAg ICAgICAgKFdlYkNvcmU6OklubGluZUl0ZXJhdG9yOjppbmNyZW1lbnQpOgorICAgICAgICAoV2Vi Q29yZTo6SW5saW5lSXRlcmF0b3I6OmN1cnJlbnQpOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5l QmlkaVJlc29sdmVyOjphcHBlbmRSdW4pOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9j a0xpbmVMYXlvdXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y2hlY2tNaWRwb2ludHMpOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmFwcGVuZFJ1bnNGb3JPYmplY3QpOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmxheW91dElubGluZUNoaWxkcmVuKToKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckJsb2NrOjptYXRjaGVkRW5kTGluZSk6CisgICAgICAgIChXZWJDb3Jl Ojp0cnlIeXBoZW5hdGluZyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6ZmluZE5l eHRMaW5lQnJlYWspOgorCisyMDExLTAzLTI5ICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwogICAgICAgICBSZW5h bWUgSW5saW5lSXRlcmF0b3I6Om5leHRCcmVha2FibGVQb3NpdGlvbiB0byBtX25leHRCcmVha2Fi bGVQb3NpdGlvbiB0byBtYXRjaCBtb2Rlcm4gc3R5bGUKICAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3MzIzCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9JbmxpbmVJdGVyYXRvci5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L0lubGluZUl0ZXJhdG9yLmgKaW5kZXggYjc2MTJlMGU0MTEwZTJlOWQzYTNlMWJjMTdkMmY5MDVj MWJiYWFhMS4uZjI2OWYxNzk4MDAyMTQ4MTc2ZDRlNGY2MDg1MGVlNDhkZmRmYmVkMCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUl0ZXJhdG9yLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUl0ZXJhdG9yLmgKQEAgLTM2LDcgKzM2LDcgQEAg cHVibGljOgogICAgIElubGluZUl0ZXJhdG9yKCkKICAgICAgICAgOiBtX2Jsb2NrKDApCiAgICAg ICAgICwgbV9vYmooMCkKLSAgICAgICAgLCBwb3MoMCkKKyAgICAgICAgLCBtX3BvcygwKQogICAg ICAgICAsIG1fbmV4dEJyZWFrYWJsZVBvc2l0aW9uKC0xKQogICAgIHsKICAgICB9CkBAIC00NCw3 ICs0NCw3IEBAIHB1YmxpYzoKICAgICBJbmxpbmVJdGVyYXRvcihSZW5kZXJCbG9jayogYiwgUmVu ZGVyT2JqZWN0KiBvLCB1bnNpZ25lZCBwKQogICAgICAgICA6IG1fYmxvY2soYikKICAgICAgICAg LCBtX29iaihvKQotICAgICAgICAsIHBvcyhwKQorICAgICAgICAsIG1fcG9zKHApCiAgICAgICAg ICwgbV9uZXh0QnJlYWthYmxlUG9zaXRpb24oLTEpCiAgICAgewogICAgIH0KQEAgLTU3LDE4ICs1 NywxOCBAQCBwdWJsaWM6CiAKICAgICBSZW5kZXJCbG9jayogbV9ibG9jazsKICAgICBSZW5kZXJP YmplY3QqIG1fb2JqOwotICAgIHVuc2lnbmVkIHBvczsKKyAgICB1bnNpZ25lZCBtX3BvczsKICAg ICBpbnQgbV9uZXh0QnJlYWthYmxlUG9zaXRpb247CiB9OwogCiBpbmxpbmUgYm9vbCBvcGVyYXRv cj09KGNvbnN0IElubGluZUl0ZXJhdG9yJiBpdDEsIGNvbnN0IElubGluZUl0ZXJhdG9yJiBpdDIp CiB7Ci0gICAgcmV0dXJuIGl0MS5wb3MgPT0gaXQyLnBvcyAmJiBpdDEubV9vYmogPT0gaXQyLm1f b2JqOworICAgIHJldHVybiBpdDEubV9wb3MgPT0gaXQyLm1fcG9zICYmIGl0MS5tX29iaiA9PSBp dDIubV9vYmo7CiB9CiAKIGlubGluZSBib29sIG9wZXJhdG9yIT0oY29uc3QgSW5saW5lSXRlcmF0 b3ImIGl0MSwgY29uc3QgSW5saW5lSXRlcmF0b3ImIGl0MikKIHsKLSAgICByZXR1cm4gaXQxLnBv cyAhPSBpdDIucG9zIHx8IGl0MS5tX29iaiAhPSBpdDIubV9vYmo7CisgICAgcmV0dXJuIGl0MS5t X3BvcyAhPSBpdDIubV9wb3MgfHwgaXQxLm1fb2JqICE9IGl0Mi5tX29iajsKIH0KIAogc3RhdGlj IGlubGluZSBSZW5kZXJPYmplY3QqIGJpZGlOZXh0KFJlbmRlckJsb2NrKiBibG9jaywgUmVuZGVy T2JqZWN0KiBjdXJyZW50LCBJbmxpbmVCaWRpUmVzb2x2ZXIqIHJlc29sdmVyID0gMCwgYm9vbCBz a2lwSW5saW5lcyA9IHRydWUsIGJvb2wqIGVuZE9mSW5saW5lUHRyID0gMCkKQEAgLTE4NCwxNSAr MTg0LDE1IEBAIGlubGluZSB2b2lkIElubGluZUl0ZXJhdG9yOjppbmNyZW1lbnQoSW5saW5lQmlk aVJlc29sdmVyKiByZXNvbHZlcikKICAgICBpZiAoIW1fb2JqKQogICAgICAgICByZXR1cm47CiAg ICAgaWYgKG1fb2JqLT5pc1RleHQoKSkgewotICAgICAgICBwb3MrKzsKLSAgICAgICAgaWYgKHBv cyA+PSB0b1JlbmRlclRleHQobV9vYmopLT50ZXh0TGVuZ3RoKCkpIHsKKyAgICAgICAgbV9wb3Mr KzsKKyAgICAgICAgaWYgKG1fcG9zID49IHRvUmVuZGVyVGV4dChtX29iaiktPnRleHRMZW5ndGgo KSkgewogICAgICAgICAgICAgbV9vYmogPSBiaWRpTmV4dChtX2Jsb2NrLCBtX29iaiwgcmVzb2x2 ZXIpOwotICAgICAgICAgICAgcG9zID0gMDsKKyAgICAgICAgICAgIG1fcG9zID0gMDsKICAgICAg ICAgICAgIG1fbmV4dEJyZWFrYWJsZVBvc2l0aW9uID0gLTE7CiAgICAgICAgIH0KICAgICB9IGVs c2UgewogICAgICAgICBtX29iaiA9IGJpZGlOZXh0KG1fYmxvY2ssIG1fb2JqLCByZXNvbHZlcik7 Ci0gICAgICAgIHBvcyA9IDA7CisgICAgICAgIG1fcG9zID0gMDsKICAgICAgICAgbV9uZXh0QnJl YWthYmxlUG9zaXRpb24gPSAtMTsKICAgICB9CiB9CkBAIC0yMDgsMTAgKzIwOCwxMCBAQCBpbmxp bmUgVUNoYXIgSW5saW5lSXRlcmF0b3I6OmN1cnJlbnQoKSBjb25zdAogICAgICAgICByZXR1cm4g MDsKIAogICAgIFJlbmRlclRleHQqIHRleHQgPSB0b1JlbmRlclRleHQobV9vYmopOwotICAgIGlm IChwb3MgPj0gdGV4dC0+dGV4dExlbmd0aCgpKQorICAgIGlmIChtX3BvcyA+PSB0ZXh0LT50ZXh0 TGVuZ3RoKCkpCiAgICAgICAgIHJldHVybiAwOwogCi0gICAgcmV0dXJuIHRleHQtPmNoYXJhY3Rl cnMoKVtwb3NdOworICAgIHJldHVybiB0ZXh0LT5jaGFyYWN0ZXJzKClbbV9wb3NdOwogfQogCiBB TFdBWVNfSU5MSU5FIFdURjo6VW5pY29kZTo6RGlyZWN0aW9uIElubGluZUl0ZXJhdG9yOjpkaXJl Y3Rpb24oKSBjb25zdApAQCAtMjM1LDcgKzIzNSw3IEBAIHRlbXBsYXRlIDw+CiBpbmxpbmUgdm9p ZCBJbmxpbmVCaWRpUmVzb2x2ZXI6OmFwcGVuZFJ1bigpCiB7CiAgICAgaWYgKCFlbXB0eVJ1biAm JiAhZW9yLmF0RW5kKCkpIHsKLSAgICAgICAgaW50IHN0YXJ0ID0gc29yLnBvczsKKyAgICAgICAg aW50IHN0YXJ0ID0gc29yLm1fcG9zOwogICAgICAgICBSZW5kZXJPYmplY3QqIG9iaiA9IHNvci5t X29iajsKICAgICAgICAgd2hpbGUgKG9iaiAmJiBvYmogIT0gZW9yLm1fb2JqICYmIG9iaiAhPSBl bmRPZkxpbmUubV9vYmopIHsKICAgICAgICAgICAgIFJlbmRlckJsb2NrOjphcHBlbmRSdW5zRm9y T2JqZWN0KHN0YXJ0LCBvYmotPmxlbmd0aCgpLCBvYmosICp0aGlzKTsgICAgICAgIApAQCAtMjQz LDEwICsyNDMsMTAgQEAgaW5saW5lIHZvaWQgSW5saW5lQmlkaVJlc29sdmVyOjphcHBlbmRSdW4o KQogICAgICAgICAgICAgb2JqID0gYmlkaU5leHQoc29yLm1fYmxvY2ssIG9iaik7CiAgICAgICAg IH0KICAgICAgICAgaWYgKG9iaikgewotICAgICAgICAgICAgdW5zaWduZWQgcG9zID0gb2JqID09 IGVvci5tX29iaiA/IGVvci5wb3MgOiBVSU5UX01BWDsKLSAgICAgICAgICAgIGlmIChvYmogPT0g ZW5kT2ZMaW5lLm1fb2JqICYmIGVuZE9mTGluZS5wb3MgPD0gcG9zKSB7CisgICAgICAgICAgICB1 bnNpZ25lZCBwb3MgPSBvYmogPT0gZW9yLm1fb2JqID8gZW9yLm1fcG9zIDogVUlOVF9NQVg7Cisg ICAgICAgICAgICBpZiAob2JqID09IGVuZE9mTGluZS5tX29iaiAmJiBlbmRPZkxpbmUubV9wb3Mg PD0gcG9zKSB7CiAgICAgICAgICAgICAgICAgcmVhY2hlZEVuZE9mTGluZSA9IHRydWU7Ci0gICAg ICAgICAgICAgICAgcG9zID0gZW5kT2ZMaW5lLnBvczsKKyAgICAgICAgICAgICAgICBwb3MgPSBl bmRPZkxpbmUubV9wb3M7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICAvLyBJdCdzIE9LIHRv IGFkZCBydW5zIGZvciB6ZXJvLWxlbmd0aCBSZW5kZXJPYmplY3RzLCBqdXN0IGRvbid0IG1ha2Ug dGhlIHJ1biBsYXJnZXIgdGhhbiBpdCBzaG91bGQgYmUKICAgICAgICAgICAgIGludCBlbmQgPSBv YmotPmxlbmd0aCgpID8gcG9zKzEgOiAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcAppbmRleCAwNjEwOWE5M2M0YzVhYjA1NWZjYTZi MzI3N2JiOWE3ZjQ3ZWQ2ZjU4Li5mMmFiZmYyMDJiZmE1ZjY2Y2Q3YTQ0Y2VmNTA4YzE4YmZiZDli MmEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5l TGF5b3V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5l TGF5b3V0LmNwcApAQCAtOTgsNyArOTgsNyBAQCBzdGF0aWMgdm9pZCBjaGVja01pZHBvaW50cyhM aW5lTWlkcG9pbnRTdGF0ZSYgbGluZU1pZHBvaW50U3RhdGUsIElubGluZUl0ZXJhdG9yJgogICAg ICAgICAgICAgLy8gV2UgaGl0IHRoZSBsaW5lIGJyZWFrIGJlZm9yZSB0aGUgc3RhcnQgcG9pbnQu ICBTaGF2ZSBvZmYgdGhlIHN0YXJ0IHBvaW50LgogICAgICAgICAgICAgbGluZU1pZHBvaW50U3Rh dGUubnVtTWlkcG9pbnRzLS07CiAgICAgICAgICAgICBpZiAoZW5kcG9pbnQubV9vYmotPnN0eWxl KCktPmNvbGxhcHNlV2hpdGVTcGFjZSgpKQotICAgICAgICAgICAgICAgIGVuZHBvaW50LnBvcy0t OworICAgICAgICAgICAgICAgIGVuZHBvaW50Lm1fcG9zLS07CiAgICAgICAgIH0KICAgICB9ICAg IAogfQpAQCAtMTI5LDcgKzEyOSw3IEBAIHZvaWQgUmVuZGVyQmxvY2s6OmFwcGVuZFJ1bnNGb3JP YmplY3QoaW50IHN0YXJ0LCBpbnQgZW5kLCBSZW5kZXJPYmplY3QqIG9iaiwgSW5sCiAgICAgICAg IC8vIFRoaXMgaXMgYSBuZXcgc3RhcnQgcG9pbnQuIFN0b3AgaWdub3Jpbmcgb2JqZWN0cyBhbmQg CiAgICAgICAgIC8vIGFkanVzdCBvdXIgc3RhcnQuCiAgICAgICAgIGxpbmVNaWRwb2ludFN0YXRl LmJldHdlZW5NaWRwb2ludHMgPSBmYWxzZTsKLSAgICAgICAgc3RhcnQgPSBuZXh0TWlkcG9pbnQu cG9zOworICAgICAgICBzdGFydCA9IG5leHRNaWRwb2ludC5tX3BvczsKICAgICAgICAgbGluZU1p ZHBvaW50U3RhdGUuY3VycmVudE1pZHBvaW50Kys7CiAgICAgICAgIGlmIChzdGFydCA8IGVuZCkK ICAgICAgICAgICAgIHJldHVybiBhcHBlbmRSdW5zRm9yT2JqZWN0KHN0YXJ0LCBlbmQsIG9iaiwg cmVzb2x2ZXIpOwpAQCAtMTQxLDE0ICsxNDEsMTQgQEAgdm9pZCBSZW5kZXJCbG9jazo6YXBwZW5k UnVuc0Zvck9iamVjdChpbnQgc3RhcnQsIGludCBlbmQsIFJlbmRlck9iamVjdCogb2JqLCBJbmwK IAogICAgICAgICAvLyBBbiBlbmQgbWlkcG9pbnQgaGFzIGJlZW4gZW5jb3VudGVyZWQgd2l0aGlu IG91ciBvYmplY3QuICBXZQogICAgICAgICAvLyBuZWVkIHRvIGdvIGFoZWFkIGFuZCBhcHBlbmQg YSBydW4gd2l0aCBvdXIgZW5kcG9pbnQuCi0gICAgICAgIGlmIChzdGF0aWNfY2FzdDxpbnQ+KG5l eHRNaWRwb2ludC5wb3MgKyAxKSA8PSBlbmQpIHsKKyAgICAgICAgaWYgKHN0YXRpY19jYXN0PGlu dD4obmV4dE1pZHBvaW50Lm1fcG9zICsgMSkgPD0gZW5kKSB7CiAgICAgICAgICAgICBsaW5lTWlk cG9pbnRTdGF0ZS5iZXR3ZWVuTWlkcG9pbnRzID0gdHJ1ZTsKICAgICAgICAgICAgIGxpbmVNaWRw b2ludFN0YXRlLmN1cnJlbnRNaWRwb2ludCsrOwotICAgICAgICAgICAgaWYgKG5leHRNaWRwb2lu dC5wb3MgIT0gVUlOVF9NQVgpIHsgLy8gVUlOVF9NQVggbWVhbnMgc3RvcCBhdCB0aGUgb2JqZWN0 IGFuZCBkb24ndCBpbmNsdWRlIGFueSBvZiBpdC4KLSAgICAgICAgICAgICAgICBpZiAoc3RhdGlj X2Nhc3Q8aW50PihuZXh0TWlkcG9pbnQucG9zICsgMSkgPiBzdGFydCkKKyAgICAgICAgICAgIGlm IChuZXh0TWlkcG9pbnQubV9wb3MgIT0gVUlOVF9NQVgpIHsgLy8gVUlOVF9NQVggbWVhbnMgc3Rv cCBhdCB0aGUgb2JqZWN0IGFuZCBkb24ndCBpbmNsdWRlIGFueSBvZiBpdC4KKyAgICAgICAgICAg ICAgICBpZiAoc3RhdGljX2Nhc3Q8aW50PihuZXh0TWlkcG9pbnQubV9wb3MgKyAxKSA+IHN0YXJ0 KQogICAgICAgICAgICAgICAgICAgICByZXNvbHZlci5hZGRSdW4obmV3IChvYmotPnJlbmRlckFy ZW5hKCkpCi0gICAgICAgICAgICAgICAgICAgICAgICBCaWRpUnVuKHN0YXJ0LCBuZXh0TWlkcG9p bnQucG9zICsgMSwgb2JqLCByZXNvbHZlci5jb250ZXh0KCksIHJlc29sdmVyLmRpcigpKSk7Ci0g ICAgICAgICAgICAgICAgcmV0dXJuIGFwcGVuZFJ1bnNGb3JPYmplY3QobmV4dE1pZHBvaW50LnBv cyArIDEsIGVuZCwgb2JqLCByZXNvbHZlcik7CisgICAgICAgICAgICAgICAgICAgICAgICBCaWRp UnVuKHN0YXJ0LCBuZXh0TWlkcG9pbnQubV9wb3MgKyAxLCBvYmosIHJlc29sdmVyLmNvbnRleHQo KSwgcmVzb2x2ZXIuZGlyKCkpKTsKKyAgICAgICAgICAgICAgICByZXR1cm4gYXBwZW5kUnVuc0Zv ck9iamVjdChuZXh0TWlkcG9pbnQubV9wb3MgKyAxLCBlbmQsIG9iaiwgcmVzb2x2ZXIpOwogICAg ICAgICAgICAgfQogICAgICAgICB9IGVsc2UKICAgICAgICAgICAgcmVzb2x2ZXIuYWRkUnVuKG5l dyAob2JqLT5yZW5kZXJBcmVuYSgpKSBCaWRpUnVuKHN0YXJ0LCBlbmQsIG9iaiwgcmVzb2x2ZXIu Y29udGV4dCgpLCByZXNvbHZlci5kaXIoKSkpOwpAQCAtNzY5LDcgKzc2OSw3IEBAIHZvaWQgUmVu ZGVyQmxvY2s6OmxheW91dElubGluZUNoaWxkcmVuKGJvb2wgcmVsYXlvdXRDaGlsZHJlbiwgaW50 JiByZXBhaW50TG9naWNhCiAKICAgICAgICAgICAgIGlmIChpc0xpbmVFbXB0eSkgewogICAgICAg ICAgICAgICAgIGlmIChsYXN0Um9vdEJveCgpKQotICAgICAgICAgICAgICAgICAgICBsYXN0Um9v dEJveCgpLT5zZXRMaW5lQnJlYWtJbmZvKGVuZC5tX29iaiwgZW5kLnBvcywgcmVzb2x2ZXIuc3Rh dHVzKCkpOworICAgICAgICAgICAgICAgICAgICBsYXN0Um9vdEJveCgpLT5zZXRMaW5lQnJlYWtJ bmZvKGVuZC5tX29iaiwgZW5kLm1fcG9zLCByZXNvbHZlci5zdGF0dXMoKSk7CiAgICAgICAgICAg ICB9IGVsc2UgewogICAgICAgICAgICAgICAgIFZpc3VhbERpcmVjdGlvbk92ZXJyaWRlIG92ZXJy aWRlID0gKHN0eWxlKCktPnZpc3VhbGx5T3JkZXJlZCgpID8gKHN0eWxlKCktPmRpcmVjdGlvbigp ID09IExUUiA/IFZpc3VhbExlZnRUb1JpZ2h0T3ZlcnJpZGUgOiBWaXN1YWxSaWdodFRvTGVmdE92 ZXJyaWRlKSA6IE5vVmlzdWFsT3ZlcnJpZGUpOwogICAgICAgICAgICAgICAgIHJlc29sdmVyLmNy ZWF0ZUJpZGlSdW5zRm9yTGluZShlbmQsIG92ZXJyaWRlLCBwcmV2aW91c0xpbmVCcm9rZUNsZWFu bHkpOwpAQCAtODMyLDcgKzgzMiw3IEBAIHZvaWQgUmVuZGVyQmxvY2s6OmxheW91dElubGluZUNo aWxkcmVuKGJvb2wgcmVsYXlvdXRDaGlsZHJlbiwgaW50JiByZXBhaW50TG9naWNhCiAgICAgICAg ICAgICAgICAgaWYgKHJlc29sdmVyLnJ1bkNvdW50KCkpIHsKICAgICAgICAgICAgICAgICAgICAg aWYgKGh5cGhlbmF0ZWQpCiAgICAgICAgICAgICAgICAgICAgICAgICByZXNvbHZlci5sb2dpY2Fs bHlMYXN0UnVuKCktPm1faGFzSHlwaGVuID0gdHJ1ZTsKLSAgICAgICAgICAgICAgICAgICAgbGlu ZUJveCA9IGNvbnN0cnVjdExpbmUocmVzb2x2ZXIucnVuQ291bnQoKSwgcmVzb2x2ZXIuZmlyc3RS dW4oKSwgcmVzb2x2ZXIubGFzdFJ1bigpLCBmaXJzdExpbmUsICFlbmQubV9vYmosIGVuZC5tX29i aiAmJiAhZW5kLnBvcyA/IGVuZC5tX29iaiA6IDApOworICAgICAgICAgICAgICAgICAgICBsaW5l Qm94ID0gY29uc3RydWN0TGluZShyZXNvbHZlci5ydW5Db3VudCgpLCByZXNvbHZlci5maXJzdFJ1 bigpLCByZXNvbHZlci5sYXN0UnVuKCksIGZpcnN0TGluZSwgIWVuZC5tX29iaiwgZW5kLm1fb2Jq ICYmICFlbmQubV9wb3MgPyBlbmQubV9vYmogOiAwKTsKICAgICAgICAgICAgICAgICAgICAgaWYg KGxpbmVCb3gpIHsKICAgICAgICAgICAgICAgICAgICAgICAgIGxpbmVCb3gtPnNldEVuZHNXaXRo QnJlYWsocHJldmlvdXNMaW5lQnJva2VDbGVhbmx5KTsKIApAQCAtODc3LDcgKzg3Nyw3IEBAIHZv aWQgUmVuZGVyQmxvY2s6OmxheW91dElubGluZUNoaWxkcmVuKGJvb2wgcmVsYXlvdXRDaGlsZHJl biwgaW50JiByZXBhaW50TG9naWNhCiAgICAgICAgICAgICAgICAgcmVzb2x2ZXIuZGVsZXRlUnVu cygpOwogCiAgICAgICAgICAgICAgICAgaWYgKGxpbmVCb3gpIHsKLSAgICAgICAgICAgICAgICAg ICAgbGluZUJveC0+c2V0TGluZUJyZWFrSW5mbyhlbmQubV9vYmosIGVuZC5wb3MsIHJlc29sdmVy LnN0YXR1cygpKTsKKyAgICAgICAgICAgICAgICAgICAgbGluZUJveC0+c2V0TGluZUJyZWFrSW5m byhlbmQubV9vYmosIGVuZC5tX3BvcywgcmVzb2x2ZXIuc3RhdHVzKCkpOwogICAgICAgICAgICAg ICAgICAgICBpZiAodXNlUmVwYWludEJvdW5kcykgewogICAgICAgICAgICAgICAgICAgICAgICAg cmVwYWludExvZ2ljYWxUb3AgPSBtaW4ocmVwYWludExvZ2ljYWxUb3AsIGJlZm9yZVNpZGVWaXN1 YWxPdmVyZmxvd0ZvckxpbmUobGluZUJveCkpOwogICAgICAgICAgICAgICAgICAgICAgICAgcmVw YWludExvZ2ljYWxCb3R0b20gPSBtYXgocmVwYWludExvZ2ljYWxCb3R0b20sIGFmdGVyU2lkZVZp c3VhbE92ZXJmbG93Rm9yTGluZShsaW5lQm94KSk7CkBAIC0xMjY4LDcgKzEyNjgsNyBAQCBib29s IFJlbmRlckJsb2NrOjptYXRjaGVkRW5kTGluZShjb25zdCBJbmxpbmVCaWRpUmVzb2x2ZXImIHJl c29sdmVyLCBjb25zdCBJbmxpbgogICAgIHN0YXRpYyBpbnQgbnVtTGluZXMgPSA4OyAvLyBUaGUg IyBvZiBsaW5lcyB3ZSdyZSB3aWxsaW5nIHRvIG1hdGNoIGFnYWluc3QuCiAgICAgUm9vdElubGlu ZUJveCogbGluZSA9IGVuZExpbmU7CiAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBudW1MaW5lcyAm JiBsaW5lOyBpKyssIGxpbmUgPSBsaW5lLT5uZXh0Um9vdEJveCgpKSB7Ci0gICAgICAgIGlmIChs aW5lLT5saW5lQnJlYWtPYmooKSA9PSByZXNvbHZlci5wb3NpdGlvbigpLm1fb2JqICYmIGxpbmUt PmxpbmVCcmVha1BvcygpID09IHJlc29sdmVyLnBvc2l0aW9uKCkucG9zKSB7CisgICAgICAgIGlm IChsaW5lLT5saW5lQnJlYWtPYmooKSA9PSByZXNvbHZlci5wb3NpdGlvbigpLm1fb2JqICYmIGxp bmUtPmxpbmVCcmVha1BvcygpID09IHJlc29sdmVyLnBvc2l0aW9uKCkubV9wb3MpIHsKICAgICAg ICAgICAgIC8vIFdlIGhhdmUgYSBtYXRjaC4KICAgICAgICAgICAgIGlmIChsaW5lLT5saW5lQnJl YWtCaWRpU3RhdHVzKCkgIT0gcmVzb2x2ZXIuc3RhdHVzKCkpCiAgICAgICAgICAgICAgICAgcmV0 dXJuIGZhbHNlOyAvLyAuLi5idXQgdGhlIGJpZGkgc3RhdGUgZG9lc24ndCBtYXRjaC4KQEAgLTE1 MDUsNyArMTUwNSw3IEBAIHN0YXRpYyB2b2lkIHRyeUh5cGhlbmF0aW5nKFJlbmRlclRleHQqIHRl eHQsIGNvbnN0IEZvbnQmIGZvbnQsIGNvbnN0IEF0b21pY1N0cmluCiAjZW5kaWYKIAogICAgIGxp bmVCcmVhay5tX29iaiA9IHRleHQ7Ci0gICAgbGluZUJyZWFrLnBvcyA9IGxhc3RTcGFjZSArIHBy ZWZpeExlbmd0aDsKKyAgICBsaW5lQnJlYWsubV9wb3MgPSBsYXN0U3BhY2UgKyBwcmVmaXhMZW5n dGg7CiAgICAgbGluZUJyZWFrLm1fbmV4dEJyZWFrYWJsZVBvc2l0aW9uID0gbmV4dEJyZWFrYWJs ZTsKICAgICBoeXBoZW5hdGVkID0gdHJ1ZTsKIH0KQEAgLTE1MTUsNyArMTUxNSw3IEBAIElubGlu ZUl0ZXJhdG9yIFJlbmRlckJsb2NrOjpmaW5kTmV4dExpbmVCcmVhayhJbmxpbmVCaWRpUmVzb2x2 ZXImIHJlc29sdmVyLCBib29sCiB7CiAgICAgQVNTRVJUKHJlc29sdmVyLnBvc2l0aW9uKCkubV9i bG9jayA9PSB0aGlzKTsKIAotICAgIGJvb2wgYXBwbGllZFN0YXJ0V2lkdGggPSByZXNvbHZlci5w b3NpdGlvbigpLnBvcyA+IDA7CisgICAgYm9vbCBhcHBsaWVkU3RhcnRXaWR0aCA9IHJlc29sdmVy LnBvc2l0aW9uKCkubV9wb3MgPiAwOwogICAgIExpbmVNaWRwb2ludFN0YXRlJiBsaW5lTWlkcG9p bnRTdGF0ZSA9IHJlc29sdmVyLm1pZHBvaW50U3RhdGUoKTsKICAgICAKICAgICBpbnQgYmxvY2tP ZmZzZXQgPSBsb2dpY2FsSGVpZ2h0KCk7CkBAIC0xNTQ4LDcgKzE1NDgsNyBAQCBJbmxpbmVJdGVy YXRvciBSZW5kZXJCbG9jazo6ZmluZE5leHRMaW5lQnJlYWsoSW5saW5lQmlkaVJlc29sdmVyJiBy ZXNvbHZlciwgYm9vbAogCiAgICAgUmVuZGVyT2JqZWN0KiBvID0gcmVzb2x2ZXIucG9zaXRpb24o KS5tX29iajsKICAgICBSZW5kZXJPYmplY3QqIGxhc3QgPSBvOwotICAgIHVuc2lnbmVkIHBvcyA9 IHJlc29sdmVyLnBvc2l0aW9uKCkucG9zOworICAgIHVuc2lnbmVkIHBvcyA9IHJlc29sdmVyLnBv c2l0aW9uKCkubV9wb3M7CiAgICAgaW50IG5leHRCcmVha2FibGUgPSByZXNvbHZlci5wb3NpdGlv bigpLm1fbmV4dEJyZWFrYWJsZVBvc2l0aW9uOwogICAgIGJvb2wgYXRTdGFydCA9IHRydWU7CiAK QEAgLTE1ODUsNyArMTU4NSw3IEBAIElubGluZUl0ZXJhdG9yIFJlbmRlckJsb2NrOjpmaW5kTmV4 dExpbmVCcmVhayhJbmxpbmVCaWRpUmVzb2x2ZXImIHJlc29sdmVyLCBib29sCiAgICAgICAgIGlm IChvLT5pc0JSKCkpIHsKICAgICAgICAgICAgIGlmICh3ICsgdG1wVyA8PSB3aWR0aCkgewogICAg ICAgICAgICAgICAgIGxCcmVhay5tX29iaiA9IG87Ci0gICAgICAgICAgICAgICAgbEJyZWFrLnBv cyA9IDA7CisgICAgICAgICAgICAgICAgbEJyZWFrLm1fcG9zID0gMDsKICAgICAgICAgICAgICAg ICBsQnJlYWsubV9uZXh0QnJlYWthYmxlUG9zaXRpb24gPSAtMTsKICAgICAgICAgICAgICAgICBs QnJlYWsuaW5jcmVtZW50KCk7CiAKQEAgLTE2MTcsNyArMTYxNyw3IEBAIElubGluZUl0ZXJhdG9y IFJlbmRlckJsb2NrOjpmaW5kTmV4dExpbmVCcmVhayhJbmxpbmVCaWRpUmVzb2x2ZXImIHJlc29s dmVyLCBib29sCiAgICAgICAgICAgICAgICAgICAgIHBvc2l0aW9uTmV3RmxvYXRPbkxpbmUoZiwg bGFzdEZsb2F0RnJvbVByZXZpb3VzTGluZSwgZmlyc3RMaW5lLCBsaW5lTGVmdE9mZnNldCwgbGlu ZVJpZ2h0T2Zmc2V0KTsKICAgICAgICAgICAgICAgICAgICAgd2lkdGggPSBtYXgoMCwgbGluZVJp Z2h0T2Zmc2V0IC0gbGluZUxlZnRPZmZzZXQpOwogICAgICAgICAgICAgICAgICAgICBpZiAobEJy ZWFrLm1fb2JqID09IG8pIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIEFTU0VSVCghbEJyZWFr LnBvcyk7CisgICAgICAgICAgICAgICAgICAgICAgICBBU1NFUlQoIWxCcmVhay5tX3Bvcyk7CiAg ICAgICAgICAgICAgICAgICAgICAgICBsQnJlYWsuaW5jcmVtZW50KCk7CiAgICAgICAgICAgICAg ICAgICAgIH0KICAgICAgICAgICAgICAgICB9IGVsc2UKQEAgLTE2NDAsNyArMTY0MCw3IEBAIElu bGluZUl0ZXJhdG9yIFJlbmRlckJsb2NrOjpmaW5kTmV4dExpbmVCcmVhayhJbmxpbmVCaWRpUmVz b2x2ZXImIHJlc29sdmVyLCBib29sCiAgICAgICAgICAgICAgICAgaWYgKGlzSW5saW5lVHlwZSB8 fCBvLT5jb250YWluZXIoKS0+aXNSZW5kZXJJbmxpbmUoKSkgewogICAgICAgICAgICAgICAgICAg ICBpZiAoaWdub3JpbmdTcGFjZXMpIHsKICAgICAgICAgICAgICAgICAgICAgICAgIGlnbm9yZVN0 YXJ0Lm1fb2JqID0gbzsKLSAgICAgICAgICAgICAgICAgICAgICAgIGlnbm9yZVN0YXJ0LnBvcyA9 IDA7CisgICAgICAgICAgICAgICAgICAgICAgICBpZ25vcmVTdGFydC5tX3BvcyA9IDA7CiAgICAg ICAgICAgICAgICAgICAgICAgICBhZGRNaWRwb2ludChsaW5lTWlkcG9pbnRTdGF0ZSwgaWdub3Jl U3RhcnQpOyAvLyBTdG9wIGlnbm9yaW5nIHNwYWNlcy4KICAgICAgICAgICAgICAgICAgICAgICAg IGFkZE1pZHBvaW50KGxpbmVNaWRwb2ludFN0YXRlLCBpZ25vcmVTdGFydCk7IC8vIFN0YXJ0IGln bm9yaW5nIGFnYWluLgogICAgICAgICAgICAgICAgICAgICB9CkBAIC0xNjg2LDcgKzE2ODYsNyBA QCBJbmxpbmVJdGVyYXRvciBSZW5kZXJCbG9jazo6ZmluZE5leHRMaW5lQnJlYWsoSW5saW5lQmlk aVJlc29sdmVyJiByZXNvbHZlciwgYm9vbAogICAgICAgICAgICAgICAgIHcgKz0gdG1wVzsKICAg ICAgICAgICAgICAgICB0bXBXID0gMDsKICAgICAgICAgICAgICAgICBsQnJlYWsubV9vYmogPSBv OwotICAgICAgICAgICAgICAgIGxCcmVhay5wb3MgPSAwOworICAgICAgICAgICAgICAgIGxCcmVh ay5tX3BvcyA9IDA7CiAgICAgICAgICAgICAgICAgbEJyZWFrLm1fbmV4dEJyZWFrYWJsZVBvc2l0 aW9uID0gLTE7CiAgICAgICAgICAgICB9CiAKQEAgLTE3NTksNyArMTc1OSw3IEBAIElubGluZUl0 ZXJhdG9yIFJlbmRlckJsb2NrOjpmaW5kTmV4dExpbmVCcmVhayhJbmxpbmVCaWRpUmVzb2x2ZXIm IHJlc29sdmVyLCBib29sCiAgICAgICAgICAgICAgICAgdyArPSB0bXBXOwogICAgICAgICAgICAg ICAgIHRtcFcgPSAwOwogICAgICAgICAgICAgICAgIGxCcmVhay5tX29iaiA9IG87Ci0gICAgICAg ICAgICAgICAgbEJyZWFrLnBvcyA9IDA7CisgICAgICAgICAgICAgICAgbEJyZWFrLm1fcG9zID0g MDsKICAgICAgICAgICAgICAgICBsQnJlYWsubV9uZXh0QnJlYWthYmxlUG9zaXRpb24gPSAtMTsK ICAgICAgICAgICAgICAgICBBU1NFUlQoIWxlbik7CiAgICAgICAgICAgICB9CkBAIC0xODU3LDcg KzE4NTcsNyBAQCBJbmxpbmVJdGVyYXRvciBSZW5kZXJCbG9jazo6ZmluZE5leHRMaW5lQnJlYWso SW5saW5lQmlkaVJlc29sdmVyJiByZXNvbHZlciwgYm9vbAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGlmICh3ICsgdG1wVyArIGNoYXJXaWR0aCA+IHdpZHRoKSB7CiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGxpbmVXYXNUb29XaWRlID0gdHJ1ZTsKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgbEJyZWFrLm1fb2JqID0gbzsKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgbEJyZWFrLnBvcyA9IHBvczsKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgbEJyZWFrLm1fcG9zID0gcG9zOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBsQnJlYWsubV9uZXh0QnJlYWthYmxlUG9zaXRpb24gPSBuZXh0QnJlYWthYmxlOwogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBza2lwVHJhaWxpbmdXaGl0ZXNwYWNlKGxCcmVhaywg aXNMaW5lRW1wdHksIHByZXZpb3VzTGluZUJyb2tlQ2xlYW5seSk7CiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgfQpAQCAtMTg2OCw3ICsxODY4LDcgQEAgSW5saW5lSXRlcmF0b3IgUmVuZGVy QmxvY2s6OmZpbmROZXh0TGluZUJyZWFrKElubGluZUJpZGlSZXNvbHZlciYgcmVzb2x2ZXIsIGJv b2wKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGh5cGhlbmF0ZWQpCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBnb3RvIGVuZDsKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGxCcmVhay5t X29iaiAmJiBzaG91bGRQcmVzZXJ2ZU5ld2xpbmUobEJyZWFrLm1fb2JqKSAmJiBsQnJlYWsubV9v YmotPmlzVGV4dCgpICYmIHRvUmVuZGVyVGV4dChsQnJlYWsubV9vYmopLT50ZXh0TGVuZ3RoKCkg JiYgIXRvUmVuZGVyVGV4dChsQnJlYWsubV9vYmopLT5pc1dvcmRCcmVhaygpICYmIHRvUmVuZGVy VGV4dChsQnJlYWsubV9vYmopLT5jaGFyYWN0ZXJzKClbbEJyZWFrLnBvc10gPT0gJ1xuJykgewor ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChsQnJlYWsubV9vYmogJiYgc2hvdWxkUHJl c2VydmVOZXdsaW5lKGxCcmVhay5tX29iaikgJiYgbEJyZWFrLm1fb2JqLT5pc1RleHQoKSAmJiB0 b1JlbmRlclRleHQobEJyZWFrLm1fb2JqKS0+dGV4dExlbmd0aCgpICYmICF0b1JlbmRlclRleHQo bEJyZWFrLm1fb2JqKS0+aXNXb3JkQnJlYWsoKSAmJiB0b1JlbmRlclRleHQobEJyZWFrLm1fb2Jq KS0+Y2hhcmFjdGVycygpW2xCcmVhay5tX3Bvc10gPT0gJ1xuJykgewogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBpZiAoIXN0b3BwZWRJZ25vcmluZ1NwYWNlcyAmJiBwb3MgPiAwKSB7 CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBXZSBuZWVkIHRvIHN0b3Ag cmlnaHQgYmVmb3JlIHRoZSBuZXdsaW5lIGFuZCB0aGVuIHN0YXJ0IHVwIGFnYWluLgogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYWRkTWlkcG9pbnQobGluZU1pZHBvaW50U3Rh dGUsIElubGluZUl0ZXJhdG9yKDAsIG8sIHBvcyAtIDEpKTsgLy8gU3RvcApAQCAtMTg3Nyw3ICsx ODc3LDcgQEAgSW5saW5lSXRlcmF0b3IgUmVuZGVyQmxvY2s6OmZpbmROZXh0TGluZUJyZWFrKElu bGluZUJpZGlSZXNvbHZlciYgcmVzb2x2ZXIsIGJvb2wKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgbEJyZWFrLmluY3JlbWVudCgpOwogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBwcmV2aW91c0xpbmVCcm9rZUNsZWFubHkgPSB0cnVlOwogICAgICAgICAgICAgICAgICAg ICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAobEJyZWFrLm1fb2Jq ICYmIGxCcmVhay5wb3MgJiYgbEJyZWFrLm1fb2JqLT5pc1RleHQoKSAmJiB0b1JlbmRlclRleHQo bEJyZWFrLm1fb2JqKS0+dGV4dExlbmd0aCgpICYmIHRvUmVuZGVyVGV4dChsQnJlYWsubV9vYmop LT5jaGFyYWN0ZXJzKClbbEJyZWFrLnBvcyAtIDFdID09IHNvZnRIeXBoZW4gJiYgc3R5bGUtPmh5 cGhlbnMoKSAhPSBIeXBoZW5zTm9uZSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAo bEJyZWFrLm1fb2JqICYmIGxCcmVhay5tX3BvcyAmJiBsQnJlYWsubV9vYmotPmlzVGV4dCgpICYm IHRvUmVuZGVyVGV4dChsQnJlYWsubV9vYmopLT50ZXh0TGVuZ3RoKCkgJiYgdG9SZW5kZXJUZXh0 KGxCcmVhay5tX29iaiktPmNoYXJhY3RlcnMoKVtsQnJlYWsubV9wb3MgLSAxXSA9PSBzb2Z0SHlw aGVuICYmIHN0eWxlLT5oeXBoZW5zKCkgIT0gSHlwaGVuc05vbmUpCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGh5cGhlbmF0ZWQgPSB0cnVlOwogICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGdvdG8gZW5kOyAvLyBEaWRuJ3QgZml0LiBKdW1wIHRvIHRoZSBlbmQuCiAgICAgICAg ICAgICAgICAgICAgICAgICB9IGVsc2UgewpAQCAtMTg5OCw3ICsxODk4LDcgQEAgSW5saW5lSXRl cmF0b3IgUmVuZGVyQmxvY2s6OmZpbmROZXh0TGluZUJyZWFrKElubGluZUJpZGlSZXNvbHZlciYg cmVzb2x2ZXIsIGJvb2wKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhZGRNaWRwb2ludChs aW5lTWlkcG9pbnRTdGF0ZSwgSW5saW5lSXRlcmF0b3IoMCwgbywgcG9zKSk7IC8vIFN0YXJ0CiAg ICAgICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgICAgICAgICBsQnJlYWsu bV9vYmogPSBvOwotICAgICAgICAgICAgICAgICAgICAgICAgbEJyZWFrLnBvcyA9IHBvczsKKyAg ICAgICAgICAgICAgICAgICAgICAgIGxCcmVhay5tX3BvcyA9IHBvczsKICAgICAgICAgICAgICAg ICAgICAgICAgIGxCcmVhay5tX25leHRCcmVha2FibGVQb3NpdGlvbiA9IG5leHRCcmVha2FibGU7 CiAgICAgICAgICAgICAgICAgICAgICAgICBsQnJlYWsuaW5jcmVtZW50KCk7CiAgICAgICAgICAg ICAgICAgICAgICAgICBwcmV2aW91c0xpbmVCcm9rZUNsZWFubHkgPSB0cnVlOwpAQCAtMTkxMCw3 ICsxOTEwLDcgQEAgSW5saW5lSXRlcmF0b3IgUmVuZGVyQmxvY2s6OmZpbmROZXh0TGluZUJyZWFr KElubGluZUJpZGlSZXNvbHZlciYgcmVzb2x2ZXIsIGJvb2wKICAgICAgICAgICAgICAgICAgICAg ICAgIHdyYXBXID0gMDsKICAgICAgICAgICAgICAgICAgICAgICAgIHRtcFcgPSAwOwogICAgICAg ICAgICAgICAgICAgICAgICAgbEJyZWFrLm1fb2JqID0gbzsKLSAgICAgICAgICAgICAgICAgICAg ICAgIGxCcmVhay5wb3MgPSBwb3M7CisgICAgICAgICAgICAgICAgICAgICAgICBsQnJlYWsubV9w b3MgPSBwb3M7CiAgICAgICAgICAgICAgICAgICAgICAgICBsQnJlYWsubV9uZXh0QnJlYWthYmxl UG9zaXRpb24gPSBuZXh0QnJlYWthYmxlOwogICAgICAgICAgICAgICAgICAgICAgICAgLy8gQXV0 by13cmFwcGluZyB0ZXh0IHNob3VsZCBub3Qgd3JhcCBpbiB0aGUgbWlkZGxlIG9mIGEgd29yZCBv bmNlIGl0IGhhcyBoYWQgYW4KICAgICAgICAgICAgICAgICAgICAgICAgIC8vIG9wcG9ydHVuaXR5 IHRvIGJyZWFrIGFmdGVyIGEgd29yZC4KQEAgLTE5MjEsNyArMTkyMSw3IEBAIElubGluZUl0ZXJh dG9yIFJlbmRlckJsb2NrOjpmaW5kTmV4dExpbmVCcmVhayhJbmxpbmVCaWRpUmVzb2x2ZXImIHJl c29sdmVyLCBib29sCiAgICAgICAgICAgICAgICAgICAgICAgICAvLyBSZW1lbWJlciB0aGlzIGFz IGEgYnJlYWthYmxlIHBvc2l0aW9uIGluIGNhc2UKICAgICAgICAgICAgICAgICAgICAgICAgIC8v IGFkZGluZyB0aGUgZW5kIHdpZHRoIGZvcmNlcyBhIGJyZWFrLgogICAgICAgICAgICAgICAgICAg ICAgICAgbEJyZWFrLm1fb2JqID0gbzsKLSAgICAgICAgICAgICAgICAgICAgICAgIGxCcmVhay5w b3MgPSBwb3M7CisgICAgICAgICAgICAgICAgICAgICAgICBsQnJlYWsubV9wb3MgPSBwb3M7CiAg ICAgICAgICAgICAgICAgICAgICAgICBsQnJlYWsubV9uZXh0QnJlYWthYmxlUG9zaXRpb24gPSBu ZXh0QnJlYWthYmxlOwogICAgICAgICAgICAgICAgICAgICAgICAgbWlkV29yZEJyZWFrICY9IChi cmVha1dvcmRzIHx8IGJyZWFrQWxsKTsKICAgICAgICAgICAgICAgICAgICAgfQpAQCAtMTk1NSwx MyArMTk1NSwxMyBAQCBJbmxpbmVJdGVyYXRvciBSZW5kZXJCbG9jazo6ZmluZE5leHRMaW5lQnJl YWsoSW5saW5lQmlkaVJlc29sdmVyJiByZXNvbHZlciwgYm9vbAogCiAgICAgICAgICAgICAgICAg aWYgKGN1cnJlbnRDaGFyYWN0ZXJJc1NwYWNlICYmICFwcmV2aW91c0NoYXJhY3RlcklzU3BhY2Up IHsKICAgICAgICAgICAgICAgICAgICAgaWdub3JlU3RhcnQubV9vYmogPSBvOwotICAgICAgICAg ICAgICAgICAgICBpZ25vcmVTdGFydC5wb3MgPSBwb3M7CisgICAgICAgICAgICAgICAgICAgIGln bm9yZVN0YXJ0Lm1fcG9zID0gcG9zOwogICAgICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAg ICAgIGlmICghY3VycmVudENoYXJhY3RlcklzV1MgJiYgcHJldmlvdXNDaGFyYWN0ZXJJc1dTKSB7 CiAgICAgICAgICAgICAgICAgICAgIGlmIChhdXRvV3JhcCAmJiBvLT5zdHlsZSgpLT5icmVha09u bHlBZnRlcldoaXRlU3BhY2UoKSkgewogICAgICAgICAgICAgICAgICAgICAgICAgbEJyZWFrLm1f b2JqID0gbzsKLSAgICAgICAgICAgICAgICAgICAgICAgIGxCcmVhay5wb3MgPSBwb3M7CisgICAg ICAgICAgICAgICAgICAgICAgICBsQnJlYWsubV9wb3MgPSBwb3M7CiAgICAgICAgICAgICAgICAg ICAgICAgICBsQnJlYWsubV9uZXh0QnJlYWthYmxlUG9zaXRpb24gPSBuZXh0QnJlYWthYmxlOwog ICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgfQpAQCAtMTk4Nyw3ICsxOTg3 LDcgQEAgSW5saW5lSXRlcmF0b3IgUmVuZGVyQmxvY2s6OmZpbmROZXh0TGluZUJyZWFrKElubGlu ZUJpZGlSZXNvbHZlciYgcmVzb2x2ZXIsIGJvb2wKICAgICAgICAgICAgICAgICBpZiAoY2FuSHlw aGVuYXRlKQogICAgICAgICAgICAgICAgICAgICB0cnlIeXBoZW5hdGluZyh0LCBmLCBzdHlsZS0+ bG9jYWxlKCksIHN0eWxlLT5oeXBoZW5hdGlvbkxpbWl0QmVmb3JlKCksIHN0eWxlLT5oeXBoZW5h dGlvbkxpbWl0QWZ0ZXIoKSwgbGFzdFNwYWNlLCBwb3MsIHcgKyB0bXBXIC0gYWRkaXRpb25hbFRt cFcsIHdpZHRoLCBpc0ZpeGVkUGl0Y2gsIGNvbGxhcHNlV2hpdGVTcGFjZSwgbGFzdFNwYWNlV29y ZFNwYWNpbmcsIGxCcmVhaywgbmV4dEJyZWFrYWJsZSwgaHlwaGVuYXRlZCk7CiAgICAgICAgICAg ICAgICAgCi0gICAgICAgICAgICAgICAgaWYgKCFoeXBoZW5hdGVkICYmIGxCcmVhay5tX29iaiAm JiBsQnJlYWsucG9zICYmIGxCcmVhay5tX29iai0+aXNUZXh0KCkgJiYgdG9SZW5kZXJUZXh0KGxC cmVhay5tX29iaiktPnRleHRMZW5ndGgoKSAmJiB0b1JlbmRlclRleHQobEJyZWFrLm1fb2JqKS0+ Y2hhcmFjdGVycygpW2xCcmVhay5wb3MgLSAxXSA9PSBzb2Z0SHlwaGVuICYmIHN0eWxlLT5oeXBo ZW5zKCkgIT0gSHlwaGVuc05vbmUpCisgICAgICAgICAgICAgICAgaWYgKCFoeXBoZW5hdGVkICYm IGxCcmVhay5tX29iaiAmJiBsQnJlYWsubV9wb3MgJiYgbEJyZWFrLm1fb2JqLT5pc1RleHQoKSAm JiB0b1JlbmRlclRleHQobEJyZWFrLm1fb2JqKS0+dGV4dExlbmd0aCgpICYmIHRvUmVuZGVyVGV4 dChsQnJlYWsubV9vYmopLT5jaGFyYWN0ZXJzKClbbEJyZWFrLm1fcG9zIC0gMV0gPT0gc29mdEh5 cGhlbiAmJiBzdHlsZS0+aHlwaGVucygpICE9IEh5cGhlbnNOb25lKQogICAgICAgICAgICAgICAg ICAgICBoeXBoZW5hdGVkID0gdHJ1ZTsKICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAg ICBpZiAoaHlwaGVuYXRlZCkKQEAgLTIwMjYsNyArMjAyNiw3IEBAIElubGluZUl0ZXJhdG9yIFJl bmRlckJsb2NrOjpmaW5kTmV4dExpbmVCcmVhayhJbmxpbmVCaWRpUmVzb2x2ZXImIHJlc29sdmVy LCBib29sCiAgICAgICAgICAgICAgICAgICAgICAgICB3ICs9IHRtcFc7CiAgICAgICAgICAgICAg ICAgICAgICAgICB0bXBXID0gMDsKICAgICAgICAgICAgICAgICAgICAgICAgIGxCcmVhay5tX29i aiA9IG5leHQ7Ci0gICAgICAgICAgICAgICAgICAgICAgICBsQnJlYWsucG9zID0gMDsKKyAgICAg ICAgICAgICAgICAgICAgICAgIGxCcmVhay5tX3BvcyA9IDA7CiAgICAgICAgICAgICAgICAgICAg ICAgICBsQnJlYWsubV9uZXh0QnJlYWthYmxlUG9zaXRpb24gPSAtMTsKICAgICAgICAgICAgICAg ICAgICAgfQogICAgICAgICAgICAgICAgIH0KQEAgLTIwNTgsNyArMjA1OCw3IEBAIElubGluZUl0 ZXJhdG9yIFJlbmRlckJsb2NrOjpmaW5kTmV4dExpbmVCcmVhayhJbmxpbmVCaWRpUmVzb2x2ZXIm IHJlc29sdmVyLCBib29sCiAgICAgICAgICAgICAgICAgdyArPSB0bXBXOwogICAgICAgICAgICAg ICAgIHRtcFcgPSAwOwogICAgICAgICAgICAgICAgIGxCcmVhay5tX29iaiA9IG5leHQ7Ci0gICAg ICAgICAgICAgICAgbEJyZWFrLnBvcyA9IDA7CisgICAgICAgICAgICAgICAgbEJyZWFrLm1fcG9z ID0gMDsKICAgICAgICAgICAgICAgICBsQnJlYWsubV9uZXh0QnJlYWthYmxlUG9zaXRpb24gPSAt MTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQpAQCAtMjA3OCw3ICsyMDc4LDcgQEAgSW5saW5l SXRlcmF0b3IgUmVuZGVyQmxvY2s6OmZpbmROZXh0TGluZUJyZWFrKElubGluZUJpZGlSZXNvbHZl ciYgcmVzb2x2ZXIsIGJvb2wKICAgICAKICAgICBpZiAodyArIHRtcFcgPD0gd2lkdGggfHwgbGFz dFdTID09IE5PV1JBUCkgewogICAgICAgICBsQnJlYWsubV9vYmogPSAwOwotICAgICAgICBsQnJl YWsucG9zID0gMDsKKyAgICAgICAgbEJyZWFrLm1fcG9zID0gMDsKICAgICAgICAgbEJyZWFrLm1f bmV4dEJyZWFrYWJsZVBvc2l0aW9uID0gLTE7CiAgICAgfQogCkBAIC0yMDg5LDEwICsyMDg5LDEw IEBAIElubGluZUl0ZXJhdG9yIFJlbmRlckJsb2NrOjpmaW5kTmV4dExpbmVCcmVhayhJbmxpbmVC aWRpUmVzb2x2ZXImIHJlc29sdmVyLCBib29sCiAgICAgICAgICAgICAvLyBGSVhNRTogRG9uJ3Qg cmVhbGx5IHVuZGVyc3RhbmQgdGhpcyBjYXNlLgogICAgICAgICAgICAgaWYgKHBvcyAhPSAwKSB7 CiAgICAgICAgICAgICAgICAgbEJyZWFrLm1fb2JqID0gbzsKLSAgICAgICAgICAgICAgICBsQnJl YWsucG9zID0gcG9zIC0gMTsKKyAgICAgICAgICAgICAgICBsQnJlYWsubV9wb3MgPSBwb3MgLSAx OwogICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgICBsQnJlYWsubV9vYmogPSBs YXN0OwotICAgICAgICAgICAgICAgIGxCcmVhay5wb3MgPSBsYXN0LT5pc1RleHQoKSA/IGxhc3Qt Pmxlbmd0aCgpIDogMDsKKyAgICAgICAgICAgICAgICBsQnJlYWsubV9wb3MgPSBsYXN0LT5pc1Rl eHQoKSA/IGxhc3QtPmxlbmd0aCgpIDogMDsKICAgICAgICAgICAgICAgICBsQnJlYWsubV9uZXh0 QnJlYWthYmxlUG9zaXRpb24gPSAtMTsKICAgICAgICAgICAgIH0KICAgICAgICAgfSBlbHNlIGlm IChsQnJlYWsubV9vYmopIHsKQEAgLTIxMDAsNyArMjEwMCw3IEBAIElubGluZUl0ZXJhdG9yIFJl bmRlckJsb2NrOjpmaW5kTmV4dExpbmVCcmVhayhJbmxpbmVCaWRpUmVzb2x2ZXImIHJlc29sdmVy LCBib29sCiAgICAgICAgICAgICAvLyBUaGVyZSdzIG5vIHJvb20gYXQgYWxsLiBXZSBqdXN0IGhh dmUgdG8gYmUgb24gdGhpcyBsaW5lLAogICAgICAgICAgICAgLy8gZXZlbiB0aG91Z2ggd2UnbGwg c3BpbGwgb3V0LgogICAgICAgICAgICAgbEJyZWFrLm1fb2JqID0gbzsKLSAgICAgICAgICAgIGxC cmVhay5wb3MgPSBwb3M7CisgICAgICAgICAgICBsQnJlYWsubV9wb3MgPSBwb3M7CiAgICAgICAg ICAgICBsQnJlYWsubV9uZXh0QnJlYWthYmxlUG9zaXRpb24gPSAtMTsKICAgICAgICAgfQogICAg IH0KQEAgLTIxMjEsNyArMjEyMSw3IEBAIElubGluZUl0ZXJhdG9yIFJlbmRlckJsb2NrOjpmaW5k TmV4dExpbmVCcmVhayhJbmxpbmVCaWRpUmVzb2x2ZXImIHJlc29sdmVyLCBib29sCiAgICAgICAg ICAgICBpbnQgdHJhaWxpbmdTcGFjZU1pZHBvaW50ID0gbGluZU1pZHBvaW50U3RhdGUubnVtTWlk cG9pbnRzIC0gMTsKICAgICAgICAgICAgIGZvciAoIDsgdHJhaWxpbmdTcGFjZU1pZHBvaW50ID49 IDAgJiYgbGluZU1pZHBvaW50U3RhdGUubWlkcG9pbnRzW3RyYWlsaW5nU3BhY2VNaWRwb2ludF0u bV9vYmogIT0gdHJhaWxpbmdTcGFjZU9iamVjdDsgLS10cmFpbGluZ1NwYWNlTWlkcG9pbnQpIHsg fQogICAgICAgICAgICAgQVNTRVJUKHRyYWlsaW5nU3BhY2VNaWRwb2ludCA+PSAwKTsKLSAgICAg ICAgICAgIGxpbmVNaWRwb2ludFN0YXRlLm1pZHBvaW50c1t0cmFpbGluZ1NwYWNlTWlkcG9pbnRd LnBvcy0tOworICAgICAgICAgICAgbGluZU1pZHBvaW50U3RhdGUubWlkcG9pbnRzW3RyYWlsaW5n U3BhY2VNaWRwb2ludF0ubV9wb3MtLTsKIAogICAgICAgICAgICAgLy8gTm93IG1ha2Ugc3VyZSBl dmVyeSBzaW5nbGUgdHJhaWxpbmdQb3NpdGlvbmVkQm94IGZvbGxvd2luZyB0aGUgdHJhaWxpbmdT cGFjZU1pZHBvaW50IHByb3Blcmx5IHN0b3BzIGFuZCBzdGFydHMgCiAgICAgICAgICAgICAvLyBp Z25vcmluZyBzcGFjZXMuCkBAIC0yMTQ3LDcgKzIxNDcsNyBAQCBJbmxpbmVJdGVyYXRvciBSZW5k ZXJCbG9jazo6ZmluZE5leHRMaW5lQnJlYWsoSW5saW5lQmlkaVJlc29sdmVyJiByZXNvbHZlciwg Ym9vbAogICAgICAgICAgICAgYWRkTWlkcG9pbnQobGluZU1pZHBvaW50U3RhdGUsIGVuZE1pZCk7 CiAgICAgICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHRyYWlsaW5nUG9zaXRpb25lZEJv eGVzLnNpemUoKTsgKytpKSB7CiAgICAgICAgICAgICAgICAgaWdub3JlU3RhcnQubV9vYmogPSB0 cmFpbGluZ1Bvc2l0aW9uZWRCb3hlc1tpXTsKLSAgICAgICAgICAgICAgICBpZ25vcmVTdGFydC5w b3MgPSAwOworICAgICAgICAgICAgICAgIGlnbm9yZVN0YXJ0Lm1fcG9zID0gMDsKICAgICAgICAg ICAgICAgICBhZGRNaWRwb2ludChsaW5lTWlkcG9pbnRTdGF0ZSwgaWdub3JlU3RhcnQpOyAvLyBT dG9wIGlnbm9yaW5nIHNwYWNlcy4KICAgICAgICAgICAgICAgICBhZGRNaWRwb2ludChsaW5lTWlk cG9pbnRTdGF0ZSwgaWdub3JlU3RhcnQpOyAvLyBTdGFydCBpZ25vcmluZyBhZ2Fpbi4KICAgICAg ICAgICAgIH0KQEAgLTIxNTgsOCArMjE1OCw4IEBAIElubGluZUl0ZXJhdG9yIFJlbmRlckJsb2Nr OjpmaW5kTmV4dExpbmVCcmVhayhJbmxpbmVCaWRpUmVzb2x2ZXImIHJlc29sdmVyLCBib29sCiAg ICAgLy8gb2YgdGhlIG9iamVjdC4gRG8gdGhpcyBhZGp1c3RtZW50IHRvIG1ha2UgaXQgcG9pbnQg dG8gdGhlIHN0YXJ0CiAgICAgLy8gb2YgdGhlIG5leHQgb2JqZWN0IGluc3RlYWQgdG8gYXZvaWQg Y29uZnVzaW5nIHRoZSByZXN0IG9mIHRoZQogICAgIC8vIGNvZGUuCi0gICAgaWYgKGxCcmVhay5w b3MgPiAwKSB7Ci0gICAgICAgIGxCcmVhay5wb3MtLTsKKyAgICBpZiAobEJyZWFrLm1fcG9zID4g MCkgeworICAgICAgICBsQnJlYWsubV9wb3MtLTsKICAgICAgICAgbEJyZWFrLmluY3JlbWVudCgp OwogICAgIH0KIAo=