41722 2010-07-06 16:54:37 -0700 Make it possible to have both the JIT and Interpreter available in a single build 2010-07-06 18:36:14 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 oliver oliver oldest_to_newest 247236 0 oliver 2010-07-06 16:54:37 -0700 Make it possible to have both the JIT and Interpreter available in a single build 247242 1 60663 oliver 2010-07-06 17:25:09 -0700 Created attachment 60663 Patch 247248 2 60663 mjs 2010-07-06 17:50:51 -0700 Comment on attachment 60663 Patch r=me 247262 3 oliver 2010-07-06 18:36:14 -0700 Committed r62612: <http://trac.webkit.org/changeset/62612> 60663 2010-07-06 17:25:09 -0700 2010-07-06 17:50:51 -0700 Patch bug-41722-20100706172507.patch text/plain 31797 oliver ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCBjMzBkZDdmMjYyOTI5NjE4MjljZDMyOTAwMWU5NDY2ZmE4MjhlYWYwLi5j NzA1ZmUxZTNjMjVkMWM3OTExNmM4ZGM1NjcyNGY5MjBiODQxNTBiIDEwMDY0NAotLS0gYS9KYXZh U2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsNTUgQEAKKzIwMTAtMDctMDYgIE9saXZlciBIdW50ICA8b2xpdmVyQGFwcGxlLmNvbT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIGl0 IHBvc3NpYmxlIHRvIGhhdmUgYm90aCB0aGUgSklUIGFuZCBJbnRlcnByZXRlciBhdmFpbGFibGUg aW4gYSBzaW5nbGUgYnVpbGQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTQxNzIyCisKKyAgICAgICAgU2VwYXJhdGUgdGhlIGNvbmNlcHQgb2YgIUVOQUJM RShKSVQpIGFuZCBFTkFCTEUoSU5URVJQUkVURVIpIGFuZCBtYWtlIGl0IHBvc3NpYmxlCisgICAg ICAgIHRvIGhhdmUgYm90aCBKSVQgYW5kIElOVEVSUFJFVEVSIGVuYWJsZWQgYXQgdGhlIHNhbWUg dGltZS4gIFRoaXMgZG9lc24ndCBhZGQKKyAgICAgICAgc3VwcG9ydCBmb3IgbWl4IG1vZGUgZXhl Y3V0aW9uLCBidXQgaXQgZG9lcyBhbGxvdyBhIHNpbmdsZSBidWlsZCB0byBjb250YWluIGFsbAor ICAgICAgICB0aGUgY29kZSBuZWVkZWQgdG8gdXNlIGVpdGhlciB0aGUgaW50ZXJwcmV0ZXIgb3Ig dGhlIGppdC4KKworICAgICAgICBJZiBib3RoIEVOQUJMRShJTlRFUlBSRVRFUikgYW5kIEVOQUJM RShKSVQpIGFyZSB0cnVlIHRoZW4gc2V0dGluZyB0aGUgZW52aXJvbm1lbnQKKyAgICAgICAgdmFy aWFibGUgSlNDX0ZPUkNFX0lOVEVSUFJFVEVSIHdpbGwgZm9yY2UgSlNDIHRvIHVzZSB0aGUgaW50 ZXJwcmV0ZXIuCisKKyAgICAgICAgVGhpcyBwYXRjaCBiYXNpY2FsbHkgY29uc2lzdHMgb2YgcmVw bGFjaW5nICFFTkFCTEUoSklUKSB3aXRoIEVOQUJMRShJTlRFUlBSRVRFUiksCisgICAgICAgIG9y IGNvbnZlcnRpbmcgI2lmIEVOQUJMRShKSVQpIC4uLiAjZWxzZSAuLi4gaW50byAjaWYgRU5BQkxF KEpJVCkgLi4uICNlbmRpZgorICAgICAgICAjaWYgRU5BQkxFKElOVEVSUFJFVEVSKSwgZXRjLiAg VGhlcmUgYXJlIGFsc28gYSBmZXcgZnVuY3Rpb25zIHRoYXQgbmVlZCB0byBiZQorICAgICAgICBy ZW5hbWVkIHRvIHJlc29sdmUgcmV0dXJuIHR5cGUgYW1iaWd1aXR5LgorCisgICAgICAgICogYnl0 ZWNvZGUvQ29kZUJsb2NrLmNwcDoKKyAgICAgICAgKEpTQzo6Q29kZUJsb2NrOjp+Q29kZUJsb2Nr KToKKyAgICAgICAgKEpTQzo6Q29kZUJsb2NrOjpzaHJpbmtUb0ZpdCk6CisgICAgICAgICogYnl0 ZWNvZGUvQ29kZUJsb2NrLmg6CisgICAgICAgICogaW50ZXJwcmV0ZXIvQ2FsbEZyYW1lLmg6Cisg ICAgICAgIChKU0M6OkV4ZWNTdGF0ZTo6cmV0dXJuVlBDKToKKyAgICAgICAgKiBpbnRlcnByZXRl ci9JbnRlcnByZXRlci5jcHA6CisgICAgICAgIChKU0M6OkludGVycHJldGVyOjp1bndpbmRDYWxs RnJhbWUpOgorICAgICAgICAoSlNDOjpJbnRlcnByZXRlcjo6dGhyb3dFeGNlcHRpb24pOgorICAg ICAgICAoSlNDOjpJbnRlcnByZXRlcjo6ZXhlY3V0ZSk6CisgICAgICAgIChKU0M6OkludGVycHJl dGVyOjpleGVjdXRlQ2FsbCk6CisgICAgICAgIChKU0M6OkludGVycHJldGVyOjpleGVjdXRlQ29u c3RydWN0KToKKyAgICAgICAgKEpTQzo6SW50ZXJwcmV0ZXI6OnByZXBhcmVGb3JSZXBlYXRDYWxs KToKKyAgICAgICAgKEpTQzo6SW50ZXJwcmV0ZXI6OnByaXZhdGVFeGVjdXRlKToKKyAgICAgICAg KEpTQzo6SW50ZXJwcmV0ZXI6OnJldHJpZXZlTGFzdENhbGxlcik6CisgICAgICAgICogaW50ZXJw cmV0ZXIvSW50ZXJwcmV0ZXIuaDoKKyAgICAgICAgKiBydW50aW1lL0FycmF5UHJvdG90eXBlLmNw cDoKKyAgICAgICAgKEpTQzo6aXNOdW1lcmljQ29tcGFyZUZ1bmN0aW9uKToKKyAgICAgICAgKiBy dW50aW1lL0V4ZWN1dGFibGUuY3BwOgorICAgICAgICAoSlNDOjpFdmFsRXhlY3V0YWJsZTo6Z2Vu ZXJhdGVKSVRDb2RlKToKKyAgICAgICAgKEpTQzo6UHJvZ3JhbUV4ZWN1dGFibGU6OmdlbmVyYXRl SklUQ29kZSk6CisgICAgICAgIChKU0M6OkZ1bmN0aW9uRXhlY3V0YWJsZTo6Z2VuZXJhdGVKSVRD b2RlRm9yQ2FsbCk6CisgICAgICAgIChKU0M6OkZ1bmN0aW9uRXhlY3V0YWJsZTo6Z2VuZXJhdGVK SVRDb2RlRm9yQ29uc3RydWN0KToKKyAgICAgICAgKEpTQzo6RnVuY3Rpb25FeGVjdXRhYmxlOjpy ZXBhcnNlRXhjZXB0aW9uSW5mbyk6CisgICAgICAgIChKU0M6OkV2YWxFeGVjdXRhYmxlOjpyZXBh cnNlRXhjZXB0aW9uSW5mbyk6CisgICAgICAgICogcnVudGltZS9KU0Z1bmN0aW9uLmNwcDoKKyAg ICAgICAgKiBydW50aW1lL0pTR2xvYmFsRGF0YS5jcHA6CisgICAgICAgIChKU0M6OkpTR2xvYmFs RGF0YTo6SlNHbG9iYWxEYXRhKToKKyAgICAgICAgKiBydW50aW1lL0pTR2xvYmFsRGF0YS5oOgor ICAgICAgICAoSlNDOjpKU0dsb2JhbERhdGE6OmNhblVzZUpJVCk6CisgICAgICAgICogd3RmL1Bs YXRmb3JtLmg6CisKIDIwMTAtMDctMDYgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgog CiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gQmFydGguCmRpZmYgLS1naXQgYS9KYXZhU2NyaXB0 Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suY3BwIGIvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29k ZUJsb2NrLmNwcAppbmRleCBmNjg1NzYxZTdmNDhhOTJkNzdjM2ZlOWEwMGFjZjgxYWM4OWY2YmQ0 Li5mMzhmN2Y0MzM1MDQ0OGZmMTgyYjAyNjE1YjgwN2NkYWQyNDViOGUzIDEwMDY0NAotLS0gYS9K YXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suY3BwCisrKyBiL0phdmFTY3JpcHRDb3Jl L2J5dGVjb2RlL0NvZGVCbG9jay5jcHAKQEAgLTEzNzMsMTMgKzEzNzMsMTQgQEAgQ29kZUJsb2Nr OjpDb2RlQmxvY2soU2NyaXB0RXhlY3V0YWJsZSogb3duZXJFeGVjdXRhYmxlLCBDb2RlVHlwZSBj b2RlVHlwZSwgUGFzc1IKIAogQ29kZUJsb2NrOjp+Q29kZUJsb2NrKCkKIHsKLSNpZiAhRU5BQkxF KEpJVCkKKyNpZiBFTkFCTEUoSU5URVJQUkVURVIpCiAgICAgZm9yIChzaXplX3Qgc2l6ZSA9IG1f Z2xvYmFsUmVzb2x2ZUluc3RydWN0aW9ucy5zaXplKCksIGkgPSAwOyBpIDwgc2l6ZTsgKytpKQog ICAgICAgICBkZXJlZlN0cnVjdHVyZXMoJm1faW5zdHJ1Y3Rpb25zW21fZ2xvYmFsUmVzb2x2ZUlu c3RydWN0aW9uc1tpXV0pOwogCiAgICAgZm9yIChzaXplX3Qgc2l6ZSA9IG1fcHJvcGVydHlBY2Nl c3NJbnN0cnVjdGlvbnMuc2l6ZSgpLCBpID0gMDsgaSA8IHNpemU7ICsraSkKICAgICAgICAgZGVy ZWZTdHJ1Y3R1cmVzKCZtX2luc3RydWN0aW9uc1ttX3Byb3BlcnR5QWNjZXNzSW5zdHJ1Y3Rpb25z W2ldXSk7Ci0jZWxzZQorI2VuZGlmCisjaWYgRU5BQkxFKEpJVCkKICAgICBmb3IgKHNpemVfdCBz aXplID0gbV9nbG9iYWxSZXNvbHZlSW5mb3Muc2l6ZSgpLCBpID0gMDsgaSA8IHNpemU7ICsraSkg ewogICAgICAgICBpZiAobV9nbG9iYWxSZXNvbHZlSW5mb3NbaV0uc3RydWN0dXJlKQogICAgICAg ICAgICAgbV9nbG9iYWxSZXNvbHZlSW5mb3NbaV0uc3RydWN0dXJlLT5kZXJlZigpOwpAQCAtMTQw Nyw3ICsxNDA4LDcgQEAgQ29kZUJsb2NrOjp+Q29kZUJsb2NrKCkKICAgICB1bmxpbmtDYWxsZXJz KCk7CiAjZW5kaWYKIAotI2VuZGlmIC8vICFFTkFCTEUoSklUKQorI2VuZGlmIC8vIEVOQUJMRShK SVQpCiAKICNpZiBEVU1QX0NPREVfQkxPQ0tfU1RBVElTVElDUwogICAgIGxpdmVDb2RlQmxvY2tT ZXQucmVtb3ZlKHRoaXMpOwpAQCAtMTY2OSw3ICsxNjcwLDcgQEAgYm9vbCBDb2RlQmxvY2s6OmZ1 bmN0aW9uUmVnaXN0ZXJGb3JCeXRlY29kZU9mZnNldCh1bnNpZ25lZCBieXRlY29kZU9mZnNldCwg aW50JgogfQogI2VuZGlmCiAKLSNpZiAhRU5BQkxFKEpJVCkKKyNpZiBFTkFCTEUoSU5URVJQUkVU RVIpCiBib29sIENvZGVCbG9jazo6aGFzR2xvYmFsUmVzb2x2ZUluc3RydWN0aW9uQXRCeXRlY29k ZU9mZnNldCh1bnNpZ25lZCBieXRlY29kZU9mZnNldCkKIHsKICAgICBpZiAobV9nbG9iYWxSZXNv bHZlSW5zdHJ1Y3Rpb25zLmlzRW1wdHkoKSkKQEAgLTE2ODksNyArMTY5MCw4IEBAIGJvb2wgQ29k ZUJsb2NrOjpoYXNHbG9iYWxSZXNvbHZlSW5zdHJ1Y3Rpb25BdEJ5dGVjb2RlT2Zmc2V0KHVuc2ln bmVkIGJ5dGVjb2RlT2ZmCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICByZXR1cm4gdHJ1ZTsK IH0KLSNlbHNlCisjZW5kaWYKKyNpZiBFTkFCTEUoSklUKQogYm9vbCBDb2RlQmxvY2s6Omhhc0ds b2JhbFJlc29sdmVJbmZvQXRCeXRlY29kZU9mZnNldCh1bnNpZ25lZCBieXRlY29kZU9mZnNldCkK IHsKICAgICBpZiAobV9nbG9iYWxSZXNvbHZlSW5mb3MuaXNFbXB0eSgpKQpAQCAtMTcxNSwxMCAr MTcxNywxMSBAQCB2b2lkIENvZGVCbG9jazo6c2hyaW5rVG9GaXQoKQogewogICAgIG1faW5zdHJ1 Y3Rpb25zLnNocmlua1RvRml0KCk7CiAKLSNpZiAhRU5BQkxFKEpJVCkKKyNpZiBFTkFCTEUoSU5U RVJQUkVURVIpCiAgICAgbV9wcm9wZXJ0eUFjY2Vzc0luc3RydWN0aW9ucy5zaHJpbmtUb0ZpdCgp OwogICAgIG1fZ2xvYmFsUmVzb2x2ZUluc3RydWN0aW9ucy5zaHJpbmtUb0ZpdCgpOwotI2Vsc2UK KyNlbmRpZgorI2lmIEVOQUJMRShKSVQpCiAgICAgbV9zdHJ1Y3R1cmVTdHViSW5mb3Muc2hyaW5r VG9GaXQoKTsKICAgICBtX2dsb2JhbFJlc29sdmVJbmZvcy5zaHJpbmtUb0ZpdCgpOwogICAgIG1f Y2FsbExpbmtJbmZvcy5zaHJpbmtUb0ZpdCgpOwpkaWZmIC0tZ2l0IGEvSmF2YVNjcmlwdENvcmUv Ynl0ZWNvZGUvQ29kZUJsb2NrLmggYi9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2su aAppbmRleCAzNjM4MDcwOTQyYmIzNzYyNzU3YWJmMjk1OWEzODg0YmYyMDEwOTA1Li43MDBhMWQz ZDkwZTkzODNjYjZhYWQ2ZjRhZjMzMzE2MGVmYzc2NjI2IDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0 Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suaAorKysgYi9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9D b2RlQmxvY2suaApAQCAtMzU4LDcgKzM1OCw4IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICB9 CiAgICAgICAgIAogICAgICAgICBib29sIGZ1bmN0aW9uUmVnaXN0ZXJGb3JCeXRlY29kZU9mZnNl dCh1bnNpZ25lZCBieXRlY29kZU9mZnNldCwgaW50JiBmdW5jdGlvblJlZ2lzdGVySW5kZXgpOwot I2Vsc2UKKyNlbmRpZgorI2lmIEVOQUJMRShJTlRFUlBSRVRFUikKICAgICAgICAgdW5zaWduZWQg Ynl0ZWNvZGVPZmZzZXQoQ2FsbEZyYW1lKiwgSW5zdHJ1Y3Rpb24qIHJldHVybkFkZHJlc3MpCiAg ICAgICAgIHsKICAgICAgICAgICAgIHJldHVybiBzdGF0aWNfY2FzdDxJbnN0cnVjdGlvbio+KHJl dHVybkFkZHJlc3MpIC0gaW5zdHJ1Y3Rpb25zKCkuYmVnaW4oKTsKQEAgLTQxNiwxMSArNDE3LDEy IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICB1bnNpZ25lZCBqdW1wVGFyZ2V0KGludCBpbmRl eCkgY29uc3QgeyByZXR1cm4gbV9qdW1wVGFyZ2V0c1tpbmRleF07IH0KICAgICAgICAgdW5zaWdu ZWQgbGFzdEp1bXBUYXJnZXQoKSBjb25zdCB7IHJldHVybiBtX2p1bXBUYXJnZXRzLmxhc3QoKTsg fQogCi0jaWYgIUVOQUJMRShKSVQpCisjaWYgRU5BQkxFKElOVEVSUFJFVEVSKQogICAgICAgICB2 b2lkIGFkZFByb3BlcnR5QWNjZXNzSW5zdHJ1Y3Rpb24odW5zaWduZWQgcHJvcGVydHlBY2Nlc3NJ bnN0cnVjdGlvbikgeyBtX3Byb3BlcnR5QWNjZXNzSW5zdHJ1Y3Rpb25zLmFwcGVuZChwcm9wZXJ0 eUFjY2Vzc0luc3RydWN0aW9uKTsgfQogICAgICAgICB2b2lkIGFkZEdsb2JhbFJlc29sdmVJbnN0 cnVjdGlvbih1bnNpZ25lZCBnbG9iYWxSZXNvbHZlSW5zdHJ1Y3Rpb24pIHsgbV9nbG9iYWxSZXNv bHZlSW5zdHJ1Y3Rpb25zLmFwcGVuZChnbG9iYWxSZXNvbHZlSW5zdHJ1Y3Rpb24pOyB9CiAgICAg ICAgIGJvb2wgaGFzR2xvYmFsUmVzb2x2ZUluc3RydWN0aW9uQXRCeXRlY29kZU9mZnNldCh1bnNp Z25lZCBieXRlY29kZU9mZnNldCk7Ci0jZWxzZQorI2VuZGlmCisjaWYgRU5BQkxFKEpJVCkKICAg ICAgICAgc2l6ZV90IG51bWJlck9mU3RydWN0dXJlU3R1YkluZm9zKCkgY29uc3QgeyByZXR1cm4g bV9zdHJ1Y3R1cmVTdHViSW5mb3Muc2l6ZSgpOyB9CiAgICAgICAgIHZvaWQgYWRkU3RydWN0dXJl U3R1YkluZm8oY29uc3QgU3RydWN0dXJlU3R1YkluZm8mIHN0dWJJbmZvKSB7IG1fc3RydWN0dXJl U3R1YkluZm9zLmFwcGVuZChzdHViSW5mbyk7IH0KICAgICAgICAgU3RydWN0dXJlU3R1YkluZm8m IHN0cnVjdHVyZVN0dWJJbmZvKGludCBpbmRleCkgeyByZXR1cm4gbV9zdHJ1Y3R1cmVTdHViSW5m b3NbaW5kZXhdOyB9CkBAIC01NTEsMTAgKzU1MywxMSBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAg ICAgUmVmUHRyPFNvdXJjZVByb3ZpZGVyPiBtX3NvdXJjZTsKICAgICAgICAgdW5zaWduZWQgbV9z b3VyY2VPZmZzZXQ7CiAKLSNpZiAhRU5BQkxFKEpJVCkKKyNpZiBFTkFCTEUoSU5URVJQUkVURVIp CiAgICAgICAgIFZlY3Rvcjx1bnNpZ25lZD4gbV9wcm9wZXJ0eUFjY2Vzc0luc3RydWN0aW9uczsK ICAgICAgICAgVmVjdG9yPHVuc2lnbmVkPiBtX2dsb2JhbFJlc29sdmVJbnN0cnVjdGlvbnM7Ci0j ZWxzZQorI2VuZGlmCisjaWYgRU5BQkxFKEpJVCkKICAgICAgICAgVmVjdG9yPFN0cnVjdHVyZVN0 dWJJbmZvPiBtX3N0cnVjdHVyZVN0dWJJbmZvczsKICAgICAgICAgVmVjdG9yPEdsb2JhbFJlc29s dmVJbmZvPiBtX2dsb2JhbFJlc29sdmVJbmZvczsKICAgICAgICAgVmVjdG9yPENhbGxMaW5rSW5m bz4gbV9jYWxsTGlua0luZm9zOwpkaWZmIC0tZ2l0IGEvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0 ZXIvQ2FsbEZyYW1lLmggYi9KYXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9DYWxsRnJhbWUuaApp bmRleCA3ZWE1OWZiNTY4Y2MzM2JhZGVmY2NkNmM2NWU5MjIyYmJjZWY4YmJhLi5iZGU5Nzg2MTJi NWMzYzUyNmY5MDhhMWQ0ZGU5YjI4NzY4NjAxYjAxIDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29y ZS9pbnRlcnByZXRlci9DYWxsRnJhbWUuaAorKysgYi9KYXZhU2NyaXB0Q29yZS9pbnRlcnByZXRl ci9DYWxsRnJhbWUuaApAQCAtMTA2LDggKzEwNiw5IEBAIG5hbWVzcGFjZSBKU0MgIHsKICAgICAg ICAgQ2FsbEZyYW1lKiBjYWxsZXJGcmFtZSgpIGNvbnN0IHsgcmV0dXJuIHRoaXNbUmVnaXN0ZXJG aWxlOjpDYWxsZXJGcmFtZV0uY2FsbEZyYW1lKCk7IH0KICNpZiBFTkFCTEUoSklUKQogICAgICAg ICBSZXR1cm5BZGRyZXNzUHRyIHJldHVyblBDKCkgY29uc3QgeyByZXR1cm4gUmV0dXJuQWRkcmVz c1B0cih0aGlzW1JlZ2lzdGVyRmlsZTo6UmV0dXJuUENdLnZQQygpKTsgfQotI2Vsc2UKLSAgICAg ICAgSW5zdHJ1Y3Rpb24qIHJldHVyblBDKCkgY29uc3QgeyByZXR1cm4gdGhpc1tSZWdpc3RlckZp bGU6OlJldHVyblBDXS52UEMoKTsgfQorI2VuZGlmCisjaWYgRU5BQkxFKElOVEVSUFJFVEVSKQor ICAgICAgICBJbnN0cnVjdGlvbiogcmV0dXJuVlBDKCkgY29uc3QgeyByZXR1cm4gdGhpc1tSZWdp c3RlckZpbGU6OlJldHVyblBDXS52UEMoKTsgfQogI2VuZGlmCiAKICAgICAgICAgdm9pZCBzZXRD YWxsZXJGcmFtZShDYWxsRnJhbWUqIGNhbGxlckZyYW1lKSB7IHN0YXRpY19jYXN0PFJlZ2lzdGVy Kj4odGhpcylbUmVnaXN0ZXJGaWxlOjpDYWxsZXJGcmFtZV0gPSBjYWxsZXJGcmFtZTsgfQpkaWZm IC0tZ2l0IGEvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvSW50ZXJwcmV0ZXIuY3BwIGIvSmF2 YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvSW50ZXJwcmV0ZXIuY3BwCmluZGV4IDgxNjAyNDk3MGZk MDQxMDM1OTUzNWNjOWRlNmNkZGEwNTU3MzMwNDYuLjg5ODk2Njk3NWQ2Yzk0NzlhNzA3MmEwZjlm OWI1M2Y3MmE1ODdhYWIgMTAwNjQ0Ci0tLSBhL0phdmFTY3JpcHRDb3JlL2ludGVycHJldGVyL0lu dGVycHJldGVyLmNwcAorKysgYi9KYXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9JbnRlcnByZXRl ci5jcHAKQEAgLTc5LDcgKzc5LDcgQEAgc3RhdGljIGludCBkZXB0aChDb2RlQmxvY2sqIGNvZGVC bG9jaywgU2NvcGVDaGFpbiYgc2MpCiAgICAgcmV0dXJuIHNjLmxvY2FsRGVwdGgoKTsKIH0KIAot I2lmICFFTkFCTEUoSklUKQorI2lmIEVOQUJMRShJTlRFUlBSRVRFUikgCiBORVZFUl9JTkxJTkUg Ym9vbCBJbnRlcnByZXRlcjo6cmVzb2x2ZShDYWxsRnJhbWUqIGNhbGxGcmFtZSwgSW5zdHJ1Y3Rp b24qIHZQQywgSlNWYWx1ZSYgZXhjZXB0aW9uVmFsdWUpCiB7CiAgICAgaW50IGRzdCA9IHZQQ1sx XS51Lm9wZXJhbmQ7CkBAIC0yOTQsNyArMjk0LDcgQEAgTkVWRVJfSU5MSU5FIGJvb2wgSW50ZXJw cmV0ZXI6OnJlc29sdmVCYXNlQW5kUHJvcGVydHkoQ2FsbEZyYW1lKiBjYWxsRnJhbWUsIEluc3QK ICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLSNlbmRpZiAvLyAhRU5BQkxFKEpJVCkKKyNlbmRpZiAv LyBFTkFCTEUoSU5URVJQUkVURVIpCiAKIEFMV0FZU19JTkxJTkUgQ2FsbEZyYW1lKiBJbnRlcnBy ZXRlcjo6c2xpZGVSZWdpc3RlcldpbmRvd0ZvckNhbGwoQ29kZUJsb2NrKiBuZXdDb2RlQmxvY2ss IFJlZ2lzdGVyRmlsZSogcmVnaXN0ZXJGaWxlLCBDYWxsRnJhbWUqIGNhbGxGcmFtZSwgc2l6ZV90 IHJlZ2lzdGVyT2Zmc2V0LCBpbnQgYXJnYykKIHsKQEAgLTMzMyw3ICszMzMsNyBAQCBBTFdBWVNf SU5MSU5FIENhbGxGcmFtZSogSW50ZXJwcmV0ZXI6OnNsaWRlUmVnaXN0ZXJXaW5kb3dGb3JDYWxs KENvZGVCbG9jayogbmV3QwogICAgIHJldHVybiBDYWxsRnJhbWU6OmNyZWF0ZShyKTsKIH0KIAot I2lmICFFTkFCTEUoSklUKQorI2lmIEVOQUJMRShJTlRFUlBSRVRFUikKIHN0YXRpYyBORVZFUl9J TkxJTkUgYm9vbCBpc0ludmFsaWRQYXJhbUZvckluKENhbGxGcmFtZSogY2FsbEZyYW1lLCBDb2Rl QmxvY2sqIGNvZGVCbG9jaywgY29uc3QgSW5zdHJ1Y3Rpb24qIHZQQywgSlNWYWx1ZSB2YWx1ZSwg SlNWYWx1ZSYgZXhjZXB0aW9uRGF0YSkKIHsKICAgICBpZiAodmFsdWUuaXNPYmplY3QoKSkKQEAg LTU0Nyw3ICs1NDcsMTggQEAgTkVWRVJfSU5MSU5FIGJvb2wgSW50ZXJwcmV0ZXI6OnVud2luZENh bGxGcmFtZShDYWxsRnJhbWUqJiBjYWxsRnJhbWUsIEpTVmFsdWUgZXgKICAgICAgICAgcmV0dXJu IGZhbHNlOwogCiAgICAgY29kZUJsb2NrID0gY2FsbGVyRnJhbWUtPmNvZGVCbG9jaygpOwotICAg IGJ5dGVjb2RlT2Zmc2V0ID0gY29kZUJsb2NrLT5ieXRlY29kZU9mZnNldChjYWxsZXJGcmFtZSwg Y2FsbEZyYW1lLT5yZXR1cm5QQygpKTsKKyNpZiBFTkFCTEUoSklUKQorI2lmIEVOQUJMRShJTlRF UlBSRVRFUikKKyAgICBpZiAoY2FsbGVyRnJhbWUtPmdsb2JhbERhdGEoKS5jYW5Vc2VKSVQoKSkK KyNlbmRpZgorICAgICAgICBieXRlY29kZU9mZnNldCA9IGNvZGVCbG9jay0+Ynl0ZWNvZGVPZmZz ZXQoY2FsbGVyRnJhbWUsIGNhbGxGcmFtZS0+cmV0dXJuUEMoKSk7CisjaWYgRU5BQkxFKElOVEVS UFJFVEVSKQorICAgIGVsc2UKKyAgICAgICAgYnl0ZWNvZGVPZmZzZXQgPSBjb2RlQmxvY2stPmJ5 dGVjb2RlT2Zmc2V0KGNhbGxlckZyYW1lLCBjYWxsRnJhbWUtPnJldHVyblZQQygpKTsKKyNlbmRp ZgorI2Vsc2UKKyAgICBieXRlY29kZU9mZnNldCA9IGNvZGVCbG9jay0+Ynl0ZWNvZGVPZmZzZXQo Y2FsbGVyRnJhbWUsIGNhbGxGcmFtZS0+cmV0dXJuVlBDKCkpOworI2VuZGlmCiAgICAgY2FsbEZy YW1lID0gY2FsbGVyRnJhbWU7CiAgICAgcmV0dXJuIHRydWU7CiB9CkBAIC01OTQsMTYgKzYwNSwy NCBAQCBORVZFUl9JTkxJTkUgSGFuZGxlckluZm8qIEludGVycHJldGVyOjp0aHJvd0V4Y2VwdGlv bihDYWxsRnJhbWUqJiBjYWxsRnJhbWUsIEpTVgogICAgIC8vIHRoZSBwcm9maWxlciBtYW51YWxs eSB0aGF0IHRoZSBjYWxsIGluc3RydWN0aW9uIGhhcyByZXR1cm5lZCwgc2luY2UKICAgICAvLyB3 ZSdsbCBuZXZlciByZWFjaCB0aGUgcmVsZXZhbnQgb3BfcHJvZmlsZV9kaWRfY2FsbC4KICAgICBp ZiAoUHJvZmlsZXIqIHByb2ZpbGVyID0gKlByb2ZpbGVyOjplbmFibGVkUHJvZmlsZXJSZWZlcmVu Y2UoKSkgewotI2lmICFFTkFCTEUoSklUKQotICAgICAgICAvLyBGSVhNRTogV2h5IDg/IC0gd29y ayBvdXQgd2hhdCB0aGlzIG1hZ2ljIHZhbHVlIGlzLCByZXBsYWNlIHRoZSBjb25zdGFudCB3aXRo IHNvbWV0aGluZyBtb3JlIGhlbHBmdWwuCi0gICAgICAgIGlmIChpc0NhbGxCeXRlY29kZShjb2Rl QmxvY2stPmluc3RydWN0aW9ucygpW2J5dGVjb2RlT2Zmc2V0XS51Lm9wY29kZSkpCi0gICAgICAg ICAgICBwcm9maWxlci0+ZGlkRXhlY3V0ZShjYWxsRnJhbWUsIGNhbGxGcmFtZS0+cihjb2RlQmxv Y2stPmluc3RydWN0aW9ucygpW2J5dGVjb2RlT2Zmc2V0ICsgMV0udS5vcGVyYW5kKS5qc1ZhbHVl KCkpOwotICAgICAgICBlbHNlIGlmIChjb2RlQmxvY2stPmluc3RydWN0aW9ucygpLnNpemUoKSA+ IChieXRlY29kZU9mZnNldCArIDgpICYmIGNvZGVCbG9jay0+aW5zdHJ1Y3Rpb25zKClbYnl0ZWNv ZGVPZmZzZXQgKyA4XS51Lm9wY29kZSA9PSBnZXRPcGNvZGUob3BfY29uc3RydWN0KSkKLSAgICAg ICAgICAgIHByb2ZpbGVyLT5kaWRFeGVjdXRlKGNhbGxGcmFtZSwgY2FsbEZyYW1lLT5yKGNvZGVC bG9jay0+aW5zdHJ1Y3Rpb25zKClbYnl0ZWNvZGVPZmZzZXQgKyA5XS51Lm9wZXJhbmQpLmpzVmFs dWUoKSk7Ci0jZWxzZQotICAgICAgICBpbnQgZnVuY3Rpb25SZWdpc3RlckluZGV4OwotICAgICAg ICBpZiAoY29kZUJsb2NrLT5mdW5jdGlvblJlZ2lzdGVyRm9yQnl0ZWNvZGVPZmZzZXQoYnl0ZWNv ZGVPZmZzZXQsIGZ1bmN0aW9uUmVnaXN0ZXJJbmRleCkpCi0gICAgICAgICAgICBwcm9maWxlci0+ ZGlkRXhlY3V0ZShjYWxsRnJhbWUsIGNhbGxGcmFtZS0+cihmdW5jdGlvblJlZ2lzdGVySW5kZXgp LmpzVmFsdWUoKSk7CisjaWYgRU5BQkxFKElOVEVSUFJFVEVSKQorICAgICAgICBpZiAoIWNhbGxG cmFtZS0+Z2xvYmFsRGF0YSgpLmNhblVzZUpJVCgpKSB7CisgICAgICAgICAgICAvLyBGSVhNRTog V2h5IDg/IC0gd29yayBvdXQgd2hhdCB0aGlzIG1hZ2ljIHZhbHVlIGlzLCByZXBsYWNlIHRoZSBj b25zdGFudCB3aXRoIHNvbWV0aGluZyBtb3JlIGhlbHBmdWwuCisgICAgICAgICAgICBpZiAoaXND YWxsQnl0ZWNvZGUoY29kZUJsb2NrLT5pbnN0cnVjdGlvbnMoKVtieXRlY29kZU9mZnNldF0udS5v cGNvZGUpKQorICAgICAgICAgICAgICAgIHByb2ZpbGVyLT5kaWRFeGVjdXRlKGNhbGxGcmFtZSwg Y2FsbEZyYW1lLT5yKGNvZGVCbG9jay0+aW5zdHJ1Y3Rpb25zKClbYnl0ZWNvZGVPZmZzZXQgKyAx XS51Lm9wZXJhbmQpLmpzVmFsdWUoKSk7CisgICAgICAgICAgICBlbHNlIGlmIChjb2RlQmxvY2st Pmluc3RydWN0aW9ucygpLnNpemUoKSA+IChieXRlY29kZU9mZnNldCArIDgpICYmIGNvZGVCbG9j ay0+aW5zdHJ1Y3Rpb25zKClbYnl0ZWNvZGVPZmZzZXQgKyA4XS51Lm9wY29kZSA9PSBnZXRPcGNv ZGUob3BfY29uc3RydWN0KSkKKyAgICAgICAgICAgICAgICBwcm9maWxlci0+ZGlkRXhlY3V0ZShj YWxsRnJhbWUsIGNhbGxGcmFtZS0+cihjb2RlQmxvY2stPmluc3RydWN0aW9ucygpW2J5dGVjb2Rl T2Zmc2V0ICsgOV0udS5vcGVyYW5kKS5qc1ZhbHVlKCkpOworICAgICAgICB9CisjaWYgRU5BQkxF KEpJVCkKKyAgICAgICAgZWxzZQorI2VuZGlmCisjZW5kaWYKKyNpZiBFTkFCTEUoSklUKQorICAg ICAgICB7CisgICAgICAgICAgICBpbnQgZnVuY3Rpb25SZWdpc3RlckluZGV4OworICAgICAgICAg ICAgaWYgKGNvZGVCbG9jay0+ZnVuY3Rpb25SZWdpc3RlckZvckJ5dGVjb2RlT2Zmc2V0KGJ5dGVj b2RlT2Zmc2V0LCBmdW5jdGlvblJlZ2lzdGVySW5kZXgpKQorICAgICAgICAgICAgICAgIHByb2Zp bGVyLT5kaWRFeGVjdXRlKGNhbGxGcmFtZSwgY2FsbEZyYW1lLT5yKGZ1bmN0aW9uUmVnaXN0ZXJJ bmRleCkuanNWYWx1ZSgpKTsKKyAgICAgICAgfQogI2VuZGlmCiAgICAgfQogCkBAIC02NzYsMTIg KzY5NSwyMCBAQCBKU1ZhbHVlIEludGVycHJldGVyOjpleGVjdXRlKFByb2dyYW1FeGVjdXRhYmxl KiBwcm9ncmFtLCBDYWxsRnJhbWUqIGNhbGxGcmFtZSwgUwogICAgIHsKICAgICAgICAgU2FtcGxp bmdUb29sOjpDYWxsUmVjb3JkIGNhbGxSZWNvcmQobV9zYW1wbGVyLmdldCgpKTsKIAotICAgICAg ICBtX3JlZW50cnlEZXB0aCsrOworICAgICAgICBtX3JlZW50cnlEZXB0aCsrOyAgCiAjaWYgRU5B QkxFKEpJVCkKLSAgICAgICAgcmVzdWx0ID0gcHJvZ3JhbS0+aml0Q29kZShuZXdDYWxsRnJhbWUs IHNjb3BlQ2hhaW4pLmV4ZWN1dGUoJm1fcmVnaXN0ZXJGaWxlLCBuZXdDYWxsRnJhbWUsIHNjb3Bl Q2hhaW4tPmdsb2JhbERhdGEsIGV4Y2VwdGlvbik7Ci0jZWxzZQotICAgICAgICByZXN1bHQgPSBw cml2YXRlRXhlY3V0ZShOb3JtYWwsICZtX3JlZ2lzdGVyRmlsZSwgbmV3Q2FsbEZyYW1lLCBleGNl cHRpb24pOworI2lmIEVOQUJMRShJTlRFUlBSRVRFUikKKyAgICAgICAgaWYgKGNhbGxGcmFtZS0+ Z2xvYmFsRGF0YSgpLmNhblVzZUpJVCgpKQorI2VuZGlmCisgICAgICAgICAgICByZXN1bHQgPSBw cm9ncmFtLT5qaXRDb2RlKG5ld0NhbGxGcmFtZSwgc2NvcGVDaGFpbikuZXhlY3V0ZSgmbV9yZWdp c3RlckZpbGUsIG5ld0NhbGxGcmFtZSwgc2NvcGVDaGFpbi0+Z2xvYmFsRGF0YSwgZXhjZXB0aW9u KTsKKyNpZiBFTkFCTEUoSU5URVJQUkVURVIpCisgICAgICAgIGVsc2UKKyNlbmRpZgogI2VuZGlm CisjaWYgRU5BQkxFKElOVEVSUFJFVEVSKQorICAgICAgICAgICAgcmVzdWx0ID0gcHJpdmF0ZUV4 ZWN1dGUoTm9ybWFsLCAmbV9yZWdpc3RlckZpbGUsIG5ld0NhbGxGcmFtZSwgZXhjZXB0aW9uKTsK KyNlbmRpZgorCiAgICAgICAgIG1fcmVlbnRyeURlcHRoLS07CiAgICAgfQogCkBAIC03NDksMTIg Kzc3NiwxOSBAQCBKU1ZhbHVlIEludGVycHJldGVyOjpleGVjdXRlQ2FsbChDYWxsRnJhbWUqIGNh bGxGcmFtZSwgSlNPYmplY3QqIGZ1bmN0aW9uLCBDYWxsVAogICAgICAgICB7CiAgICAgICAgICAg ICBTYW1wbGluZ1Rvb2w6OkNhbGxSZWNvcmQgY2FsbFJlY29yZChtX3NhbXBsZXIuZ2V0KCkpOwog Ci0gICAgICAgICAgICBtX3JlZW50cnlEZXB0aCsrOwotICAgICNpZiBFTkFCTEUoSklUKQotICAg ICAgICAgICAgcmVzdWx0ID0gY2FsbERhdGEuanMuZnVuY3Rpb25FeGVjdXRhYmxlLT5qaXRDb2Rl Rm9yQ2FsbChuZXdDYWxsRnJhbWUsIGNhbGxEYXRhU2NvcGVDaGFpbikuZXhlY3V0ZSgmbV9yZWdp c3RlckZpbGUsIG5ld0NhbGxGcmFtZSwgY2FsbERhdGFTY29wZUNoYWluLT5nbG9iYWxEYXRhLCBl eGNlcHRpb24pOwotICAgICNlbHNlCi0gICAgICAgICAgICByZXN1bHQgPSBwcml2YXRlRXhlY3V0 ZShOb3JtYWwsICZtX3JlZ2lzdGVyRmlsZSwgbmV3Q2FsbEZyYW1lLCBleGNlcHRpb24pOwotICAg ICNlbmRpZgorICAgICAgICAgICAgbV9yZWVudHJ5RGVwdGgrKzsgIAorI2lmIEVOQUJMRShKSVQp CisjaWYgRU5BQkxFKElOVEVSUFJFVEVSKQorICAgICAgICAgICAgaWYgKGNhbGxGcmFtZS0+Z2xv YmFsRGF0YSgpLmNhblVzZUpJVCgpKQorI2VuZGlmCisgICAgICAgICAgICAgICAgcmVzdWx0ID0g Y2FsbERhdGEuanMuZnVuY3Rpb25FeGVjdXRhYmxlLT5qaXRDb2RlRm9yQ2FsbChuZXdDYWxsRnJh bWUsIGNhbGxEYXRhU2NvcGVDaGFpbikuZXhlY3V0ZSgmbV9yZWdpc3RlckZpbGUsIG5ld0NhbGxG cmFtZSwgY2FsbERhdGFTY29wZUNoYWluLT5nbG9iYWxEYXRhLCBleGNlcHRpb24pOworI2lmIEVO QUJMRShJTlRFUlBSRVRFUikKKyAgICAgICAgICAgIGVsc2UKKyNlbmRpZgorI2VuZGlmCisjaWYg RU5BQkxFKElOVEVSUFJFVEVSKQorICAgICAgICAgICAgICAgIHJlc3VsdCA9IHByaXZhdGVFeGVj dXRlKE5vcm1hbCwgJm1fcmVnaXN0ZXJGaWxlLCBuZXdDYWxsRnJhbWUsIGV4Y2VwdGlvbik7Cisj ZW5kaWYKICAgICAgICAgICAgIG1fcmVlbnRyeURlcHRoLS07CiAgICAgICAgIH0KIApAQCAtODQx LDEyICs4NzUsMTkgQEAgSlNPYmplY3QqIEludGVycHJldGVyOjpleGVjdXRlQ29uc3RydWN0KENh bGxGcmFtZSogY2FsbEZyYW1lLCBKU09iamVjdCogY29uc3RydWMKICAgICAgICAgewogICAgICAg ICAgICAgU2FtcGxpbmdUb29sOjpDYWxsUmVjb3JkIGNhbGxSZWNvcmQobV9zYW1wbGVyLmdldCgp KTsKIAotICAgICAgICAgICAgbV9yZWVudHJ5RGVwdGgrKzsKLSAgICAjaWYgRU5BQkxFKEpJVCkK LSAgICAgICAgICAgIHJlc3VsdCA9IGNvbnN0cnVjdERhdGEuanMuZnVuY3Rpb25FeGVjdXRhYmxl LT5qaXRDb2RlRm9yQ29uc3RydWN0KG5ld0NhbGxGcmFtZSwgY29uc3RydWN0RGF0YVNjb3BlQ2hh aW4pLmV4ZWN1dGUoJm1fcmVnaXN0ZXJGaWxlLCBuZXdDYWxsRnJhbWUsIGNvbnN0cnVjdERhdGFT Y29wZUNoYWluLT5nbG9iYWxEYXRhLCBleGNlcHRpb24pOwotICAgICNlbHNlCi0gICAgICAgICAg ICByZXN1bHQgPSBwcml2YXRlRXhlY3V0ZShOb3JtYWwsICZtX3JlZ2lzdGVyRmlsZSwgbmV3Q2Fs bEZyYW1lLCBleGNlcHRpb24pOwotICAgICNlbmRpZgorICAgICAgICAgICAgbV9yZWVudHJ5RGVw dGgrKzsgIAorI2lmIEVOQUJMRShKSVQpCisjaWYgRU5BQkxFKElOVEVSUFJFVEVSKQorICAgICAg ICAgICAgaWYgKGNhbGxGcmFtZS0+Z2xvYmFsRGF0YSgpLmNhblVzZUpJVCgpKQorI2VuZGlmCisg ICAgICAgICAgICAgICAgcmVzdWx0ID0gY29uc3RydWN0RGF0YS5qcy5mdW5jdGlvbkV4ZWN1dGFi bGUtPmppdENvZGVGb3JDb25zdHJ1Y3QobmV3Q2FsbEZyYW1lLCBjb25zdHJ1Y3REYXRhU2NvcGVD aGFpbikuZXhlY3V0ZSgmbV9yZWdpc3RlckZpbGUsIG5ld0NhbGxGcmFtZSwgY29uc3RydWN0RGF0 YVNjb3BlQ2hhaW4tPmdsb2JhbERhdGEsIGV4Y2VwdGlvbik7CisjaWYgRU5BQkxFKElOVEVSUFJF VEVSKQorICAgICAgICAgICAgZWxzZQorI2VuZGlmCisjZW5kaWYKKyNpZiBFTkFCTEUoSU5URVJQ UkVURVIpCisgICAgICAgICAgICAgICAgcmVzdWx0ID0gcHJpdmF0ZUV4ZWN1dGUoTm9ybWFsLCAm bV9yZWdpc3RlckZpbGUsIG5ld0NhbGxGcmFtZSwgZXhjZXB0aW9uKTsKKyNlbmRpZgogICAgICAg ICAgICAgbV9yZWVudHJ5RGVwdGgtLTsKICAgICAgICAgfQogCkBAIC05MjIsMTEgKzk2MywxMyBA QCBDYWxsRnJhbWVDbG9zdXJlIEludGVycHJldGVyOjpwcmVwYXJlRm9yUmVwZWF0Q2FsbChGdW5j dGlvbkV4ZWN1dGFibGUqIEZ1bmN0aW9uRQogICAgICAgICByZXR1cm4gQ2FsbEZyYW1lQ2xvc3Vy ZSgpOwogICAgIH0KICAgICAvLyBhIDAgY29kZUJsb2NrIGluZGljYXRlcyBhIGJ1aWx0LWluIGNh bGxlcgotICAgIG5ld0NhbGxGcmFtZS0+aW5pdChjb2RlQmxvY2ssIDAsIHNjb3BlQ2hhaW4sIGNh bGxGcmFtZS0+YWRkSG9zdENhbGxGcmFtZUZsYWcoKSwgYXJnYywgZnVuY3Rpb24pOworICAgIG5l d0NhbGxGcmFtZS0+aW5pdChjb2RlQmxvY2ssIDAsIHNjb3BlQ2hhaW4sIGNhbGxGcmFtZS0+YWRk SG9zdENhbGxGcmFtZUZsYWcoKSwgYXJnYywgZnVuY3Rpb24pOyAgCiAjaWYgRU5BQkxFKEpJVCkK LSAgICBGdW5jdGlvbkV4ZWN1dGFibGUtPmppdENvZGVGb3JDYWxsKG5ld0NhbGxGcmFtZSwgc2Nv cGVDaGFpbik7CisjaWYgRU5BQkxFKElOVEVSUFJFVEVSKQorICAgIGlmIChjYWxsRnJhbWUtPmds b2JhbERhdGEoKS5jYW5Vc2VKSVQoKSkKKyNlbmRpZgorICAgICAgICBGdW5jdGlvbkV4ZWN1dGFi bGUtPmppdENvZGVGb3JDYWxsKG5ld0NhbGxGcmFtZSwgc2NvcGVDaGFpbik7CiAjZW5kaWYKLQog ICAgIENhbGxGcmFtZUNsb3N1cmUgcmVzdWx0ID0geyBjYWxsRnJhbWUsIG5ld0NhbGxGcmFtZSwg ZnVuY3Rpb24sIEZ1bmN0aW9uRXhlY3V0YWJsZSwgc2NvcGVDaGFpbi0+Z2xvYmFsRGF0YSwgb2xk RW5kLCBzY29wZUNoYWluLCBjb2RlQmxvY2stPm1fbnVtUGFyYW1ldGVycywgYXJnYyB9OwogICAg IHJldHVybiByZXN1bHQ7CiB9CkBAIC05NDIsMTEgKzk4NSwxOCBAQCBKU1ZhbHVlIEludGVycHJl dGVyOjpleGVjdXRlKENhbGxGcmFtZUNsb3N1cmUmIGNsb3N1cmUsIEpTVmFsdWUqIGV4Y2VwdGlv bikKICAgICB7CiAgICAgICAgIFNhbXBsaW5nVG9vbDo6Q2FsbFJlY29yZCBjYWxsUmVjb3JkKG1f c2FtcGxlci5nZXQoKSk7CiAgICAgICAgIAotICAgICAgICBtX3JlZW50cnlEZXB0aCsrOworICAg ICAgICBtX3JlZW50cnlEZXB0aCsrOyAgCiAjaWYgRU5BQkxFKEpJVCkKLSAgICAgICAgcmVzdWx0 ID0gY2xvc3VyZS5mdW5jdGlvbkV4ZWN1dGFibGUtPmdlbmVyYXRlZEpJVENvZGVGb3JDYWxsKCku ZXhlY3V0ZSgmbV9yZWdpc3RlckZpbGUsIGNsb3N1cmUubmV3Q2FsbEZyYW1lLCBjbG9zdXJlLmds b2JhbERhdGEsIGV4Y2VwdGlvbik7Ci0jZWxzZQotICAgICAgICByZXN1bHQgPSBwcml2YXRlRXhl Y3V0ZShOb3JtYWwsICZtX3JlZ2lzdGVyRmlsZSwgY2xvc3VyZS5uZXdDYWxsRnJhbWUsIGV4Y2Vw dGlvbik7CisjaWYgRU5BQkxFKElOVEVSUFJFVEVSKQorICAgICAgICBpZiAoY2xvc3VyZS5uZXdD YWxsRnJhbWUtPmdsb2JhbERhdGEoKS5jYW5Vc2VKSVQoKSkKKyNlbmRpZgorICAgICAgICAgICAg cmVzdWx0ID0gY2xvc3VyZS5mdW5jdGlvbkV4ZWN1dGFibGUtPmdlbmVyYXRlZEpJVENvZGVGb3JD YWxsKCkuZXhlY3V0ZSgmbV9yZWdpc3RlckZpbGUsIGNsb3N1cmUubmV3Q2FsbEZyYW1lLCBjbG9z dXJlLmdsb2JhbERhdGEsIGV4Y2VwdGlvbik7CisjaWYgRU5BQkxFKElOVEVSUFJFVEVSKQorICAg ICAgICBlbHNlCisjZW5kaWYKKyNlbmRpZgorI2lmIEVOQUJMRShJTlRFUlBSRVRFUikKKyAgICAg ICAgICAgIHJlc3VsdCA9IHByaXZhdGVFeGVjdXRlKE5vcm1hbCwgJm1fcmVnaXN0ZXJGaWxlLCBj bG9zdXJlLm5ld0NhbGxGcmFtZSwgZXhjZXB0aW9uKTsKICNlbmRpZgogICAgICAgICBtX3JlZW50 cnlEZXB0aC0tOwogICAgIH0KQEAgLTEwNDEsMTAgKzEwOTEsMTggQEAgSlNWYWx1ZSBJbnRlcnBy ZXRlcjo6ZXhlY3V0ZShFdmFsRXhlY3V0YWJsZSogZXZhbCwgQ2FsbEZyYW1lKiBjYWxsRnJhbWUs IEpTT2JqZWMKICAgICAgICAgU2FtcGxpbmdUb29sOjpDYWxsUmVjb3JkIGNhbGxSZWNvcmQobV9z YW1wbGVyLmdldCgpKTsKIAogICAgICAgICBtX3JlZW50cnlEZXB0aCsrOworICAgICAgICAKICNp ZiBFTkFCTEUoSklUKQotICAgICAgICByZXN1bHQgPSBldmFsLT5qaXRDb2RlKG5ld0NhbGxGcmFt ZSwgc2NvcGVDaGFpbikuZXhlY3V0ZSgmbV9yZWdpc3RlckZpbGUsIG5ld0NhbGxGcmFtZSwgc2Nv cGVDaGFpbi0+Z2xvYmFsRGF0YSwgZXhjZXB0aW9uKTsKLSNlbHNlCi0gICAgICAgIHJlc3VsdCA9 IHByaXZhdGVFeGVjdXRlKE5vcm1hbCwgJm1fcmVnaXN0ZXJGaWxlLCBuZXdDYWxsRnJhbWUsIGV4 Y2VwdGlvbik7CisjaWYgRU5BQkxFKElOVEVSUFJFVEVSKQorICAgICAgICBpZiAoY2FsbEZyYW1l LT5nbG9iYWxEYXRhKCkuY2FuVXNlSklUKCkpCisjZW5kaWYKKyAgICAgICAgICAgIHJlc3VsdCA9 IGV2YWwtPmppdENvZGUobmV3Q2FsbEZyYW1lLCBzY29wZUNoYWluKS5leGVjdXRlKCZtX3JlZ2lz dGVyRmlsZSwgbmV3Q2FsbEZyYW1lLCBzY29wZUNoYWluLT5nbG9iYWxEYXRhLCBleGNlcHRpb24p OworI2lmIEVOQUJMRShJTlRFUlBSRVRFUikKKyAgICAgICAgZWxzZQorI2VuZGlmCisjZW5kaWYK KyNpZiBFTkFCTEUoSU5URVJQUkVURVIpCisgICAgICAgICAgICByZXN1bHQgPSBwcml2YXRlRXhl Y3V0ZShOb3JtYWwsICZtX3JlZ2lzdGVyRmlsZSwgbmV3Q2FsbEZyYW1lLCBleGNlcHRpb24pOwog I2VuZGlmCiAgICAgICAgIG1fcmVlbnRyeURlcHRoLS07CiAgICAgfQpAQCAtMTA4NCw3ICsxMTQy LDcgQEAgTkVWRVJfSU5MSU5FIHZvaWQgSW50ZXJwcmV0ZXI6OmRlYnVnKENhbGxGcmFtZSogY2Fs bEZyYW1lLCBEZWJ1Z0hvb2tJRCBkZWJ1Z0hvb2sKICAgICB9CiB9CiAgICAgCi0jaWYgIUVOQUJM RShKSVQpCisjaWYgRU5BQkxFKElOVEVSUFJFVEVSKQogTkVWRVJfSU5MSU5FIFNjb3BlQ2hhaW5O b2RlKiBJbnRlcnByZXRlcjo6Y3JlYXRlRXhjZXB0aW9uU2NvcGUoQ2FsbEZyYW1lKiBjYWxsRnJh bWUsIGNvbnN0IEluc3RydWN0aW9uKiB2UEMpCiB7CiAgICAgaW50IGRzdCA9IHZQQ1sxXS51Lm9w ZXJhbmQ7CkBAIC0xMzIwLDcgKzEzNzgsNyBAQCBORVZFUl9JTkxJTkUgdm9pZCBJbnRlcnByZXRl cjo6dW5jYWNoZUdldEJ5SUQoQ29kZUJsb2NrKiBjb2RlQmxvY2ssIEluc3RydWN0aW9uKgogICAg IHZQQ1s0XSA9IDA7CiB9CiAKLSNlbmRpZiAvLyAhRU5BQkxFKEpJVCkKKyNlbmRpZiAvLyBFTkFC TEUoSU5URVJQUkVURVIpCiAKIEpTVmFsdWUgSW50ZXJwcmV0ZXI6OnByaXZhdGVFeGVjdXRlKEV4 ZWN1dGlvbkZsYWcgZmxhZywgUmVnaXN0ZXJGaWxlKiByZWdpc3RlckZpbGUsIENhbGxGcmFtZSog Y2FsbEZyYW1lLCBKU1ZhbHVlKiBleGNlcHRpb24pCiB7CkBAIC0xMzM2LDEyICsxMzk0LDE2IEBA IEpTVmFsdWUgSW50ZXJwcmV0ZXI6OnByaXZhdGVFeGVjdXRlKEV4ZWN1dGlvbkZsYWcgZmxhZywg UmVnaXN0ZXJGaWxlKiByZWdpc3RlckZpCiAgICAgICAgICNlbmRpZiAvLyBIQVZFKENPTVBVVEVE X0dPVE8pCiAgICAgICAgIHJldHVybiBKU1ZhbHVlKCk7CiAgICAgfQotCisgICAgCiAjaWYgRU5B QkxFKEpJVCkKKyNpZiBFTkFCTEUoSU5URVJQUkVURVIpCiAgICAgLy8gTWl4aW5nIEludGVycHJl dGVyICsgSklUIGlzIG5vdCBzdXBwb3J0ZWQuCi0gICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Cisg ICAgaWYgKGNhbGxGcmFtZS0+Z2xvYmFsRGF0YSgpLmNhblVzZUpJVCgpKQorI2VuZGlmCisgICAg ICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogI2VuZGlmCi0jaWYgISFFTkFCTEUoSklUKQorCisj aWYgIUVOQUJMRShJTlRFUlBSRVRFUikKICAgICBVTlVTRURfUEFSQU0ocmVnaXN0ZXJGaWxlKTsK ICAgICBVTlVTRURfUEFSQU0oY2FsbEZyYW1lKTsKICAgICBVTlVTRURfUEFSQU0oZXhjZXB0aW9u KTsKQEAgLTM3MDQsMTYgKzM3NjYsMTYgQEAgc2tpcF9pZF9jdXN0b21fc2VsZjoKICAgICAgICAg ICAgICAgICBnb3RvIHZtX3Rocm93OwogICAgICAgICAgICAgfQogICAgICAgICAgICAgQVNTRVJU KCFhc0Z1bmN0aW9uKGNhbGxGcmFtZS0+Y2FsbGVlKCkpLT5pc0hvc3RGdW5jdGlvbigpKTsKLSAg ICAgICAgICAgIHVpbnQzMl90IGV4cGVjdGVkUGFyYW1zID0gYXNGdW5jdGlvbihjYWxsRnJhbWUt PmNhbGxlZSgpKS0+anNFeGVjdXRhYmxlKCktPnBhcmFtZXRlckNvdW50KCk7Ci0gICAgICAgICAg ICB1aW50MzJfdCBpbnBsYWNlQXJncyA9IG1pbihhcmdDb3VudCwgZXhwZWN0ZWRQYXJhbXMpOwot ICAgICAgICAgICAgdWludDMyX3QgaSA9IDA7CisgICAgICAgICAgICBpbnQzMl90IGV4cGVjdGVk UGFyYW1zID0gYXNGdW5jdGlvbihjYWxsRnJhbWUtPmNhbGxlZSgpKS0+anNFeGVjdXRhYmxlKCkt PnBhcmFtZXRlckNvdW50KCk7CisgICAgICAgICAgICBpbnQzMl90IGlucGxhY2VBcmdzID0gbWlu KHN0YXRpY19jYXN0PGludDMyX3Q+KGFyZ0NvdW50KSwgZXhwZWN0ZWRQYXJhbXMpOworICAgICAg ICAgICAgaW50MzJfdCBpID0gMDsKICAgICAgICAgICAgIFJlZ2lzdGVyKiBhcmdTdG9yZSA9IGNh bGxGcmFtZS0+cmVnaXN0ZXJzKCkgKyBhcmdzT2Zmc2V0OwogCiAgICAgICAgICAgICAvLyBGaXJz dCBzdGVwIGlzIHRvIGNvcHkgdGhlICJleHBlY3RlZCIgcGFyYW1ldGVycyBmcm9tIHRoZWlyIG5v cm1hbCBsb2NhdGlvbiByZWxhdGl2ZSB0byB0aGUgY2FsbGZyYW1lCiAgICAgICAgICAgICBmb3Ig KDsgaSA8IGlucGxhY2VBcmdzOyBpKyspCiAgICAgICAgICAgICAgICAgYXJnU3RvcmVbaV0gPSBj YWxsRnJhbWUtPnJlZ2lzdGVycygpW2kgLSBSZWdpc3RlckZpbGU6OkNhbGxGcmFtZUhlYWRlclNp emUgLSBleHBlY3RlZFBhcmFtc107CiAgICAgICAgICAgICAvLyBUaGVuIHdlIGNvcHkgYW55IGFk ZGl0aW9uYWwgYXJndW1lbnRzIHRoYXQgbWF5IGJlIGZ1cnRoZXIgdXAgdGhlIHN0YWNrICgnLTEn IHRvIGFjY291bnQgZm9yICd0aGlzJykKLSAgICAgICAgICAgIGZvciAoOyBpIDwgYXJnQ291bnQ7 IGkrKykKKyAgICAgICAgICAgIGZvciAoOyBpIDwgc3RhdGljX2Nhc3Q8aW50MzJfdD4oYXJnQ291 bnQpOyBpKyspCiAgICAgICAgICAgICAgICAgYXJnU3RvcmVbaV0gPSBjYWxsRnJhbWUtPnJlZ2lz dGVycygpW2kgLSBSZWdpc3RlckZpbGU6OkNhbGxGcmFtZUhlYWRlclNpemUgLSBleHBlY3RlZFBh cmFtcyAtIGFyZ0NvdW50IC0gMV07CiAgICAgICAgIH0gZWxzZSBpZiAoIWFyZ3VtZW50cy5pc1Vu ZGVmaW5lZE9yTnVsbCgpKSB7CiAgICAgICAgICAgICBpZiAoIWFyZ3VtZW50cy5pc09iamVjdCgp KSB7CkBAIC0zOTA3LDcgKzM5NjksNyBAQCBza2lwX2lkX2N1c3RvbV9zZWxmOgogCiAgICAgICAg IEpTVmFsdWUgcmV0dXJuVmFsdWUgPSBjYWxsRnJhbWUtPnIocmVzdWx0KS5qc1ZhbHVlKCk7CiAK LSAgICAgICAgdlBDID0gY2FsbEZyYW1lLT5yZXR1cm5QQygpOworICAgICAgICB2UEMgPSBjYWxs RnJhbWUtPnJldHVyblZQQygpOwogICAgICAgICBjYWxsRnJhbWUgPSBjYWxsRnJhbWUtPmNhbGxl ckZyYW1lKCk7CiAgICAgICAgIAogICAgICAgICBpZiAoY2FsbEZyYW1lLT5oYXNIb3N0Q2FsbEZy YW1lRmxhZygpKQpAQCAtMzk1MSw3ICs0MDEzLDcgQEAgc2tpcF9pZF9jdXN0b21fc2VsZjoKICAg ICAgICAgaWYgKFVOTElLRUxZKCFyZXR1cm5WYWx1ZS5pc09iamVjdCgpKSkKICAgICAgICAgICAg IHJldHVyblZhbHVlID0gY2FsbEZyYW1lLT5yKHZQQ1syXS51Lm9wZXJhbmQpLmpzVmFsdWUoKTsK IAotICAgICAgICB2UEMgPSBjYWxsRnJhbWUtPnJldHVyblBDKCk7CisgICAgICAgIHZQQyA9IGNh bGxGcmFtZS0+cmV0dXJuVlBDKCk7CiAgICAgICAgIGNhbGxGcmFtZSA9IGNhbGxGcmFtZS0+Y2Fs bGVyRnJhbWUoKTsKIAogICAgICAgICBpZiAoY2FsbEZyYW1lLT5oYXNIb3N0Q2FsbEZyYW1lRmxh ZygpKQpAQCAtNDEzNiw3ICs0MTk4LDYgQEAgc2tpcF9pZF9jdXN0b21fc2VsZjoKICAgICAgICAg ICAgIGNhbGxGcmFtZS0+aW5pdChuZXdDb2RlQmxvY2ssIHZQQyArIE9QQ09ERV9MRU5HVEgob3Bf Y29uc3RydWN0KSwgY2FsbERhdGFTY29wZUNoYWluLCBwcmV2aW91c0NhbGxGcmFtZSwgYXJnQ291 bnQsIGFzRnVuY3Rpb24odikpOwogICAgICAgICAgICAgY29kZUJsb2NrID0gbmV3Q29kZUJsb2Nr OwogICAgICAgICAgICAgdlBDID0gbmV3Q29kZUJsb2NrLT5pbnN0cnVjdGlvbnMoKS5iZWdpbigp OwotCiAjaWYgRU5BQkxFKE9QQ09ERV9TVEFUUykKICAgICAgICAgICAgIE9wY29kZVN0YXRzOjpy ZXNldExhc3RJbnN0cnVjdGlvbigpOwogI2VuZGlmCkBAIC00NTM2LDcgKzQ1OTcsNyBAQCBza2lw X2lkX2N1c3RvbV9zZWxmOgogICAgICN1bmRlZiBERUZJTkVfT1BDT0RFCiAgICAgI3VuZGVmIENI RUNLX0ZPUl9FWENFUFRJT04KICAgICAjdW5kZWYgQ0hFQ0tfRk9SX1RJTUVPVVQKLSNlbmRpZiAv LyAhRU5BQkxFKEpJVCkKKyNlbmRpZiAvLyBFTkFCTEUoSU5URVJQUkVURVIpCiB9CiAKIEpTVmFs dWUgSW50ZXJwcmV0ZXI6OnJldHJpZXZlQXJndW1lbnRzKENhbGxGcmFtZSogY2FsbEZyYW1lLCBK U0Z1bmN0aW9uKiBmdW5jdGlvbikgY29uc3QKQEAgLTQ1OTIsOCArNDY1MywxNyBAQCB2b2lkIElu dGVycHJldGVyOjpyZXRyaWV2ZUxhc3RDYWxsZXIoQ2FsbEZyYW1lKiBjYWxsRnJhbWUsIGludCYg bGluZU51bWJlciwgaW50cAogICAgIENvZGVCbG9jayogY2FsbGVyQ29kZUJsb2NrID0gY2FsbGVy RnJhbWUtPmNvZGVCbG9jaygpOwogICAgIGlmICghY2FsbGVyQ29kZUJsb2NrKQogICAgICAgICBy ZXR1cm47Ci0KLSAgICB1bnNpZ25lZCBieXRlY29kZU9mZnNldCA9IGNhbGxlckNvZGVCbG9jay0+ Ynl0ZWNvZGVPZmZzZXQoY2FsbGVyRnJhbWUsIGNhbGxGcmFtZS0+cmV0dXJuUEMoKSk7CisgICAg dW5zaWduZWQgYnl0ZWNvZGVPZmZzZXQgPSAwOworI2lmIEVOQUJMRShJTlRFUlBSRVRFUikKKyAg ICBpZiAoIWNhbGxlckZyYW1lLT5nbG9iYWxEYXRhKCkuY2FuVXNlSklUKCkpCisgICAgICAgIGJ5 dGVjb2RlT2Zmc2V0ID0gY2FsbGVyQ29kZUJsb2NrLT5ieXRlY29kZU9mZnNldChjYWxsZXJGcmFt ZSwgY2FsbEZyYW1lLT5yZXR1cm5WUEMoKSk7CisjaWYgRU5BQkxFKEpJVCkKKyAgICBlbHNlCisg ICAgICAgIGJ5dGVjb2RlT2Zmc2V0ID0gY2FsbGVyQ29kZUJsb2NrLT5ieXRlY29kZU9mZnNldChj YWxsZXJGcmFtZSwgY2FsbEZyYW1lLT5yZXR1cm5QQygpKTsKKyNlbmRpZgorI2Vsc2UKKyAgICBi eXRlY29kZU9mZnNldCA9IGNhbGxlckNvZGVCbG9jay0+Ynl0ZWNvZGVPZmZzZXQoY2FsbGVyRnJh bWUsIGNhbGxGcmFtZS0+cmV0dXJuUEMoKSk7CisjZW5kaWYKICAgICBsaW5lTnVtYmVyID0gY2Fs bGVyQ29kZUJsb2NrLT5saW5lTnVtYmVyRm9yQnl0ZWNvZGVPZmZzZXQoY2FsbGVyRnJhbWUsIGJ5 dGVjb2RlT2Zmc2V0IC0gMSk7CiAgICAgc291cmNlSUQgPSBjYWxsZXJDb2RlQmxvY2stPm93bmVy RXhlY3V0YWJsZSgpLT5zb3VyY2VJRCgpOwogICAgIHNvdXJjZVVSTCA9IGNhbGxlckNvZGVCbG9j ay0+b3duZXJFeGVjdXRhYmxlKCktPnNvdXJjZVVSTCgpOwpkaWZmIC0tZ2l0IGEvSmF2YVNjcmlw dENvcmUvaW50ZXJwcmV0ZXIvSW50ZXJwcmV0ZXIuaCBiL0phdmFTY3JpcHRDb3JlL2ludGVycHJl dGVyL0ludGVycHJldGVyLmgKaW5kZXggNTU1YmJmOWJjODUwOTdmYjM2YTY5OTZiNGE4ZGU3NDY0 ODRmOTVmMi4uOTY5ZWVlMzRiMWZmNGExYTc4MTk0NDEzZWNkOWI1ZGMwNTMzNWYxNCAxMDA2NDQK LS0tIGEvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvSW50ZXJwcmV0ZXIuaAorKysgYi9KYXZh U2NyaXB0Q29yZS9pbnRlcnByZXRlci9JbnRlcnByZXRlci5oCkBAIC0xMjMsNyArMTIzLDcgQEAg bmFtZXNwYWNlIEpTQyB7CiAKICAgICAgICAgSlNWYWx1ZSBleGVjdXRlKEV2YWxFeGVjdXRhYmxl KiwgQ2FsbEZyYW1lKiwgSlNPYmplY3QqIHRoaXNPYmplY3QsIGludCBnbG9iYWxSZWdpc3Rlck9m ZnNldCwgU2NvcGVDaGFpbk5vZGUqLCBKU1ZhbHVlKiBleGNlcHRpb24pOwogCi0jaWYgIUVOQUJM RShKSVQpCisjaWYgRU5BQkxFKElOVEVSUFJFVEVSKQogICAgICAgICBORVZFUl9JTkxJTkUgYm9v bCByZXNvbHZlKENhbGxGcmFtZSosIEluc3RydWN0aW9uKiwgSlNWYWx1ZSYgZXhjZXB0aW9uVmFs dWUpOwogICAgICAgICBORVZFUl9JTkxJTkUgYm9vbCByZXNvbHZlU2tpcChDYWxsRnJhbWUqLCBJ bnN0cnVjdGlvbiosIEpTVmFsdWUmIGV4Y2VwdGlvblZhbHVlKTsKICAgICAgICAgTkVWRVJfSU5M SU5FIGJvb2wgcmVzb2x2ZUdsb2JhbChDYWxsRnJhbWUqLCBJbnN0cnVjdGlvbiosIEpTVmFsdWUm IGV4Y2VwdGlvblZhbHVlKTsKQEAgLTEzNiw3ICsxMzYsNyBAQCBuYW1lc3BhY2UgSlNDIHsKICAg ICAgICAgdm9pZCB1bmNhY2hlR2V0QnlJRChDb2RlQmxvY2sqLCBJbnN0cnVjdGlvbiogdlBDKTsK ICAgICAgICAgdm9pZCB0cnlDYWNoZVB1dEJ5SUQoQ2FsbEZyYW1lKiwgQ29kZUJsb2NrKiwgSW5z dHJ1Y3Rpb24qLCBKU1ZhbHVlIGJhc2VWYWx1ZSwgY29uc3QgUHV0UHJvcGVydHlTbG90Jik7CiAg ICAgICAgIHZvaWQgdW5jYWNoZVB1dEJ5SUQoQ29kZUJsb2NrKiwgSW5zdHJ1Y3Rpb24qIHZQQyk7 ICAgICAgICAKLSNlbmRpZiAvLyAhRU5BQkxFKEpJVCkKKyNlbmRpZiAvLyBFTkFCTEUoSU5URVJQ UkVURVIpCiAKICAgICAgICAgTkVWRVJfSU5MSU5FIGJvb2wgdW53aW5kQ2FsbEZyYW1lKENhbGxG cmFtZSomLCBKU1ZhbHVlLCB1bnNpZ25lZCYgYnl0ZWNvZGVPZmZzZXQsIENvZGVCbG9jayomKTsK IApkaWZmIC0tZ2l0IGEvSmF2YVNjcmlwdENvcmUvcnVudGltZS9BcnJheVByb3RvdHlwZS5jcHAg Yi9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0FycmF5UHJvdG90eXBlLmNwcAppbmRleCA5NDA3YmU3 YmFjMzc2YzgyZTY0MWNiZjMwMjUxOWNmNWQ0MDRmZjA3Li4yY2IwNGZmZmEwZjFmOWIzZTQwYzZj MjA0OWE2NjFmMWZkZTJkYjk4IDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0Fy cmF5UHJvdG90eXBlLmNwcAorKysgYi9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0FycmF5UHJvdG90 eXBlLmNwcApAQCAtNzYsOCArNzYsMTYgQEAgc3RhdGljIGlubGluZSBib29sIGlzTnVtZXJpY0Nv bXBhcmVGdW5jdGlvbihFeGVjU3RhdGUqIGV4ZWMsIENhbGxUeXBlIGNhbGxUeXBlLAogI2lmIEVO QUJMRShKSVQpCiAgICAgLy8gSWYgdGhlIEpJVCBpcyBlbmFibGVkIHRoZW4gd2UgbmVlZCB0byBw cmVzZXJ2ZSB0aGUgaW52YXJpYW50IHRoYXQgZXZlcnkKICAgICAvLyBmdW5jdGlvbiB3aXRoIGEg Q29kZUJsb2NrIGFsc28gaGFzIEpJVCBjb2RlLgotICAgIGNhbGxEYXRhLmpzLmZ1bmN0aW9uRXhl Y3V0YWJsZS0+aml0Q29kZUZvckNhbGwoZXhlYywgY2FsbERhdGEuanMuc2NvcGVDaGFpbik7Ci0g ICAgQ29kZUJsb2NrKiBjb2RlQmxvY2sgPSAmY2FsbERhdGEuanMuZnVuY3Rpb25FeGVjdXRhYmxl LT5nZW5lcmF0ZWRCeXRlY29kZUZvckNhbGwoKTsKKyAgICBDb2RlQmxvY2sqIGNvZGVCbG9jayA9 IDA7CisjaWYgRU5BQkxFKElOVEVSUFJFVEVSKQorICAgIGlmICghZXhlYy0+Z2xvYmFsRGF0YSgp LmNhblVzZUpJVCgpKQorICAgICAgICBjb2RlQmxvY2sgPSBjYWxsRGF0YS5qcy5mdW5jdGlvbkV4 ZWN1dGFibGUtPmJ5dGVjb2RlRm9yQ2FsbChleGVjLCBjYWxsRGF0YS5qcy5zY29wZUNoYWluKTsK KyAgICBlbHNlCisjZW5kaWYKKyAgICB7CisgICAgICAgIGNhbGxEYXRhLmpzLmZ1bmN0aW9uRXhl Y3V0YWJsZS0+aml0Q29kZUZvckNhbGwoZXhlYywgY2FsbERhdGEuanMuc2NvcGVDaGFpbik7Cisg ICAgICAgIGNvZGVCbG9jayA9ICZjYWxsRGF0YS5qcy5mdW5jdGlvbkV4ZWN1dGFibGUtPmdlbmVy YXRlZEJ5dGVjb2RlRm9yQ2FsbCgpOworICAgIH0KICNlbHNlCiAgICAgQ29kZUJsb2NrKiBjb2Rl QmxvY2sgPSBjYWxsRGF0YS5qcy5mdW5jdGlvbkV4ZWN1dGFibGUtPmJ5dGVjb2RlRm9yQ2FsbChl eGVjLCBjYWxsRGF0YS5qcy5zY29wZUNoYWluKTsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvSmF2YVNj cmlwdENvcmUvcnVudGltZS9FeGVjdXRhYmxlLmNwcCBiL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv RXhlY3V0YWJsZS5jcHAKaW5kZXggMmI2OGVmNGU5NTM0OTNmOTMzYjUwMTY1ZWZjYjYyYWIzMjQx YmM1My4uNmQzYzljZmNiMGViOGFmYTBmNjY2YWIxMjc4ODgzMjc5YjcxZDhjMyAxMDA2NDQKLS0t IGEvSmF2YVNjcmlwdENvcmUvcnVudGltZS9FeGVjdXRhYmxlLmNwcAorKysgYi9KYXZhU2NyaXB0 Q29yZS9ydW50aW1lL0V4ZWN1dGFibGUuY3BwCkBAIC0xNzcsNiArMTc3LDkgQEAgYm9vbCBGdW5j dGlvbkV4ZWN1dGFibGU6OmNvbXBpbGVGb3JDb25zdHJ1Y3QoRXhlY1N0YXRlKiwgU2NvcGVDaGFp bk5vZGUqIHNjb3BlQ2gKIAogdm9pZCBFdmFsRXhlY3V0YWJsZTo6Z2VuZXJhdGVKSVRDb2RlKEV4 ZWNTdGF0ZSogZXhlYywgU2NvcGVDaGFpbk5vZGUqIHNjb3BlQ2hhaW5Ob2RlKQogeworI2lmIEVO QUJMRShJTlRFUlBSRVRFUikKKyAgICBBU1NFUlQoZXhlYy0+Z2xvYmFsRGF0YSgpLmNhblVzZUpJ VCgpKTsKKyNlbmRpZgogICAgIENvZGVCbG9jayogY29kZUJsb2NrID0gJmJ5dGVjb2RlKGV4ZWMs IHNjb3BlQ2hhaW5Ob2RlKTsKICAgICBtX2ppdENvZGVGb3JDYWxsID0gSklUOjpjb21waWxlKHNj b3BlQ2hhaW5Ob2RlLT5nbG9iYWxEYXRhLCBjb2RlQmxvY2spOwogCkBAIC0xODgsNiArMTkxLDkg QEAgdm9pZCBFdmFsRXhlY3V0YWJsZTo6Z2VuZXJhdGVKSVRDb2RlKEV4ZWNTdGF0ZSogZXhlYywg U2NvcGVDaGFpbk5vZGUqIHNjb3BlQ2hhaW4KIAogdm9pZCBQcm9ncmFtRXhlY3V0YWJsZTo6Z2Vu ZXJhdGVKSVRDb2RlKEV4ZWNTdGF0ZSogZXhlYywgU2NvcGVDaGFpbk5vZGUqIHNjb3BlQ2hhaW5O b2RlKQogeworI2lmIEVOQUJMRShJTlRFUlBSRVRFUikKKyAgICBBU1NFUlQoZXhlYy0+Z2xvYmFs RGF0YSgpLmNhblVzZUpJVCgpKTsKKyNlbmRpZgogICAgIENvZGVCbG9jayogY29kZUJsb2NrID0g JmJ5dGVjb2RlKGV4ZWMsIHNjb3BlQ2hhaW5Ob2RlKTsKICAgICBtX2ppdENvZGVGb3JDYWxsID0g SklUOjpjb21waWxlKHNjb3BlQ2hhaW5Ob2RlLT5nbG9iYWxEYXRhLCBjb2RlQmxvY2spOwogCkBA IC0xOTksNiArMjA1LDkgQEAgdm9pZCBQcm9ncmFtRXhlY3V0YWJsZTo6Z2VuZXJhdGVKSVRDb2Rl KEV4ZWNTdGF0ZSogZXhlYywgU2NvcGVDaGFpbk5vZGUqIHNjb3BlQ2gKIAogdm9pZCBGdW5jdGlv bkV4ZWN1dGFibGU6OmdlbmVyYXRlSklUQ29kZUZvckNhbGwoRXhlY1N0YXRlKiBleGVjLCBTY29w ZUNoYWluTm9kZSogc2NvcGVDaGFpbk5vZGUpCiB7CisjaWYgRU5BQkxFKElOVEVSUFJFVEVSKQor ICAgIEFTU0VSVChleGVjLT5nbG9iYWxEYXRhKCkuY2FuVXNlSklUKCkpOworI2VuZGlmCiAgICAg Q29kZUJsb2NrKiBjb2RlQmxvY2sgPSBieXRlY29kZUZvckNhbGwoZXhlYywgc2NvcGVDaGFpbk5v ZGUpOwogICAgIG1faml0Q29kZUZvckNhbGwgPSBKSVQ6OmNvbXBpbGUoc2NvcGVDaGFpbk5vZGUt Pmdsb2JhbERhdGEsIGNvZGVCbG9jaywgJm1faml0Q29kZUZvckNhbGxXaXRoQXJpdHlDaGVjayk7 CiAKQEAgLTIxMCw2ICsyMTksOSBAQCB2b2lkIEZ1bmN0aW9uRXhlY3V0YWJsZTo6Z2VuZXJhdGVK SVRDb2RlRm9yQ2FsbChFeGVjU3RhdGUqIGV4ZWMsIFNjb3BlQ2hhaW5Ob2RlKgogCiB2b2lkIEZ1 bmN0aW9uRXhlY3V0YWJsZTo6Z2VuZXJhdGVKSVRDb2RlRm9yQ29uc3RydWN0KEV4ZWNTdGF0ZSog ZXhlYywgU2NvcGVDaGFpbk5vZGUqIHNjb3BlQ2hhaW5Ob2RlKQogeworI2lmIEVOQUJMRShJTlRF UlBSRVRFUikKKyAgICBBU1NFUlQoZXhlYy0+Z2xvYmFsRGF0YSgpLmNhblVzZUpJVCgpKTsKKyNl bmRpZgogICAgIENvZGVCbG9jayogY29kZUJsb2NrID0gYnl0ZWNvZGVGb3JDb25zdHJ1Y3QoZXhl Yywgc2NvcGVDaGFpbk5vZGUpOwogICAgIG1faml0Q29kZUZvckNvbnN0cnVjdCA9IEpJVDo6Y29t cGlsZShzY29wZUNoYWluTm9kZS0+Z2xvYmFsRGF0YSwgY29kZUJsb2NrLCAmbV9qaXRDb2RlRm9y Q29uc3RydWN0V2l0aEFyaXR5Q2hlY2spOwogCkBAIC0yNTEsOCArMjYzLDEzIEBAIFBhc3NPd25Q dHI8RXhjZXB0aW9uSW5mbz4gRnVuY3Rpb25FeGVjdXRhYmxlOjpyZXBhcnNlRXhjZXB0aW9uSW5m byhKU0dsb2JhbERhdGEqCiAgICAgQVNTRVJUKG5ld0NvZGVCbG9jay0+aW5zdHJ1Y3Rpb25Db3Vu dCgpID09IGNvZGVCbG9jay0+aW5zdHJ1Y3Rpb25Db3VudCgpKTsKIAogI2lmIEVOQUJMRShKSVQp Ci0gICAgSklUQ29kZSBuZXdKSVRDb2RlID0gSklUOjpjb21waWxlKGdsb2JhbERhdGEsIG5ld0Nv ZGVCbG9jay5nZXQoKSk7Ci0gICAgQVNTRVJUKGNvZGVCbG9jay0+bV9pc0NvbnN0cnVjdG9yID8g bmV3SklUQ29kZS5zaXplKCkgPT0gZ2VuZXJhdGVkSklUQ29kZUZvckNvbnN0cnVjdCgpLnNpemUo KSA6IG5ld0pJVENvZGUuc2l6ZSgpID09IGdlbmVyYXRlZEpJVENvZGVGb3JDYWxsKCkuc2l6ZSgp KTsKKyNpZiBFTkFCTEUoSU5URVJQUkVURVIpCisgICAgaWYgKGdsb2JhbERhdGEtPmNhblVzZUpJ VCgpKQorI2VuZGlmCisgICAgeworICAgICAgICBKSVRDb2RlIG5ld0pJVENvZGUgPSBKSVQ6OmNv bXBpbGUoZ2xvYmFsRGF0YSwgbmV3Q29kZUJsb2NrLmdldCgpKTsKKyAgICAgICAgQVNTRVJUKGNv ZGVCbG9jay0+bV9pc0NvbnN0cnVjdG9yID8gbmV3SklUQ29kZS5zaXplKCkgPT0gZ2VuZXJhdGVk SklUQ29kZUZvckNvbnN0cnVjdCgpLnNpemUoKSA6IG5ld0pJVENvZGUuc2l6ZSgpID09IGdlbmVy YXRlZEpJVENvZGVGb3JDYWxsKCkuc2l6ZSgpKTsKKyAgICB9CiAjZW5kaWYKIAogICAgIGdsb2Jh bERhdGEtPmZ1bmN0aW9uQ29kZUJsb2NrQmVpbmdSZXBhcnNlZCA9IDA7CkBAIC0yNzgsOCArMjk1 LDEzIEBAIFBhc3NPd25QdHI8RXhjZXB0aW9uSW5mbz4gRXZhbEV4ZWN1dGFibGU6OnJlcGFyc2VF eGNlcHRpb25JbmZvKEpTR2xvYmFsRGF0YSogZ2xvCiAgICAgQVNTRVJUKG5ld0NvZGVCbG9jay0+ aW5zdHJ1Y3Rpb25Db3VudCgpID09IGNvZGVCbG9jay0+aW5zdHJ1Y3Rpb25Db3VudCgpKTsKIAog I2lmIEVOQUJMRShKSVQpCi0gICAgSklUQ29kZSBuZXdKSVRDb2RlID0gSklUOjpjb21waWxlKGds b2JhbERhdGEsIG5ld0NvZGVCbG9jay5nZXQoKSk7Ci0gICAgQVNTRVJUKG5ld0pJVENvZGUuc2l6 ZSgpID09IGdlbmVyYXRlZEpJVENvZGVGb3JDYWxsKCkuc2l6ZSgpKTsKKyNpZiBFTkFCTEUoSU5U RVJQUkVURVIpCisgICAgaWYgKGdsb2JhbERhdGEtPmNhblVzZUpJVCgpKQorI2VuZGlmCisgICAg eworICAgICAgICBKSVRDb2RlIG5ld0pJVENvZGUgPSBKSVQ6OmNvbXBpbGUoZ2xvYmFsRGF0YSwg bmV3Q29kZUJsb2NrLmdldCgpKTsKKyAgICAgICAgQVNTRVJUKG5ld0pJVENvZGUuc2l6ZSgpID09 IGdlbmVyYXRlZEpJVENvZGVGb3JDYWxsKCkuc2l6ZSgpKTsKKyAgICB9CiAjZW5kaWYKIAogICAg IHJldHVybiBuZXdDb2RlQmxvY2stPmV4dHJhY3RFeGNlcHRpb25JbmZvKCk7CmRpZmYgLS1naXQg YS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTRnVuY3Rpb24uY3BwIGIvSmF2YVNjcmlwdENvcmUv cnVudGltZS9KU0Z1bmN0aW9uLmNwcAppbmRleCA3ZmNkMDM3MGRlYTFmNGQzMWIzZTU0MDI3YjNj YzRhZGY1MmFjYzRiLi40OWNjOGZhOWZlOTFhMDgzNzQ0OGQ4ZDRkZDBlYmU1Y2I0ODYwZTgzIDEw MDY0NAotLS0gYS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTRnVuY3Rpb24uY3BwCisrKyBiL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNGdW5jdGlvbi5jcHAKQEAgLTQyLDEzICs0MiwxNCBAQCB1 c2luZyBuYW1lc3BhY2UgV1RGOwogdXNpbmcgbmFtZXNwYWNlIFVuaWNvZGU7CiAKIG5hbWVzcGFj ZSBKU0MgewotCisjaWYgRU5BQkxFKEpJVCkKIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwg Y2FsbEhvc3RGdW5jdGlvbkFzQ29uc3RydWN0b3IoRXhlY1N0YXRlKiBleGVjKQogewogICAgIENv ZGVCbG9jayogY29kZUJsb2NrID0gZXhlYy0+Y2FsbGVyRnJhbWUoKS0+Y29kZUJsb2NrKCk7CiAg ICAgdW5zaWduZWQgdlBDSW5kZXggPSBjb2RlQmxvY2stPmJ5dGVjb2RlT2Zmc2V0KGV4ZWMsIGV4 ZWMtPnJldHVyblBDKCkpOwogICAgIHJldHVybiB0aHJvd1ZNRXJyb3IoZXhlYywgY3JlYXRlTm90 QUNvbnN0cnVjdG9yRXJyb3IoZXhlYywgZXhlYy0+Y2FsbGVlKCksIHZQQ0luZGV4LCBjb2RlQmxv Y2spKTsKIH0KKyNlbmRpZgogCiBBU1NFUlRfQ0xBU1NfRklUU19JTl9DRUxMKEpTRnVuY3Rpb24p OwogCmRpZmYgLS1naXQgYS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTR2xvYmFsRGF0YS5jcHAg Yi9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTR2xvYmFsRGF0YS5jcHAKaW5kZXggMzBhNWVmOWI1 OGI2NDMwMDdiZTAzNTlkNGI2NmY3MGNhMDVlNWQ3OC4uYjE2YmQ1ZDM3MzkwMTNiODBjZjAzNzY0 NDQzMjlmNTExYmNiMjc3MiAxMDA2NDQKLS0tIGEvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0ds b2JhbERhdGEuY3BwCisrKyBiL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNHbG9iYWxEYXRhLmNw cApAQCAtMTUyLDYgKzE1Miw5IEBAIEpTR2xvYmFsRGF0YTo6SlNHbG9iYWxEYXRhKEdsb2JhbERh dGFUeXBlIGdsb2JhbERhdGFUeXBlLCBUaHJlYWRTdGFja1R5cGUgdGhyZWFkCiAjaWZuZGVmIE5E RUJVRwogICAgICwgZXhjbHVzaXZlVGhyZWFkKDApCiAjZW5kaWYKKyNpZiBFTkFCTEUoSklUKSAm JiBFTkFCTEUoSU5URVJQUkVURVIpCisgICAgLCBtX2NhblVzZUpJVCghZ2V0ZW52KCJKU0NfRk9S Q0VfSU5URVJQUkVURVIiKSkKKyNlbmRpZgogewogI2lmIFBMQVRGT1JNKE1BQykKICAgICBzdGFy dFByb2ZpbGVyU2VydmVySWZOZWVkZWQoKTsKZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL3J1 bnRpbWUvSlNHbG9iYWxEYXRhLmggYi9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTR2xvYmFsRGF0 YS5oCmluZGV4IGY5OWM4ZDYxNzBkNTY1OTA5NjkxMzRmMGVhNzkzNGUzMzkxYjViOTEuLmYzZjZj YmExZjEyMjg2ZGFhMTYxZjExNTg2OWQyMjU3NGRmOTJjOTYgMTAwNjQ0Ci0tLSBhL0phdmFTY3Jp cHRDb3JlL3J1bnRpbWUvSlNHbG9iYWxEYXRhLmgKKysrIGIvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9KU0dsb2JhbERhdGEuaApAQCAtMTY3LDYgKzE2NywxMyBAQCBuYW1lc3BhY2UgSlNDIHsKICAg ICAgICAgRXhlY3V0YWJsZUFsbG9jYXRvciBleGVjdXRhYmxlQWxsb2NhdG9yOwogI2VuZGlmCiAK KyNpZiBFTkFCTEUoSklUKQorI2lmIEVOQUJMRShJTlRFUlBSRVRFUikKKyAgICAgICAgYm9vbCBj YW5Vc2VKSVQoKSB7IHJldHVybiBtX2NhblVzZUpJVDsgfQorI2VuZGlmCisjZWxzZQorICAgICAg ICBib29sIGNhblVzZUpJVCgpIHsgcmV0dXJuIGZhbHNlOyB9CisjZW5kaWYKICAgICAgICAgTGV4 ZXIqIGxleGVyOwogICAgICAgICBQYXJzZXIqIHBhcnNlcjsKICAgICAgICAgSW50ZXJwcmV0ZXIq IGludGVycHJldGVyOwpAQCAtMjMzLDYgKzI0MCw5IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAg ICBKU0dsb2JhbERhdGEoR2xvYmFsRGF0YVR5cGUsIFRocmVhZFN0YWNrVHlwZSk7CiAgICAgICAg IHN0YXRpYyBKU0dsb2JhbERhdGEqJiBzaGFyZWRJbnN0YW5jZUludGVybmFsKCk7CiAgICAgICAg IHZvaWQgY3JlYXRlTmF0aXZlVGh1bmsoKTsKKyNpZiBFTkFCTEUoSklUKSAmJiBFTkFCTEUoSU5U RVJQUkVURVIpCisgICAgICAgIGJvb2wgbV9jYW5Vc2VKSVQ7CisjZW5kaWYKICAgICB9OwogCiB9 IC8vIG5hbWVzcGFjZSBKU0MKZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL3d0Zi9QbGF0Zm9y bS5oIGIvSmF2YVNjcmlwdENvcmUvd3RmL1BsYXRmb3JtLmgKaW5kZXggNTM4NTdjYWM4OTUzNjlj YzcxNjI3MGI1M2EyOGNhZmViMjQzMmRiYi4uNjgzODBiMThjMzgyYWYxYWVkMjk5OTY5YTIyZmM1 Yjk3ODljODkzNCAxMDA2NDQKLS0tIGEvSmF2YVNjcmlwdENvcmUvd3RmL1BsYXRmb3JtLmgKKysr IGIvSmF2YVNjcmlwdENvcmUvd3RmL1BsYXRmb3JtLmgKQEAgLTk3Miw2ICs5NzIsMTQgQEAgb24g TWluR1cuIFNlZSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjkyNjgg Ki8KIAogI2VuZGlmIC8qICFkZWZpbmVkKEVOQUJMRV9KSVQpICovCiAKKyNpZiAhRU5BQkxFKEpJ VCkKKyNkZWZpbmUgRU5BQkxFX0lOVEVSUFJFVEVSIDEKKyNlbmRpZgorCisjaWYgIShFTkFCTEUo SklUKSB8fCBFTkFCTEUoSU5URVJQUkVURVIpKQorI2Vycm9yIFlvdSBoYXZlIHRvIGhhdmUgYXQg bGVhc3Qgb25lIGV4ZWN1dGlvbiBtb2RlbCBlbmFibGVkIHRvIGJ1aWxkIEpTQworI2VuZGlmCisK IC8qIENQVSBhcmNoaXRlY3R1cmUgc3BlY2lmaWMgb3B0aW1pemF0aW9ucyAqLwogI2lmIENQVShB Uk1fVFJBRElUSU9OQUwpCiAjaWYgRU5BQkxFKEpJVCkgJiYgIWRlZmluZWQoRU5BQkxFX0pJVF9P UFRJTUlaRV9NT0QpICYmIFdURl9BUk1fQVJDSF9BVF9MRUFTVCg1KQpAQCAtMTAxMiw3ICsxMDIw LDcgQEAgb24gTWluR1cuIFNlZSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjkyNjggKi8KICNkZWZpbmUgSlNDX0hPU1RfQ0FMTAogI2VuZGlmCiAKLSNpZiBDT01QSUxF UihHQ0MpICYmICFFTkFCTEUoSklUKQorI2lmIENPTVBJTEVSKEdDQykgJiYgRU5BQkxFKElOVEVS UFJFVEVSKQogI2RlZmluZSBIQVZFX0NPTVBVVEVEX0dPVE8gMQogI2VuZGlmCiAK