57054 2011-03-24 14:47:14 -0700 Ensure that all compilation takes place within a dynamic global object scope 2011-03-24 15:15:38 -0700 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 373113 0 ggaren 2011-03-24 14:47:14 -0700 Ensure that all compilation takes place within a dynamic global object scope 373120 1 86841 ggaren 2011-03-24 14:56:04 -0700 Created attachment 86841 Patch 373124 2 ggaren 2011-03-24 15:03:04 -0700 Committed r81904: <http://trac.webkit.org/changeset/81904> 373136 3 webkit.review.bot 2011-03-24 15:15:38 -0700 http://trac.webkit.org/changeset/81904 might have broken Windows Release (Build) and Windows Debug (Build) 86841 2011-03-24 14:56:04 -0700 2011-03-24 14:58:02 -0700 Patch bug-57054-20110324145603.patch text/plain 18415 ggaren SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gODE5MDEpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNTEgQEAK KzIwMTEtMDMtMjQgIEdlb2ZmcmV5IEdhcmVuICA8Z2dhcmVuQGFwcGxlLmNvbT4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFbnN1cmUgdGhhdCBhbGwg Y29tcGlsYXRpb24gdGFrZXMgcGxhY2Ugd2l0aGluIGEgZHluYW1pYyBnbG9iYWwgb2JqZWN0IHNj b3BlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NzA1 NAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vOTA4MzAxMT4gICAgICAgIAorCisgICAgICAgIE90 aGVyd2lzZSwgZW50cnkgdG8gdGhlIGdsb2JhbCBvYmplY3Qgc2NvcGUgbWlnaHQgdGhyb3cgYXdh eSB0aGUgY29kZQorICAgICAgICB3ZSBqdXN0IGNvbXBpbGVkLCBjYXVzaW5nIGEgY3Jhc2guCisK KyAgICAgICAgKiBKYXZhU2NyaXB0Q29yZS5leHA6IFVwZGF0ZWQgZm9yIHNpZ25hdHVyZSBjaGFu Z2UuCisKKyAgICAgICAgKiBkZWJ1Z2dlci9EZWJ1Z2dlci5jcHA6CisgICAgICAgIChKU0M6OmV2 YWx1YXRlSW5HbG9iYWxDYWxsRnJhbWUpOgorICAgICAgICAqIGRlYnVnZ2VyL0RlYnVnZ2VyQ2Fs bEZyYW1lLmNwcDoKKyAgICAgICAgKEpTQzo6RGVidWdnZXJDYWxsRnJhbWU6OmV2YWx1YXRlKTog UmVtb3ZlZCBleHBsaWNpdCBjb21waWxhdGlvbiBjYWxscworICAgICAgICBoZXJlIGJlY2F1c2Ug KGEpIHRoZXkgdG9vayBwbGFjZSBvdXRzaWRlIGEgZHluYW1pYyBnbG9iYWwgb2JqZWN0IHNjb3Bl CisgICAgICAgIGFuZCAoYikgdGhleSB3ZXJlIHJlZHVuZGFudC4KKworICAgICAgICAqIGludGVy cHJldGVyL0NhY2hlZENhbGwuaDoKKyAgICAgICAgKEpTQzo6Q2FjaGVkQ2FsbDo6Q2FjaGVkQ2Fs bCk6IFVwZGF0ZWQgZm9yIHNpZ25hdHVyZSBjaGFuZ2UuCisKKyAgICAgICAgKiBpbnRlcnByZXRl ci9JbnRlcnByZXRlci5jcHA6CisgICAgICAgIChKU0M6OkludGVycHJldGVyOjpleGVjdXRlKToK KyAgICAgICAgKEpTQzo6SW50ZXJwcmV0ZXI6OmV4ZWN1dGVDYWxsKToKKyAgICAgICAgKEpTQzo6 SW50ZXJwcmV0ZXI6OmV4ZWN1dGVDb25zdHJ1Y3QpOiBEZWNsYXJlIG91ciBkeW5hbWljIGdsb2Jh bCBvYmplY3QKKyAgICAgICAgc2NvcGUgZWFybGllciwgdG8gZW5zdXJlIHRoYXQgY29tcGlsYXRp b24gdGFrZXMgcGxhY2Ugd2l0aGluIGl0LgorCisgICAgICAgICogcnVudGltZS9Db21wbGV0aW9u LmNwcDoKKyAgICAgICAgKEpTQzo6ZXZhbHVhdGUpOiBSZW1vdmVkIGV4cGxpY2l0IGNvbXBpbGF0 aW9uIGNhbGxzIGhlcmUgYmVjYXVzZSAoYSkKKyAgICAgICAgdGhleSB0b29rIHBsYWNlIG91dHNp ZGUgYSBkeW5hbWljIGdsb2JhbCBvYmplY3Qgc2NvcGUgYW5kIChiKSB0aGV5IHdlcmUKKyAgICAg ICAgcmVkdW5kYW50LgorCisgICAgICAgICogcnVudGltZS9FeGVjdXRhYmxlLmg6CisgICAgICAg IChKU0M6OkV2YWxFeGVjdXRhYmxlOjpjb21waWxlKToKKyAgICAgICAgKEpTQzo6UHJvZ3JhbUV4 ZWN1dGFibGU6OmNvbXBpbGUpOgorICAgICAgICAoSlNDOjpGdW5jdGlvbkV4ZWN1dGFibGU6OmNv bXBpbGVGb3JDYWxsKToKKyAgICAgICAgKEpTQzo6RnVuY3Rpb25FeGVjdXRhYmxlOjpjb21waWxl Rm9yQ29uc3RydWN0KTogQWRkZWQgYW4gQVNTRVJUIHRvCisgICAgICAgIHZlcmlmeSBvdXIgbmV3 IGludmFyaWFudCB0aGF0IGFsbCBjb21waWxhdGlvbiB0YWtlcyBwbGFjZSB3aXRoaW4gYQorICAg ICAgICBkeW5hbWljIGdsb2JhbCBvYmplY3Qgc2NvcGUuCisKKyAgICAgICAgKiBydW50aW1lL0pT R2xvYmFsT2JqZWN0LmNwcDoKKyAgICAgICAgKEpTQzo6RHluYW1pY0dsb2JhbE9iamVjdFNjb3Bl OjpEeW5hbWljR2xvYmFsT2JqZWN0U2NvcGUpOgorICAgICAgICAqIHJ1bnRpbWUvSlNHbG9iYWxP YmplY3QuaDogQ2hhbmdlZCB0aGUgc2lnbmF0dXJlIG9mIER5bmFtaWNHbG9iYWxPYmplY3RTY29w ZQorICAgICAgICB0byByZXF1aXJlIGEgSlNHbG9iYWxEYXRhIGluc3RlYWQgb2YgYW4gRXhlY1N0 YXRlKiBzaW5jZSBpdCBpcyBvZnRlbgorICAgICAgICBlYXNpZXIgdG8gcHJvdmlkZSB0aGUgZm9y bWVyLCBhbmQgdGhlIGxhdHRlciB3YXMgbm90IG5lY2Vzc2FyeS4KKwogMjAxMS0wMy0yNCAgT2xp dmVyIEh1bnQgIDxvbGl2ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEdlb2Zm cmV5IEdhcmVuLgpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLmV4 cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUuZXhw CShyZXZpc2lvbiA4MTg5NSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29y ZS5leHAJKHdvcmtpbmcgY29weSkKQEAgLTIwNCw3ICsyMDQsNyBAQCBfX1pOM0pTQzIyb2JqZWN0 Q29uc3RydWN0b3JUYWJsZUUKIF9fWk4zSlNDMjNBYnN0cmFjdFNhbXBsaW5nQ291bnRlcjRkdW1w RXYKIF9fWk4zSlNDMjNvYmplY3RQcm90b0Z1bmNUb1N0cmluZ0VQTlNfOUV4ZWNTdGF0ZUUKIF9f Wk4zSlNDMjNzZXRVcFN0YXRpY0Z1bmN0aW9uU2xvdEVQTlNfOUV4ZWNTdGF0ZUVQS05TXzlIYXNo RW50cnlFUE5TXzhKU09iamVjdEVSS05TXzEwSWRlbnRpZmllckVSTlNfMTJQcm9wZXJ0eVNsb3RF Ci1fX1pOM0pTQzI0RHluYW1pY0dsb2JhbE9iamVjdFNjb3BlQzFFUE5TXzlFeGVjU3RhdGVFUE5T XzE0SlNHbG9iYWxPYmplY3RFCitfX1pOM0pTQzI0RHluYW1pY0dsb2JhbE9iamVjdFNjb3BlQzFF Uk5TXzEySlNHbG9iYWxEYXRhRVBOU18xNEpTR2xvYmFsT2JqZWN0RQogX19aTjNKU0MyNEpTT2Jq ZWN0V2l0aEdsb2JhbE9iamVjdEMyRVBOU18xNEpTR2xvYmFsT2JqZWN0RU4zV1RGMTdOb25OdWxs UGFzc1JlZlB0cklOU185U3RydWN0dXJlRUVFCiBfX1pOM0pTQzI0Y3JlYXRlU3RhY2tPdmVyZmxv d0Vycm9yRVBOU185RXhlY1N0YXRlRQogX19aTjNKU0MyNGNyZWF0ZVN0YWNrT3ZlcmZsb3dFcnJv ckVQTlNfOUV4ZWNTdGF0ZUUKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZWJ1Z2dlci9E ZWJ1Z2dlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RlYnVnZ2Vy L0RlYnVnZ2VyLmNwcAkocmV2aXNpb24gODE4OTUpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUv ZGVidWdnZXIvRGVidWdnZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMzIsOSArMTMyLDYgQEAg SlNWYWx1ZSBldmFsdWF0ZUluR2xvYmFsQ2FsbEZyYW1lKGNvbnN0IAogICAgICAgICBnbG9iYWxE YXRhLmV4Y2VwdGlvbiA9IEpTVmFsdWUoKTsKICAgICAgICAgcmV0dXJuIGV4Y2VwdGlvbjsKICAg ICB9Ci0gICAgSlNPYmplY3QqIGVycm9yID0gZXZhbC0+Y29tcGlsZShnbG9iYWxDYWxsRnJhbWUs IGdsb2JhbENhbGxGcmFtZS0+c2NvcGVDaGFpbigpKTsKLSAgICBpZiAoZXJyb3IpCi0gICAgICAg IHJldHVybiBlcnJvcjsKIAogICAgIEpTVmFsdWUgcmVzdWx0ID0gZ2xvYmFsRGF0YS5pbnRlcnBy ZXRlci0+ZXhlY3V0ZShldmFsLCBnbG9iYWxDYWxsRnJhbWUsIGdsb2JhbE9iamVjdCwgZ2xvYmFs Q2FsbEZyYW1lLT5zY29wZUNoYWluKCkpOwogICAgIGlmIChnbG9iYWxEYXRhLmV4Y2VwdGlvbikg ewpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RlYnVnZ2VyL0RlYnVnZ2VyQ2FsbEZyYW1l LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGVidWdnZXIvRGVidWdn ZXJDYWxsRnJhbWUuY3BwCShyZXZpc2lvbiA4MTg5NSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9kZWJ1Z2dlci9EZWJ1Z2dlckNhbGxGcmFtZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTk1LDEw ICs5NSw2IEBAIEpTVmFsdWUgRGVidWdnZXJDYWxsRnJhbWU6OmV2YWx1YXRlKGNvbnMKICAgICAg ICAgZ2xvYmFsRGF0YS5leGNlcHRpb24gPSBKU1ZhbHVlKCk7CiAgICAgfQogCi0gICAgSlNPYmpl Y3QqIGVycm9yID0gZXZhbC0+Y29tcGlsZShtX2NhbGxGcmFtZSwgbV9jYWxsRnJhbWUtPnNjb3Bl Q2hhaW4oKSk7Ci0gICAgaWYgKGVycm9yKQotICAgICAgICByZXR1cm4gZXJyb3I7Ci0KICAgICBK U1ZhbHVlIHJlc3VsdCA9IGdsb2JhbERhdGEuaW50ZXJwcmV0ZXItPmV4ZWN1dGUoZXZhbCwgbV9j YWxsRnJhbWUsIHRoaXNPYmplY3QoKSwgbV9jYWxsRnJhbWUtPnNjb3BlQ2hhaW4oKSk7CiAgICAg aWYgKGdsb2JhbERhdGEuZXhjZXB0aW9uKSB7CiAgICAgICAgIGV4Y2VwdGlvbiA9IGdsb2JhbERh dGEuZXhjZXB0aW9uOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2ludGVycHJldGVyL0Nh Y2hlZENhbGwuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0 ZXIvQ2FjaGVkQ2FsbC5oCShyZXZpc2lvbiA4MTg5NSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9pbnRlcnByZXRlci9DYWNoZWRDYWxsLmgJKHdvcmtpbmcgY29weSkKQEAgLTM4LDcgKzM4LDcg QEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgIENhY2hlZENhbGwoQ2FsbEZyYW1lKiBjYWxsRnJh bWUsIEpTRnVuY3Rpb24qIGZ1bmN0aW9uLCBpbnQgYXJnQ291bnQpCiAgICAgICAgICAgICA6IG1f dmFsaWQoZmFsc2UpCiAgICAgICAgICAgICAsIG1faW50ZXJwcmV0ZXIoY2FsbEZyYW1lLT5pbnRl cnByZXRlcigpKQotICAgICAgICAgICAgLCBtX2dsb2JhbE9iamVjdFNjb3BlKGNhbGxGcmFtZSwg ZnVuY3Rpb24tPnNjb3BlKCktPmdsb2JhbE9iamVjdC5nZXQoKSkKKyAgICAgICAgICAgICwgbV9n bG9iYWxPYmplY3RTY29wZShjYWxsRnJhbWUtPmdsb2JhbERhdGEoKSwgZnVuY3Rpb24tPnNjb3Bl KCktPmdsb2JhbE9iamVjdC5nZXQoKSkKICAgICAgICAgewogICAgICAgICAgICAgQVNTRVJUKCFm dW5jdGlvbi0+aXNIb3N0RnVuY3Rpb24oKSk7CiAgICAgICAgICAgICBtX2Nsb3N1cmUgPSBtX2lu dGVycHJldGVyLT5wcmVwYXJlRm9yUmVwZWF0Q2FsbChmdW5jdGlvbi0+anNFeGVjdXRhYmxlKCks IGNhbGxGcmFtZSwgZnVuY3Rpb24sIGFyZ0NvdW50LCBmdW5jdGlvbi0+c2NvcGUoKSk7CkluZGV4 OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvSW50ZXJwcmV0ZXIuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9JbnRlcnByZXRlci5j cHAJKHJldmlzaW9uIDgxODk1KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2ludGVycHJldGVy L0ludGVycHJldGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzM4LDYgKzczOCw4IEBAIEpTVmFs dWUgSW50ZXJwcmV0ZXI6OmV4ZWN1dGUoUHJvZ3JhbUV4ZWMKICAgICBpZiAobV9yZWVudHJ5RGVw dGggPj0gTWF4U21hbGxUaHJlYWRSZWVudHJ5RGVwdGggJiYgbV9yZWVudHJ5RGVwdGggPj0gY2Fs bEZyYW1lLT5nbG9iYWxEYXRhKCkubWF4UmVlbnRyeURlcHRoKQogICAgICAgICByZXR1cm4gY2hl Y2tlZFJldHVybih0aHJvd1N0YWNrT3ZlcmZsb3dFcnJvcihjYWxsRnJhbWUpKTsKIAorICAgIER5 bmFtaWNHbG9iYWxPYmplY3RTY29wZSBnbG9iYWxPYmplY3RTY29wZSgqc2NvcGVDaGFpbi0+Z2xv YmFsRGF0YSwgc2NvcGVDaGFpbi0+Z2xvYmFsT2JqZWN0LmdldCgpKTsKKwogICAgIEpTT2JqZWN0 KiBlcnJvciA9IHByb2dyYW0tPmNvbXBpbGUoY2FsbEZyYW1lLCBzY29wZUNoYWluKTsKICAgICBp ZiAoZXJyb3IpCiAgICAgICAgIHJldHVybiBjaGVja2VkUmV0dXJuKHRocm93RXJyb3IoY2FsbEZy YW1lLCBlcnJvcikpOwpAQCAtNzU3LDggKzc1OSw2IEBAIEpTVmFsdWUgSW50ZXJwcmV0ZXI6OmV4 ZWN1dGUoUHJvZ3JhbUV4ZWMKICAgICBuZXdDYWxsRnJhbWUtPmluaXQoY29kZUJsb2NrLCAwLCBz Y29wZUNoYWluLCBDYWxsRnJhbWU6Om5vQ2FsbGVyKCksIGNvZGVCbG9jay0+bV9udW1QYXJhbWV0 ZXJzLCAwKTsKICAgICBuZXdDYWxsRnJhbWUtPnVuY2hlY2tlZFIobmV3Q2FsbEZyYW1lLT5ob3N0 VGhpc1JlZ2lzdGVyKCkpID0gSlNWYWx1ZSh0aGlzT2JqKTsKIAotICAgIER5bmFtaWNHbG9iYWxP YmplY3RTY29wZSBnbG9iYWxPYmplY3RTY29wZShjYWxsRnJhbWUsIHNjb3BlQ2hhaW4tPmdsb2Jh bE9iamVjdC5nZXQoKSk7Ci0KICAgICBQcm9maWxlcioqIHByb2ZpbGVyID0gUHJvZmlsZXI6OmVu YWJsZWRQcm9maWxlclJlZmVyZW5jZSgpOwogICAgIGlmICgqcHJvZmlsZXIpCiAgICAgICAgICgq cHJvZmlsZXIpLT53aWxsRXhlY3V0ZShjYWxsRnJhbWUsIHByb2dyYW0tPnNvdXJjZVVSTCgpLCBw cm9ncmFtLT5saW5lTm8oKSk7CkBAIC04MTMsNiArODEzLDggQEAgSlNWYWx1ZSBJbnRlcnByZXRl cjo6ZXhlY3V0ZUNhbGwoQ2FsbEZyYQogICAgIGlmIChjYWxsVHlwZSA9PSBDYWxsVHlwZUpTKSB7 CiAgICAgICAgIFNjb3BlQ2hhaW5Ob2RlKiBjYWxsRGF0YVNjb3BlQ2hhaW4gPSBjYWxsRGF0YS5q cy5zY29wZUNoYWluOwogCisgICAgICAgIER5bmFtaWNHbG9iYWxPYmplY3RTY29wZSBnbG9iYWxP YmplY3RTY29wZSgqY2FsbERhdGFTY29wZUNoYWluLT5nbG9iYWxEYXRhLCBjYWxsRGF0YVNjb3Bl Q2hhaW4tPmdsb2JhbE9iamVjdC5nZXQoKSk7CisKICAgICAgICAgSlNPYmplY3QqIGNvbXBpbGVF cnJvciA9IGNhbGxEYXRhLmpzLmZ1bmN0aW9uRXhlY3V0YWJsZS0+Y29tcGlsZUZvckNhbGwoY2Fs bEZyYW1lLCBjYWxsRGF0YVNjb3BlQ2hhaW4pOwogICAgICAgICBpZiAoVU5MSUtFTFkoISFjb21w aWxlRXJyb3IpKSB7CiAgICAgICAgICAgICBtX3JlZ2lzdGVyRmlsZS5zaHJpbmsob2xkRW5kKTsK QEAgLTgyOCw4ICs4MzAsNiBAQCBKU1ZhbHVlIEludGVycHJldGVyOjpleGVjdXRlQ2FsbChDYWxs RnJhCiAKICAgICAgICAgbmV3Q2FsbEZyYW1lLT5pbml0KG5ld0NvZGVCbG9jaywgMCwgY2FsbERh dGFTY29wZUNoYWluLCBjYWxsRnJhbWUtPmFkZEhvc3RDYWxsRnJhbWVGbGFnKCksIGFyZ0NvdW50 LCBmdW5jdGlvbik7CiAKLSAgICAgICAgRHluYW1pY0dsb2JhbE9iamVjdFNjb3BlIGdsb2JhbE9i amVjdFNjb3BlKG5ld0NhbGxGcmFtZSwgY2FsbERhdGFTY29wZUNoYWluLT5nbG9iYWxPYmplY3Qu Z2V0KCkpOwotCiAgICAgICAgIFByb2ZpbGVyKiogcHJvZmlsZXIgPSBQcm9maWxlcjo6ZW5hYmxl ZFByb2ZpbGVyUmVmZXJlbmNlKCk7CiAgICAgICAgIGlmICgqcHJvZmlsZXIpCiAgICAgICAgICAg ICAoKnByb2ZpbGVyKS0+d2lsbEV4ZWN1dGUoY2FsbEZyYW1lLCBmdW5jdGlvbik7CkBAIC04NjAs NyArODYwLDcgQEAgSlNWYWx1ZSBJbnRlcnByZXRlcjo6ZXhlY3V0ZUNhbGwoQ2FsbEZyYQogICAg IG5ld0NhbGxGcmFtZSA9IENhbGxGcmFtZTo6Y3JlYXRlKG5ld0NhbGxGcmFtZS0+cmVnaXN0ZXJz KCkgKyByZWdpc3Rlck9mZnNldCk7CiAgICAgbmV3Q2FsbEZyYW1lLT5pbml0KDAsIDAsIHNjb3Bl Q2hhaW4sIGNhbGxGcmFtZS0+YWRkSG9zdENhbGxGcmFtZUZsYWcoKSwgYXJnQ291bnQsIGZ1bmN0 aW9uKTsKIAotICAgIER5bmFtaWNHbG9iYWxPYmplY3RTY29wZSBnbG9iYWxPYmplY3RTY29wZShu ZXdDYWxsRnJhbWUsIHNjb3BlQ2hhaW4tPmdsb2JhbE9iamVjdC5nZXQoKSk7CisgICAgRHluYW1p Y0dsb2JhbE9iamVjdFNjb3BlIGdsb2JhbE9iamVjdFNjb3BlKCpzY29wZUNoYWluLT5nbG9iYWxE YXRhLCBzY29wZUNoYWluLT5nbG9iYWxPYmplY3QuZ2V0KCkpOwogCiAgICAgUHJvZmlsZXIqKiBw cm9maWxlciA9IFByb2ZpbGVyOjplbmFibGVkUHJvZmlsZXJSZWZlcmVuY2UoKTsKICAgICBpZiAo KnByb2ZpbGVyKQpAQCAtOTAyLDYgKzkwMiw4IEBAIEpTT2JqZWN0KiBJbnRlcnByZXRlcjo6ZXhl Y3V0ZUNvbnN0cnVjdCgKICAgICBpZiAoY29uc3RydWN0VHlwZSA9PSBDb25zdHJ1Y3RUeXBlSlMp IHsKICAgICAgICAgU2NvcGVDaGFpbk5vZGUqIGNvbnN0cnVjdERhdGFTY29wZUNoYWluID0gY29u c3RydWN0RGF0YS5qcy5zY29wZUNoYWluOwogCisgICAgICAgIER5bmFtaWNHbG9iYWxPYmplY3RT Y29wZSBnbG9iYWxPYmplY3RTY29wZSgqY29uc3RydWN0RGF0YVNjb3BlQ2hhaW4tPmdsb2JhbERh dGEsIGNvbnN0cnVjdERhdGFTY29wZUNoYWluLT5nbG9iYWxPYmplY3QuZ2V0KCkpOworCiAgICAg ICAgIEpTT2JqZWN0KiBjb21waWxlRXJyb3IgPSBjb25zdHJ1Y3REYXRhLmpzLmZ1bmN0aW9uRXhl Y3V0YWJsZS0+Y29tcGlsZUZvckNvbnN0cnVjdChjYWxsRnJhbWUsIGNvbnN0cnVjdERhdGFTY29w ZUNoYWluKTsKICAgICAgICAgaWYgKFVOTElLRUxZKCEhY29tcGlsZUVycm9yKSkgewogICAgICAg ICAgICAgbV9yZWdpc3RlckZpbGUuc2hyaW5rKG9sZEVuZCk7CkBAIC05MTcsOCArOTE5LDYgQEAg SlNPYmplY3QqIEludGVycHJldGVyOjpleGVjdXRlQ29uc3RydWN0KAogCiAgICAgICAgIG5ld0Nh bGxGcmFtZS0+aW5pdChuZXdDb2RlQmxvY2ssIDAsIGNvbnN0cnVjdERhdGFTY29wZUNoYWluLCBj YWxsRnJhbWUtPmFkZEhvc3RDYWxsRnJhbWVGbGFnKCksIGFyZ0NvdW50LCBjb25zdHJ1Y3Rvcik7 CiAKLSAgICAgICAgRHluYW1pY0dsb2JhbE9iamVjdFNjb3BlIGdsb2JhbE9iamVjdFNjb3BlKG5l d0NhbGxGcmFtZSwgY29uc3RydWN0RGF0YVNjb3BlQ2hhaW4tPmdsb2JhbE9iamVjdC5nZXQoKSk7 Ci0KICAgICAgICAgUHJvZmlsZXIqKiBwcm9maWxlciA9IFByb2ZpbGVyOjplbmFibGVkUHJvZmls ZXJSZWZlcmVuY2UoKTsKICAgICAgICAgaWYgKCpwcm9maWxlcikKICAgICAgICAgICAgICgqcHJv ZmlsZXIpLT53aWxsRXhlY3V0ZShjYWxsRnJhbWUsIGNvbnN0cnVjdG9yKTsKQEAgLTk1Miw3ICs5 NTIsNyBAQCBKU09iamVjdCogSW50ZXJwcmV0ZXI6OmV4ZWN1dGVDb25zdHJ1Y3QoCiAgICAgbmV3 Q2FsbEZyYW1lID0gQ2FsbEZyYW1lOjpjcmVhdGUobmV3Q2FsbEZyYW1lLT5yZWdpc3RlcnMoKSAr IHJlZ2lzdGVyT2Zmc2V0KTsKICAgICBuZXdDYWxsRnJhbWUtPmluaXQoMCwgMCwgc2NvcGVDaGFp biwgY2FsbEZyYW1lLT5hZGRIb3N0Q2FsbEZyYW1lRmxhZygpLCBhcmdDb3VudCwgY29uc3RydWN0 b3IpOwogCi0gICAgRHluYW1pY0dsb2JhbE9iamVjdFNjb3BlIGdsb2JhbE9iamVjdFNjb3BlKG5l d0NhbGxGcmFtZSwgc2NvcGVDaGFpbi0+Z2xvYmFsT2JqZWN0LmdldCgpKTsKKyAgICBEeW5hbWlj R2xvYmFsT2JqZWN0U2NvcGUgZ2xvYmFsT2JqZWN0U2NvcGUoKnNjb3BlQ2hhaW4tPmdsb2JhbERh dGEsIHNjb3BlQ2hhaW4tPmdsb2JhbE9iamVjdC5nZXQoKSk7CiAKICAgICBQcm9maWxlcioqIHBy b2ZpbGVyID0gUHJvZmlsZXI6OmVuYWJsZWRQcm9maWxlclJlZmVyZW5jZSgpOwogICAgIGlmICgq cHJvZmlsZXIpCkBAIC0xMDY2LDExICsxMDY2LDExIEBAIEpTVmFsdWUgSW50ZXJwcmV0ZXI6OmV4 ZWN1dGUoRXZhbEV4ZWN1dGEKIHsKICAgICBBU1NFUlQoIXNjb3BlQ2hhaW4tPmdsb2JhbERhdGEt PmV4Y2VwdGlvbik7CiAKKyAgICBEeW5hbWljR2xvYmFsT2JqZWN0U2NvcGUgZ2xvYmFsT2JqZWN0 U2NvcGUoKnNjb3BlQ2hhaW4tPmdsb2JhbERhdGEsIHNjb3BlQ2hhaW4tPmdsb2JhbE9iamVjdC5n ZXQoKSk7CisKICAgICBpZiAobV9yZWVudHJ5RGVwdGggPj0gTWF4U21hbGxUaHJlYWRSZWVudHJ5 RGVwdGggJiYgbV9yZWVudHJ5RGVwdGggPj0gY2FsbEZyYW1lLT5nbG9iYWxEYXRhKCkubWF4UmVl bnRyeURlcHRoKQogICAgICAgICByZXR1cm4gY2hlY2tlZFJldHVybih0aHJvd1N0YWNrT3ZlcmZs b3dFcnJvcihjYWxsRnJhbWUpKTsKIAotICAgIER5bmFtaWNHbG9iYWxPYmplY3RTY29wZSBnbG9i YWxPYmplY3RTY29wZShjYWxsRnJhbWUsIHNjb3BlQ2hhaW4tPmdsb2JhbE9iamVjdC5nZXQoKSk7 Ci0KICAgICBKU09iamVjdCogY29tcGlsZUVycm9yID0gZXZhbC0+Y29tcGlsZShjYWxsRnJhbWUs IHNjb3BlQ2hhaW4pOwogICAgIGlmIChVTkxJS0VMWSghIWNvbXBpbGVFcnJvcikpCiAgICAgICAg IHJldHVybiBjaGVja2VkUmV0dXJuKHRocm93RXJyb3IoY2FsbEZyYW1lLCBjb21waWxlRXJyb3Ip KTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NvbXBsZXRpb24uY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NvbXBsZXRpb24uY3Bw CShyZXZpc2lvbiA4MTg5NSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NvbXBs ZXRpb24uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01OCw5ICs1OCw2IEBAIENvbXBsZXRpb24gZXZh bHVhdGUoRXhlY1N0YXRlKiBleGVjLCBTY28KICAgICAgICAgZXhlYy0+Z2xvYmFsRGF0YSgpLmV4 Y2VwdGlvbiA9IEpTVmFsdWUoKTsKICAgICAgICAgcmV0dXJuIENvbXBsZXRpb24oVGhyb3csIGV4 Y2VwdGlvbik7CiAgICAgfQotICAgIEpTT2JqZWN0KiBlcnJvciA9IHByb2dyYW0tPmNvbXBpbGUo ZXhlYywgc2NvcGVDaGFpbik7Ci0gICAgaWYgKGVycm9yKQotICAgICAgICByZXR1cm4gQ29tcGxl dGlvbihUaHJvdywgZXJyb3IpOwogCiAgICAgSlNPYmplY3QqIHRoaXNPYmogPSAoIXRoaXNWYWx1 ZSB8fCB0aGlzVmFsdWUuaXNVbmRlZmluZWRPck51bGwoKSkgPyBleGVjLT5keW5hbWljR2xvYmFs T2JqZWN0KCkgOiB0aGlzVmFsdWUudG9PYmplY3QoZXhlYyk7CiAKSW5kZXg6IFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL0V4ZWN1dGFibGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9FeGVjdXRhYmxlLmgJKHJldmlzaW9uIDgxODk1KQorKysgU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvRXhlY3V0YWJsZS5oCSh3b3JraW5nIGNvcHkpCkBA IC0yMTYsNiArMjE2LDcgQEAgbmFtZXNwYWNlIEpTQyB7CiAKICAgICAgICAgSlNPYmplY3QqIGNv bXBpbGUoRXhlY1N0YXRlKiBleGVjLCBTY29wZUNoYWluTm9kZSogc2NvcGVDaGFpbk5vZGUpCiAg ICAgICAgIHsKKyAgICAgICAgICAgIEFTU0VSVChleGVjLT5nbG9iYWxEYXRhKCkuZHluYW1pY0ds b2JhbE9iamVjdCk7CiAgICAgICAgICAgICBKU09iamVjdCogZXJyb3IgPSAwOwogICAgICAgICAg ICAgaWYgKCFtX2V2YWxDb2RlQmxvY2spCiAgICAgICAgICAgICAgICAgZXJyb3IgPSBjb21waWxl SW50ZXJuYWwoZXhlYywgc2NvcGVDaGFpbk5vZGUpOwpAQCAtMjYwLDYgKzI2MSw3IEBAIG5hbWVz cGFjZSBKU0MgewogCiAgICAgICAgIEpTT2JqZWN0KiBjb21waWxlKEV4ZWNTdGF0ZSogZXhlYywg U2NvcGVDaGFpbk5vZGUqIHNjb3BlQ2hhaW5Ob2RlKQogICAgICAgICB7CisgICAgICAgICAgICBB U1NFUlQoZXhlYy0+Z2xvYmFsRGF0YSgpLmR5bmFtaWNHbG9iYWxPYmplY3QpOwogICAgICAgICAg ICAgSlNPYmplY3QqIGVycm9yID0gMDsKICAgICAgICAgICAgIGlmICghbV9wcm9ncmFtQ29kZUJs b2NrKQogICAgICAgICAgICAgICAgIGVycm9yID0gY29tcGlsZUludGVybmFsKGV4ZWMsIHNjb3Bl Q2hhaW5Ob2RlKTsKQEAgLTMyNSw2ICszMjcsNyBAQCBuYW1lc3BhY2UgSlNDIHsKIAogICAgICAg ICBKU09iamVjdCogY29tcGlsZUZvckNhbGwoRXhlY1N0YXRlKiBleGVjLCBTY29wZUNoYWluTm9k ZSogc2NvcGVDaGFpbk5vZGUpCiAgICAgICAgIHsKKyAgICAgICAgICAgIEFTU0VSVChleGVjLT5n bG9iYWxEYXRhKCkuZHluYW1pY0dsb2JhbE9iamVjdCk7CiAgICAgICAgICAgICBKU09iamVjdCog ZXJyb3IgPSAwOwogICAgICAgICAgICAgaWYgKCFtX2NvZGVCbG9ja0ZvckNhbGwpCiAgICAgICAg ICAgICAgICAgZXJyb3IgPSBjb21waWxlRm9yQ2FsbEludGVybmFsKGV4ZWMsIHNjb3BlQ2hhaW5O b2RlKTsKQEAgLTM0NSw2ICszNDgsNyBAQCBuYW1lc3BhY2UgSlNDIHsKIAogICAgICAgICBKU09i amVjdCogY29tcGlsZUZvckNvbnN0cnVjdChFeGVjU3RhdGUqIGV4ZWMsIFNjb3BlQ2hhaW5Ob2Rl KiBzY29wZUNoYWluTm9kZSkKICAgICAgICAgeworICAgICAgICAgICAgQVNTRVJUKGV4ZWMtPmds b2JhbERhdGEoKS5keW5hbWljR2xvYmFsT2JqZWN0KTsKICAgICAgICAgICAgIEpTT2JqZWN0KiBl cnJvciA9IDA7CiAgICAgICAgICAgICBpZiAoIW1fY29kZUJsb2NrRm9yQ29uc3RydWN0KQogICAg ICAgICAgICAgICAgIGVycm9yID0gY29tcGlsZUZvckNvbnN0cnVjdEludGVybmFsKGV4ZWMsIHNj b3BlQ2hhaW5Ob2RlKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTR2xv YmFsT2JqZWN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9KU0dsb2JhbE9iamVjdC5jcHAJKHJldmlzaW9uIDgxODk1KQorKysgU291cmNlL0phdmFTY3Jp cHRDb3JlL3J1bnRpbWUvSlNHbG9iYWxPYmplY3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00Mzks MjEgKzQzOSwyMSBAQCB2b2lkKiBKU0dsb2JhbE9iamVjdDo6b3BlcmF0b3IgbmV3KHNpemVfCiAg ICAgcmV0dXJuIGdsb2JhbERhdGEtPmhlYXAuYWxsb2NhdGUoc2l6ZSk7CiB9CiAKLUR5bmFtaWNH bG9iYWxPYmplY3RTY29wZTo6RHluYW1pY0dsb2JhbE9iamVjdFNjb3BlKENhbGxGcmFtZSogY2Fs bEZyYW1lLCBKU0dsb2JhbE9iamVjdCogZHluYW1pY0dsb2JhbE9iamVjdCkKLSAgICA6IG1fZHlu YW1pY0dsb2JhbE9iamVjdFNsb3QoY2FsbEZyYW1lLT5nbG9iYWxEYXRhKCkuZHluYW1pY0dsb2Jh bE9iamVjdCkKK0R5bmFtaWNHbG9iYWxPYmplY3RTY29wZTo6RHluYW1pY0dsb2JhbE9iamVjdFNj b3BlKEpTR2xvYmFsRGF0YSYgZ2xvYmFsRGF0YSwgSlNHbG9iYWxPYmplY3QqIGR5bmFtaWNHbG9i YWxPYmplY3QpCisgICAgOiBtX2R5bmFtaWNHbG9iYWxPYmplY3RTbG90KGdsb2JhbERhdGEuZHlu YW1pY0dsb2JhbE9iamVjdCkKICAgICAsIG1fc2F2ZWREeW5hbWljR2xvYmFsT2JqZWN0KG1fZHlu YW1pY0dsb2JhbE9iamVjdFNsb3QpCiB7CiAgICAgaWYgKCFtX2R5bmFtaWNHbG9iYWxPYmplY3RT bG90KSB7CiAjaWYgRU5BQkxFKEFTU0VNQkxFUikKICAgICAgICAgaWYgKEV4ZWN1dGFibGVBbGxv Y2F0b3I6OnVuZGVyTWVtb3J5UHJlc3N1cmUoKSkKLSAgICAgICAgICAgIGNhbGxGcmFtZS0+Z2xv YmFsRGF0YSgpLnJlY29tcGlsZUFsbEpTRnVuY3Rpb25zKCk7CisgICAgICAgICAgICBnbG9iYWxE YXRhLnJlY29tcGlsZUFsbEpTRnVuY3Rpb25zKCk7CiAjZW5kaWYKIAogICAgICAgICBtX2R5bmFt aWNHbG9iYWxPYmplY3RTbG90ID0gZHluYW1pY0dsb2JhbE9iamVjdDsKIAogICAgICAgICAvLyBS ZXNldCB0aGUgZGF0ZSBjYWNoZSBiZXR3ZWVuIEpTIGludm9jYXRpb25zIHRvIGZvcmNlIHRoZSBW TQogICAgICAgICAvLyB0byBvYnNlcnZlIHRpbWUgem9uZSBjaGFuZ2VzLgotICAgICAgICBjYWxs RnJhbWUtPmdsb2JhbERhdGEoKS5yZXNldERhdGVDYWNoZSgpOworICAgICAgICBnbG9iYWxEYXRh LnJlc2V0RGF0ZUNhY2hlKCk7CiAgICAgfQogfQogCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9KU0dsb2JhbE9iamVjdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL0pTR2xvYmFsT2JqZWN0LmgJKHJldmlzaW9uIDgxODk1KQorKysgU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNHbG9iYWxPYmplY3QuaAkod29ya2luZyBjb3B5 KQpAQCAtNDM0LDcgKzQzNCw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgIGNsYXNzIER5bmFtaWNH bG9iYWxPYmplY3RTY29wZSB7CiAgICAgICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKER5bmFtaWNH bG9iYWxPYmplY3RTY29wZSk7CiAgICAgcHVibGljOgotICAgICAgICBEeW5hbWljR2xvYmFsT2Jq ZWN0U2NvcGUoQ2FsbEZyYW1lKiBjYWxsRnJhbWUsIEpTR2xvYmFsT2JqZWN0KiBkeW5hbWljR2xv YmFsT2JqZWN0KTsKKyAgICAgICAgRHluYW1pY0dsb2JhbE9iamVjdFNjb3BlKEpTR2xvYmFsRGF0 YSYsIEpTR2xvYmFsT2JqZWN0Kik7CiAKICAgICAgICAgfkR5bmFtaWNHbG9iYWxPYmplY3RTY29w ZSgpCiAgICAgICAgIHsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgxOTAxKQorKysgU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEt MDMtMjQgIEdlb2ZmcmV5IEdhcmVuICA8Z2dhcmVuQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFbnN1cmUgdGhhdCBhbGwgY29tcGls YXRpb24gdGFrZXMgcGxhY2Ugd2l0aGluIGEgZHluYW1pYyBnbG9iYWwgb2JqZWN0IHNjb3BlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NzA1NAorCisg ICAgICAgICogYmluZGluZ3MvanMvSlNFcnJvckhhbmRsZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6SlNFcnJvckhhbmRsZXI6OmhhbmRsZUV2ZW50KToKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9K U0V2ZW50TGlzdGVuZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SlNFdmVudExpc3RlbmVyOjpo YW5kbGVFdmVudCk6IFVwZGF0ZWQgZm9yIHNpZ25hdHVyZSBjaGFuZ2UuCisKIDIwMTEtMDMtMjQg IEpvaG4gQmF1bWFuICA8amJhdW1hbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgS2VubmV0aCBSdXNzZWxsLgpJbmRleDogU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNF cnJvckhhbmRsZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pz L0pTRXJyb3JIYW5kbGVyLmNwcAkocmV2aXNpb24gODE4OTUpCisrKyBTb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9qcy9KU0Vycm9ySGFuZGxlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg4LDcgKzg4 LDcgQEAgdm9pZCBKU0Vycm9ySGFuZGxlcjo6aGFuZGxlRXZlbnQoU2NyaXB0RQogICAgICAgICBh cmdzLmFwcGVuZChqc051bWJlcihlcnJvckV2ZW50LT5saW5lbm8oKSkpOwogCiAgICAgICAgIEpT R2xvYmFsRGF0YSYgZ2xvYmFsRGF0YSA9IGdsb2JhbE9iamVjdC0+Z2xvYmFsRGF0YSgpOwotICAg ICAgICBEeW5hbWljR2xvYmFsT2JqZWN0U2NvcGUgZ2xvYmFsT2JqZWN0U2NvcGUoZXhlYywgZ2xv YmFsRGF0YS5keW5hbWljR2xvYmFsT2JqZWN0ID8gZ2xvYmFsRGF0YS5keW5hbWljR2xvYmFsT2Jq ZWN0IDogZ2xvYmFsT2JqZWN0KTsKKyAgICAgICAgRHluYW1pY0dsb2JhbE9iamVjdFNjb3BlIGds b2JhbE9iamVjdFNjb3BlKGdsb2JhbERhdGEsIGdsb2JhbERhdGEuZHluYW1pY0dsb2JhbE9iamVj dCA/IGdsb2JhbERhdGEuZHluYW1pY0dsb2JhbE9iamVjdCA6IGdsb2JhbE9iamVjdCk7CiAKICAg ICAgICAgSlNWYWx1ZSB0aGlzVmFsdWUgPSBnbG9iYWxPYmplY3QtPnRvVGhpc09iamVjdChleGVj KTsKIApJbmRleDogU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNFdmVudExpc3RlbmVyLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0V2ZW50TGlzdGVu ZXIuY3BwCShyZXZpc2lvbiA4MTg5NSkKKysrIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pT RXZlbnRMaXN0ZW5lci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwOCw3ICsxMDgsNyBAQCB2b2lk IEpTRXZlbnRMaXN0ZW5lcjo6aGFuZGxlRXZlbnQoU2NyaXB0CiAgICAgICAgIGdsb2JhbE9iamVj dC0+c2V0Q3VycmVudEV2ZW50KGV2ZW50KTsKIAogICAgICAgICBKU0dsb2JhbERhdGEmIGdsb2Jh bERhdGEgPSBnbG9iYWxPYmplY3QtPmdsb2JhbERhdGEoKTsKLSAgICAgICAgRHluYW1pY0dsb2Jh bE9iamVjdFNjb3BlIGdsb2JhbE9iamVjdFNjb3BlKGV4ZWMsIGdsb2JhbERhdGEuZHluYW1pY0ds b2JhbE9iamVjdCA/IGdsb2JhbERhdGEuZHluYW1pY0dsb2JhbE9iamVjdCA6IGdsb2JhbE9iamVj dCk7CisgICAgICAgIER5bmFtaWNHbG9iYWxPYmplY3RTY29wZSBnbG9iYWxPYmplY3RTY29wZShn bG9iYWxEYXRhLCBnbG9iYWxEYXRhLmR5bmFtaWNHbG9iYWxPYmplY3QgPyBnbG9iYWxEYXRhLmR5 bmFtaWNHbG9iYWxPYmplY3QgOiBnbG9iYWxPYmplY3QpOwogCiAgICAgICAgIGdsb2JhbERhdGEu dGltZW91dENoZWNrZXIuc3RhcnQoKTsKICAgICAgICAgSlNWYWx1ZSByZXR2YWw7CkluZGV4OiBT b3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9t YWMvQ2hhbmdlTG9nCShyZXZpc2lvbiA4MTkwMSkKKysrIFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDExLTAzLTI0ICBHZW9mZnJl eSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgRW5zdXJlIHRoYXQgYWxsIGNvbXBpbGF0aW9uIHRha2VzIHBs YWNlIHdpdGhpbiBhIGR5bmFtaWMgZ2xvYmFsIG9iamVjdCBzY29wZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTcwNTQKKworICAgICAgICAqIFdlYlZp ZXcvV2ViU2NyaXB0RGVidWdEZWxlZ2F0ZS5tbToKKyAgICAgICAgKC1bV2ViU2NyaXB0Q2FsbEZy YW1lIGV2YWx1YXRlV2ViU2NyaXB0Ol0pOiBVcGRhdGVkIGZvciBzaWduYXR1cmUgY2hhbmdlLgor CiAyMDExLTAzLTI0ICBKaWEgUHUgIDxqcHVAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IERhcmluIEFkbGVyLgpJbmRleDogU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJTY3Jp cHREZWJ1Z0RlbGVnYXRlLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZp ZXcvV2ViU2NyaXB0RGVidWdEZWxlZ2F0ZS5tbQkocmV2aXNpb24gODE4OTUpCisrKyBTb3VyY2Uv V2ViS2l0L21hYy9XZWJWaWV3L1dlYlNjcmlwdERlYnVnRGVsZWdhdGUubW0JKHdvcmtpbmcgY29w eSkKQEAgLTIzOSw3ICsyMzksNyBAQCAtIChpZClldmFsdWF0ZVdlYlNjcmlwdDooTlNTdHJpbmcg KilzY3JpCiAgICAgaWYgKHNlbGYgPT0gX3ByaXZhdGUtPmRlYnVnZ2VyLT5nbG9iYWxDYWxsRnJh bWUoKSAmJiAhZ2xvYmFsT2JqZWN0LT5nbG9iYWxEYXRhKCkuZHluYW1pY0dsb2JhbE9iamVjdCkg ewogICAgICAgICBKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0ID0gX3ByaXZhdGUtPmRlYnVn Z2VyLT5nbG9iYWxPYmplY3QoKTsKIAotICAgICAgICBEeW5hbWljR2xvYmFsT2JqZWN0U2NvcGUg Z2xvYmFsT2JqZWN0U2NvcGUoZ2xvYmFsT2JqZWN0LT5nbG9iYWxFeGVjKCksIGdsb2JhbE9iamVj dCk7CisgICAgICAgIER5bmFtaWNHbG9iYWxPYmplY3RTY29wZSBnbG9iYWxPYmplY3RTY29wZShn bG9iYWxPYmplY3QtPmdsb2JhbERhdGEoKSwgZ2xvYmFsT2JqZWN0KTsKIAogICAgICAgICBKU1Zh bHVlIGV4Y2VwdGlvbjsKICAgICAgICAgSlNWYWx1ZSByZXN1bHQgPSBldmFsdWF0ZUluR2xvYmFs Q2FsbEZyYW1lKHN0cmluZ1RvVVN0cmluZyhzY3JpcHQpLCBleGNlcHRpb24sIGdsb2JhbE9iamVj dCk7Cg==