189300 2018-09-04 23:43:44 -0700 Fix DeferredSourceDump to capture the caller bytecodeIndex instead of CodeOrigin. 2018-09-05 13:21:24 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mark.lam mark.lam commit-queue fpizlo keith_miller msaboff rmorisset saam tzagallo webkit-bug-importer ysuzuki oldest_to_newest 1456647 0 mark.lam 2018-09-04 23:43:44 -0700 At the time a DeferredSourceDump is instantiated, it captures a CodeOrigin value, which points to a InlineCallFrame in the DFG::Plan's m_inlineCallFrames set. The DeferredSourceDump may be later used to dump the source of a failed compilation. The DFG::Plan may have been destructed by then, and since the compilation failed, the InlineCallFrame is also destructed, which means DeferredSourceDump::dump() may be accessing freed memory. DeferredSourceDump doesn't really need a CodeOrigin. All it wants is the caller bytecodeIndex for the call to an inlined function. Hence, we can fix this issue by changing DeferredSourceDump to capture the caller bytecodeIndex instead. <rdar://problem/39681779> 1456653 1 348898 mark.lam 2018-09-04 23:56:14 -0700 Created attachment 348898 proposed patch. 1456655 2 348899 mark.lam 2018-09-05 00:04:47 -0700 Created attachment 348899 proposed patch. 1456827 3 348899 mark.lam 2018-09-05 12:54:04 -0700 Comment on attachment 348899 proposed patch. Thanks for the review. Landing now. 1456831 4 348899 commit-queue 2018-09-05 13:21:22 -0700 Comment on attachment 348899 proposed patch. Clearing flags on attachment: 348899 Committed r235684: <https://trac.webkit.org/changeset/235684> 1456832 5 commit-queue 2018-09-05 13:21:24 -0700 All reviewed patches have been landed. Closing bug. 348898 2018-09-04 23:56:14 -0700 2018-09-05 00:04:47 -0700 proposed patch. bug-189300.patch text/plain 6917 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjM1NjU5KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM4IEBA CisyMDE4LTA5LTA0ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBG aXggRGVmZXJyZWRTb3VyY2VEdW1wIHRvIGNhcHR1cmUgdGhlIGNhbGxlciBieXRlY29kZUluZGV4 IGluc3RlYWQgb2YgQ29kZU9yaWdpbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE4OTMwMAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzk2ODE3Nzk+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQXQgdGhl IHRpbWUgYSBEZWZlcnJlZFNvdXJjZUR1bXAgaXMgaW5zdGFudGlhdGVkLCBpdCBjYXB0dXJlcyBh IENvZGVPcmlnaW4gdmFsdWUKKyAgICAgICAgd2hpY2ggcG9pbnRzIHRvIGEgSW5saW5lQ2FsbEZy YW1lIGluIHRoZSBERkc6OlBsYW4ncyBtX2lubGluZUNhbGxGcmFtZXMgc2V0LiAgVGhlCisgICAg ICAgIERlZmVycmVkU291cmNlRHVtcCBpcyBsYXRlciB1c2VkIHRvIGR1bXAgc291cmNlIGV2ZW4g aWYgdGhlIGNvbXBpbGF0aW9uIGZhaWxzLgorICAgICAgICBUaGlzIGlzIGludGVudGlvbmFsIHNv IHRoYXQgd2UgY2FuIHVzZSB0aGlzIHRvb2wgdG8gc2VlIHdoYXQgc291cmNlIGZhaWxzIHRvCisg ICAgICAgIGNvbXBpbGUgYXMgd2VsbC4KKworICAgICAgICBUaGUgREZHOjpQbGFuIG1heSBoYXZl IGJlZW4gZGVzdHJ1Y3RlZCBieSB0aGVuLCBhbmQgc2luY2UgdGhlIGNvbXBpbGF0aW9uIGZhaWxl ZCwKKyAgICAgICAgdGhlIElubGluZUNhbGxGcmFtZSBpcyBhbHNvIGRlc3RydWN0ZWQuICBUaGlz IG1lYW5zIERlZmVycmVkU291cmNlRHVtcDo6ZHVtcCgpCisgICAgICAgIG1heSBiZSBlbmQgdXAg YWNjZXNzaW5nIGZyZWVkIG1lbW9yeS4KKworICAgICAgICBEZWZlcnJlZFNvdXJjZUR1bXAgZG9l c24ndCByZWFsbHkgbmVlZCBhIENvZGVPcmlnaW4uICBBbGwgaXQgd2FudHMgaXMgdGhlIGNhbGxl cgorICAgICAgICBieXRlY29kZUluZGV4IGZvciB0aGUgY2FsbCB0byBhbiBpbmxpbmVkIGZ1bmN0 aW9uLiAgSGVuY2UsIHdlIGNhbiBmaXggdGhpcyBpc3N1ZQorICAgICAgICBieSBjaGFuZ2luZyBE ZWZlcnJlZFNvdXJjZUR1bXAgdG8gY2FwdHVyZSB0aGUgY2FsbGVyIGJ5dGVjb2RlSW5kZXggaW5z dGVhZC4KKworICAgICAgICBJbiB0aGlzIHBhdGNoLCB3ZSBhbHNvIGNoYW5nZSBEZWZlcnJlZFNv dXJjZUR1bXAncyBtX2NvZGVCbG9jayBhbmQgbV9yb290Q29kZUJsb2NrCisgICAgICAgIHRvIGJl IFN0cm9uZyByZWZlcmVuY2VzIHRvIGVuc3VyZSB0aGF0IHRoZSBDb2RlQmxvY2tzIGFyZSBrZXB0 IGFsaXZlIHVudGlsIHRoZXkKKyAgICAgICAgY2FuIGJlIGR1bXBlZC4KKworICAgICAgICAqIGJ5 dGVjb2RlL0RlZmVycmVkQ29tcGlsYXRpb25DYWxsYmFjay5jcHA6CisgICAgICAgIChKU0M6OkRl ZmVycmVkQ29tcGlsYXRpb25DYWxsYmFjazo6ZHVtcENvbXBpbGVkU291cmNlc0lmTmVlZGVkKToK KyAgICAgICAgKiBieXRlY29kZS9EZWZlcnJlZFNvdXJjZUR1bXAuY3BwOgorICAgICAgICAoSlND OjpEZWZlcnJlZFNvdXJjZUR1bXA6OkRlZmVycmVkU291cmNlRHVtcCk6CisgICAgICAgIChKU0M6 OkRlZmVycmVkU291cmNlRHVtcDo6ZHVtcCk6CisgICAgICAgICogYnl0ZWNvZGUvRGVmZXJyZWRT b3VyY2VEdW1wLmg6CisgICAgICAgICogZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcDoKKyAgICAg ICAgKEpTQzo6REZHOjpCeXRlQ29kZVBhcnNlcjo6cGFyc2VDb2RlQmxvY2spOgorCiAyMDE4LTA5 LTA0ICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2 aWV3ZWQgaW5kZW50YXRpb25zIGNoYW5nZS4KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9i eXRlY29kZS9EZWZlcnJlZENvbXBpbGF0aW9uQ2FsbGJhY2suY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9EZWZlcnJlZENvbXBpbGF0aW9uQ2FsbGJhY2su Y3BwCShyZXZpc2lvbiAyMzU2MjcpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUv RGVmZXJyZWRDb21waWxhdGlvbkNhbGxiYWNrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsx LDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTMsIDIwMTQgQXBwbGUgSW5jLiBBbGwgcmln aHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDEzLTIwMTggQXBwbGUgSW5jLiBBbGwg cmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNl IGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUg cGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC02NSw2 ICs2NSw3IEBAIHZvaWQgRGVmZXJyZWRDb21waWxhdGlvbkNhbGxiYWNrOjpkdW1wQ28KICAgICAg ICAgZGF0YUxvZygiWyIsICsraW5kZXgsICJdICIpOwogICAgICAgICBpbmZvLmR1bXAoKTsKICAg ICB9CisgICAgZGF0YUxvZygiXG4iKTsKIH0KIAogfSAvLyBKU0MKSW5kZXg6IFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9ieXRlY29kZS9EZWZlcnJlZFNvdXJjZUR1bXAuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9EZWZlcnJlZFNvdXJjZUR1bXAuY3BwCShy ZXZpc2lvbiAyMzU2MjcpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvRGVmZXJy ZWRTb3VyY2VEdW1wLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBD b3B5cmlnaHQgKEMpIDIwMTUgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29w eXJpZ2h0IChDKSAyMDE1LTIwMTggQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoK ICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdp dGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRo YXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0zMiwxNyArMzIsMTYgQEAKIG5hbWVzcGFj ZSBKU0MgewogCiBEZWZlcnJlZFNvdXJjZUR1bXA6OkRlZmVycmVkU291cmNlRHVtcChDb2RlQmxv Y2sqIGNvZGVCbG9jaykKLSAgICA6IG1fY29kZUJsb2NrKGNvZGVCbG9jaykKLSAgICAsIG1fcm9v dENvZGVCbG9jayhudWxscHRyKQorICAgIDogbV9jb2RlQmxvY2soKmNvZGVCbG9jay0+dm0oKSwg Y29kZUJsb2NrKQogICAgICwgbV9yb290SklUVHlwZShKSVRDb2RlOjpOb25lKQogewogfQogCi1E ZWZlcnJlZFNvdXJjZUR1bXA6OkRlZmVycmVkU291cmNlRHVtcChDb2RlQmxvY2sqIGNvZGVCbG9j aywgQ29kZUJsb2NrKiByb290Q29kZUJsb2NrLCBKSVRDb2RlOjpKSVRUeXBlIHJvb3RKSVRUeXBl LCBDb2RlT3JpZ2luIGNhbGxlckNvZGVPcmlnaW4pCi0gICAgOiBtX2NvZGVCbG9jayhjb2RlQmxv Y2spCi0gICAgLCBtX3Jvb3RDb2RlQmxvY2socm9vdENvZGVCbG9jaykKK0RlZmVycmVkU291cmNl RHVtcDo6RGVmZXJyZWRTb3VyY2VEdW1wKENvZGVCbG9jayogY29kZUJsb2NrLCBDb2RlQmxvY2sq IHJvb3RDb2RlQmxvY2ssIEpJVENvZGU6OkpJVFR5cGUgcm9vdEpJVFR5cGUsIHVuc2lnbmVkIGNh bGxlckJ5dGVjb2RlSW5kZXgpCisgICAgOiBtX2NvZGVCbG9jaygqY29kZUJsb2NrLT52bSgpLCBj b2RlQmxvY2spCisgICAgLCBtX3Jvb3RDb2RlQmxvY2soKmNvZGVCbG9jay0+dm0oKSwgcm9vdENv ZGVCbG9jaykKICAgICAsIG1fcm9vdEpJVFR5cGUocm9vdEpJVFR5cGUpCi0gICAgLCBtX2NhbGxl ckNvZGVPcmlnaW4oY2FsbGVyQ29kZU9yaWdpbikKKyAgICAsIG1fY2FsbGVyQnl0ZWNvZGVJbmRl eChjYWxsZXJCeXRlY29kZUluZGV4KQogewogfQogCkBAIC01Niw3ICs1NSw3IEBAIHZvaWQgRGVm ZXJyZWRTb3VyY2VEdW1wOjpkdW1wKCkKICAgICBkYXRhTG9nKCptX2NvZGVCbG9jayk7CiAKICAg ICBpZiAoaXNJbmxpbmVkRnJhbWUpCi0gICAgICAgIGRhdGFMb2coIiBhdCAiLCBDb2RlQmxvY2tX aXRoSklUVHlwZShtX3Jvb3RDb2RlQmxvY2ssIG1fcm9vdEpJVFR5cGUpLCAiICIsIG1fY2FsbGVy Q29kZU9yaWdpbik7CisgICAgICAgIGRhdGFMb2coIiBhdCAiLCBDb2RlQmxvY2tXaXRoSklUVHlw ZSgqbV9yb290Q29kZUJsb2NrLCBtX3Jvb3RKSVRUeXBlKSwgIiAiLCAiYmMjIiwgbV9jYWxsZXJC eXRlY29kZUluZGV4KTsKIAogICAgIGRhdGFMb2coIlxuJycnIik7CiAgICAgbV9jb2RlQmxvY2st PmR1bXBTb3VyY2UoKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9EZWZl cnJlZFNvdXJjZUR1bXAuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0 ZWNvZGUvRGVmZXJyZWRTb3VyY2VEdW1wLmgJKHJldmlzaW9uIDIzNTYyNykKKysrIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9ieXRlY29kZS9EZWZlcnJlZFNvdXJjZUR1bXAuaAkod29ya2luZyBjb3B5 KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTUgQXBwbGUgSW5jLiBB bGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDE1LTIwMTggQXBwbGUgSW5j LiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4g c291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9u LCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBA IC0yNyw2ICsyNyw3IEBACiAKICNpbmNsdWRlICJDb2RlT3JpZ2luLmgiCiAjaW5jbHVkZSAiSklU Q29kZS5oIgorI2luY2x1ZGUgIlN0cm9uZy5oIgogCiBuYW1lc3BhY2UgSlNDIHsKIApAQCAtMzUs MTUgKzM2LDE1IEBAIGNsYXNzIENvZGVCbG9jazsKIGNsYXNzIERlZmVycmVkU291cmNlRHVtcCB7 CiBwdWJsaWM6CiAgICAgRGVmZXJyZWRTb3VyY2VEdW1wKENvZGVCbG9jayopOwotICAgIERlZmVy cmVkU291cmNlRHVtcChDb2RlQmxvY2sqLCBDb2RlQmxvY2sqIHJvb3RDb2RlQmxvY2ssIEpJVENv ZGU6OkpJVFR5cGUgcm9vdEpJVFR5cGUsIENvZGVPcmlnaW4gY2FsbGVyQ29kZU9yaWdpbik7Cisg ICAgRGVmZXJyZWRTb3VyY2VEdW1wKENvZGVCbG9jayosIENvZGVCbG9jayogcm9vdENvZGVCbG9j aywgSklUQ29kZTo6SklUVHlwZSByb290SklUVHlwZSwgdW5zaWduZWQgY2FsbGVyQnl0ZWNvZGVJ bmRleCk7CiAKICAgICB2b2lkIGR1bXAoKTsKIAogcHJpdmF0ZToKLSAgICBDb2RlQmxvY2sqIG1f Y29kZUJsb2NrOwotICAgIENvZGVCbG9jayogbV9yb290Q29kZUJsb2NrOworICAgIFN0cm9uZzxD b2RlQmxvY2s+IG1fY29kZUJsb2NrOworICAgIFN0cm9uZzxDb2RlQmxvY2s+IG1fcm9vdENvZGVC bG9jazsKICAgICBKSVRDb2RlOjpKSVRUeXBlIG1fcm9vdEpJVFR5cGU7Ci0gICAgQ29kZU9yaWdp biBtX2NhbGxlckNvZGVPcmlnaW47CisgICAgdW5zaWduZWQgbV9jYWxsZXJCeXRlY29kZUluZGV4 IHsgVUlOVF9NQVggfTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIEpTQwpJbmRleDogU291cmNlL0ph dmFTY3JpcHRDb3JlL2RmZy9ERkdCeXRlQ29kZVBhcnNlci5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdCeXRlQ29kZVBhcnNlci5jcHAJKHJldmlzaW9uIDIz NTYyNykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC02OTUyLDcgKzY5NTIsNyBAQCB2b2lkIEJ5dGVDb2RlUGFyc2Vy OjpwYXJzZUNvZGVCbG9jaygpCiAgICAgaWYgKFVOTElLRUxZKE9wdGlvbnM6OmR1bXBTb3VyY2VB dERGR1RpbWUoKSkpIHsKICAgICAgICAgVmVjdG9yPERlZmVycmVkU291cmNlRHVtcD4mIGRlZmVy cmVkU291cmNlRHVtcCA9IG1fZ3JhcGgubV9wbGFuLmNhbGxiYWNrKCktPmVuc3VyZURlZmVycmVk U291cmNlRHVtcCgpOwogICAgICAgICBpZiAoaW5saW5lQ2FsbEZyYW1lKCkpIHsKLSAgICAgICAg ICAgIERlZmVycmVkU291cmNlRHVtcCBkdW1wKGNvZGVCbG9jay0+YmFzZWxpbmVWZXJzaW9uKCks IG1fY29kZUJsb2NrLCBKSVRDb2RlOjpERkdKSVQsIGlubGluZUNhbGxGcmFtZSgpLT5kaXJlY3RD YWxsZXIpOworICAgICAgICAgICAgRGVmZXJyZWRTb3VyY2VEdW1wIGR1bXAoY29kZUJsb2NrLT5i YXNlbGluZVZlcnNpb24oKSwgbV9jb2RlQmxvY2ssIEpJVENvZGU6OkRGR0pJVCwgaW5saW5lQ2Fs bEZyYW1lKCktPmRpcmVjdENhbGxlci5ieXRlY29kZUluZGV4KTsKICAgICAgICAgICAgIGRlZmVy cmVkU291cmNlRHVtcC5hcHBlbmQoZHVtcCk7CiAgICAgICAgIH0gZWxzZQogICAgICAgICAgICAg ZGVmZXJyZWRTb3VyY2VEdW1wLmFwcGVuZChEZWZlcnJlZFNvdXJjZUR1bXAoY29kZUJsb2NrLT5i YXNlbGluZVZlcnNpb24oKSkpOwo= 348899 2018-09-05 00:04:47 -0700 2018-09-05 13:21:22 -0700 proposed patch. bug-189300.patch text/plain 7008 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjM1NjU5KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM4IEBA CisyMDE4LTA5LTA0ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBG aXggRGVmZXJyZWRTb3VyY2VEdW1wIHRvIGNhcHR1cmUgdGhlIGNhbGxlciBieXRlY29kZUluZGV4 IGluc3RlYWQgb2YgQ29kZU9yaWdpbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE4OTMwMAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzk2ODE3Nzk+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQXQgdGhl IHRpbWUgYSBEZWZlcnJlZFNvdXJjZUR1bXAgaXMgaW5zdGFudGlhdGVkLCBpdCBjYXB0dXJlcyBh IENvZGVPcmlnaW4gdmFsdWUKKyAgICAgICAgd2hpY2ggcG9pbnRzIHRvIGEgSW5saW5lQ2FsbEZy YW1lIGluIHRoZSBERkc6OlBsYW4ncyBtX2lubGluZUNhbGxGcmFtZXMgc2V0LiAgVGhlCisgICAg ICAgIERlZmVycmVkU291cmNlRHVtcCBpcyBsYXRlciB1c2VkIHRvIGR1bXAgc291cmNlIGV2ZW4g aWYgdGhlIGNvbXBpbGF0aW9uIGZhaWxzLgorICAgICAgICBUaGlzIGlzIGludGVudGlvbmFsIHNv IHRoYXQgd2UgY2FuIHVzZSB0aGlzIHRvb2wgdG8gc2VlIHdoYXQgc291cmNlIGZhaWxzIHRvCisg ICAgICAgIGNvbXBpbGUgYXMgd2VsbC4KKworICAgICAgICBUaGUgREZHOjpQbGFuIG1heSBoYXZl IGJlZW4gZGVzdHJ1Y3RlZCBieSB0aGVuLCBhbmQgc2luY2UgdGhlIGNvbXBpbGF0aW9uIGZhaWxl ZCwKKyAgICAgICAgdGhlIElubGluZUNhbGxGcmFtZSBpcyBhbHNvIGRlc3RydWN0ZWQuICBUaGlz IG1lYW5zIERlZmVycmVkU291cmNlRHVtcDo6ZHVtcCgpCisgICAgICAgIG1heSBiZSBlbmQgdXAg YWNjZXNzaW5nIGZyZWVkIG1lbW9yeS4KKworICAgICAgICBEZWZlcnJlZFNvdXJjZUR1bXAgZG9l c24ndCByZWFsbHkgbmVlZCBhIENvZGVPcmlnaW4uICBBbGwgaXQgd2FudHMgaXMgdGhlIGNhbGxl cgorICAgICAgICBieXRlY29kZUluZGV4IGZvciB0aGUgY2FsbCB0byBhbiBpbmxpbmVkIGZ1bmN0 aW9uLiAgSGVuY2UsIHdlIGNhbiBmaXggdGhpcyBpc3N1ZQorICAgICAgICBieSBjaGFuZ2luZyBE ZWZlcnJlZFNvdXJjZUR1bXAgdG8gY2FwdHVyZSB0aGUgY2FsbGVyIGJ5dGVjb2RlSW5kZXggaW5z dGVhZC4KKworICAgICAgICBJbiB0aGlzIHBhdGNoLCB3ZSBhbHNvIGNoYW5nZSBEZWZlcnJlZFNv dXJjZUR1bXAncyBtX2NvZGVCbG9jayBhbmQgbV9yb290Q29kZUJsb2NrCisgICAgICAgIHRvIGJl IFN0cm9uZyByZWZlcmVuY2VzIHRvIGVuc3VyZSB0aGF0IHRoZSBDb2RlQmxvY2tzIGFyZSBrZXB0 IGFsaXZlIHVudGlsIHRoZXkKKyAgICAgICAgY2FuIGJlIGR1bXBlZC4KKworICAgICAgICAqIGJ5 dGVjb2RlL0RlZmVycmVkQ29tcGlsYXRpb25DYWxsYmFjay5jcHA6CisgICAgICAgIChKU0M6OkRl ZmVycmVkQ29tcGlsYXRpb25DYWxsYmFjazo6ZHVtcENvbXBpbGVkU291cmNlc0lmTmVlZGVkKToK KyAgICAgICAgKiBieXRlY29kZS9EZWZlcnJlZFNvdXJjZUR1bXAuY3BwOgorICAgICAgICAoSlND OjpEZWZlcnJlZFNvdXJjZUR1bXA6OkRlZmVycmVkU291cmNlRHVtcCk6CisgICAgICAgIChKU0M6 OkRlZmVycmVkU291cmNlRHVtcDo6ZHVtcCk6CisgICAgICAgICogYnl0ZWNvZGUvRGVmZXJyZWRT b3VyY2VEdW1wLmg6CisgICAgICAgICogZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcDoKKyAgICAg ICAgKEpTQzo6REZHOjpCeXRlQ29kZVBhcnNlcjo6cGFyc2VDb2RlQmxvY2spOgorCiAyMDE4LTA5 LTA0ICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2 aWV3ZWQgaW5kZW50YXRpb25zIGNoYW5nZS4KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9i eXRlY29kZS9EZWZlcnJlZENvbXBpbGF0aW9uQ2FsbGJhY2suY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9EZWZlcnJlZENvbXBpbGF0aW9uQ2FsbGJhY2su Y3BwCShyZXZpc2lvbiAyMzU2MjcpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUv RGVmZXJyZWRDb21waWxhdGlvbkNhbGxiYWNrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsx LDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTMsIDIwMTQgQXBwbGUgSW5jLiBBbGwgcmln aHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDEzLTIwMTggQXBwbGUgSW5jLiBBbGwg cmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNl IGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUg cGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC02NSw2 ICs2NSw3IEBAIHZvaWQgRGVmZXJyZWRDb21waWxhdGlvbkNhbGxiYWNrOjpkdW1wQ28KICAgICAg ICAgZGF0YUxvZygiWyIsICsraW5kZXgsICJdICIpOwogICAgICAgICBpbmZvLmR1bXAoKTsKICAg ICB9CisgICAgZGF0YUxvZygiXG4iKTsKIH0KIAogfSAvLyBKU0MKSW5kZXg6IFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9ieXRlY29kZS9EZWZlcnJlZFNvdXJjZUR1bXAuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9EZWZlcnJlZFNvdXJjZUR1bXAuY3BwCShy ZXZpc2lvbiAyMzU2MjcpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvRGVmZXJy ZWRTb3VyY2VEdW1wLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBD b3B5cmlnaHQgKEMpIDIwMTUgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29w eXJpZ2h0IChDKSAyMDE1LTIwMTggQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoK ICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdp dGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRo YXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0yOCwyMSArMjgsMjEgQEAKIAogI2luY2x1 ZGUgIkNvZGVCbG9jay5oIgogI2luY2x1ZGUgIkNvZGVCbG9ja1dpdGhKSVRUeXBlLmgiCisjaW5j bHVkZSAiU3Ryb25nSW5saW5lcy5oIgogCiBuYW1lc3BhY2UgSlNDIHsKIAogRGVmZXJyZWRTb3Vy Y2VEdW1wOjpEZWZlcnJlZFNvdXJjZUR1bXAoQ29kZUJsb2NrKiBjb2RlQmxvY2spCi0gICAgOiBt X2NvZGVCbG9jayhjb2RlQmxvY2spCi0gICAgLCBtX3Jvb3RDb2RlQmxvY2sobnVsbHB0cikKKyAg ICA6IG1fY29kZUJsb2NrKCpjb2RlQmxvY2stPnZtKCksIGNvZGVCbG9jaykKICAgICAsIG1fcm9v dEpJVFR5cGUoSklUQ29kZTo6Tm9uZSkKIHsKIH0KIAotRGVmZXJyZWRTb3VyY2VEdW1wOjpEZWZl cnJlZFNvdXJjZUR1bXAoQ29kZUJsb2NrKiBjb2RlQmxvY2ssIENvZGVCbG9jayogcm9vdENvZGVC bG9jaywgSklUQ29kZTo6SklUVHlwZSByb290SklUVHlwZSwgQ29kZU9yaWdpbiBjYWxsZXJDb2Rl T3JpZ2luKQotICAgIDogbV9jb2RlQmxvY2soY29kZUJsb2NrKQotICAgICwgbV9yb290Q29kZUJs b2NrKHJvb3RDb2RlQmxvY2spCitEZWZlcnJlZFNvdXJjZUR1bXA6OkRlZmVycmVkU291cmNlRHVt cChDb2RlQmxvY2sqIGNvZGVCbG9jaywgQ29kZUJsb2NrKiByb290Q29kZUJsb2NrLCBKSVRDb2Rl OjpKSVRUeXBlIHJvb3RKSVRUeXBlLCB1bnNpZ25lZCBjYWxsZXJCeXRlY29kZUluZGV4KQorICAg IDogbV9jb2RlQmxvY2soKmNvZGVCbG9jay0+dm0oKSwgY29kZUJsb2NrKQorICAgICwgbV9yb290 Q29kZUJsb2NrKCpjb2RlQmxvY2stPnZtKCksIHJvb3RDb2RlQmxvY2spCiAgICAgLCBtX3Jvb3RK SVRUeXBlKHJvb3RKSVRUeXBlKQotICAgICwgbV9jYWxsZXJDb2RlT3JpZ2luKGNhbGxlckNvZGVP cmlnaW4pCisgICAgLCBtX2NhbGxlckJ5dGVjb2RlSW5kZXgoY2FsbGVyQnl0ZWNvZGVJbmRleCkK IHsKIH0KIApAQCAtNTYsNyArNTYsNyBAQCB2b2lkIERlZmVycmVkU291cmNlRHVtcDo6ZHVtcCgp CiAgICAgZGF0YUxvZygqbV9jb2RlQmxvY2spOwogCiAgICAgaWYgKGlzSW5saW5lZEZyYW1lKQot ICAgICAgICBkYXRhTG9nKCIgYXQgIiwgQ29kZUJsb2NrV2l0aEpJVFR5cGUobV9yb290Q29kZUJs b2NrLCBtX3Jvb3RKSVRUeXBlKSwgIiAiLCBtX2NhbGxlckNvZGVPcmlnaW4pOworICAgICAgICBk YXRhTG9nKCIgYXQgIiwgQ29kZUJsb2NrV2l0aEpJVFR5cGUoKm1fcm9vdENvZGVCbG9jaywgbV9y b290SklUVHlwZSksICIgIiwgImJjIyIsIG1fY2FsbGVyQnl0ZWNvZGVJbmRleCk7CiAKICAgICBk YXRhTG9nKCJcbicnJyIpOwogICAgIG1fY29kZUJsb2NrLT5kdW1wU291cmNlKCk7CkluZGV4OiBT b3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvRGVmZXJyZWRTb3VyY2VEdW1wLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0RlZmVycmVkU291cmNlRHVt cC5oCShyZXZpc2lvbiAyMzU2MjcpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUv RGVmZXJyZWRTb3VyY2VEdW1wLmgJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAvKgot ICogQ29weXJpZ2h0IChDKSAyMDE1IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAq IENvcHlyaWdodCAoQykgMjAxNS0yMDE4IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4K ICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1z LCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRl ZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMjcsNiArMjcsNyBAQAogCiAjaW5j bHVkZSAiQ29kZU9yaWdpbi5oIgogI2luY2x1ZGUgIkpJVENvZGUuaCIKKyNpbmNsdWRlICJTdHJv bmcuaCIKIAogbmFtZXNwYWNlIEpTQyB7CiAKQEAgLTM1LDE1ICszNiwxNSBAQCBjbGFzcyBDb2Rl QmxvY2s7CiBjbGFzcyBEZWZlcnJlZFNvdXJjZUR1bXAgewogcHVibGljOgogICAgIERlZmVycmVk U291cmNlRHVtcChDb2RlQmxvY2sqKTsKLSAgICBEZWZlcnJlZFNvdXJjZUR1bXAoQ29kZUJsb2Nr KiwgQ29kZUJsb2NrKiByb290Q29kZUJsb2NrLCBKSVRDb2RlOjpKSVRUeXBlIHJvb3RKSVRUeXBl LCBDb2RlT3JpZ2luIGNhbGxlckNvZGVPcmlnaW4pOworICAgIERlZmVycmVkU291cmNlRHVtcChD b2RlQmxvY2sqLCBDb2RlQmxvY2sqIHJvb3RDb2RlQmxvY2ssIEpJVENvZGU6OkpJVFR5cGUgcm9v dEpJVFR5cGUsIHVuc2lnbmVkIGNhbGxlckJ5dGVjb2RlSW5kZXgpOwogCiAgICAgdm9pZCBkdW1w KCk7CiAKIHByaXZhdGU6Ci0gICAgQ29kZUJsb2NrKiBtX2NvZGVCbG9jazsKLSAgICBDb2RlQmxv Y2sqIG1fcm9vdENvZGVCbG9jazsKKyAgICBTdHJvbmc8Q29kZUJsb2NrPiBtX2NvZGVCbG9jazsK KyAgICBTdHJvbmc8Q29kZUJsb2NrPiBtX3Jvb3RDb2RlQmxvY2s7CiAgICAgSklUQ29kZTo6SklU VHlwZSBtX3Jvb3RKSVRUeXBlOwotICAgIENvZGVPcmlnaW4gbV9jYWxsZXJDb2RlT3JpZ2luOwor ICAgIHVuc2lnbmVkIG1fY2FsbGVyQnl0ZWNvZGVJbmRleCB7IFVJTlRfTUFYIH07CiB9OwogCiB9 IC8vIG5hbWVzcGFjZSBKU0MKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQnl0 ZUNvZGVQYXJzZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcv REZHQnl0ZUNvZGVQYXJzZXIuY3BwCShyZXZpc2lvbiAyMzU2MjcpCisrKyBTb3VyY2UvSmF2YVNj cmlwdENvcmUvZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjk1 Miw3ICs2OTUyLDcgQEAgdm9pZCBCeXRlQ29kZVBhcnNlcjo6cGFyc2VDb2RlQmxvY2soKQogICAg IGlmIChVTkxJS0VMWShPcHRpb25zOjpkdW1wU291cmNlQXRERkdUaW1lKCkpKSB7CiAgICAgICAg IFZlY3RvcjxEZWZlcnJlZFNvdXJjZUR1bXA+JiBkZWZlcnJlZFNvdXJjZUR1bXAgPSBtX2dyYXBo Lm1fcGxhbi5jYWxsYmFjaygpLT5lbnN1cmVEZWZlcnJlZFNvdXJjZUR1bXAoKTsKICAgICAgICAg aWYgKGlubGluZUNhbGxGcmFtZSgpKSB7Ci0gICAgICAgICAgICBEZWZlcnJlZFNvdXJjZUR1bXAg ZHVtcChjb2RlQmxvY2stPmJhc2VsaW5lVmVyc2lvbigpLCBtX2NvZGVCbG9jaywgSklUQ29kZTo6 REZHSklULCBpbmxpbmVDYWxsRnJhbWUoKS0+ZGlyZWN0Q2FsbGVyKTsKKyAgICAgICAgICAgIERl ZmVycmVkU291cmNlRHVtcCBkdW1wKGNvZGVCbG9jay0+YmFzZWxpbmVWZXJzaW9uKCksIG1fY29k ZUJsb2NrLCBKSVRDb2RlOjpERkdKSVQsIGlubGluZUNhbGxGcmFtZSgpLT5kaXJlY3RDYWxsZXIu Ynl0ZWNvZGVJbmRleCk7CiAgICAgICAgICAgICBkZWZlcnJlZFNvdXJjZUR1bXAuYXBwZW5kKGR1 bXApOwogICAgICAgICB9IGVsc2UKICAgICAgICAgICAgIGRlZmVycmVkU291cmNlRHVtcC5hcHBl bmQoRGVmZXJyZWRTb3VyY2VEdW1wKGNvZGVCbG9jay0+YmFzZWxpbmVWZXJzaW9uKCkpKTsK