147840 2015-08-10 13:49:38 -0700 Make ASan build not depend on asan.xcconfig 2015-08-11 16:50:26 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ap ap benjamin cmarcelo commit-queue dbates ddkilzer fpizlo ggaren mitz oldest_to_newest 1116319 0 ap 2015-08-10 13:49:38 -0700 Address Sanitizer can be enabled by forcing clang build flags from any build system, but we currently depend on injecting asan.xcconfig. rdar://problem/21093702 1116328 1 258649 ap 2015-08-10 13:57:13 -0700 Created attachment 258649 proposed patch To be clear, we will still be using the xcconfig to enable ASan on Mac, however it won't be required. The patch is mechanical; it's possible that we don't need to use asanUnsafeJSValue() just as much. 1116624 2 258649 dbates 2015-08-11 11:59:32 -0700 Comment on attachment 258649 proposed patch OK. 1116752 3 258649 fpizlo 2015-08-11 15:40:03 -0700 Comment on attachment 258649 proposed patch LGTM 1116788 4 258649 commit-queue 2015-08-11 16:50:22 -0700 Comment on attachment 258649 proposed patch Clearing flags on attachment: 258649 Committed r188311: <http://trac.webkit.org/changeset/188311> 1116789 5 commit-queue 2015-08-11 16:50:26 -0700 All reviewed patches have been landed. Closing bug. 258649 2015-08-10 13:57:13 -0700 2015-08-11 16:50:22 -0700 proposed patch ASanBlacklist.txt text/plain 11378 ap SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTg4MjI1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBA CisyMDE1LTA4LTEwICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAg ICAgIE1ha2UgQVNhbiBidWlsZCBub3QgZGVwZW5kIG9uIGFzYW4ueGNjb25maWcKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0Nzg0MAorICAgICAgICBy ZGFyOi8vcHJvYmxlbS8yMTA5MzcwMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogZGZnL0RGR09TUkVudHJ5LmNwcDoKKyAgICAgICAgKEpTQzo6REZH OjpPU1JFbnRyeURhdGE6OmR1bXApOgorICAgICAgICAoSlNDOjpERkc6OnByZXBhcmVPU1JFbnRy eSk6CisgICAgICAgICogZnRsL0ZUTE9TUkVudHJ5LmNwcDoKKyAgICAgICAgKEpTQzo6RlRMOjpw cmVwYXJlT1NSRW50cnkpOgorICAgICAgICAqIGhlYXAvQ29uc2VydmF0aXZlUm9vdHMuY3BwOgor ICAgICAgICAoSlNDOjpDb25zZXJ2YXRpdmVSb290czo6Z2VuZXJpY0FkZFBvaW50ZXIpOgorICAg ICAgICAoSlNDOjpDb25zZXJ2YXRpdmVSb290czo6Z2VuZXJpY0FkZFNwYW4pOgorICAgICAgICAq IGhlYXAvTWFjaGluZVN0YWNrTWFya2VyLmNwcDoKKyAgICAgICAgKEpTQzo6TWFjaGluZVRocmVh ZHM6OnJlbW92ZVRocmVhZElmRm91bmQpOgorICAgICAgICAoSlNDOjpNYWNoaW5lVGhyZWFkczo6 Z2F0aGVyRnJvbUN1cnJlbnRUaHJlYWQpOgorICAgICAgICAoSlNDOjpNYWNoaW5lVGhyZWFkczo6 VGhyZWFkOjpjYXB0dXJlU3RhY2spOgorICAgICAgICAoSlNDOjpjb3B5TWVtb3J5KToKKyAgICAg ICAgKiBpbnRlcnByZXRlci9SZWdpc3Rlci5oOgorICAgICAgICAoSlNDOjpSZWdpc3Rlcjo6b3Bl cmF0b3I9KToKKyAgICAgICAgKEpTQzo6UmVnaXN0ZXI6OmFzYW5VbnNhZmVKU1ZhbHVlKToKKyAg ICAgICAgKEpTQzo6UmVnaXN0ZXI6OmpzVmFsdWUpOgorCiAyMDE1LTA4LTA3ICBHZW9mZnJleSBH YXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CiAKICAgICAgICAgTGV0J3MgcmVuYW1lIEZ1bmN0aW9u Qm9keU5vZGUKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT1NSRW50cnkuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT1NSRW50cnkuY3Bw CShyZXZpc2lvbiAxODgxOTYpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR09TUkVu dHJ5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTAsNiArOTAsNyBAQCB2b2lkIE9TUkVudHJ5RGF0 YTo6ZHVtcChQcmludFN0cmVhbSYgb3V0CiAgICAgZHVtcEluQ29udGV4dChvdXQsIG51bGxwdHIp OwogfQogCitTVVBQUkVTU19BU0FOCiB2b2lkKiBwcmVwYXJlT1NSRW50cnkoRXhlY1N0YXRlKiBl eGVjLCBDb2RlQmxvY2sqIGNvZGVCbG9jaywgdW5zaWduZWQgYnl0ZWNvZGVJbmRleCkKIHsKICAg ICBBU1NFUlQoSklUQ29kZTo6aXNPcHRpbWl6aW5nSklUKGNvZGVCbG9jay0+aml0VHlwZSgpKSk7 CkBAIC0yMDIsMzMgKzIwMywzMyBAQCB2b2lkKiBwcmVwYXJlT1NSRW50cnkoRXhlY1N0YXRlKiBl eGVjLCBDCiAgICAgZm9yIChzaXplX3QgbG9jYWwgPSAwOyBsb2NhbCA8IGVudHJ5LT5tX2V4cGVj dGVkVmFsdWVzLm51bWJlck9mTG9jYWxzKCk7ICsrbG9jYWwpIHsKICAgICAgICAgaW50IGxvY2Fs T2Zmc2V0ID0gdmlydHVhbFJlZ2lzdGVyRm9yTG9jYWwobG9jYWwpLm9mZnNldCgpOwogICAgICAg ICBpZiAoZW50cnktPm1fbG9jYWxzRm9yY2VkRG91YmxlLmdldChsb2NhbCkpIHsKLSAgICAgICAg ICAgIGlmICghZXhlYy0+cmVnaXN0ZXJzKClbbG9jYWxPZmZzZXRdLmpzVmFsdWUoKS5pc051bWJl cigpKSB7CisgICAgICAgICAgICBpZiAoIWV4ZWMtPnJlZ2lzdGVycygpW2xvY2FsT2Zmc2V0XS5h c2FuVW5zYWZlSlNWYWx1ZSgpLmlzTnVtYmVyKCkpIHsKICAgICAgICAgICAgICAgICBpZiAoT3B0 aW9uczo6dmVyYm9zZU9TUigpKSB7CiAgICAgICAgICAgICAgICAgICAgIGRhdGFMb2coCiAgICAg ICAgICAgICAgICAgICAgICAgICAiICAgIE9TUiBmYWlsZWQgYmVjYXVzZSB2YXJpYWJsZSAiLCBs b2NhbE9mZnNldCwgIiBpcyAiLAotICAgICAgICAgICAgICAgICAgICAgICAgZXhlYy0+cmVnaXN0 ZXJzKClbbG9jYWxPZmZzZXRdLmpzVmFsdWUoKSwgIiwgZXhwZWN0ZWQgbnVtYmVyLlxuIik7Cisg ICAgICAgICAgICAgICAgICAgICAgICBleGVjLT5yZWdpc3RlcnMoKVtsb2NhbE9mZnNldF0uYXNh blVuc2FmZUpTVmFsdWUoKSwgIiwgZXhwZWN0ZWQgbnVtYmVyLlxuIik7CiAgICAgICAgICAgICAg ICAgfQogICAgICAgICAgICAgICAgIHJldHVybiAwOwogICAgICAgICAgICAgfQogICAgICAgICAg ICAgY29udGludWU7CiAgICAgICAgIH0KICAgICAgICAgaWYgKGVudHJ5LT5tX2xvY2Fsc0ZvcmNl ZE1hY2hpbmVJbnQuZ2V0KGxvY2FsKSkgewotICAgICAgICAgICAgaWYgKCFleGVjLT5yZWdpc3Rl cnMoKVtsb2NhbE9mZnNldF0uanNWYWx1ZSgpLmlzTWFjaGluZUludCgpKSB7CisgICAgICAgICAg ICBpZiAoIWV4ZWMtPnJlZ2lzdGVycygpW2xvY2FsT2Zmc2V0XS5hc2FuVW5zYWZlSlNWYWx1ZSgp LmlzTWFjaGluZUludCgpKSB7CiAgICAgICAgICAgICAgICAgaWYgKE9wdGlvbnM6OnZlcmJvc2VP U1IoKSkgewogICAgICAgICAgICAgICAgICAgICBkYXRhTG9nKAogICAgICAgICAgICAgICAgICAg ICAgICAgIiAgICBPU1IgZmFpbGVkIGJlY2F1c2UgdmFyaWFibGUgIiwgbG9jYWxPZmZzZXQsICIg aXMgIiwKLSAgICAgICAgICAgICAgICAgICAgICAgIGV4ZWMtPnJlZ2lzdGVycygpW2xvY2FsT2Zm c2V0XS5qc1ZhbHVlKCksICIsIGV4cGVjdGVkICIsCisgICAgICAgICAgICAgICAgICAgICAgICBl eGVjLT5yZWdpc3RlcnMoKVtsb2NhbE9mZnNldF0uYXNhblVuc2FmZUpTVmFsdWUoKSwgIiwgZXhw ZWN0ZWQgIiwKICAgICAgICAgICAgICAgICAgICAgICAgICJtYWNoaW5lIGludC5cbiIpOwogICAg ICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICByZXR1cm4gMDsKICAgICAgICAgICAgIH0K ICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9Ci0gICAgICAgIGlmICghZW50cnktPm1f ZXhwZWN0ZWRWYWx1ZXMubG9jYWwobG9jYWwpLnZhbGlkYXRlKGV4ZWMtPnJlZ2lzdGVycygpW2xv Y2FsT2Zmc2V0XS5qc1ZhbHVlKCkpKSB7CisgICAgICAgIGlmICghZW50cnktPm1fZXhwZWN0ZWRW YWx1ZXMubG9jYWwobG9jYWwpLnZhbGlkYXRlKGV4ZWMtPnJlZ2lzdGVycygpW2xvY2FsT2Zmc2V0 XS5hc2FuVW5zYWZlSlNWYWx1ZSgpKSkgewogICAgICAgICAgICAgaWYgKE9wdGlvbnM6OnZlcmJv c2VPU1IoKSkgewogICAgICAgICAgICAgICAgIGRhdGFMb2coCiAgICAgICAgICAgICAgICAgICAg ICIgICAgT1NSIGZhaWxlZCBiZWNhdXNlIHZhcmlhYmxlICIsIGxvY2FsT2Zmc2V0LCAiIGlzICIs Ci0gICAgICAgICAgICAgICAgICAgIGV4ZWMtPnJlZ2lzdGVycygpW2xvY2FsT2Zmc2V0XS5qc1Zh bHVlKCksICIsIGV4cGVjdGVkICIsCisgICAgICAgICAgICAgICAgICAgIGV4ZWMtPnJlZ2lzdGVy cygpW2xvY2FsT2Zmc2V0XS5hc2FuVW5zYWZlSlNWYWx1ZSgpLCAiLCBleHBlY3RlZCAiLAogICAg ICAgICAgICAgICAgICAgICBlbnRyeS0+bV9leHBlY3RlZFZhbHVlcy5sb2NhbChsb2NhbCksICIu XG4iKTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIHJldHVybiAwOwpAQCAtMjgwLDIzICsy ODEsMjMgQEAgdm9pZCogcHJlcGFyZU9TUkVudHJ5KEV4ZWNTdGF0ZSogZXhlYywgQwogICAgICAg ICAKICAgICAgICAgaWYgKHJlZy5pc0xvY2FsKCkpIHsKICAgICAgICAgICAgIGlmIChlbnRyeS0+ bV9sb2NhbHNGb3JjZWREb3VibGUuZ2V0KHJlZy50b0xvY2FsKCkpKSB7Ci0gICAgICAgICAgICAg ICAgKmJpdHdpc2VfY2FzdDxkb3VibGUqPihwaXZvdCArIGluZGV4KSA9IGV4ZWMtPnJlZ2lzdGVy cygpW3JlZy5vZmZzZXQoKV0uanNWYWx1ZSgpLmFzTnVtYmVyKCk7CisgICAgICAgICAgICAgICAg KmJpdHdpc2VfY2FzdDxkb3VibGUqPihwaXZvdCArIGluZGV4KSA9IGV4ZWMtPnJlZ2lzdGVycygp W3JlZy5vZmZzZXQoKV0uYXNhblVuc2FmZUpTVmFsdWUoKS5hc051bWJlcigpOwogICAgICAgICAg ICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgCiAgICAgICAgICAg ICBpZiAoZW50cnktPm1fbG9jYWxzRm9yY2VkTWFjaGluZUludC5nZXQocmVnLnRvTG9jYWwoKSkp IHsKLSAgICAgICAgICAgICAgICAqYml0d2lzZV9jYXN0PGludDY0X3QqPihwaXZvdCArIGluZGV4 KSA9IGV4ZWMtPnJlZ2lzdGVycygpW3JlZy5vZmZzZXQoKV0uanNWYWx1ZSgpLmFzTWFjaGluZUlu dCgpIDw8IEpTVmFsdWU6OmludDUyU2hpZnRBbW91bnQ7CisgICAgICAgICAgICAgICAgKmJpdHdp c2VfY2FzdDxpbnQ2NF90Kj4ocGl2b3QgKyBpbmRleCkgPSBleGVjLT5yZWdpc3RlcnMoKVtyZWcu b2Zmc2V0KCldLmFzYW5VbnNhZmVKU1ZhbHVlKCkuYXNNYWNoaW5lSW50KCkgPDwgSlNWYWx1ZTo6 aW50NTJTaGlmdEFtb3VudDsKICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAg IH0KICAgICAgICAgfQogICAgICAgICAKLSAgICAgICAgcGl2b3RbaW5kZXhdID0gZXhlYy0+cmVn aXN0ZXJzKClbcmVnLm9mZnNldCgpXS5qc1ZhbHVlKCk7CisgICAgICAgIHBpdm90W2luZGV4XSA9 IGV4ZWMtPnJlZ2lzdGVycygpW3JlZy5vZmZzZXQoKV0uYXNhblVuc2FmZUpTVmFsdWUoKTsKICAg ICB9CiAgICAgCiAgICAgLy8gNCkgUmVzaHVmZmxlIHRob3NlIHJlZ2lzdGVycyB0aGF0IG5lZWQg cmVzaHVmZmxpbmcuCiAgICAgVmVjdG9yPEpTVmFsdWU+IHRlbXBvcmFyeUxvY2FscyhlbnRyeS0+ bV9yZXNodWZmbGluZ3Muc2l6ZSgpKTsKICAgICBmb3IgKHVuc2lnbmVkIGkgPSBlbnRyeS0+bV9y ZXNodWZmbGluZ3Muc2l6ZSgpOyBpLS07KQotICAgICAgICB0ZW1wb3JhcnlMb2NhbHNbaV0gPSBw aXZvdFtWaXJ0dWFsUmVnaXN0ZXIoZW50cnktPm1fcmVzaHVmZmxpbmdzW2ldLmZyb21PZmZzZXQp LnRvTG9jYWwoKV0uanNWYWx1ZSgpOworICAgICAgICB0ZW1wb3JhcnlMb2NhbHNbaV0gPSBwaXZv dFtWaXJ0dWFsUmVnaXN0ZXIoZW50cnktPm1fcmVzaHVmZmxpbmdzW2ldLmZyb21PZmZzZXQpLnRv TG9jYWwoKV0uYXNhblVuc2FmZUpTVmFsdWUoKTsKICAgICBmb3IgKHVuc2lnbmVkIGkgPSBlbnRy eS0+bV9yZXNodWZmbGluZ3Muc2l6ZSgpOyBpLS07KQogICAgICAgICBwaXZvdFtWaXJ0dWFsUmVn aXN0ZXIoZW50cnktPm1fcmVzaHVmZmxpbmdzW2ldLnRvT2Zmc2V0KS50b0xvY2FsKCldID0gdGVt cG9yYXJ5TG9jYWxzW2ldOwogICAgIApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9G VExPU1JFbnRyeS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9G VExPU1JFbnRyeS5jcHAJKHJldmlzaW9uIDE4ODE5NikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9mdGwvRlRMT1NSRW50cnkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zOCw2ICszOCw3IEBACiAK IG5hbWVzcGFjZSBKU0MgeyBuYW1lc3BhY2UgRlRMIHsKIAorU1VQUFJFU1NfQVNBTgogdm9pZCog cHJlcGFyZU9TUkVudHJ5KAogICAgIEV4ZWNTdGF0ZSogZXhlYywgQ29kZUJsb2NrKiBkZmdDb2Rl QmxvY2ssIENvZGVCbG9jayogZW50cnlDb2RlQmxvY2ssCiAgICAgdW5zaWduZWQgYnl0ZWNvZGVJ bmRleCwgdW5zaWduZWQgc3RyZWFtSW5kZXgpCkBAIC03MSw3ICs3Miw3IEBAIHZvaWQqIHByZXBh cmVPU1JFbnRyeSgKICAgICAgICAgZGF0YUxvZygiICAgIFZhbHVlcyBhdCBlbnRyeTogIiwgdmFs dWVzLCAiXG4iKTsKICAgICAKICAgICBmb3IgKGludCBhcmd1bWVudCA9IHZhbHVlcy5udW1iZXJP ZkFyZ3VtZW50cygpOyBhcmd1bWVudC0tOykgewotICAgICAgICBKU1ZhbHVlIHZhbHVlT25TdGFj ayA9IGV4ZWMtPnIodmlydHVhbFJlZ2lzdGVyRm9yQXJndW1lbnQoYXJndW1lbnQpLm9mZnNldCgp KS5qc1ZhbHVlKCk7CisgICAgICAgIEpTVmFsdWUgdmFsdWVPblN0YWNrID0gZXhlYy0+cih2aXJ0 dWFsUmVnaXN0ZXJGb3JBcmd1bWVudChhcmd1bWVudCkub2Zmc2V0KCkpLmFzYW5VbnNhZmVKU1Zh bHVlKCk7CiAgICAgICAgIEpTVmFsdWUgcmVjb25zdHJ1Y3RlZFZhbHVlID0gdmFsdWVzLmFyZ3Vt ZW50KGFyZ3VtZW50KTsKICAgICAgICAgaWYgKHZhbHVlT25TdGFjayA9PSByZWNvbnN0cnVjdGVk VmFsdWUgfHwgIWFyZ3VtZW50KQogICAgICAgICAgICAgY29udGludWU7CkluZGV4OiBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvaGVhcC9Db25zZXJ2YXRpdmVSb290cy5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvQ29uc2VydmF0aXZlUm9vdHMuY3BwCShyZXZpc2lv biAxODgxOTYpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9Db25zZXJ2YXRpdmVSb290 cy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTkyLDYgKzkyLDcgQEAgaW5saW5lIHZvaWQgQ29uc2Vy dmF0aXZlUm9vdHM6OmdlbmVyaWNBZAogfQogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBNYXJrSG9vaz4K K1NVUFBSRVNTX0FTQU4KIHZvaWQgQ29uc2VydmF0aXZlUm9vdHM6OmdlbmVyaWNBZGRTcGFuKHZv aWQqIGJlZ2luLCB2b2lkKiBlbmQsIE1hcmtIb29rJiBtYXJrSG9vaykKIHsKICAgICBpZiAoYmVn aW4gPiBlbmQpIHsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL01hY2hpbmVTdGFj a01hcmtlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvTWFj aGluZVN0YWNrTWFya2VyLmNwcAkocmV2aXNpb24gMTg4MTk2KQorKysgU291cmNlL0phdmFTY3Jp cHRDb3JlL2hlYXAvTWFjaGluZVN0YWNrTWFya2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzM1 LDcgKzMzNSw4IEBAIHZvaWQgTWFjaGluZVRocmVhZHM6OnJlbW92ZVRocmVhZElmRm91bmQKICAg ICAgICAgZGVsZXRlIHQ7CiAgICAgfQogfQotICAgIAorCitTVVBQUkVTU19BU0FOCiB2b2lkIE1h Y2hpbmVUaHJlYWRzOjpnYXRoZXJGcm9tQ3VycmVudFRocmVhZChDb25zZXJ2YXRpdmVSb290cyYg Y29uc2VydmF0aXZlUm9vdHMsIEpJVFN0dWJSb3V0aW5lU2V0JiBqaXRTdHViUm91dGluZXMsIENv ZGVCbG9ja1NldCYgY29kZUJsb2Nrcywgdm9pZCogc3RhY2tPcmlnaW4sIHZvaWQqIHN0YWNrVG9w LCBSZWdpc3RlclN0YXRlJiBjYWxsZWVTYXZlZFJlZ2lzdGVycykKIHsKICAgICB2b2lkKiByZWdp c3RlcnNCZWdpbiA9ICZjYWxsZWVTYXZlZFJlZ2lzdGVyczsKQEAgLTUxOSw2ICs1MjAsNyBAQCBz dGQ6OnBhaXI8dm9pZCosIHNpemVfdD4gTWFjaGluZVRocmVhZHM6CiAgICAgcmV0dXJuIHN0ZDo6 bWFrZV9wYWlyKGJlZ2luLCBzdGF0aWNfY2FzdDxjaGFyKj4oZW5kKSAtIHN0YXRpY19jYXN0PGNo YXIqPihiZWdpbikpOwogfQogCitTVVBQUkVTU19BU0FOCiBzdGF0aWMgdm9pZCBjb3B5TWVtb3J5 KHZvaWQqIGRzdCwgY29uc3Qgdm9pZCogc3JjLCBzaXplX3Qgc2l6ZSkKIHsKICAgICBzaXplX3Qg ZHN0QXNTaXplID0gcmVpbnRlcnByZXRfY2FzdDxzaXplX3Q+KGRzdCk7CkluZGV4OiBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvUmVnaXN0ZXIuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvUmVnaXN0ZXIuaAkocmV2aXNpb24gMTg4MTk2 KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2ludGVycHJldGVyL1JlZ2lzdGVyLmgJKHdvcmtp bmcgY29weSkKQEAgLTUxLDYgKzUxLDcgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgIFJlZ2lz dGVyKGNvbnN0IEpTVmFsdWUmKTsKICAgICAgICAgUmVnaXN0ZXImIG9wZXJhdG9yPShjb25zdCBK U1ZhbHVlJik7CiAgICAgICAgIEpTVmFsdWUganNWYWx1ZSgpIGNvbnN0OworICAgICAgICBKU1Zh bHVlIGFzYW5VbnNhZmVKU1ZhbHVlKCkgY29uc3Q7CiAgICAgICAgIEVuY29kZWRKU1ZhbHVlIGVu Y29kZWRKU1ZhbHVlKCkgY29uc3Q7CiAgICAgICAgIAogICAgICAgICBSZWdpc3RlciYgb3BlcmF0 b3I9KENhbGxGcmFtZSopOwpAQCAtMTEwLDYgKzExMSwxMiBAQCBuYW1lc3BhY2UgSlNDIHsKICAg ICAgICAgcmV0dXJuICp0aGlzOwogICAgIH0KIAorICAgIC8vIEZJWE1FIChyZGFyOi8vcHJvYmxl bS8xOTM3OTIxNCk6IEFTYW4gb25seSBuZWVkcyB0byBiZSBzdXBwcmVzc2VkIGZvciBSZWdpc3Rl cjo6anNWYWx1ZSgpIHdoZW4gY2FsbGVkIGZyb20gcHJlcGFyZU9TUkVudHJ5KCksIGJ1dCB0aGVy ZSBpcyBjdXJyZW50bHkgbm8gd2F5IHRvIGV4cHJlc3MgdGhpcyBzaG9ydCBvZiBhZGRpbmcgYSBz ZXBhcmF0ZSBjb3B5IG9mIHRoZSBmdW5jdGlvbi4KKyAgICBTVVBQUkVTU19BU0FOIEFMV0FZU19J TkxJTkUgSlNWYWx1ZSBSZWdpc3Rlcjo6YXNhblVuc2FmZUpTVmFsdWUoKSBjb25zdAorICAgIHsK KyAgICAgICAgcmV0dXJuIEpTVmFsdWU6OmRlY29kZSh1LnZhbHVlKTsKKyAgICB9CisKICAgICBB TFdBWVNfSU5MSU5FIEpTVmFsdWUgUmVnaXN0ZXI6OmpzVmFsdWUoKSBjb25zdAogICAgIHsKICAg ICAgICAgcmV0dXJuIEpTVmFsdWU6OmRlY29kZSh1LnZhbHVlKTsKSW5kZXg6IFNvdXJjZS9XVEYv d3RmL0NvbXBpbGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dURi93dGYvQ29tcGlsZXIuaAko cmV2aXNpb24gMTg4MTk2KQorKysgU291cmNlL1dURi93dGYvQ29tcGlsZXIuaAkod29ya2luZyBj b3B5KQpAQCAtMTM3LDYgKzEzNywxMiBAQAogI2RlZmluZSBBU0FOX0VOQUJMRUQgMAogI2VuZGlm CiAKKyNpZiBBU0FOX0VOQUJMRUQKKyNkZWZpbmUgU1VQUFJFU1NfQVNBTiBfX2F0dHJpYnV0ZV9f KChub19zYW5pdGl6ZV9hZGRyZXNzKSkKKyNlbHNlCisjZGVmaW5lIFNVUFBSRVNTX0FTQU4KKyNl bmRpZgorCiAvKiA9PT09IENvbXBpbGVyLWluZGVwZW5kZW50IG1hY3JvcyBmb3IgdmFyaW91cyBj b21waWxlciBmZWF0dXJlcywgaW4gYWxwaGFiZXRpY2FsIG9yZGVyID09PT0gKi8KIAogLyogQUxX QVlTX0lOTElORSAqLwpJbmRleDogVG9vbHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L0NoYW5nZUxvZwkocmV2aXNpb24gMTg4MjI1KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTUtMDgtMTAgIEFsZXhleSBQcm9za3VyeWFrb3Yg IDxhcEBhcHBsZS5jb20+CisKKyAgICAgICAgTWFrZSBBU2FuIGJ1aWxkIG5vdCBkZXBlbmQgb24g YXNhbi54Y2NvbmZpZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTQ3ODQwCisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzIxMDkzNzAyCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBhc2FuL2FzYW4ueGNjb25m aWc6CisgICAgICAgICogYXNhbi93ZWJraXQtYXNhbi1pZ25vcmUudHh0OiBSZW1vdmVkLiBJdCdz IG5vIGxvbmdlciBuZWVkZWQsIGFzIHVuc2FmZSBmdW5jdGlvbnMKKyAgICAgICAgYXJlIG5vdyBt YXJrZWQgaW4gc291cmNlIGNvZGUuCisKIDIwMTUtMDgtMTAgIFlvdWVubiBGYWJsZXQgIDx5b3Vl bm4uZmFibGV0QGNyZi5jYW5vbi5mcj4KIAogICAgICAgICBDb21waWxlIHdhcm5pbmcgKC1Xc2ln bi1jb21wYXJlKSBvbiAzMi1iaXRzIGF0IFdlYkNvcmUvcGxhdGZvcm0vRmlsZVN5c3RlbS5jcHAK SW5kZXg6IFRvb2xzL2FzYW4vYXNhbi54Y2NvbmZpZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9hc2Fu L2FzYW4ueGNjb25maWcJKHJldmlzaW9uIDE4ODE5NikKKysrIFRvb2xzL2FzYW4vYXNhbi54Y2Nv bmZpZwkod29ya2luZyBjb3B5KQpAQCAtMTIsNyArMTIsNyBAQCBHQ0NfT1BUSU1JWkFUSU9OX0xF VkVMX1JlbGVhc2UgPSAxOwogCiBDTEFOR19BRERSRVNTX1NBTklUSVpFUj1ZRVMKIAotQVNBTl9P VEhFUl9DRkxBR1MgPSAtZnNhbml0aXplLWJsYWNrbGlzdD0kKEFTQU5fSUdOT1JFKSAtZm5vLW9t aXQtZnJhbWUtcG9pbnRlciAtZzsKK0FTQU5fT1RIRVJfQ0ZMQUdTID0gLWZuby1vbWl0LWZyYW1l LXBvaW50ZXIgLWc7CiBBU0FOX09USEVSX0NQTFVTUExVU0ZMQUdTID0gJChBU0FOX09USEVSX0NG TEFHUyk7CiAKIEdDQ19FTkFCTEVfT0JKQ19HQyA9IE5POwpJbmRleDogVG9vbHMvYXNhbi93ZWJr aXQtYXNhbi1pZ25vcmUudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL2FzYW4vd2Via2l0LWFzYW4t aWdub3JlLnR4dAkocmV2aXNpb24gMTg4MTk2KQorKysgVG9vbHMvYXNhbi93ZWJraXQtYXNhbi1p Z25vcmUudHh0CSh3b3JraW5nIGNvcHkpCkBAIC0xLDcgKzAsMCBAQAotZnVuOipnZW5lcmljQWRk U3BhbioKLWZ1bjoqZ2F0aGVyRnJvbUN1cnJlbnRUaHJlYWQqQ29uc2VydmF0aXZlUm9vdHMqCi1m dW46KkRGRypwcmVwYXJlT1NSRW50cnkqCi0jIEZJWE1FIChyZGFyOi8vcHJvYmxlbS8xOTM3OTIx NCk6IFJlZ2lzdGVyOjpqc1ZhbHVlKCkgb25seSBuZWVkcyB0byBiZSBibGFja2xpc3RlZCB3aGVu Ci0jIGNhbGxlZCBmcm9tIHByZXBhcmVPU1JFbnRyeSgpLCBidXQgdGhlcmUgaXMgY3VycmVudGx5 IG5vIHdheSB0byBleHByZXNzIHRoaXMgaW4gYSBibGFja2xpc3QuCi1mdW46KkpTQypSZWdpc3Rl cipqc1ZhbHVlKgotZnVuOiphc2FuVW5zYWZlTWVtY3B5Kgo=