164650 2016-11-11 14:09:02 -0800 We recursively grab a lock in the DFGBytecodeParser causing us to deadlock 2016-11-11 15:50:47 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 saam saam benjamin commit-queue fpizlo ggaren gskachkov jfbastien keith_miller mark.lam msaboff oliver ryanhaddad ticaiolima webkit-bug-importer ysuzuki oldest_to_newest 1250400 0 saam 2016-11-11 14:09:02 -0800 Lets not do that. 1250402 1 saam 2016-11-11 14:13:27 -0800 <rdar://problem/28996663> 1250404 2 294536 saam 2016-11-11 14:14:11 -0800 Created attachment 294536 patch 1250408 3 294536 ggaren 2016-11-11 14:31:17 -0800 Comment on attachment 294536 patch Need to hold a lock when reading byValInfo, at least because of cachedId. 1250415 4 294538 saam 2016-11-11 14:35:18 -0800 Created attachment 294538 patch 1250418 5 294538 ggaren 2016-11-11 14:36:42 -0800 Comment on attachment 294538 patch r=me 1250439 6 294538 commit-queue 2016-11-11 15:06:47 -0800 Comment on attachment 294538 patch Clearing flags on attachment: 294538 Committed r208614: <http://trac.webkit.org/changeset/208614> 1250440 7 commit-queue 2016-11-11 15:06:52 -0800 All reviewed patches have been landed. Closing bug. 1250455 8 ryanhaddad 2016-11-11 15:36:46 -0800 (In reply to comment #6) > Comment on attachment 294538 [details] > patch > > Clearing flags on attachment: 294538 > > Committed r208614: <http://trac.webkit.org/changeset/208614> This change appears to have broken the Windows build: https://build.webkit.org/builders/Apple%20Win%20Release%20%28Build%29/builds/81889 1250467 9 saam 2016-11-11 15:50:47 -0800 (In reply to comment #8) > (In reply to comment #6) > > Comment on attachment 294538 [details] > > patch > > > > Clearing flags on attachment: 294538 > > > > Committed r208614: <http://trac.webkit.org/changeset/208614> > > This change appears to have broken the Windows build: > > https://build.webkit.org/builders/Apple%20Win%20Release%20%28Build%29/builds/ > 81889 Hopefully this fixes window's build https://trac.webkit.org/changeset/208619 294536 2016-11-11 14:14:11 -0800 2016-11-11 14:35:18 -0800 patch c-backup.diff text/plain 5237 saam SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyMDg2MTApCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDE1IEBACisyMDE2LTExLTExICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUu Y29tPgorCisgICAgICAgIFdlIHJlY3Vyc2l2ZWx5IGdyYWIgYSBsb2NrIGluIHRoZSBERkdCeXRl Y29kZVBhcnNlciBjYXVzaW5nIHVzIHRvIGRlYWRsb2NrCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjQ2NTAKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHN0cmVzcy9kb250LWRlYWQtbG9jay1wdXQtYnkt dmFsLWFzLXB1dC1ieS1pZC5qczogQWRkZWQuCisgICAgICAgIChpZGVudCk6CisgICAgICAgIChs ZXQuby5zZXQgZm9vKToKKyAgICAgICAgKGZvbyk6CisKIDIwMTYtMTEtMTEgIENocmlzIER1bWV6 ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCBy MjA4NTg0LgpJbmRleDogSlNUZXN0cy9zdHJlc3MvZG9udC1kZWFkLWxvY2stcHV0LWJ5LXZhbC1h cy1wdXQtYnktaWQuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gSlNUZXN0cy9zdHJlc3MvZG9udC1kZWFkLWxv Y2stcHV0LWJ5LXZhbC1hcy1wdXQtYnktaWQuanMJKG5vbmV4aXN0ZW50KQorKysgSlNUZXN0cy9z dHJlc3MvZG9udC1kZWFkLWxvY2stcHV0LWJ5LXZhbC1hcy1wdXQtYnktaWQuanMJKHdvcmtpbmcg Y29weSkKQEAgLTAsMCArMSwxNyBAQAorZnVuY3Rpb24gaWRlbnQoKSB7IHJldHVybiAiZm9vIjsg fQorbm9JbmxpbmUoaWRlbnQpOworCitsZXQgbyA9IHsKKyAgICBzZXQgZm9vKHgpIHsKKyAgICAg ICAgZm9vKGZhbHNlKTsKKyAgICB9Cit9OworCitmdW5jdGlvbiBmb28oY29uZCkgeworICAgIGlm IChjb25kKQorICAgICAgICBvW2lkZW50KCldID0gMjA7Cit9CisKK2ZvciAobGV0IGkgPSAwOyBp IDwgMTAwMDA7IGkrKykgeworICAgIGZvbyh0cnVlKTsKK30KSW5kZXg6IFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwkocmV2aXNpb24gMjA4NjA3KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE2LTExLTExICBTYWFtIEJh cmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAgIFdlIHJlY3Vyc2l2ZWx5IGdyYWIg YSBsb2NrIGluIHRoZSBERkdCeXRlY29kZVBhcnNlciBjYXVzaW5nIHVzIHRvIGRlYWRsb2NrCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjQ2NTAKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTb21lIGNvZGUg d2FzIGluY29ycmVjdGx5IGhvbGRpbmcgYSBsb2NrIHdoZW4gcmVjdXJzaXZlbHkgY2FsbGluZwor ICAgICAgICBiYWNrIGludG8gdGhlIGJ5dGVjb2RlIHBhcnNlcidzIHZpYSBpbmxpbmluZyBhIHB1 dF9ieV92YWwgYXMgYSBwdXRfYnlfaWQuCisgICAgICAgIFRoaXMgY2FuIGNhdXNlIGEgZGVhZGxv Y2sgaWYgdGhlIGlubGluZWUgQ29kZUJsb2NrIGlzIHNvbWV0aGluZyB3ZSdyZQorICAgICAgICBh bHJlYWR5IGhvbGRpbmcgYSBsb2NrIGZvci4gSSd2ZSBjaGFuZ2VkIHRoZSByYW5nZSBvZiB0aGUg bG9jayBob2xkZXIKKyAgICAgICAgdG8gYmUgYXMgbmFycm93IGFzIHBvc3NpYmxlLgorCisgICAg ICAgICogZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpCeXRl Q29kZVBhcnNlcjo6cGFyc2VCbG9jayk6CisKIDIwMTYtMTEtMTEgIENocmlzIER1bWV6ICA8Y2R1 bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMjA4NTg0 LgpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdCeXRlQ29kZVBhcnNlci5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdCeXRlQ29kZVBhcnNl ci5jcHAJKHJldmlzaW9uIDIwODYwNykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH Qnl0ZUNvZGVQYXJzZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MjQwLDcgKzQyNDAsNiBAQCBi b29sIEJ5dGVDb2RlUGFyc2VyOjpwYXJzZUJsb2NrKHVuc2lnbmVkCiAgICAgICAgICAgICBHZXRC eUlkU3RhdHVzIGdldEJ5SWRTdGF0dXM7CiAgICAgICAgICAgICB1bnNpZ25lZCBpZGVudGlmaWVy TnVtYmVyID0gMDsKICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICBDb25jdXJyZW50SklU TG9ja2VyIGxvY2tlcihtX2lubGluZVN0YWNrVG9wLT5tX3Byb2ZpbGVkQmxvY2stPm1fbG9jayk7 CiAgICAgICAgICAgICAgICAgQnlWYWxJbmZvKiBieVZhbEluZm8gPSBtX2lubGluZVN0YWNrVG9w LT5tX2J5VmFsSW5mb3MuZ2V0KENvZGVPcmlnaW4oY3VycmVudENvZGVPcmlnaW4oKS5ieXRlY29k ZUluZGV4KSk7CiAgICAgICAgICAgICAgICAgLy8gRklYTUU6IFdoZW4gdGhlIGJ5dGVjb2RlIGlz IG5vdCBjb21waWxlZCBpbiB0aGUgYmFzZWxpbmUgSklULCBieVZhbEluZm8gYmVjb21lcyBudWxs LgogICAgICAgICAgICAgICAgIC8vIEF0IHRoYXQgdGltZSwgdGhlcmUgaXMgbm8gaW5mb3JtYXRp b24uCkBAIC00MjU3LDkgKzQyNTYsMTIgQEAgYm9vbCBCeXRlQ29kZVBhcnNlcjo6cGFyc2VCbG9j ayh1bnNpZ25lZAogICAgICAgICAgICAgICAgICAgICAgICAgYWRkVG9HcmFwaChDaGVja1N0cmlu Z0lkZW50LCBPcEluZm8odWlkKSwgcHJvcGVydHkpOwogICAgICAgICAgICAgICAgICAgICB9CiAK LSAgICAgICAgICAgICAgICAgICAgZ2V0QnlJZFN0YXR1cyA9IEdldEJ5SWRTdGF0dXM6OmNvbXB1 dGVGb3JTdHViSW5mbygKLSAgICAgICAgICAgICAgICAgICAgICAgIGxvY2tlciwgbV9pbmxpbmVT dGFja1RvcC0+bV9wcm9maWxlZEJsb2NrLAotICAgICAgICAgICAgICAgICAgICAgICAgYnlWYWxJ bmZvLT5zdHViSW5mbywgY3VycmVudENvZGVPcmlnaW4oKSwgdWlkKTsKKyAgICAgICAgICAgICAg ICAgICAgeworICAgICAgICAgICAgICAgICAgICAgICAgQ29uY3VycmVudEpJVExvY2tlciBsb2Nr ZXIobV9pbmxpbmVTdGFja1RvcC0+bV9wcm9maWxlZEJsb2NrLT5tX2xvY2spOworICAgICAgICAg ICAgICAgICAgICAgICAgZ2V0QnlJZFN0YXR1cyA9IEdldEJ5SWRTdGF0dXM6OmNvbXB1dGVGb3JT dHViSW5mbygKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBsb2NrZXIsIG1faW5saW5lU3Rh Y2tUb3AtPm1fcHJvZmlsZWRCbG9jaywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBieVZh bEluZm8tPnN0dWJJbmZvLCBjdXJyZW50Q29kZU9yaWdpbigpLCB1aWQpOworICAgICAgICAgICAg ICAgICAgICB9CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQogCkBAIC00Mjk1LDcg KzQyOTcsNiBAQCBib29sIEJ5dGVDb2RlUGFyc2VyOjpwYXJzZUJsb2NrKHVuc2lnbmVkCiAgICAg ICAgICAgICBib29sIGlzRGlyZWN0ID0gb3Bjb2RlSUQgPT0gb3BfcHV0X2J5X3ZhbF9kaXJlY3Q7 CiAgICAgICAgICAgICBib29sIGNvbXBpbGVkQXNQdXRCeUlkID0gZmFsc2U7CiAgICAgICAgICAg ICB7Ci0gICAgICAgICAgICAgICAgQ29uY3VycmVudEpJVExvY2tlciBsb2NrZXIobV9pbmxpbmVT dGFja1RvcC0+bV9wcm9maWxlZEJsb2NrLT5tX2xvY2spOwogICAgICAgICAgICAgICAgIEJ5VmFs SW5mbyogYnlWYWxJbmZvID0gbV9pbmxpbmVTdGFja1RvcC0+bV9ieVZhbEluZm9zLmdldChDb2Rl T3JpZ2luKGN1cnJlbnRDb2RlT3JpZ2luKCkuYnl0ZWNvZGVJbmRleCkpOwogICAgICAgICAgICAg ICAgIC8vIEZJWE1FOiBXaGVuIHRoZSBieXRlY29kZSBpcyBub3QgY29tcGlsZWQgaW4gdGhlIGJh c2VsaW5lIEpJVCwgYnlWYWxJbmZvIGJlY29tZXMgbnVsbC4KICAgICAgICAgICAgICAgICAvLyBB dCB0aGF0IHRpbWUsIHRoZXJlIGlzIG5vIGluZm9ybWF0aW9uLgpAQCAtNDMxNyw5ICs0MzE4LDEz IEBAIGJvb2wgQnl0ZUNvZGVQYXJzZXI6OnBhcnNlQmxvY2sodW5zaWduZWQKICAgICAgICAgICAg ICAgICAgICAgICAgIGFkZFRvR3JhcGgoQ2hlY2tTdHJpbmdJZGVudCwgT3BJbmZvKHVpZCksIHBy b3BlcnR5KTsKICAgICAgICAgICAgICAgICAgICAgfQogCi0gICAgICAgICAgICAgICAgICAgIFB1 dEJ5SWRTdGF0dXMgcHV0QnlJZFN0YXR1cyA9IFB1dEJ5SWRTdGF0dXM6OmNvbXB1dGVGb3JTdHVi SW5mbygKLSAgICAgICAgICAgICAgICAgICAgICAgIGxvY2tlciwgbV9pbmxpbmVTdGFja1RvcC0+ bV9wcm9maWxlZEJsb2NrLAotICAgICAgICAgICAgICAgICAgICAgICAgYnlWYWxJbmZvLT5zdHVi SW5mbywgY3VycmVudENvZGVPcmlnaW4oKSwgdWlkKTsKKyAgICAgICAgICAgICAgICAgICAgUHV0 QnlJZFN0YXR1cyBwdXRCeUlkU3RhdHVzOworICAgICAgICAgICAgICAgICAgICB7CisgICAgICAg ICAgICAgICAgICAgICAgICBDb25jdXJyZW50SklUTG9ja2VyIGxvY2tlcihtX2lubGluZVN0YWNr VG9wLT5tX3Byb2ZpbGVkQmxvY2stPm1fbG9jayk7CisgICAgICAgICAgICAgICAgICAgICAgICBw dXRCeUlkU3RhdHVzID0gUHV0QnlJZFN0YXR1czo6Y29tcHV0ZUZvclN0dWJJbmZvKAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGxvY2tlciwgbV9pbmxpbmVTdGFja1RvcC0+bV9wcm9maWxl ZEJsb2NrLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJ5VmFsSW5mby0+c3R1YkluZm8s IGN1cnJlbnRDb2RlT3JpZ2luKCksIHVpZCk7CisgICAgICAgICAgICAgICAgICAgIH0KIAogICAg ICAgICAgICAgICAgICAgICBoYW5kbGVQdXRCeUlkKGJhc2UsIGlkZW50aWZpZXJOdW1iZXIsIHZh bHVlLCBwdXRCeUlkU3RhdHVzLCBpc0RpcmVjdCk7CiAgICAgICAgICAgICAgICAgfQo= 294538 2016-11-11 14:35:18 -0800 2016-11-11 15:06:47 -0800 patch c-backup.diff text/plain 6379 saam SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyMDg2MDcpCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDE1IEBACisyMDE2LTExLTExICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUu Y29tPgorCisgICAgICAgIFdlIHJlY3Vyc2l2ZWx5IGdyYWIgYSBsb2NrIGluIHRoZSBERkdCeXRl Y29kZVBhcnNlciBjYXVzaW5nIHVzIHRvIGRlYWRsb2NrCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjQ2NTAKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHN0cmVzcy9kb250LWRlYWQtbG9jay1wdXQtYnkt dmFsLWFzLXB1dC1ieS1pZC5qczogQWRkZWQuCisgICAgICAgIChpZGVudCk6CisgICAgICAgIChs ZXQuby5zZXQgZm9vKToKKyAgICAgICAgKGZvbyk6CisKIDIwMTYtMTEtMTEgIENocmlzIER1bWV6 ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCBy MjA4NTg0LgpJbmRleDogSlNUZXN0cy9zdHJlc3MvZG9udC1kZWFkLWxvY2stcHV0LWJ5LXZhbC1h cy1wdXQtYnktaWQuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gSlNUZXN0cy9zdHJlc3MvZG9udC1kZWFkLWxv Y2stcHV0LWJ5LXZhbC1hcy1wdXQtYnktaWQuanMJKG5vbmV4aXN0ZW50KQorKysgSlNUZXN0cy9z dHJlc3MvZG9udC1kZWFkLWxvY2stcHV0LWJ5LXZhbC1hcy1wdXQtYnktaWQuanMJKHdvcmtpbmcg Y29weSkKQEAgLTAsMCArMSwxNyBAQAorZnVuY3Rpb24gaWRlbnQoKSB7IHJldHVybiAiZm9vIjsg fQorbm9JbmxpbmUoaWRlbnQpOworCitsZXQgbyA9IHsKKyAgICBzZXQgZm9vKHgpIHsKKyAgICAg ICAgZm9vKGZhbHNlKTsKKyAgICB9Cit9OworCitmdW5jdGlvbiBmb28oY29uZCkgeworICAgIGlm IChjb25kKQorICAgICAgICBvW2lkZW50KCldID0gMjA7Cit9CisKK2ZvciAobGV0IGkgPSAwOyBp IDwgMTAwMDA7IGkrKykgeworICAgIGZvbyh0cnVlKTsKK30KSW5kZXg6IFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwkocmV2aXNpb24gMjA4NjA3KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE2LTExLTExICBTYWFtIEJh cmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAgIFdlIHJlY3Vyc2l2ZWx5IGdyYWIg YSBsb2NrIGluIHRoZSBERkdCeXRlY29kZVBhcnNlciBjYXVzaW5nIHVzIHRvIGRlYWRsb2NrCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjQ2NTAKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTb21lIGNvZGUg d2FzIGluY29ycmVjdGx5IGhvbGRpbmcgYSBsb2NrIHdoZW4gcmVjdXJzaXZlbHkgY2FsbGluZwor ICAgICAgICBiYWNrIGludG8gdGhlIGJ5dGVjb2RlIHBhcnNlcidzIHZpYSBpbmxpbmluZyBhIHB1 dF9ieV92YWwgYXMgYSBwdXRfYnlfaWQuCisgICAgICAgIFRoaXMgY2FuIGNhdXNlIGEgZGVhZGxv Y2sgaWYgdGhlIGlubGluZWUgQ29kZUJsb2NrIGlzIHNvbWV0aGluZyB3ZSdyZQorICAgICAgICBh bHJlYWR5IGhvbGRpbmcgYSBsb2NrIGZvci4gSSd2ZSBjaGFuZ2VkIHRoZSByYW5nZSBvZiB0aGUg bG9jayBob2xkZXIKKyAgICAgICAgdG8gYmUgYXMgbmFycm93IGFzIHBvc3NpYmxlLgorCisgICAg ICAgICogZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpCeXRl Q29kZVBhcnNlcjo6cGFyc2VCbG9jayk6CisKIDIwMTYtMTEtMTEgIENocmlzIER1bWV6ICA8Y2R1 bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMjA4NTg0 LgpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdCeXRlQ29kZVBhcnNlci5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdCeXRlQ29kZVBhcnNl ci5jcHAJKHJldmlzaW9uIDIwODYwNykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH Qnl0ZUNvZGVQYXJzZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00Mjk1LDM0ICs0Mjk1LDQwIEBA IGJvb2wgQnl0ZUNvZGVQYXJzZXI6OnBhcnNlQmxvY2sodW5zaWduZWQKICAgICAgICAgICAgIGJv b2wgaXNEaXJlY3QgPSBvcGNvZGVJRCA9PSBvcF9wdXRfYnlfdmFsX2RpcmVjdDsKICAgICAgICAg ICAgIGJvb2wgY29tcGlsZWRBc1B1dEJ5SWQgPSBmYWxzZTsKICAgICAgICAgICAgIHsKLSAgICAg ICAgICAgICAgICBDb25jdXJyZW50SklUTG9ja2VyIGxvY2tlcihtX2lubGluZVN0YWNrVG9wLT5t X3Byb2ZpbGVkQmxvY2stPm1fbG9jayk7Ci0gICAgICAgICAgICAgICAgQnlWYWxJbmZvKiBieVZh bEluZm8gPSBtX2lubGluZVN0YWNrVG9wLT5tX2J5VmFsSW5mb3MuZ2V0KENvZGVPcmlnaW4oY3Vy cmVudENvZGVPcmlnaW4oKS5ieXRlY29kZUluZGV4KSk7Ci0gICAgICAgICAgICAgICAgLy8gRklY TUU6IFdoZW4gdGhlIGJ5dGVjb2RlIGlzIG5vdCBjb21waWxlZCBpbiB0aGUgYmFzZWxpbmUgSklU LCBieVZhbEluZm8gYmVjb21lcyBudWxsLgotICAgICAgICAgICAgICAgIC8vIEF0IHRoYXQgdGlt ZSwgdGhlcmUgaXMgbm8gaW5mb3JtYXRpb24uCi0gICAgICAgICAgICAgICAgaWYgKGJ5VmFsSW5m byAKLSAgICAgICAgICAgICAgICAgICAgJiYgYnlWYWxJbmZvLT5zdHViSW5mbwotICAgICAgICAg ICAgICAgICAgICAmJiAhYnlWYWxJbmZvLT50b29rU2xvd1BhdGgKLSAgICAgICAgICAgICAgICAg ICAgJiYgIW1faW5saW5lU3RhY2tUb3AtPm1fZXhpdFByb2ZpbGUuaGFzRXhpdFNpdGUobV9jdXJy ZW50SW5kZXgsIEJhZElkZW50KQotICAgICAgICAgICAgICAgICAgICAmJiAhbV9pbmxpbmVTdGFj a1RvcC0+bV9leGl0UHJvZmlsZS5oYXNFeGl0U2l0ZShtX2N1cnJlbnRJbmRleCwgQmFkVHlwZSkK LSAgICAgICAgICAgICAgICAgICAgJiYgIW1faW5saW5lU3RhY2tUb3AtPm1fZXhpdFByb2ZpbGUu aGFzRXhpdFNpdGUobV9jdXJyZW50SW5kZXgsIEJhZENlbGwpKSB7Ci0gICAgICAgICAgICAgICAg ICAgIGNvbXBpbGVkQXNQdXRCeUlkID0gdHJ1ZTsKLSAgICAgICAgICAgICAgICAgICAgdW5zaWdu ZWQgaWRlbnRpZmllck51bWJlciA9IG1fZ3JhcGguaWRlbnRpZmllcnMoKS5lbnN1cmUoYnlWYWxJ bmZvLT5jYWNoZWRJZC5pbXBsKCkpOwotICAgICAgICAgICAgICAgICAgICBVbmlxdWVkU3RyaW5n SW1wbCogdWlkID0gbV9ncmFwaC5pZGVudGlmaWVycygpW2lkZW50aWZpZXJOdW1iZXJdOwotCi0g ICAgICAgICAgICAgICAgICAgIGlmIChTeW1ib2wqIHN5bWJvbCA9IGJ5VmFsSW5mby0+Y2FjaGVk U3ltYm9sLmdldCgpKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBGcm96ZW5WYWx1ZSogZnJv emVuID0gbV9ncmFwaC5mcmVlemVTdHJvbmcoc3ltYm9sKTsKLSAgICAgICAgICAgICAgICAgICAg ICAgIGFkZFRvR3JhcGgoQ2hlY2tDZWxsLCBPcEluZm8oZnJvemVuKSwgcHJvcGVydHkpOwotICAg ICAgICAgICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAgICAgICAgICAgQVNTRVJU KCF1aWQtPmlzU3ltYm9sKCkpOwotICAgICAgICAgICAgICAgICAgICAgICAgYWRkVG9HcmFwaChD aGVja1N0cmluZ0lkZW50LCBPcEluZm8odWlkKSwgcHJvcGVydHkpOwotICAgICAgICAgICAgICAg ICAgICB9CisgICAgICAgICAgICAgICAgdW5zaWduZWQgaWRlbnRpZmllck51bWJlcjsKKyAgICAg ICAgICAgICAgICBQdXRCeUlkU3RhdHVzIHB1dEJ5SWRTdGF0dXM7CisgICAgICAgICAgICAgICAg eworICAgICAgICAgICAgICAgICAgICBDb25jdXJyZW50SklUTG9ja2VyIGxvY2tlcihtX2lubGlu ZVN0YWNrVG9wLT5tX3Byb2ZpbGVkQmxvY2stPm1fbG9jayk7CisgICAgICAgICAgICAgICAgICAg IEJ5VmFsSW5mbyogYnlWYWxJbmZvID0gbV9pbmxpbmVTdGFja1RvcC0+bV9ieVZhbEluZm9zLmdl dChDb2RlT3JpZ2luKGN1cnJlbnRDb2RlT3JpZ2luKCkuYnl0ZWNvZGVJbmRleCkpOworICAgICAg ICAgICAgICAgICAgICAvLyBGSVhNRTogV2hlbiB0aGUgYnl0ZWNvZGUgaXMgbm90IGNvbXBpbGVk IGluIHRoZSBiYXNlbGluZSBKSVQsIGJ5VmFsSW5mbyBiZWNvbWVzIG51bGwuCisgICAgICAgICAg ICAgICAgICAgIC8vIEF0IHRoYXQgdGltZSwgdGhlcmUgaXMgbm8gaW5mb3JtYXRpb24uCisgICAg ICAgICAgICAgICAgICAgIGlmIChieVZhbEluZm8gCisgICAgICAgICAgICAgICAgICAgICAgICAm JiBieVZhbEluZm8tPnN0dWJJbmZvCisgICAgICAgICAgICAgICAgICAgICAgICAmJiAhYnlWYWxJ bmZvLT50b29rU2xvd1BhdGgKKyAgICAgICAgICAgICAgICAgICAgICAgICYmICFtX2lubGluZVN0 YWNrVG9wLT5tX2V4aXRQcm9maWxlLmhhc0V4aXRTaXRlKG1fY3VycmVudEluZGV4LCBCYWRJZGVu dCkKKyAgICAgICAgICAgICAgICAgICAgICAgICYmICFtX2lubGluZVN0YWNrVG9wLT5tX2V4aXRQ cm9maWxlLmhhc0V4aXRTaXRlKG1fY3VycmVudEluZGV4LCBCYWRUeXBlKQorICAgICAgICAgICAg ICAgICAgICAgICAgJiYgIW1faW5saW5lU3RhY2tUb3AtPm1fZXhpdFByb2ZpbGUuaGFzRXhpdFNp dGUobV9jdXJyZW50SW5kZXgsIEJhZENlbGwpKSB7CisgICAgICAgICAgICAgICAgICAgICAgICBj b21waWxlZEFzUHV0QnlJZCA9IHRydWU7CisgICAgICAgICAgICAgICAgICAgICAgICBpZGVudGlm aWVyTnVtYmVyID0gbV9ncmFwaC5pZGVudGlmaWVycygpLmVuc3VyZShieVZhbEluZm8tPmNhY2hl ZElkLmltcGwoKSk7CisgICAgICAgICAgICAgICAgICAgICAgICBVbmlxdWVkU3RyaW5nSW1wbCog dWlkID0gbV9ncmFwaC5pZGVudGlmaWVycygpW2lkZW50aWZpZXJOdW1iZXJdOworCisgICAgICAg ICAgICAgICAgICAgICAgICBpZiAoU3ltYm9sKiBzeW1ib2wgPSBieVZhbEluZm8tPmNhY2hlZFN5 bWJvbC5nZXQoKSkgeworICAgICAgICAgICAgICAgICAgICAgICAgICAgIEZyb3plblZhbHVlKiBm cm96ZW4gPSBtX2dyYXBoLmZyZWV6ZVN0cm9uZyhzeW1ib2wpOworICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGFkZFRvR3JhcGgoQ2hlY2tDZWxsLCBPcEluZm8oZnJvemVuKSwgcHJvcGVydHkp OworICAgICAgICAgICAgICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICBBU1NFUlQoIXVpZC0+aXNTeW1ib2woKSk7CisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgYWRkVG9HcmFwaChDaGVja1N0cmluZ0lkZW50LCBPcEluZm8odWlkKSwgcHJvcGVydHkp OworICAgICAgICAgICAgICAgICAgICAgICAgfQorCisgICAgICAgICAgICAgICAgICAgICAgICBw dXRCeUlkU3RhdHVzID0gUHV0QnlJZFN0YXR1czo6Y29tcHV0ZUZvclN0dWJJbmZvKAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGxvY2tlciwgbV9pbmxpbmVTdGFja1RvcC0+bV9wcm9maWxl ZEJsb2NrLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJ5VmFsSW5mby0+c3R1YkluZm8s IGN1cnJlbnRDb2RlT3JpZ2luKCksIHVpZCk7CiAKLSAgICAgICAgICAgICAgICAgICAgUHV0QnlJ ZFN0YXR1cyBwdXRCeUlkU3RhdHVzID0gUHV0QnlJZFN0YXR1czo6Y29tcHV0ZUZvclN0dWJJbmZv KAotICAgICAgICAgICAgICAgICAgICAgICAgbG9ja2VyLCBtX2lubGluZVN0YWNrVG9wLT5tX3By b2ZpbGVkQmxvY2ssCi0gICAgICAgICAgICAgICAgICAgICAgICBieVZhbEluZm8tPnN0dWJJbmZv LCBjdXJyZW50Q29kZU9yaWdpbigpLCB1aWQpOworICAgICAgICAgICAgICAgICAgICB9CisgICAg ICAgICAgICAgICAgfQogCisgICAgICAgICAgICAgICAgaWYgKGNvbXBpbGVkQXNQdXRCeUlkKQog ICAgICAgICAgICAgICAgICAgICBoYW5kbGVQdXRCeUlkKGJhc2UsIGlkZW50aWZpZXJOdW1iZXIs IHZhbHVlLCBwdXRCeUlkU3RhdHVzLCBpc0RpcmVjdCk7Ci0gICAgICAgICAgICAgICAgfQogICAg ICAgICAgICAgfQogCiAgICAgICAgICAgICBpZiAoIWNvbXBpbGVkQXNQdXRCeUlkKSB7Cg==