179562 2017-11-10 16:46:02 -0800 We should ensure that operationStrCat2 and operationStrCat3 are never passed Symbols as arguments. 2017-11-12 07:35:02 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mark.lam mark.lam fpizlo jfbastien keith_miller msaboff rmorisset saam webkit-bug-importer oldest_to_newest 1370592 0 mark.lam 2017-11-10 16:46:02 -0800 Patch coming soon. <rdar://problem/35467022> 1370619 1 326667 mark.lam 2017-11-10 17:42:26 -0800 Created attachment 326667 proposed patch. 1370623 2 326667 saam 2017-11-10 17:47:53 -0800 Comment on attachment 326667 proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=326667&action=review r=me > Source/JavaScriptCore/dfg/DFGFixupPhase.cpp:205 > + m_insertionSet.insertNode( > + m_indexInBlock, SpecNone, Check, node->origin, > + Edge(edge.node(), NotSymbolUse)); Might be worth a comment saying why we do this. 1370624 3 mark.lam 2017-11-10 17:48:37 -0800 (In reply to Saam Barati from comment #2) > > Source/JavaScriptCore/dfg/DFGFixupPhase.cpp:205 > > + m_insertionSet.insertNode( > > + m_indexInBlock, SpecNone, Check, node->origin, > > + Edge(edge.node(), NotSymbolUse)); > > Might be worth a comment saying why we do this. Thanks. I will add the comment. 1370754 4 mark.lam 2017-11-12 07:35:02 -0800 Landed in r224735: <http://trac.webkit.org/r224735>. 326667 2017-11-10 17:42:26 -0800 2017-11-10 17:47:53 -0800 proposed patch. bug-179562.patch text/plain 10960 mark.lam SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyMjQ3MTQpCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDEzIEBACisyMDE3LTExLTEwICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNv bT4KKworICAgICAgICBXZSBzaG91bGQgZW5zdXJlIHRoYXQgb3BlcmF0aW9uU3RyQ2F0MiBhbmQg b3BlcmF0aW9uU3RyQ2F0MyBhcmUgbmV2ZXIgcGFzc2VkIFN5bWJvbHMgYXMgYXJndW1lbnRzLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc5NTYyCisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNTQ2NzAyMj4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHJlZ3Jlc3MtMTc5NTYyLmpzOiBBZGRlZC4KKwog MjAxNy0xMS0wOCAgU2FhbSBCYXJhdGkgIDxzYmFyYXRpQGFwcGxlLmNvbT4KIAogICAgICAgICBB IEpTRnVuY3Rpb24ncyBPYmplY3RBbGxvY2F0aW9uUHJvZmlsZSBzaG91bGQgd2F0Y2ggdGhlIHBv bHkgcHJvdG90eXBlIHdhdGNocG9pbnQgc28gaXQgY2FuIGNsZWFyIGl0cyBvYmplY3QgYWxsb2Nh dGlvbiBwcm9maWxlCkluZGV4OiBKU1Rlc3RzL3N0cmVzcy9yZWdyZXNzLTE3OTU2Mi5qcwo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBKU1Rlc3RzL3N0cmVzcy9yZWdyZXNzLTE3OTU2Mi5qcwkobm9uZXhpc3RlbnQp CisrKyBKU1Rlc3RzL3N0cmVzcy9yZWdyZXNzLTE3OTU2Mi5qcwkod29ya2luZyBjb3B5KQpAQCAt MCwwICsxLDMzIEBACisvL0AgcnVuRlRMTm9DSklUKCItLW1heFBlclRocmVhZFN0YWNrVXNhZ2U9 NDAwMDAwIikKKworZnVuY3Rpb24gcnVuTmVhclN0YWNrTGltaXQoZikgeworICAgIGZ1bmN0aW9u IHQoKSB7CisgICAgICAgIHRyeSB7CisgICAgICAgICAgICByZXR1cm4gdCgpOworICAgICAgICB9 IGNhdGNoIChlKSB7CisgICAgICAgICAgICByZXR1cm4gZigpOworICAgICAgICB9CisgICAgfQor ICAgIHJldHVybiB0KCkKK30KKworZnVuY3Rpb24gZm9vKGEsIGIpIHsKKyAgcmV0dXJuIFt7Cisg ICAgbmFtZTogYiArICIiICsgYQorICB9XTsKK30KKwordmFyIGV4Y2VwdGlvbjsKK3RyeSB7Cisg ICAgX192XzI1MDEyID0gW10uY29uY2F0KAorICAgICAgICBmb28oMSwgW10pLAorICAgICAgICBy dW5OZWFyU3RhY2tMaW1pdCgoKSA9PiB7CisgICAgICAgICAgICByZXR1cm4gZm9vKCJibGEiLCBT eW1ib2wuc2VhcmNoKTsKKyAgICAgICAgfSkKKyAgICApOworfSBjYXRjaCAoZSkgeworICAgIGV4 Y2VwdGlvbiA9IGU7Cit9CisKK2lmIChleGNlcHRpb24gIT0gIlR5cGVFcnJvcjogQ2Fubm90IGNv bnZlcnQgYSBzeW1ib2wgdG8gYSBzdHJpbmciKQorICAgIHRocm93ICJGQUlMRUQiOwpJbmRleDog U291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMjQ3MTQpCisrKyBTb3VyY2UvSmF2YVNj cmlwdENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTct MTEtMTAgIE1hcmsgTGFtICA8bWFyay5sYW1AYXBwbGUuY29tPgorCisgICAgICAgIFdlIHNob3Vs ZCBlbnN1cmUgdGhhdCBvcGVyYXRpb25TdHJDYXQyIGFuZCBvcGVyYXRpb25TdHJDYXQzIGFyZSBu ZXZlciBwYXNzZWQgU3ltYm9scyBhcyBhcmd1bWVudHMuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzk1NjIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzM1NDY3MDIyPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogZGZnL0RGR0ZpeHVwUGhhc2UuY3BwOgorICAgICAgICAoSlNDOjpERkc6OkZpeHVwUGhh c2U6OmZpeHVwTm9kZSk6CisgICAgICAgICogZGZnL0RGR09wZXJhdGlvbnMuY3BwOgorICAgICAg ICAqIGRmZy9ERkdTYWZlVG9FeGVjdXRlLmg6CisgICAgICAgIChKU0M6OkRGRzo6U2FmZVRvRXhl Y3V0ZUVkZ2U6Om9wZXJhdG9yKCkpOgorICAgICAgICAqIGRmZy9ERkdTcGVjdWxhdGl2ZUpJVC5j cHA6CisgICAgICAgIChKU0M6OkRGRzo6U3BlY3VsYXRpdmVKSVQ6OnNwZWN1bGF0ZU5vdFN5bWJv bCk6CisgICAgICAgIChKU0M6OkRGRzo6U3BlY3VsYXRpdmVKSVQ6OnNwZWN1bGF0ZSk6CisgICAg ICAgICogZGZnL0RGR1NwZWN1bGF0aXZlSklULmg6CisgICAgICAgICogZGZnL0RGR1VzZUtpbmQu Y3BwOgorICAgICAgICAoV1RGOjpwcmludEludGVybmFsKToKKyAgICAgICAgKiBkZmcvREZHVXNl S2luZC5oOgorICAgICAgICAoSlNDOjpERkc6OnR5cGVGaWx0ZXJGb3IpOgorICAgICAgICAqIGZ0 bC9GVExDYXBhYmlsaXRpZXMuY3BwOgorICAgICAgICAoSlNDOjpGVEw6OmNhbkNvbXBpbGUpOgor ICAgICAgICAqIGZ0bC9GVExMb3dlckRGR1RvQjMuY3BwOgorICAgICAgICAoSlNDOjpGVEw6OkRG Rzo6TG93ZXJERkdUb0IzOjpzcGVjdWxhdGUpOgorICAgICAgICAoSlNDOjpGVEw6OkRGRzo6TG93 ZXJERkdUb0IzOjpzcGVjdWxhdGVOb3RTeW1ib2wpOgorCiAyMDE3LTExLTEwICBKb3NlcGggUGVj b3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogTWFr ZSBodHRwIHN0YXR1cyBjb2RlcyBiZSAiaW50ZWdlciIgaW5zdGVhZCBvZiAibnVtYmVyIiBpbiBw cm90b2NvbApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdGaXh1cFBoYXNlLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0ZpeHVwUGhhc2Uu Y3BwCShyZXZpc2lvbiAyMjQ3MTQpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0Zp eHVwUGhhc2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMDAsNiArMjAwLDkgQEAgcHJpdmF0ZToK ICAgICAgICAgICAgICAgICBub2RlLAogICAgICAgICAgICAgICAgIFsmXSAoRWRnZSYgZWRnZSkg ewogICAgICAgICAgICAgICAgICAgICBmaXhFZGdlPEtub3duUHJpbWl0aXZlVXNlPihlZGdlKTsK KyAgICAgICAgICAgICAgICAgICAgbV9pbnNlcnRpb25TZXQuaW5zZXJ0Tm9kZSgKKyAgICAgICAg ICAgICAgICAgICAgICAgIG1faW5kZXhJbkJsb2NrLCBTcGVjTm9uZSwgQ2hlY2ssIG5vZGUtPm9y aWdpbiwKKyAgICAgICAgICAgICAgICAgICAgICAgIEVkZ2UoZWRnZS5ub2RlKCksIE5vdFN5bWJv bFVzZSkpOwogICAgICAgICAgICAgICAgIH0pOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAg IH0KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT3BlcmF0aW9ucy5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPcGVyYXRpb25zLmNwcAko cmV2aXNpb24gMjI0NzE0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPcGVyYXRp b25zLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTk4NSw4ICsxOTg1LDEwIEBAIEpTQ2VsbCogSklU X09QRVJBVElPTiBvcGVyYXRpb25TdHJDYXQyKEUKICAgICBOYXRpdmVDYWxsRnJhbWVUcmFjZXIg dHJhY2VyKCZ2bSwgZXhlYyk7CiAgICAgYXV0byBzY29wZSA9IERFQ0xBUkVfVEhST1dfU0NPUEUo dm0pOwogCisgICAgQVNTRVJUKCFKU1ZhbHVlOjpkZWNvZGUoYSkuaXNTeW1ib2woKSk7CisgICAg QVNTRVJUKCFKU1ZhbHVlOjpkZWNvZGUoYikuaXNTeW1ib2woKSk7CiAgICAgSlNTdHJpbmcqIHN0 cjEgPSBKU1ZhbHVlOjpkZWNvZGUoYSkudG9TdHJpbmcoZXhlYyk7Ci0gICAgc2NvcGUuYXNzZXJ0 Tm9FeGNlcHRpb24oKTsgLy8gSW1wb3NzaWJsZSwgc2luY2Ugd2UgbXVzdCBoYXZlIGJlZW4gZ2l2 ZW4gcHJpbWl0aXZlcy4KKyAgICBzY29wZS5hc3NlcnROb0V4Y2VwdGlvbigpOyAvLyBJbXBvc3Np YmxlLCBzaW5jZSB3ZSBtdXN0IGhhdmUgYmVlbiBnaXZlbiBub24tU3ltYm9sIHByaW1pdGl2ZXMu CiAgICAgSlNTdHJpbmcqIHN0cjIgPSBKU1ZhbHVlOjpkZWNvZGUoYikudG9TdHJpbmcoZXhlYyk7 CiAgICAgc2NvcGUuYXNzZXJ0Tm9FeGNlcHRpb24oKTsKIApAQCAtMjAwMCw4ICsyMDAyLDExIEBA IEpTQ2VsbCogSklUX09QRVJBVElPTiBvcGVyYXRpb25TdHJDYXQzKEUKICAgICBOYXRpdmVDYWxs RnJhbWVUcmFjZXIgdHJhY2VyKCZ2bSwgZXhlYyk7CiAgICAgYXV0byBzY29wZSA9IERFQ0xBUkVf VEhST1dfU0NPUEUodm0pOwogCisgICAgQVNTRVJUKCFKU1ZhbHVlOjpkZWNvZGUoYSkuaXNTeW1i b2woKSk7CisgICAgQVNTRVJUKCFKU1ZhbHVlOjpkZWNvZGUoYikuaXNTeW1ib2woKSk7CisgICAg QVNTRVJUKCFKU1ZhbHVlOjpkZWNvZGUoYykuaXNTeW1ib2woKSk7CiAgICAgSlNTdHJpbmcqIHN0 cjEgPSBKU1ZhbHVlOjpkZWNvZGUoYSkudG9TdHJpbmcoZXhlYyk7Ci0gICAgc2NvcGUuYXNzZXJ0 Tm9FeGNlcHRpb24oKTsgLy8gSW1wb3NzaWJsZSwgc2luY2Ugd2UgbXVzdCBoYXZlIGJlZW4gZ2l2 ZW4gcHJpbWl0aXZlcy4KKyAgICBzY29wZS5hc3NlcnROb0V4Y2VwdGlvbigpOyAvLyBJbXBvc3Np YmxlLCBzaW5jZSB3ZSBtdXN0IGhhdmUgYmVlbiBnaXZlbiBub24tU3ltYm9sIHByaW1pdGl2ZXMu CiAgICAgSlNTdHJpbmcqIHN0cjIgPSBKU1ZhbHVlOjpkZWNvZGUoYikudG9TdHJpbmcoZXhlYyk7 CiAgICAgc2NvcGUuYXNzZXJ0Tm9FeGNlcHRpb24oKTsKICAgICBKU1N0cmluZyogc3RyMyA9IEpT VmFsdWU6OmRlY29kZShjKS50b1N0cmluZyhleGVjKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9kZmcvREZHU2FmZVRvRXhlY3V0ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9kZmcvREZHU2FmZVRvRXhlY3V0ZS5oCShyZXZpc2lvbiAyMjQ3MTQpCisrKyBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NhZmVUb0V4ZWN1dGUuaAkod29ya2luZyBjb3B5KQpA QCAtNzMsNiArNzMsNyBAQCBwdWJsaWM6CiAgICAgICAgIGNhc2UgU3RyaW5nT2JqZWN0VXNlOgog ICAgICAgICBjYXNlIFN0cmluZ09yU3RyaW5nT2JqZWN0VXNlOgogICAgICAgICBjYXNlIE5vdFN0 cmluZ1ZhclVzZToKKyAgICAgICAgY2FzZSBOb3RTeW1ib2xVc2U6CiAgICAgICAgIGNhc2UgTm90 Q2VsbFVzZToKICAgICAgICAgY2FzZSBPdGhlclVzZToKICAgICAgICAgY2FzZSBNaXNjVXNlOgpJ bmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5j cHAJKHJldmlzaW9uIDIyNDcxNCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3Bl Y3VsYXRpdmVKSVQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05NTQyLDYgKzk1NDIsMjggQEAgdm9p ZCBTcGVjdWxhdGl2ZUpJVDo6c3BlY3VsYXRlTm90U3RyaW5nVgogICAgIG5vdENlbGwubGluaygm bV9qaXQpOwogfQogCit2b2lkIFNwZWN1bGF0aXZlSklUOjpzcGVjdWxhdGVOb3RTeW1ib2woRWRn ZSBlZGdlKQoreworICAgIGlmICghbmVlZHNUeXBlQ2hlY2soZWRnZSwgflNwZWNTeW1ib2wpKQor ICAgICAgICByZXR1cm47CisKKyAgICBKU1ZhbHVlT3BlcmFuZCBvcGVyYW5kKHRoaXMsIGVkZ2Us IE1hbnVhbE9wZXJhbmRTcGVjdWxhdGlvbik7CisgICAgYXV0byB2YWx1ZVJlZ3MgPSBvcGVyYW5k LmpzVmFsdWVSZWdzKCk7CisgICAgR1BSUmVnIHZhbHVlID0gdmFsdWVSZWdzLnBheWxvYWRHUFIo KTsKKyAgICBKSVRDb21waWxlcjo6SnVtcCBub3RDZWxsOworCisgICAgYm9vbCBuZWVkc0NlbGxD aGVjayA9IG5lZWRzVHlwZUNoZWNrKGVkZ2UsIFNwZWNDZWxsKTsKKyAgICBpZiAobmVlZHNDZWxs Q2hlY2spCisgICAgICAgIG5vdENlbGwgPSBtX2ppdC5icmFuY2hJZk5vdENlbGwodmFsdWVSZWdz KTsKKworICAgIHNwZWN1bGF0aW9uQ2hlY2soQmFkVHlwZSwgSlNWYWx1ZVNvdXJjZTo6dW5ib3hl ZENlbGwodmFsdWUpLCBlZGdlLm5vZGUoKSwgbV9qaXQuYnJhbmNoSWZTeW1ib2wodmFsdWUpKTsK KworICAgIGlmIChuZWVkc0NlbGxDaGVjaykKKyAgICAgICAgbm90Q2VsbC5saW5rKCZtX2ppdCk7 CisKKyAgICBtX2ludGVycHJldGVyLmZpbHRlcihlZGdlLCB+U3BlY1N5bWJvbCk7Cit9CisKIHZv aWQgU3BlY3VsYXRpdmVKSVQ6OnNwZWN1bGF0ZVN5bWJvbChFZGdlIGVkZ2UsIEdQUlJlZyBjZWxs KQogewogICAgIERGR19UWVBFX0NIRUNLKEpTVmFsdWVTb3VyY2U6OnVuYm94ZWRDZWxsKGNlbGwp LCBlZGdlLCB+U3BlY0NlbGxDaGVjayB8IFNwZWNTeW1ib2wsIG1faml0LmJyYW5jaElmTm90U3lt Ym9sKGNlbGwpKTsKQEAgLTk3MzEsNiArOTc1Myw5IEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OnNw ZWN1bGF0ZShOb2RlKiwgRWQKICAgICBjYXNlIE5vdFN0cmluZ1ZhclVzZToKICAgICAgICAgc3Bl Y3VsYXRlTm90U3RyaW5nVmFyKGVkZ2UpOwogICAgICAgICBicmVhazsKKyAgICBjYXNlIE5vdFN5 bWJvbFVzZToKKyAgICAgICAgc3BlY3VsYXRlTm90U3ltYm9sKGVkZ2UpOworICAgICAgICBicmVh azsKICAgICBjYXNlIE5vdENlbGxVc2U6CiAgICAgICAgIHNwZWN1bGF0ZU5vdENlbGwoZWRnZSk7 CiAgICAgICAgIGJyZWFrOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVj dWxhdGl2ZUpJVC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH U3BlY3VsYXRpdmVKSVQuaAkocmV2aXNpb24gMjI0NzE0KQorKysgU291cmNlL0phdmFTY3JpcHRD b3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMTU4LDYgKzMx NTgsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzcGVjdWxhdGVTdHJpbmdPck90aGVyKEVkZ2UsIEpT VmFsdWVSZWdzLCBHUFJSZWcgc2NyYXRjaCk7CiAgICAgdm9pZCBzcGVjdWxhdGVTdHJpbmdPck90 aGVyKEVkZ2UpOwogICAgIHZvaWQgc3BlY3VsYXRlTm90U3RyaW5nVmFyKEVkZ2UpOworICAgIHZv aWQgc3BlY3VsYXRlTm90U3ltYm9sKEVkZ2UpOwogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFN0cnVj dHVyZUxvY2F0aW9uVHlwZT4KICAgICB2b2lkIHNwZWN1bGF0ZVN0cmluZ09iamVjdEZvclN0cnVj dHVyZShFZGdlLCBTdHJ1Y3R1cmVMb2NhdGlvblR5cGUpOwogICAgIHZvaWQgc3BlY3VsYXRlU3Ry aW5nT2JqZWN0KEVkZ2UsIEdQUlJlZyk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZn L0RGR1VzZUtpbmQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcv REZHVXNlS2luZC5jcHAJKHJldmlzaW9uIDIyNDcxNCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9kZmcvREZHVXNlS2luZC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE0NSw2ICsxNDUsOSBAQCB2 b2lkIHByaW50SW50ZXJuYWwoUHJpbnRTdHJlYW0mIG91dCwgVXNlCiAgICAgY2FzZSBOb3RTdHJp bmdWYXJVc2U6CiAgICAgICAgIG91dC5wcmludCgiTm90U3RyaW5nVmFyIik7CiAgICAgICAgIHJl dHVybjsKKyAgICBjYXNlIE5vdFN5bWJvbFVzZToKKyAgICAgICAgb3V0LnByaW50KCJOb3RTeW1i b2wiKTsKKyAgICAgICAgcmV0dXJuOwogICAgIGNhc2UgTm90Q2VsbFVzZToKICAgICAgICAgb3V0 LnByaW50KCJOb3RDZWxsIik7CiAgICAgICAgIHJldHVybjsKSW5kZXg6IFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9kZmcvREZHVXNlS2luZC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9kZmcvREZHVXNlS2luZC5oCShyZXZpc2lvbiAyMjQ3MTQpCisrKyBTb3VyY2UvSmF2YVNj cmlwdENvcmUvZGZnL0RGR1VzZUtpbmQuaAkod29ya2luZyBjb3B5KQpAQCAtNzIsNiArNzIsNyBA QCBlbnVtIFVzZUtpbmQgewogICAgIFN0cmluZ09iamVjdFVzZSwKICAgICBTdHJpbmdPclN0cmlu Z09iamVjdFVzZSwKICAgICBOb3RTdHJpbmdWYXJVc2UsCisgICAgTm90U3ltYm9sVXNlLAogICAg IE5vdENlbGxVc2UsCiAgICAgT3RoZXJVc2UsCiAgICAgTWlzY1VzZSwKQEAgLTE2MSw2ICsxNjIs OCBAQCBpbmxpbmUgU3BlY3VsYXRlZFR5cGUgdHlwZUZpbHRlckZvcihVc2VLCiAgICAgICAgIHJl dHVybiBTcGVjU3RyaW5nIHwgU3BlY1N0cmluZ09iamVjdDsKICAgICBjYXNlIE5vdFN0cmluZ1Zh clVzZToKICAgICAgICAgcmV0dXJuIH5TcGVjU3RyaW5nVmFyOworICAgIGNhc2UgTm90U3ltYm9s VXNlOgorICAgICAgICByZXR1cm4gflNwZWNTeW1ib2w7CiAgICAgY2FzZSBOb3RDZWxsVXNlOgog ICAgICAgICByZXR1cm4gflNwZWNDZWxsQ2hlY2s7CiAgICAgY2FzZSBPdGhlclVzZToKSW5kZXg6 IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMQ2FwYWJpbGl0aWVzLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTENhcGFiaWxpdGllcy5jcHAJKHJldmlz aW9uIDIyNDcxNCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMQ2FwYWJpbGl0aWVz LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTEyLDYgKzUxMiw3IEBAIENhcGFiaWxpdHlMZXZlbCBj YW5Db21waWxlKEdyYXBoJiBncmFwaCkKICAgICAgICAgICAgICAgICBjYXNlIE1pc2NVc2U6CiAg ICAgICAgICAgICAgICAgY2FzZSBTdHJpbmdJZGVudFVzZToKICAgICAgICAgICAgICAgICBjYXNl IE5vdFN0cmluZ1ZhclVzZToKKyAgICAgICAgICAgICAgICBjYXNlIE5vdFN5bWJvbFVzZToKICAg ICAgICAgICAgICAgICBjYXNlIEFueUludFVzZToKICAgICAgICAgICAgICAgICBjYXNlIERvdWJs ZVJlcEFueUludFVzZToKICAgICAgICAgICAgICAgICAgICAgLy8gVGhlc2UgYXJlIE9LLgpJbmRl eDogU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExMb3dlckRGR1RvQjMuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdUb0IzLmNwcAkocmV2 aXNpb24gMjI0NzE0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExMb3dlckRGR1Rv QjMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMzg1Miw2ICsxMzg1Miw5IEBAIHByaXZhdGU6CiAg ICAgICAgIGNhc2UgTm90U3RyaW5nVmFyVXNlOgogICAgICAgICAgICAgc3BlY3VsYXRlTm90U3Ry aW5nVmFyKGVkZ2UpOwogICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgTm90U3ltYm9s VXNlOgorICAgICAgICAgICAgc3BlY3VsYXRlTm90U3ltYm9sKGVkZ2UpOworICAgICAgICAgICAg YnJlYWs7CiAgICAgICAgIGNhc2UgTm90Q2VsbFVzZToKICAgICAgICAgICAgIHNwZWN1bGF0ZU5v dENlbGwoZWRnZSk7CiAgICAgICAgICAgICBicmVhazsKQEAgLTE0NDQxLDYgKzE0NDQ0LDI4IEBA IHByaXZhdGU6CiAgICAgICAgIG1fb3V0LmFwcGVuZFRvKGNvbnRpbnVhdGlvbiwgbGFzdE5leHQp OwogICAgIH0KICAgICAKKyAgICB2b2lkIHNwZWN1bGF0ZU5vdFN5bWJvbChFZGdlIGVkZ2UpCisg ICAgeworICAgICAgICBpZiAoIW1faW50ZXJwcmV0ZXIubmVlZHNUeXBlQ2hlY2soZWRnZSwgflNw ZWNTeW1ib2wpKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIEFTU0VSVChtYXlIYXZl VHlwZUNoZWNrKGVkZ2UudXNlS2luZCgpKSk7CisgICAgICAgIExWYWx1ZSB2YWx1ZSA9IGxvd0pT VmFsdWUoZWRnZSwgTWFudWFsT3BlcmFuZFNwZWN1bGF0aW9uKTsKKworICAgICAgICBMQmFzaWNC bG9jayBpc0NlbGxDYXNlID0gbV9vdXQubmV3QmxvY2soKTsKKyAgICAgICAgTEJhc2ljQmxvY2sg Y29udGludWF0aW9uID0gbV9vdXQubmV3QmxvY2soKTsKKworICAgICAgICBtX291dC5icmFuY2go aXNDZWxsKHZhbHVlLCBwcm92ZW5UeXBlKGVkZ2UpKSwgdW5zdXJlKGlzQ2VsbENhc2UpLCB1bnN1 cmUoY29udGludWF0aW9uKSk7CisKKyAgICAgICAgTEJhc2ljQmxvY2sgbGFzdE5leHQgPSBtX291 dC5hcHBlbmRUbyhpc0NlbGxDYXNlLCBjb250aW51YXRpb24pOworICAgICAgICBzcGVjdWxhdGUo QmFkVHlwZSwganNWYWx1ZVZhbHVlKHZhbHVlKSwgZWRnZS5ub2RlKCksIGlzU3ltYm9sKHZhbHVl KSk7CisgICAgICAgIG1fb3V0Lmp1bXAoY29udGludWF0aW9uKTsKKworICAgICAgICBtX291dC5h cHBlbmRUbyhjb250aW51YXRpb24sIGxhc3ROZXh0KTsKKworICAgICAgICBtX2ludGVycHJldGVy LmZpbHRlcihlZGdlLCB+U3BlY1N5bWJvbCk7CisgICAgfQorCiAgICAgdm9pZCBzcGVjdWxhdGVP dGhlcihFZGdlIGVkZ2UpCiAgICAgewogICAgICAgICBpZiAoIW1faW50ZXJwcmV0ZXIubmVlZHNU eXBlQ2hlY2soZWRnZSkpCg==