123423 2013-10-28 15:10:39 -0700 OSRExit::m_watchpointIndex should be in OSRExitCompilationInfo 2013-10-28 20:49:59 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 113647 1 fpizlo fpizlo barraclough ggaren mark.lam mhahnenberg msaboff oliver sam oldest_to_newest 944231 0 fpizlo 2013-10-28 15:10:39 -0700 Patch forthcoming. 944232 1 215338 fpizlo 2013-10-28 15:16:58 -0700 Created attachment 215338 the patch 944233 2 215338 mhahnenberg 2013-10-28 15:25:00 -0700 Comment on attachment 215338 the patch View in context: https://bugs.webkit.org/attachment.cgi?id=215338&action=review r=me > Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp:209 > + m_jit.jitCode()->osrExit[ Remove. 944304 3 fpizlo 2013-10-28 20:49:59 -0700 Landed in http://trac.webkit.org/changeset/158141 215338 2013-10-28 15:16:58 -0700 2013-10-28 15:25:00 -0700 the patch blah.patch text/plain 18791 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTU4MTM4KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQwIEBA CisyMDEzLTEwLTI4ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg T1NSRXhpdDo6bV93YXRjaHBvaW50SW5kZXggc2hvdWxkIGJlIGluIE9TUkV4aXRDb21waWxhdGlv bkluZm8KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEy MzQyMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAg ICAgICAgQWxzbyBlbmFibGUgRXhpdEtpbmQgdG8gdGVsbCB5b3UgaWYgaXQncyBhIHdhdGNocG9p bnQuCisKKyAgICAgICAgKiBieXRlY29kZS9FeGl0S2luZC5jcHA6CisgICAgICAgIChKU0M6OmV4 aXRLaW5kVG9TdHJpbmcpOgorICAgICAgICAqIGJ5dGVjb2RlL0V4aXRLaW5kLmg6CisgICAgICAg IChKU0M6OmlzV2F0Y2hwb2ludCk6CisgICAgICAgICogZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNw cDoKKyAgICAgICAgKEpTQzo6REZHOjpCeXRlQ29kZVBhcnNlcjo6c2V0TG9jYWwpOgorICAgICAg ICAoSlNDOjpERkc6OkJ5dGVDb2RlUGFyc2VyOjpzZXRBcmd1bWVudCk6CisgICAgICAgIChKU0M6 OkRGRzo6Qnl0ZUNvZGVQYXJzZXI6OmhhbmRsZUNhbGwpOgorICAgICAgICAoSlNDOjpERkc6OkJ5 dGVDb2RlUGFyc2VyOjpoYW5kbGVHZXRCeUlkKToKKyAgICAgICAgKEpTQzo6REZHOjpCeXRlQ29k ZVBhcnNlcjo6cGFyc2VCbG9jayk6CisgICAgICAgICogZGZnL0RGR0pJVENvbXBpbGVyLmNwcDoK KyAgICAgICAgKEpTQzo6REZHOjpKSVRDb21waWxlcjo6bGlua09TUkV4aXRzKToKKyAgICAgICAg KEpTQzo6REZHOjpKSVRDb21waWxlcjo6bGluayk6CisgICAgICAgICogZGZnL0RGR0pJVENvbXBp bGVyLmg6CisgICAgICAgIChKU0M6OkRGRzo6SklUQ29tcGlsZXI6OmFwcGVuZEV4aXRJbmZvKToK KyAgICAgICAgKiBkZmcvREZHT1NSRXhpdC5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6T1NSRXhp dDo6T1NSRXhpdCk6CisgICAgICAgICogZGZnL0RGR09TUkV4aXQuaDoKKyAgICAgICAgKiBkZmcv REZHT1NSRXhpdENvbXBpbGF0aW9uSW5mby5oOgorICAgICAgICAoSlNDOjpERkc6Ok9TUkV4aXRD b21waWxhdGlvbkluZm86Ok9TUkV4aXRDb21waWxhdGlvbkluZm8pOgorICAgICAgICAqIGRmZy9E RkdPU1JFeGl0Q29tcGlsZXIuY3BwOgorICAgICAgICAqIGRmZy9ERkdTcGVjdWxhdGl2ZUpJVC5j cHA6CisgICAgICAgIChKU0M6OkRGRzo6U3BlY3VsYXRpdmVKSVQ6OnNwZWN1bGF0aW9uV2F0Y2hw b2ludCk6CisgICAgICAgICogZGZnL0RGR1NwZWN1bGF0aXZlSklUMzJfNjQuY3BwOgorICAgICAg ICAoSlNDOjpERkc6OlNwZWN1bGF0aXZlSklUOjpjb21waWxlKToKKyAgICAgICAgKiBkZmcvREZH U3BlY3VsYXRpdmVKSVQ2NC5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6U3BlY3VsYXRpdmVKSVQ6 OmNvbXBpbGUpOgorCiAyMDEzLTEwLTI4ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBh cHBsZS5jb20+CiAKICAgICAgICAgUGFyc2luZyBzdXBwb3J0IGZvciAtd2Via2l0LXRleHQtZGVj b3JhdGlvbi1za2lwOiBpbmsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9F eGl0S2luZC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2Rl L0V4aXRLaW5kLmNwcAkocmV2aXNpb24gMTU4MTI0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3Jl L2J5dGVjb2RlL0V4aXRLaW5kLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDQsOCArNDQsMTIgQEAg Y29uc3QgY2hhciogZXhpdEtpbmRUb1N0cmluZyhFeGl0S2luZCBraQogICAgICAgICByZXR1cm4g IkJhZEV4ZWN1dGFibGUiOwogICAgIGNhc2UgQmFkQ2FjaGU6CiAgICAgICAgIHJldHVybiAiQmFk Q2FjaGUiOworICAgIGNhc2UgQmFkQ2FjaGVXYXRjaHBvaW50OgorICAgICAgICByZXR1cm4gIkJh ZENhY2hlV2F0Y2hwb2ludCI7CiAgICAgY2FzZSBCYWRXZWFrQ29uc3RhbnRDYWNoZToKICAgICAg ICAgcmV0dXJuICJCYWRXZWFrQ29uc3RhbnRDYWNoZSI7CisgICAgY2FzZSBCYWRXZWFrQ29uc3Rh bnRDYWNoZVdhdGNocG9pbnQ6CisgICAgICAgIHJldHVybiAiQmFkV2Vha0NvbnN0YW50Q2FjaGVX YXRjaHBvaW50IjsKICAgICBjYXNlIEJhZEluZGV4aW5nVHlwZToKICAgICAgICAgcmV0dXJuICJC YWRJbmRleGluZ1R5cGUiOwogICAgIGNhc2UgT3ZlcmZsb3c6CkluZGV4OiBTb3VyY2UvSmF2YVNj cmlwdENvcmUvYnl0ZWNvZGUvRXhpdEtpbmQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNj cmlwdENvcmUvYnl0ZWNvZGUvRXhpdEtpbmQuaAkocmV2aXNpb24gMTU4MTI0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0V4aXRLaW5kLmgJKHdvcmtpbmcgY29weSkKQEAgLTM1 LDYgKzM1LDggQEAgZW51bSBFeGl0S2luZCB7CiAgICAgQmFkRXhlY3V0YWJsZSwgLy8gV2UgZXhp dGVkIGJlY2F1c2Ugd2UgbWFkZSBhbiBpbmNvcnJlY3QgYXNzdW1wdGlvbiBhYm91dCB3aGF0IGV4 ZWN1dGFibGUgd2Ugd291bGQgc2VlLgogICAgIEJhZENhY2hlLCAvLyBXZSBleGl0ZWQgYmVjYXVz ZSBhbiBpbmxpbmUgY2FjaGUgd2FzIHdyb25nLgogICAgIEJhZFdlYWtDb25zdGFudENhY2hlLCAv LyBXZSBleGl0ZWQgYmVjYXVzZSBhIGNhY2hlIG9uIGEgd2VhayBjb25zdGFudCAodXN1YWxseSBh IHByb3RvdHlwZSkgd2FzIHdyb25nLgorICAgIEJhZENhY2hlV2F0Y2hwb2ludCwgLy8gU2FtZSBh cyBCYWRDYWNoZSBidXQgZnJvbSBhIHdhdGNocG9pbnQuCisgICAgQmFkV2Vha0NvbnN0YW50Q2Fj aGVXYXRjaHBvaW50LCAvLyBTYW1lIGFzIEJhZFdlYWtDb25zdGFudENhY2hlIGJ1dCBmcm9tIGEg d2F0Y2hwb2ludC4KICAgICBCYWRJbmRleGluZ1R5cGUsIC8vIFdlIGV4aXRlZCBiZWNhdXNlIGFu IGluZGV4aW5nIHR5cGUgd2FzIHdyb25nLgogICAgIE92ZXJmbG93LCAvLyBXZSBleGl0ZWQgYmVj YXVzZSBvZiBvdmVyZmxvdy4KICAgICBOZWdhdGl2ZVplcm8sIC8vIFdlIGV4aXRlZCBiZWNhdXNl IHdlIGVuY291bnRlcmVkIG5lZ2F0aXZlIHplcm8uCkBAIC01NCw2ICs1NiwxOCBAQCBlbnVtIEV4 aXRLaW5kIHsKIGNvbnN0IGNoYXIqIGV4aXRLaW5kVG9TdHJpbmcoRXhpdEtpbmQpOwogYm9vbCBl eGl0S2luZElzQ291bnRhYmxlKEV4aXRLaW5kKTsKIAoraW5saW5lIGJvb2wgaXNXYXRjaHBvaW50 KEV4aXRLaW5kIGtpbmQpCit7CisgICAgc3dpdGNoIChraW5kKSB7CisgICAgY2FzZSBCYWRDYWNo ZVdhdGNocG9pbnQ6CisgICAgY2FzZSBCYWRXZWFrQ29uc3RhbnRDYWNoZVdhdGNocG9pbnQ6Cisg ICAgY2FzZSBVbmNvdW50YWJsZVdhdGNocG9pbnQ6CisgICAgICAgIHJldHVybiB0cnVlOworICAg IGRlZmF1bHQ6CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9Cit9CisKIH0gLy8gbmFtZXNw YWNlIEpTQwogCiBuYW1lc3BhY2UgV1RGIHsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9k ZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9kZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3BwCShyZXZpc2lvbiAxNTgxMjQpCisrKyBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMzExLDcgKzMxMSw4IEBAIHByaXZhdGU6CiAKICAgICAgICAgVmFyaWFibGVBY2Nlc3NE YXRhKiB2YXJpYWJsZUFjY2Vzc0RhdGEgPSBuZXdWYXJpYWJsZUFjY2Vzc0RhdGEob3BlcmFuZCwg aXNDYXB0dXJlZCk7CiAgICAgICAgIHZhcmlhYmxlQWNjZXNzRGF0YS0+bWVyZ2VTdHJ1Y3R1cmVD aGVja0hvaXN0aW5nRmFpbGVkKAotICAgICAgICAgICAgbV9pbmxpbmVTdGFja1RvcC0+bV9leGl0 UHJvZmlsZS5oYXNFeGl0U2l0ZShtX2N1cnJlbnRJbmRleCwgQmFkQ2FjaGUpKTsKKyAgICAgICAg ICAgIG1faW5saW5lU3RhY2tUb3AtPm1fZXhpdFByb2ZpbGUuaGFzRXhpdFNpdGUobV9jdXJyZW50 SW5kZXgsIEJhZENhY2hlKQorICAgICAgICAgICAgfHwgbV9pbmxpbmVTdGFja1RvcC0+bV9leGl0 UHJvZmlsZS5oYXNFeGl0U2l0ZShtX2N1cnJlbnRJbmRleCwgQmFkQ2FjaGVXYXRjaHBvaW50KSk7 CiAgICAgICAgIHZhcmlhYmxlQWNjZXNzRGF0YS0+bWVyZ2VDaGVja0FycmF5SG9pc3RpbmdGYWls ZWQoCiAgICAgICAgICAgICBtX2lubGluZVN0YWNrVG9wLT5tX2V4aXRQcm9maWxlLmhhc0V4aXRT aXRlKG1fY3VycmVudEluZGV4LCBCYWRJbmRleGluZ1R5cGUpKTsKICAgICAgICAgTm9kZSogbm9k ZSA9IGFkZFRvR3JhcGgoU2V0TG9jYWwsIE9wSW5mbyh2YXJpYWJsZUFjY2Vzc0RhdGEpLCB2YWx1 ZSk7CkBAIC0zNjcsNyArMzY4LDggQEAgcHJpdmF0ZToKICAgICAgICAgICAgIHZhcmlhYmxlQWNj ZXNzRGF0YS0+bWVyZ2VTaG91bGROZXZlclVuYm94KHRydWUpOwogICAgICAgICAKICAgICAgICAg dmFyaWFibGVBY2Nlc3NEYXRhLT5tZXJnZVN0cnVjdHVyZUNoZWNrSG9pc3RpbmdGYWlsZWQoCi0g ICAgICAgICAgICBtX2lubGluZVN0YWNrVG9wLT5tX2V4aXRQcm9maWxlLmhhc0V4aXRTaXRlKG1f Y3VycmVudEluZGV4LCBCYWRDYWNoZSkpOworICAgICAgICAgICAgbV9pbmxpbmVTdGFja1RvcC0+ bV9leGl0UHJvZmlsZS5oYXNFeGl0U2l0ZShtX2N1cnJlbnRJbmRleCwgQmFkQ2FjaGUpCisgICAg ICAgICAgICB8fCBtX2lubGluZVN0YWNrVG9wLT5tX2V4aXRQcm9maWxlLmhhc0V4aXRTaXRlKG1f Y3VycmVudEluZGV4LCBCYWRDYWNoZVdhdGNocG9pbnQpKTsKICAgICAgICAgdmFyaWFibGVBY2Nl c3NEYXRhLT5tZXJnZUNoZWNrQXJyYXlIb2lzdGluZ0ZhaWxlZCgKICAgICAgICAgICAgIG1faW5s aW5lU3RhY2tUb3AtPm1fZXhpdFByb2ZpbGUuaGFzRXhpdFNpdGUobV9jdXJyZW50SW5kZXgsIEJh ZEluZGV4aW5nVHlwZSkpOwogICAgICAgICBOb2RlKiBub2RlID0gYWRkVG9HcmFwaChTZXRMb2Nh bCwgT3BJbmZvKHZhcmlhYmxlQWNjZXNzRGF0YSksIHZhbHVlKTsKQEAgLTExNDEsNyArMTE0Myw5 IEBAIHZvaWQgQnl0ZUNvZGVQYXJzZXI6OmhhbmRsZUNhbGwoSW5zdHJ1Y3QKICAgICBlbHNlIHsK ICAgICAgICAgY2FsbExpbmtTdGF0dXMgPSBDYWxsTGlua1N0YXR1czo6Y29tcHV0ZUZvcihtX2lu bGluZVN0YWNrVG9wLT5tX3Byb2ZpbGVkQmxvY2ssIG1fY3VycmVudEluZGV4KTsKICAgICAgICAg Y2FsbExpbmtTdGF0dXMuc2V0SGFzQmFkRnVuY3Rpb25FeGl0U2l0ZShtX2lubGluZVN0YWNrVG9w LT5tX2V4aXRQcm9maWxlLmhhc0V4aXRTaXRlKG1fY3VycmVudEluZGV4LCBCYWRGdW5jdGlvbikp OwotICAgICAgICBjYWxsTGlua1N0YXR1cy5zZXRIYXNCYWRDYWNoZUV4aXRTaXRlKG1faW5saW5l U3RhY2tUb3AtPm1fZXhpdFByb2ZpbGUuaGFzRXhpdFNpdGUobV9jdXJyZW50SW5kZXgsIEJhZENh Y2hlKSk7CisgICAgICAgIGNhbGxMaW5rU3RhdHVzLnNldEhhc0JhZENhY2hlRXhpdFNpdGUoCisg ICAgICAgICAgICBtX2lubGluZVN0YWNrVG9wLT5tX2V4aXRQcm9maWxlLmhhc0V4aXRTaXRlKG1f Y3VycmVudEluZGV4LCBCYWRDYWNoZSkKKyAgICAgICAgICAgIHx8IG1faW5saW5lU3RhY2tUb3At Pm1fZXhpdFByb2ZpbGUuaGFzRXhpdFNpdGUobV9jdXJyZW50SW5kZXgsIEJhZENhY2hlV2F0Y2hw b2ludCkpOwogICAgICAgICBjYWxsTGlua1N0YXR1cy5zZXRIYXNCYWRFeGVjdXRhYmxlRXhpdFNp dGUobV9pbmxpbmVTdGFja1RvcC0+bV9leGl0UHJvZmlsZS5oYXNFeGl0U2l0ZShtX2N1cnJlbnRJ bmRleCwgQmFkRXhlY3V0YWJsZSkpOwogICAgIH0KICAgICAKQEAgLTE3NjIsNyArMTc2Niw5IEBA IHZvaWQgQnl0ZUNvZGVQYXJzZXI6OmhhbmRsZUdldEJ5SWQoCiB7CiAgICAgaWYgKCFnZXRCeUlk U3RhdHVzLmlzU2ltcGxlKCkKICAgICAgICAgfHwgbV9pbmxpbmVTdGFja1RvcC0+bV9leGl0UHJv ZmlsZS5oYXNFeGl0U2l0ZShtX2N1cnJlbnRJbmRleCwgQmFkQ2FjaGUpCi0gICAgICAgIHx8IG1f aW5saW5lU3RhY2tUb3AtPm1fZXhpdFByb2ZpbGUuaGFzRXhpdFNpdGUobV9jdXJyZW50SW5kZXgs IEJhZFdlYWtDb25zdGFudENhY2hlKSkgeworICAgICAgICB8fCBtX2lubGluZVN0YWNrVG9wLT5t X2V4aXRQcm9maWxlLmhhc0V4aXRTaXRlKG1fY3VycmVudEluZGV4LCBCYWRDYWNoZVdhdGNocG9p bnQpCisgICAgICAgIHx8IG1faW5saW5lU3RhY2tUb3AtPm1fZXhpdFByb2ZpbGUuaGFzRXhpdFNp dGUobV9jdXJyZW50SW5kZXgsIEJhZFdlYWtDb25zdGFudENhY2hlKQorICAgICAgICB8fCBtX2lu bGluZVN0YWNrVG9wLT5tX2V4aXRQcm9maWxlLmhhc0V4aXRTaXRlKG1fY3VycmVudEluZGV4LCBC YWRXZWFrQ29uc3RhbnRDYWNoZVdhdGNocG9pbnQpKSB7CiAgICAgICAgIHNldChWaXJ0dWFsUmVn aXN0ZXIoZGVzdGluYXRpb25PcGVyYW5kKSwKICAgICAgICAgICAgIGFkZFRvR3JhcGgoCiAgICAg ICAgICAgICAgICAgZ2V0QnlJZFN0YXR1cy5tYWtlc0NhbGxzKCkgPyBHZXRCeUlkRmx1c2ggOiBH ZXRCeUlkLApAQCAtMTg0Niw3ICsxODUyLDggQEAgYm9vbCBCeXRlQ29kZVBhcnNlcjo6cGFyc2VC bG9jayh1bnNpZ25lZAogICAgICAgICAgICAgVmFyaWFibGVBY2Nlc3NEYXRhKiB2YXJpYWJsZSA9 IG5ld1ZhcmlhYmxlQWNjZXNzRGF0YSgKICAgICAgICAgICAgICAgICB2aXJ0dWFsUmVnaXN0ZXJG b3JBcmd1bWVudChhcmd1bWVudCksIG1fY29kZUJsb2NrLT5pc0NhcHR1cmVkKHZpcnR1YWxSZWdp c3RlckZvckFyZ3VtZW50KGFyZ3VtZW50KSkpOwogICAgICAgICAgICAgdmFyaWFibGUtPm1lcmdl U3RydWN0dXJlQ2hlY2tIb2lzdGluZ0ZhaWxlZCgKLSAgICAgICAgICAgICAgICBtX2lubGluZVN0 YWNrVG9wLT5tX2V4aXRQcm9maWxlLmhhc0V4aXRTaXRlKG1fY3VycmVudEluZGV4LCBCYWRDYWNo ZSkpOworICAgICAgICAgICAgICAgIG1faW5saW5lU3RhY2tUb3AtPm1fZXhpdFByb2ZpbGUuaGFz RXhpdFNpdGUobV9jdXJyZW50SW5kZXgsIEJhZENhY2hlKQorICAgICAgICAgICAgICAgIHx8IG1f aW5saW5lU3RhY2tUb3AtPm1fZXhpdFByb2ZpbGUuaGFzRXhpdFNpdGUobV9jdXJyZW50SW5kZXgs IEJhZENhY2hlV2F0Y2hwb2ludCkpOwogICAgICAgICAgICAgdmFyaWFibGUtPm1lcmdlQ2hlY2tB cnJheUhvaXN0aW5nRmFpbGVkKAogICAgICAgICAgICAgICAgIG1faW5saW5lU3RhY2tUb3AtPm1f ZXhpdFByb2ZpbGUuaGFzRXhpdFNpdGUobV9jdXJyZW50SW5kZXgsIEJhZEluZGV4aW5nVHlwZSkp OwogICAgICAgICAgICAgCkBAIC0xOTAzLDcgKzE5MTAsOCBAQCBib29sIEJ5dGVDb2RlUGFyc2Vy OjpwYXJzZUJsb2NrKHVuc2lnbmVkCiAgICAgICAgICAgICAgICAgaWYgKCFjYWNoZWRTdHJ1Y3R1 cmUKICAgICAgICAgICAgICAgICAgICAgfHwgY2FjaGVkU3RydWN0dXJlLT5jbGFzc0luZm8oKS0+ bWV0aG9kVGFibGUudG9UaGlzICE9IEpTT2JqZWN0OjppbmZvKCktPm1ldGhvZFRhYmxlLnRvVGhp cwogICAgICAgICAgICAgICAgICAgICB8fCBtX2lubGluZVN0YWNrVG9wLT5tX3Byb2ZpbGVkQmxv Y2stPmNvdWxkVGFrZVNsb3dDYXNlKG1fY3VycmVudEluZGV4KQotICAgICAgICAgICAgICAgICAg ICB8fCBtX2lubGluZVN0YWNrVG9wLT5tX2V4aXRQcm9maWxlLmhhc0V4aXRTaXRlKG1fY3VycmVu dEluZGV4LCBCYWRDYWNoZSkpIHsKKyAgICAgICAgICAgICAgICAgICAgfHwgbV9pbmxpbmVTdGFj a1RvcC0+bV9leGl0UHJvZmlsZS5oYXNFeGl0U2l0ZShtX2N1cnJlbnRJbmRleCwgQmFkQ2FjaGUp CisgICAgICAgICAgICAgICAgICAgIHx8IG1faW5saW5lU3RhY2tUb3AtPm1fZXhpdFByb2ZpbGUu aGFzRXhpdFNpdGUobV9jdXJyZW50SW5kZXgsIEJhZENhY2hlV2F0Y2hwb2ludCkpIHsKICAgICAg ICAgICAgICAgICAgICAgc2V0VGhpcyhhZGRUb0dyYXBoKFRvVGhpcywgb3AxKSk7CiAgICAgICAg ICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgICAgICAgYWRkVG9HcmFwaCgKQEAgLTI0 NzMsNyArMjQ4MSw5IEBAIGJvb2wgQnl0ZUNvZGVQYXJzZXI6OnBhcnNlQmxvY2sodW5zaWduZWQK ICAgICAgICAgICAgIAogICAgICAgICAgICAgYm9vbCBoYXNFeGl0U2l0ZSA9CiAgICAgICAgICAg ICAgICAgbV9pbmxpbmVTdGFja1RvcC0+bV9leGl0UHJvZmlsZS5oYXNFeGl0U2l0ZShtX2N1cnJl bnRJbmRleCwgQmFkQ2FjaGUpCi0gICAgICAgICAgICAgICAgfHwgbV9pbmxpbmVTdGFja1RvcC0+ bV9leGl0UHJvZmlsZS5oYXNFeGl0U2l0ZShtX2N1cnJlbnRJbmRleCwgQmFkV2Vha0NvbnN0YW50 Q2FjaGUpOworICAgICAgICAgICAgICAgIHx8IG1faW5saW5lU3RhY2tUb3AtPm1fZXhpdFByb2Zp bGUuaGFzRXhpdFNpdGUobV9jdXJyZW50SW5kZXgsIEJhZENhY2hlV2F0Y2hwb2ludCkKKyAgICAg ICAgICAgICAgICB8fCBtX2lubGluZVN0YWNrVG9wLT5tX2V4aXRQcm9maWxlLmhhc0V4aXRTaXRl KG1fY3VycmVudEluZGV4LCBCYWRXZWFrQ29uc3RhbnRDYWNoZSkKKyAgICAgICAgICAgICAgICB8 fCBtX2lubGluZVN0YWNrVG9wLT5tX2V4aXRQcm9maWxlLmhhc0V4aXRTaXRlKG1fY3VycmVudElu ZGV4LCBCYWRXZWFrQ29uc3RhbnRDYWNoZVdhdGNocG9pbnQpOwogICAgICAgICAgICAgCiAgICAg ICAgICAgICBpZiAoIWhhc0V4aXRTaXRlICYmIHB1dEJ5SWRTdGF0dXMuaXNTaW1wbGVSZXBsYWNl KCkpIHsKICAgICAgICAgICAgICAgICBhZGRUb0dyYXBoKENoZWNrU3RydWN0dXJlLCBPcEluZm8o bV9ncmFwaC5hZGRTdHJ1Y3R1cmVTZXQocHV0QnlJZFN0YXR1cy5vbGRTdHJ1Y3R1cmUoKSkpLCBi YXNlKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHSklUQ29tcGlsZXIuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHSklUQ29tcGlsZXIu Y3BwCShyZXZpc2lvbiAxNTgxMjQpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0pJ VENvbXBpbGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjQsMjYgKzY0LDI2IEBAIHZvaWQgSklU Q29tcGlsZXI6OmxpbmtPU1JFeGl0cygpCiAgICAgQVNTRVJUKG1faml0Q29kZS0+b3NyRXhpdC5z aXplKCkgPT0gbV9leGl0Q29tcGlsYXRpb25JbmZvLnNpemUoKSk7CiAgICAgaWYgKG1fZ3JhcGgu Y29tcGlsYXRpb24oKSkgewogICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbV9qaXRD b2RlLT5vc3JFeGl0LnNpemUoKTsgKytpKSB7Ci0gICAgICAgICAgICBPU1JFeGl0JiBleGl0ID0g bV9qaXRDb2RlLT5vc3JFeGl0W2ldOworICAgICAgICAgICAgT1NSRXhpdENvbXBpbGF0aW9uSW5m byYgaW5mbyA9IG1fZXhpdENvbXBpbGF0aW9uSW5mb1tpXTsKICAgICAgICAgICAgIFZlY3RvcjxM YWJlbD4gbGFiZWxzOwotICAgICAgICAgICAgaWYgKGV4aXQubV93YXRjaHBvaW50SW5kZXggPT0g c3RkOjpudW1lcmljX2xpbWl0czx1bnNpZ25lZD46Om1heCgpKSB7Ci0gICAgICAgICAgICAgICAg T1NSRXhpdENvbXBpbGF0aW9uSW5mbyYgaW5mbyA9IG1fZXhpdENvbXBpbGF0aW9uSW5mb1tpXTsK KyAgICAgICAgICAgIGlmIChpbmZvLm1fd2F0Y2hwb2ludEluZGV4ID09IHN0ZDo6bnVtZXJpY19s aW1pdHM8dW5zaWduZWQ+OjptYXgoKSkgewogICAgICAgICAgICAgICAgIGZvciAodW5zaWduZWQg aiA9IDA7IGogPCBpbmZvLm1fZmFpbHVyZUp1bXBzLmp1bXBzKCkuc2l6ZSgpOyArK2opCiAgICAg ICAgICAgICAgICAgICAgIGxhYmVscy5hcHBlbmQoaW5mby5tX2ZhaWx1cmVKdW1wcy5qdW1wcygp W2pdLmxhYmVsKCkpOwogICAgICAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICAgICAgbGFiZWxz LmFwcGVuZChtX2ppdENvZGUtPndhdGNocG9pbnRzW2V4aXQubV93YXRjaHBvaW50SW5kZXhdLnNv dXJjZUxhYmVsKCkpOworICAgICAgICAgICAgICAgIGxhYmVscy5hcHBlbmQobV9qaXRDb2RlLT53 YXRjaHBvaW50c1tpbmZvLm1fd2F0Y2hwb2ludEluZGV4XS5zb3VyY2VMYWJlbCgpKTsKICAgICAg ICAgICAgIG1fZXhpdFNpdGVMYWJlbHMuYXBwZW5kKGxhYmVscyk7CiAgICAgICAgIH0KICAgICB9 CiAgICAgCiAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG1faml0Q29kZS0+b3NyRXhpdC5z aXplKCk7ICsraSkgewogICAgICAgICBPU1JFeGl0JiBleGl0ID0gbV9qaXRDb2RlLT5vc3JFeGl0 W2ldOwotICAgICAgICBKdW1wTGlzdCYgZmFpbHVyZUp1bXBzID0gbV9leGl0Q29tcGlsYXRpb25J bmZvW2ldLm1fZmFpbHVyZUp1bXBzOwotICAgICAgICBBU1NFUlQoZmFpbHVyZUp1bXBzLmVtcHR5 KCkgPT0gKGV4aXQubV93YXRjaHBvaW50SW5kZXggIT0gc3RkOjpudW1lcmljX2xpbWl0czx1bnNp Z25lZD46Om1heCgpKSk7Ci0gICAgICAgIGlmIChleGl0Lm1fd2F0Y2hwb2ludEluZGV4ID09IHN0 ZDo6bnVtZXJpY19saW1pdHM8dW5zaWduZWQ+OjptYXgoKSkKKyAgICAgICAgT1NSRXhpdENvbXBp bGF0aW9uSW5mbyYgaW5mbyA9IG1fZXhpdENvbXBpbGF0aW9uSW5mb1tpXTsKKyAgICAgICAgSnVt cExpc3QmIGZhaWx1cmVKdW1wcyA9IGluZm8ubV9mYWlsdXJlSnVtcHM7CisgICAgICAgIEFTU0VS VChmYWlsdXJlSnVtcHMuZW1wdHkoKSA9PSAoaW5mby5tX3dhdGNocG9pbnRJbmRleCAhPSBzdGQ6 Om51bWVyaWNfbGltaXRzPHVuc2lnbmVkPjo6bWF4KCkpKTsKKyAgICAgICAgaWYgKGluZm8ubV93 YXRjaHBvaW50SW5kZXggPT0gc3RkOjpudW1lcmljX2xpbWl0czx1bnNpZ25lZD46Om1heCgpKQog ICAgICAgICAgICAgZmFpbHVyZUp1bXBzLmxpbmsodGhpcyk7CiAgICAgICAgIGVsc2UKLSAgICAg ICAgICAgIG1faml0Q29kZS0+d2F0Y2hwb2ludHNbZXhpdC5tX3dhdGNocG9pbnRJbmRleF0uc2V0 RGVzdGluYXRpb24obGFiZWwoKSk7CisgICAgICAgICAgICBtX2ppdENvZGUtPndhdGNocG9pbnRz W2luZm8ubV93YXRjaHBvaW50SW5kZXhdLnNldERlc3RpbmF0aW9uKGxhYmVsKCkpOwogICAgICAg ICBqaXRBc3NlcnRIYXNWYWxpZENhbGxGcmFtZSgpOwogICAgICAgICBzdG9yZTMyKFRydXN0ZWRJ bW0zMihpKSwgJnZtKCktPm9zckV4aXRJbmRleCk7CiAgICAgICAgIGV4aXQuc2V0UGF0Y2hhYmxl Q29kZU9mZnNldChwYXRjaGFibGVKdW1wKCkpOwpAQCAtMjU0LDEwICsyNTQsMTEgQEAgdm9pZCBK SVRDb21waWxlcjo6bGluayhMaW5rQnVmZmVyJiBsaW5rQgogICAgIENvZGVMb2NhdGlvbkxhYmVs IHRhcmdldCA9IENvZGVMb2NhdGlvbkxhYmVsKG9zckV4aXRUaHVuay5jb2RlKCkpOwogICAgIGZv ciAodW5zaWduZWQgaSA9IDA7IGkgPCBtX2ppdENvZGUtPm9zckV4aXQuc2l6ZSgpOyArK2kpIHsK ICAgICAgICAgT1NSRXhpdCYgZXhpdCA9IG1faml0Q29kZS0+b3NyRXhpdFtpXTsKKyAgICAgICAg T1NSRXhpdENvbXBpbGF0aW9uSW5mbyYgaW5mbyA9IG1fZXhpdENvbXBpbGF0aW9uSW5mb1tpXTsK ICAgICAgICAgbGlua0J1ZmZlci5saW5rKGV4aXQuZ2V0UGF0Y2hhYmxlQ29kZU9mZnNldEFzSnVt cCgpLCB0YXJnZXQpOwogICAgICAgICBleGl0LmNvcnJlY3RKdW1wKGxpbmtCdWZmZXIpOwotICAg ICAgICBpZiAoZXhpdC5tX3dhdGNocG9pbnRJbmRleCAhPSBzdGQ6Om51bWVyaWNfbGltaXRzPHVu c2lnbmVkPjo6bWF4KCkpCi0gICAgICAgICAgICBtX2ppdENvZGUtPndhdGNocG9pbnRzW2V4aXQu bV93YXRjaHBvaW50SW5kZXhdLmNvcnJlY3RMYWJlbHMobGlua0J1ZmZlcik7CisgICAgICAgIGlm IChpbmZvLm1fd2F0Y2hwb2ludEluZGV4ICE9IHN0ZDo6bnVtZXJpY19saW1pdHM8dW5zaWduZWQ+ OjptYXgoKSkKKyAgICAgICAgICAgIG1faml0Q29kZS0+d2F0Y2hwb2ludHNbaW5mby5tX3dhdGNo cG9pbnRJbmRleF0uY29ycmVjdExhYmVscyhsaW5rQnVmZmVyKTsKICAgICB9CiAgICAgCiAgICAg aWYgKG1fZ3JhcGguY29tcGlsYXRpb24oKSkgewpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3Jl L2RmZy9ERkdKSVRDb21waWxlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9kZmcvREZHSklUQ29tcGlsZXIuaAkocmV2aXNpb24gMTU4MTI0KQorKysgU291cmNlL0phdmFT Y3JpcHRDb3JlL2RmZy9ERkdKSVRDb21waWxlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0xOTcsMTEg KzE5NywxMiBAQCBwdWJsaWM6CiAgICAgICAgIG1fZXhjZXB0aW9uQ2hlY2tzLmFwcGVuZChicmFu Y2hUZXN0UHRyKFplcm8sIEdQUkluZm86OnJldHVyblZhbHVlR1BSKSk7CiAgICAgfQogICAgIAot ICAgIHZvaWQgYXBwZW5kRXhpdEluZm8oTWFjcm9Bc3NlbWJsZXI6Okp1bXBMaXN0IGp1bXBzVG9G YWlsID0gTWFjcm9Bc3NlbWJsZXI6Okp1bXBMaXN0KCkpCisgICAgT1NSRXhpdENvbXBpbGF0aW9u SW5mbyYgYXBwZW5kRXhpdEluZm8oTWFjcm9Bc3NlbWJsZXI6Okp1bXBMaXN0IGp1bXBzVG9GYWls ID0gTWFjcm9Bc3NlbWJsZXI6Okp1bXBMaXN0KCkpCiAgICAgewogICAgICAgICBPU1JFeGl0Q29t cGlsYXRpb25JbmZvIGluZm87CiAgICAgICAgIGluZm8ubV9mYWlsdXJlSnVtcHMgPSBqdW1wc1Rv RmFpbDsKICAgICAgICAgbV9leGl0Q29tcGlsYXRpb25JbmZvLmFwcGVuZChpbmZvKTsKKyAgICAg ICAgcmV0dXJuIG1fZXhpdENvbXBpbGF0aW9uSW5mby5sYXN0KCk7CiAgICAgfQogCiAjaWYgVVNF KEpTVkFMVUUzMl82NCkKQEAgLTM1Myw3ICszNTQsNyBAQCBwcml2YXRlOgogICAgIFZlY3RvcjxJ bmxpbmVDYWNoZVdyYXBwZXI8SklUUHV0QnlJZEdlbmVyYXRvcj4sIDQ+IG1fcHV0QnlJZHM7CiAg ICAgVmVjdG9yPEluUmVjb3JkLCA0PiBtX2luczsKICAgICBWZWN0b3I8SlNDYWxsUmVjb3JkLCA0 PiBtX2pzQ2FsbHM7Ci0gICAgVmVjdG9yPE9TUkV4aXRDb21waWxhdGlvbkluZm8+IG1fZXhpdENv bXBpbGF0aW9uSW5mbzsKKyAgICBTZWdtZW50ZWRWZWN0b3I8T1NSRXhpdENvbXBpbGF0aW9uSW5m bywgND4gbV9leGl0Q29tcGlsYXRpb25JbmZvOwogICAgIFZlY3RvcjxWZWN0b3I8TGFiZWw+PiBt X2V4aXRTaXRlTGFiZWxzOwogICAgIAogICAgIENhbGwgbV9jYWxsQXJpdHlGaXh1cDsKSW5kZXg6 IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT1NSRXhpdC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPU1JFeGl0LmNwcAkocmV2aXNpb24gMTU4MTI0 KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPU1JFeGl0LmNwcAkod29ya2luZyBj b3B5KQpAQCAtNDEsNyArNDEsNiBAQCBPU1JFeGl0OjpPU1JFeGl0KEV4aXRLaW5kIGtpbmQsIEpT VmFsdWVTCiAgICAgLCBtX3ZhbHVlUHJvZmlsZSh2YWx1ZVByb2ZpbGUpCiAgICAgLCBtX3BhdGNo YWJsZUNvZGVPZmZzZXQoMCkKICAgICAsIG1fcmVjb3ZlcnlJbmRleChyZWNvdmVyeUluZGV4KQot ICAgICwgbV93YXRjaHBvaW50SW5kZXgoc3RkOjpudW1lcmljX2xpbWl0czx1bnNpZ25lZD46Om1h eCgpKQogICAgICwgbV9zdHJlYW1JbmRleChzdHJlYW1JbmRleCkKICAgICAsIG1fbGFzdFNldE9w ZXJhbmQoaml0LT5tX2xhc3RTZXRPcGVyYW5kKQogewpJbmRleDogU291cmNlL0phdmFTY3JpcHRD b3JlL2RmZy9ERkdPU1JFeGl0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3Jl L2RmZy9ERkdPU1JFeGl0LmgJKHJldmlzaW9uIDE1ODEyNCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9kZmcvREZHT1NSRXhpdC5oCSh3b3JraW5nIGNvcHkpCkBAIC05Niw3ICs5Niw2IEBAIHN0 cnVjdCBPU1JFeGl0IDogcHVibGljIE9TUkV4aXRCYXNlIHsKICAgICB1bnNpZ25lZCBtX3BhdGNo YWJsZUNvZGVPZmZzZXQ7CiAgICAgCiAgICAgdW5zaWduZWQgbV9yZWNvdmVyeUluZGV4OwotICAg IHVuc2lnbmVkIG1fd2F0Y2hwb2ludEluZGV4OwogICAgIAogICAgIHZvaWQgc2V0UGF0Y2hhYmxl Q29kZU9mZnNldChNYWNyb0Fzc2VtYmxlcjo6UGF0Y2hhYmxlSnVtcCk7CiAgICAgTWFjcm9Bc3Nl bWJsZXI6Okp1bXAgZ2V0UGF0Y2hhYmxlQ29kZU9mZnNldEFzSnVtcCgpIGNvbnN0OwpJbmRleDog U291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPU1JFeGl0Q29tcGlsYXRpb25JbmZvLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPU1JFeGl0Q29tcGlsYXRp b25JbmZvLmgJKHJldmlzaW9uIDE1ODEyNCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcv REZHT1NSRXhpdENvbXBpbGF0aW9uSW5mby5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNyw3ICszNywx MyBAQAogbmFtZXNwYWNlIEpTQyB7IG5hbWVzcGFjZSBERkcgewogCiBzdHJ1Y3QgT1NSRXhpdENv bXBpbGF0aW9uSW5mbyB7CisgICAgT1NSRXhpdENvbXBpbGF0aW9uSW5mbygpCisgICAgICAgIDog bV93YXRjaHBvaW50SW5kZXgoc3RkOjpudW1lcmljX2xpbWl0czx1bnNpZ25lZD46Om1heCgpKQor ICAgIHsKKyAgICB9CisgICAgCiAgICAgTWFjcm9Bc3NlbWJsZXI6Okp1bXBMaXN0IG1fZmFpbHVy ZUp1bXBzOworICAgIHVuc2lnbmVkIG1fd2F0Y2hwb2ludEluZGV4OwogfTsKIAogfSB9IC8vIG5h bWVzcGFjZSBKU0M6OkRGRwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPU1JF eGl0Q29tcGlsZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcv REZHT1NSRXhpdENvbXBpbGVyLmNwcAkocmV2aXNpb24gMTU4MTI0KQorKysgU291cmNlL0phdmFT Y3JpcHRDb3JlL2RmZy9ERkdPU1JFeGl0Q29tcGlsZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05 NSw4ICs5NSw3IEBAIHZvaWQgY29tcGlsZU9TUkV4aXQoRXhlY1N0YXRlKiBleGVjKQogICAgICAg ICAgICAgCiAgICAgICAgICAgICBQcm9maWxlcjo6T1NSRXhpdCogcHJvZmlsZXJFeGl0ID0gY29t cGlsYXRpb24tPmFkZE9TUkV4aXQoCiAgICAgICAgICAgICAgICAgZXhpdEluZGV4LCBQcm9maWxl cjo6T3JpZ2luU3RhY2soZGF0YWJhc2UsIGNvZGVCbG9jaywgZXhpdC5tX2NvZGVPcmlnaW4pLAot ICAgICAgICAgICAgICAgIGV4aXQubV9raW5kLAotICAgICAgICAgICAgICAgIGV4aXQubV93YXRj aHBvaW50SW5kZXggIT0gc3RkOjpudW1lcmljX2xpbWl0czx1bnNpZ25lZD46Om1heCgpKTsKKyAg ICAgICAgICAgICAgICBleGl0Lm1fa2luZCwgaXNXYXRjaHBvaW50KGV4aXQubV9raW5kKSk7CiAg ICAgICAgICAgICBqaXQuYWRkNjQoQ0NhbGxIZWxwZXJzOjpUcnVzdGVkSW1tMzIoMSksIENDYWxs SGVscGVyczo6QWJzb2x1dGVBZGRyZXNzKHByb2ZpbGVyRXhpdC0+Y291bnRlckFkZHJlc3MoKSkp OwogICAgICAgICB9CiAgICAgICAgIApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9E RkdTcGVjdWxhdGl2ZUpJVDMyXzY0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlw dENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklUMzJfNjQuY3BwCShyZXZpc2lvbiAxNTgxMjQpCisr KyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklUMzJfNjQuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0zOTAzLDcgKzM5MDMsNyBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpj b21waWxlKE5vZGUqIG5vZGUpCiAgICAgICAgIG1faml0LmFkZFdlYWtSZWZlcmVuY2Uobm9kZS0+ c3RydWN0dXJlKCkpOwogICAgICAgICBtX2ppdC5hZGRMYXppbHkoCiAgICAgICAgICAgICBzcGVj dWxhdGlvbldhdGNocG9pbnQoCi0gICAgICAgICAgICAgICAgbm9kZS0+Y2hpbGQxKCktPm9wKCkg PT0gV2Vha0pTQ29uc3RhbnQgPyBCYWRXZWFrQ29uc3RhbnRDYWNoZSA6IEJhZENhY2hlKSwKKyAg ICAgICAgICAgICAgICBub2RlLT5jaGlsZDEoKS0+b3AoKSA9PSBXZWFrSlNDb25zdGFudCA/IEJh ZFdlYWtDb25zdGFudENhY2hlV2F0Y2hwb2ludCA6IEJhZENhY2hlV2F0Y2hwb2ludCksCiAgICAg ICAgICAgICBub2RlLT5zdHJ1Y3R1cmUoKS0+dHJhbnNpdGlvbldhdGNocG9pbnRTZXQoKSk7CiAg ICAgICAgIAogI2lmICFBU1NFUlRfRElTQUJMRUQKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQ2NC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFT Y3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVDY0LmNwcAkocmV2aXNpb24gMTU4MTI0KQor KysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVDY0LmNwcAkod29y a2luZyBjb3B5KQpAQCAtNDE5Nyw3ICs0MTk3LDcgQEAgdm9pZCBTcGVjdWxhdGl2ZUpJVDo6Y29t cGlsZShOb2RlKiBub2RlKQogICAgICAgICBtX2ppdC5hZGRXZWFrUmVmZXJlbmNlKG5vZGUtPnN0 cnVjdHVyZSgpKTsKICAgICAgICAgbV9qaXQuYWRkTGF6aWx5KAogICAgICAgICAgICAgc3BlY3Vs YXRpb25XYXRjaHBvaW50KAotICAgICAgICAgICAgICAgIG5vZGUtPmNoaWxkMSgpLT5vcCgpID09 IFdlYWtKU0NvbnN0YW50ID8gQmFkV2Vha0NvbnN0YW50Q2FjaGUgOiBCYWRDYWNoZSksCisgICAg ICAgICAgICAgICAgbm9kZS0+Y2hpbGQxKCktPm9wKCkgPT0gV2Vha0pTQ29uc3RhbnQgPyBCYWRX ZWFrQ29uc3RhbnRDYWNoZVdhdGNocG9pbnQgOiBCYWRDYWNoZVdhdGNocG9pbnQpLAogICAgICAg ICAgICAgbm9kZS0+c3RydWN0dXJlKCktPnRyYW5zaXRpb25XYXRjaHBvaW50U2V0KCkpOwogCiAj aWYgIUFTU0VSVF9ESVNBQkxFRApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdT cGVjdWxhdGl2ZUpJVC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2Rm Zy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHAJKHJldmlzaW9uIDE1ODEyNCkKKysrIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0y MDUsMTcgKzIwNSwxNyBAQCBKdW1wUmVwbGFjZW1lbnRXYXRjaHBvaW50KiBTcGVjdWxhdGl2ZUpJ CiAgICAgaWYgKCFtX2NvbXBpbGVPa2F5KQogICAgICAgICByZXR1cm4gMDsKICAgICBBU1NFUlQo bV9pc0NoZWNraW5nQXJndW1lbnRUeXBlcyB8fCBtX2NhbkV4aXQpOwotICAgIG1faml0LmFwcGVu ZEV4aXRJbmZvKEpJVENvbXBpbGVyOjpKdW1wTGlzdCgpKTsKLSAgICBPU1JFeGl0JiBleGl0ID0g bV9qaXQuaml0Q29kZSgpLT5vc3JFeGl0WworICAgIE9TUkV4aXRDb21waWxhdGlvbkluZm8mIGlu Zm8gPSBtX2ppdC5hcHBlbmRFeGl0SW5mbyhKSVRDb21waWxlcjo6SnVtcExpc3QoKSk7CisgICAg bV9qaXQuaml0Q29kZSgpLT5vc3JFeGl0WwogICAgICAgICBtX2ppdC5qaXRDb2RlKCktPmFwcGVu ZE9TUkV4aXQoT1NSRXhpdCgKICAgICAgICAgICAgIGtpbmQsIGpzVmFsdWVTb3VyY2UsCiAgICAg ICAgICAgICBtX2ppdC5ncmFwaCgpLm1ldGhvZE9mR2V0dGluZ0FWYWx1ZVByb2ZpbGVGb3Iobm9k ZSksCiAgICAgICAgICAgICB0aGlzLCBtX3N0cmVhbS0+c2l6ZSgpKSldOwotICAgIGV4aXQubV93 YXRjaHBvaW50SW5kZXggPSBtX2ppdC5qaXRDb2RlKCktPmFwcGVuZFdhdGNocG9pbnQoCisgICAg aW5mby5tX3dhdGNocG9pbnRJbmRleCA9IG1faml0LmppdENvZGUoKS0+YXBwZW5kV2F0Y2hwb2lu dCgKICAgICAgICAgSnVtcFJlcGxhY2VtZW50V2F0Y2hwb2ludChtX2ppdC53YXRjaHBvaW50TGFi ZWwoKSkpOwogICAgIGlmIChtX3NwZWN1bGF0aW9uRGlyZWN0aW9uID09IEZvcndhcmRTcGVjdWxh dGlvbikKICAgICAgICAgY29udmVydExhc3RPU1JFeGl0VG9Gb3J3YXJkKCk7Ci0gICAgcmV0dXJu ICZtX2ppdC5qaXRDb2RlKCktPndhdGNocG9pbnRzW2V4aXQubV93YXRjaHBvaW50SW5kZXhdOwor ICAgIHJldHVybiAmbV9qaXQuaml0Q29kZSgpLT53YXRjaHBvaW50c1tpbmZvLm1fd2F0Y2hwb2lu dEluZGV4XTsKIH0KIAogSnVtcFJlcGxhY2VtZW50V2F0Y2hwb2ludCogU3BlY3VsYXRpdmVKSVQ6 OnNwZWN1bGF0aW9uV2F0Y2hwb2ludChFeGl0S2luZCBraW5kKQo=