52773 2011-01-19 17:35:02 -0800 [RegexFuzz] Crash in generated code 2011-01-20 13:32:01 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED InRadar P2 Normal --- 1 oliver msaboff barraclough ggaren jruderman oliver oldest_to_newest 336977 0 oliver 2011-01-19 17:35:02 -0800 testRegexp("((?!(?:|)v{2,}|))","",["","","","","vt"]) Reduced to: /((?!(?:|)v{2,}|))/.exec("vt") 337009 1 ggaren 2011-01-19 18:09:08 -0800 <rdar://problem/8890203> 337412 2 79611 msaboff 2011-01-20 10:10:39 -0800 Created attachment 79611 Patch Changed YarrGenerator::TermGenerationState::linkDataLabelToBacktrackIfExists() to resolve a DataLabelPtr is possible so that we don't overwrite an existing unresolved DataLabelPtr. 337422 3 79611 oliver 2011-01-20 10:24:01 -0800 Comment on attachment 79611 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=79611&action=review > Source/JavaScriptCore/yarr/YarrJIT.cpp:944 > + // If we have a backtrack label, connect the datalabel to it directly. > + if (m_backtrack.isLabel()) > + generator->m_expressionState.m_backtrackRecords.append(AlternativeBacktrackRecord(dataLabel, m_backtrack.getLabel())); > + else > + setBacktrackDataLabel(dataLabel); Is it at all possible to add an assertion so the we catch any attempt to clobber a label in future? Also this doesn't appear to clear m_backtrack any more so afaict every label will be pushed onto the backtrack record stack > Source/WebCore/ChangeLog:11 > +2011-01-20 Michael Saboff <msaboff@apple.com> > + > + Reviewed by NOBODY (OOPS!). > + > + Need a short description and bug URL (OOPS!) > + > + * WebCore.xcodeproj/project.pbxproj: > + > 2011-01-20 Andreas Kling <kling@webkit.org> > > Reviewed by Ariya Hidayat. No changes to webcore => this changelog is bogus 337447 4 79618 msaboff 2011-01-20 10:58:21 -0800 Created attachment 79618 Patch with changes suggested by reviewer. Added requested ASSERT, built --Debug and ran tests with successful results. The ClearDataLabel() call is no longer needed since we use the argument data label directly AND we want to preserve the existing data label. Removed the bogus WebCore change log. 337455 5 79618 oliver 2011-01-20 11:09:27 -0800 Comment on attachment 79618 Patch with changes suggested by reviewer. r=me 337560 6 msaboff 2011-01-20 13:32:01 -0800 Committed r76275: <http://trac.webkit.org/changeset/76275> 79611 2011-01-20 10:10:39 -0800 2011-01-20 10:58:21 -0800 Patch 52773.patch text/plain 5139 msaboff SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gNzYyNjApCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAK KzIwMTEtMDEtMjAgIE1pY2hhZWwgU2Fib2ZmICA8bXNhYm9mZkBhcHBsZS5jb20+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt Lzg4OTAyMDM+IFtSZWdleEZ1enpdIENyYXNoIGluIGdlbmVyYXRlZCBjb2RlICg1Mjc3MykKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUyNzczCisKKyAg ICAgICAgRml4ZWQgY2FzZSB3aGVyZSBhbiBleGlzdGluZyBEYXRhTGFiZWxQdHIgaXMgb3Zlcndy aXR0ZW4uICBUaGUKKyAgICAgICAgcmVwbGFjaW5nIERhdGFMYWJlbFB0ciBpcyBub3cgcmVzb2x2 ZWQgaW1tZWRpYXRlbHkgaW4KKyAgICAgICAgbGlua0RhdGFMYWJlbFRvQmFja3RyYWNrSWZFeGlz dHMoKS4gIENsZWFudXAgLSBlbGltaW5hdGVkIGJvb2wKKyAgICAgICAgcmV0dXJuIHZhbHVlIGZv ciB0aGUgcm91dGluZSBhcyBpdCB3YXMgbmV2ZXIgdXNlZC4KKworICAgICAgICAqIHlhcnIvWWFy ckpJVC5jcHA6CisgICAgICAgIChKU0M6OllhcnI6OllhcnJHZW5lcmF0b3I6OlRlcm1HZW5lcmF0 aW9uU3RhdGU6OmxpbmtEYXRhTGFiZWxUb0JhY2t0cmFja0lmRXhpc3RzKToKKwogMjAxMS0wMS0y MCAgWm9sdGFuIEhvcnZhdGggIDx6b2x0YW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdl ZCBieSBDc2FiYSBPc3p0cm9nb27DoWMuCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUveWFy ci9ZYXJySklULmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUveWFyci9Z YXJySklULmNwcAkocmV2aXNpb24gNzYyNjApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUveWFy ci9ZYXJySklULmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTMwLDI0ICs5MzAsMTkgQEAgY2xhc3Mg WWFyckdlbmVyYXRvciA6IHByaXZhdGUgTWFjcm9Bc3NlbQogICAgICAgICAgICAgcmV0dXJuIG1f YmFja3RyYWNrLnBsYW50SnVtcFRvQmFja3RyYWNrSWZFeGlzdHMoZ2VuZXJhdG9yKTsKICAgICAg ICAgfQogCi0gICAgICAgIGJvb2wgbGlua0RhdGFMYWJlbFRvQmFja3RyYWNrSWZFeGlzdHMoWWFy ckdlbmVyYXRvciogZ2VuZXJhdG9yLCBEYXRhTGFiZWxQdHIgZGF0YUxhYmVsKQorICAgICAgICB2 b2lkIGxpbmtEYXRhTGFiZWxUb0JhY2t0cmFja0lmRXhpc3RzKFlhcnJHZW5lcmF0b3IqIGdlbmVy YXRvciwgRGF0YUxhYmVsUHRyIGRhdGFMYWJlbCkKICAgICAgICAgewogICAgICAgICAgICAgLy8g SWYgd2UgaGF2ZSBhIHN0YWNrIG9mZnNldCBiYWNrdHJhY2sgZGVzdGluYXRpb24sIHVzZSBpdCBk aXJlY3RseQogICAgICAgICAgICAgaWYgKG1fYmFja3RyYWNrLmlzU3RhY2tPZmZzZXQoKSkgewog ICAgICAgICAgICAgICAgIGdlbmVyYXRvci0+bV9leHByZXNzaW9uU3RhdGUuYWRkSW5kaXJlY3RK dW1wRW50cnkobV9iYWNrdHJhY2suZ2V0U3RhY2tPZmZzZXQoKSwgZGF0YUxhYmVsKTsKICAgICAg ICAgICAgICAgICBtX2JhY2t0cmFjay5jbGVhclN1YkRhdGFMYWJlbFB0cigpOwogICAgICAgICAg ICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICAvLyBPdGhlcndpc2Ugc2V0IHRoZSBkYXRhIGxh YmVsICh3aGljaCBtYXkgYmUgbGlua2VkKQotICAgICAgICAgICAgICAgIHNldEJhY2t0cmFja0Rh dGFMYWJlbChkYXRhTGFiZWwpOwotCi0gICAgICAgICAgICAgICAgaWYgKChtX2JhY2t0cmFjay5p c0xhYmVsKCkpICYmIChtX2JhY2t0cmFjay5oYXNEYXRhTGFiZWwoKSkpIHsKLSAgICAgICAgICAg ICAgICAgICAgZ2VuZXJhdG9yLT5tX2V4cHJlc3Npb25TdGF0ZS5tX2JhY2t0cmFja1JlY29yZHMu YXBwZW5kKEFsdGVybmF0aXZlQmFja3RyYWNrUmVjb3JkKG1fYmFja3RyYWNrLmdldERhdGFMYWJl bCgpLCBtX2JhY2t0cmFjay5nZXRMYWJlbCgpKSk7Ci0gICAgICAgICAgICAgICAgICAgIG1fYmFj a3RyYWNrLmNsZWFyRGF0YUxhYmVsKCk7Ci0gICAgICAgICAgICAgICAgICAgIHJldHVybiB0cnVl OwotICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAvLyBJZiB3ZSBoYXZlIGEgYmFj a3RyYWNrIGxhYmVsLCBjb25uZWN0IHRoZSBkYXRhbGFiZWwgdG8gaXQgZGlyZWN0bHkuCisgICAg ICAgICAgICAgICAgaWYgKG1fYmFja3RyYWNrLmlzTGFiZWwoKSkKKyAgICAgICAgICAgICAgICAg ICAgZ2VuZXJhdG9yLT5tX2V4cHJlc3Npb25TdGF0ZS5tX2JhY2t0cmFja1JlY29yZHMuYXBwZW5k KEFsdGVybmF0aXZlQmFja3RyYWNrUmVjb3JkKGRhdGFMYWJlbCwgbV9iYWNrdHJhY2suZ2V0TGFi ZWwoKSkpOworICAgICAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICAgICAgc2V0QmFj a3RyYWNrRGF0YUxhYmVsKGRhdGFMYWJlbCk7CiAgICAgICAgICAgICB9Ci0KLSAgICAgICAgICAg IHJldHVybiBmYWxzZTsKICAgICAgICAgfQogCiAgICAgICAgIHZvaWQgYWRkQmFja3RyYWNrSnVt cChKdW1wIGp1bXApCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiA3NjI2MCkKKysrIFNvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDExIEBACisyMDExLTAx LTIwICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5lZWQgYSBzaG9ydCBkZXNjcmlwdGlv biBhbmQgYnVnIFVSTCAoT09QUyEpCisKKyAgICAgICAgKiBXZWJDb3JlLnhjb2RlcHJvai9wcm9q ZWN0LnBieHByb2o6CisKIDIwMTEtMDEtMjAgIEFuZHJlYXMgS2xpbmcgIDxrbGluZ0B3ZWJraXQu b3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFyaXlhIEhpZGF5YXQuCkluZGV4OiBMYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZp c2lvbiA3NjI2MCkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAt MSwzICsxLDE1IEBACisyMDExLTAxLTIwICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS84ODkwMjAzPiBbUmVnZXhGdXp6XSBDcmFzaCBpbiBnZW5lcmF0ZWQgY29k ZSAoNTI3NzMpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD01Mjc3MworCisgICAgICAgIE5ldyB0ZXN0IHRvIHZhbGlkYXRlIGZpeC4KKworICAgICAgICAq IGZhc3QvcmVnZXgvcGFyZW50aGVzZXMtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGZhc3QvcmVn ZXgvc2NyaXB0LXRlc3RzL3BhcmVudGhlc2VzLmpzOgorCiAyMDExLTAxLTIwICBNYWNpZWogU3Rh Y2hvd2lhayAgPG1qc0BhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBSb2Jl bi4KSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvcmVnZXgvcGFyZW50aGVzZXMtZXhwZWN0ZWQudHh0 Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvcmVnZXgvcGFyZW50aGVzZXMtZXhwZWN0 ZWQudHh0CShyZXZpc2lvbiA3NjI2MCkKKysrIExheW91dFRlc3RzL2Zhc3QvcmVnZXgvcGFyZW50 aGVzZXMtZXhwZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC03NCw2ICs3NCw3IEBAIFBBU1Mg cmVnZXhwNDIuZXhlYygnNDMyMScpIGlzIFsnNCcsJzQnLCcKIFBBU1MgLyg/ISg/PXJ7MH0pezIs fSl8KCh6KT8pPy9naS50ZXN0KCcnKSBpcyB0cnVlCiBQQVNTIHJlZ2V4cDQzLmV4ZWMoJ1NTUycp IGlzIFsnJ10KIFBBU1MgcmVnZXhwNDQuZXhlYygnU1NTJykgaXMgWycnLHVuZGVmaW5lZF0KK1BB U1MgcmVnZXhwNDUuZXhlYygndnQnKSBpcyBudWxsCiBQQVNTICdIaSBCb2InLm1hdGNoKC8oUm9i KXwoQm9iKXwoUm9iZXJ0KXwoQm9iYnkpLykgaXMgWydCb2InLHVuZGVmaW5lZCwnQm9iJyx1bmRl ZmluZWQsdW5kZWZpbmVkXQogUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQogCkluZGV4 OiBMYXlvdXRUZXN0cy9mYXN0L3JlZ2V4L3NjcmlwdC10ZXN0cy9wYXJlbnRoZXNlcy5qcwo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L3JlZ2V4L3NjcmlwdC10ZXN0cy9wYXJlbnRoZXNl cy5qcwkocmV2aXNpb24gNzYyNjApCisrKyBMYXlvdXRUZXN0cy9mYXN0L3JlZ2V4L3NjcmlwdC10 ZXN0cy9wYXJlbnRoZXNlcy5qcwkod29ya2luZyBjb3B5KQpAQCAtMTk5LDYgKzE5OSw5IEBAIHNo b3VsZEJlKCJyZWdleHA0My5leGVjKCdTU1MnKSIsICJbJyddIikKIHZhciByZWdleHA0NCA9IC8o PyEoPzpcMysocys/KSkpL2d5Owogc2hvdWxkQmUoInJlZ2V4cDQ0LmV4ZWMoJ1NTUycpIiwgIlsn Jyx1bmRlZmluZWRdIik7CiAKK3ZhciByZWdleHA0NSA9IC8oKD8hKD86fCl2ezIsfXwpKS87Citz aG91bGRCZU51bGwoInJlZ2V4cDQ1LmV4ZWMoJ3Z0JykiKTsKKwogc2hvdWxkQmUoIidIaSBCb2In Lm1hdGNoKC8oUm9iKXwoQm9iKXwoUm9iZXJ0KXwoQm9iYnkpLykiLCAiWydCb2InLHVuZGVmaW5l ZCwnQm9iJyx1bmRlZmluZWQsdW5kZWZpbmVkXSIpOwogCiB2YXIgc3VjY2Vzc2Z1bGx5UGFyc2Vk ID0gdHJ1ZTsK 79618 2011-01-20 10:58:21 -0800 2011-01-20 11:09:27 -0800 Patch with changes suggested by reviewer. 52773-1.patch text/plain 5022 msaboff SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gNzYyNjApCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAK KzIwMTEtMDEtMjAgIE1pY2hhZWwgU2Fib2ZmICA8bXNhYm9mZkBhcHBsZS5jb20+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt Lzg4OTAyMDM+IFtSZWdleEZ1enpdIENyYXNoIGluIGdlbmVyYXRlZCBjb2RlICg1Mjc3MykKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUyNzczCisKKyAg ICAgICAgRml4ZWQgY2FzZSB3aGVyZSBhbiBleGlzdGluZyBEYXRhTGFiZWxQdHIgaXMgb3Zlcndy aXR0ZW4uICBUaGUKKyAgICAgICAgcmVwbGFjaW5nIERhdGFMYWJlbFB0ciBpcyBub3cgcmVzb2x2 ZWQgaW1tZWRpYXRlbHkgaW4KKyAgICAgICAgbGlua0RhdGFMYWJlbFRvQmFja3RyYWNrSWZFeGlz dHMoKS4gIENsZWFudXAgLSBlbGltaW5hdGVkIGJvb2wKKyAgICAgICAgcmV0dXJuIHZhbHVlIGZv ciB0aGUgcm91dGluZSBhcyBpdCB3YXMgbmV2ZXIgdXNlZC4KKworICAgICAgICAqIHlhcnIvWWFy ckpJVC5jcHA6CisgICAgICAgIChKU0M6OllhcnI6OllhcnJHZW5lcmF0b3I6OlRlcm1HZW5lcmF0 aW9uU3RhdGU6OmxpbmtEYXRhTGFiZWxUb0JhY2t0cmFja0lmRXhpc3RzKToKKwogMjAxMS0wMS0y MCAgWm9sdGFuIEhvcnZhdGggIDx6b2x0YW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdl ZCBieSBDc2FiYSBPc3p0cm9nb27DoWMuCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUveWFy ci9ZYXJySklULmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUveWFyci9Z YXJySklULmNwcAkocmV2aXNpb24gNzYyNjApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUveWFy ci9ZYXJySklULmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjM5LDggKzYzOSwxMCBAQCBjbGFzcyBZ YXJyR2VuZXJhdG9yIDogcHJpdmF0ZSBNYWNyb0Fzc2VtCiAgICAgICAgICAgICBpZiAobV9zdWJE YXRhTGFiZWxQdHIpIHsKICAgICAgICAgICAgICAgICAqbV9zdWJEYXRhTGFiZWxQdHIgPSBkcDsK ICAgICAgICAgICAgICAgICBtX3N1YkRhdGFMYWJlbFB0ciA9IDA7Ci0gICAgICAgICAgICB9IGVs c2UKKyAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgICAgQVNTRVJUKCFoYXNEYXRh TGFiZWwoKSk7CiAgICAgICAgICAgICAgICAgbV9kYXRhTGFiZWxQdHIgPSBkcDsKKyAgICAgICAg ICAgIH0KICAgICAgICAgfQogCiAgICAgICAgIHZvaWQgY2xlYXJTdWJEYXRhTGFiZWxQdHIoKQpA QCAtOTMwLDI0ICs5MzIsMTkgQEAgY2xhc3MgWWFyckdlbmVyYXRvciA6IHByaXZhdGUgTWFjcm9B c3NlbQogICAgICAgICAgICAgcmV0dXJuIG1fYmFja3RyYWNrLnBsYW50SnVtcFRvQmFja3RyYWNr SWZFeGlzdHMoZ2VuZXJhdG9yKTsKICAgICAgICAgfQogCi0gICAgICAgIGJvb2wgbGlua0RhdGFM YWJlbFRvQmFja3RyYWNrSWZFeGlzdHMoWWFyckdlbmVyYXRvciogZ2VuZXJhdG9yLCBEYXRhTGFi ZWxQdHIgZGF0YUxhYmVsKQorICAgICAgICB2b2lkIGxpbmtEYXRhTGFiZWxUb0JhY2t0cmFja0lm RXhpc3RzKFlhcnJHZW5lcmF0b3IqIGdlbmVyYXRvciwgRGF0YUxhYmVsUHRyIGRhdGFMYWJlbCkK ICAgICAgICAgewogICAgICAgICAgICAgLy8gSWYgd2UgaGF2ZSBhIHN0YWNrIG9mZnNldCBiYWNr dHJhY2sgZGVzdGluYXRpb24sIHVzZSBpdCBkaXJlY3RseQogICAgICAgICAgICAgaWYgKG1fYmFj a3RyYWNrLmlzU3RhY2tPZmZzZXQoKSkgewogICAgICAgICAgICAgICAgIGdlbmVyYXRvci0+bV9l eHByZXNzaW9uU3RhdGUuYWRkSW5kaXJlY3RKdW1wRW50cnkobV9iYWNrdHJhY2suZ2V0U3RhY2tP ZmZzZXQoKSwgZGF0YUxhYmVsKTsKICAgICAgICAgICAgICAgICBtX2JhY2t0cmFjay5jbGVhclN1 YkRhdGFMYWJlbFB0cigpOwogICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICAv LyBPdGhlcndpc2Ugc2V0IHRoZSBkYXRhIGxhYmVsICh3aGljaCBtYXkgYmUgbGlua2VkKQotICAg ICAgICAgICAgICAgIHNldEJhY2t0cmFja0RhdGFMYWJlbChkYXRhTGFiZWwpOwotCi0gICAgICAg ICAgICAgICAgaWYgKChtX2JhY2t0cmFjay5pc0xhYmVsKCkpICYmIChtX2JhY2t0cmFjay5oYXNE YXRhTGFiZWwoKSkpIHsKLSAgICAgICAgICAgICAgICAgICAgZ2VuZXJhdG9yLT5tX2V4cHJlc3Np b25TdGF0ZS5tX2JhY2t0cmFja1JlY29yZHMuYXBwZW5kKEFsdGVybmF0aXZlQmFja3RyYWNrUmVj b3JkKG1fYmFja3RyYWNrLmdldERhdGFMYWJlbCgpLCBtX2JhY2t0cmFjay5nZXRMYWJlbCgpKSk7 Ci0gICAgICAgICAgICAgICAgICAgIG1fYmFja3RyYWNrLmNsZWFyRGF0YUxhYmVsKCk7Ci0gICAg ICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwotICAgICAgICAgICAgICAgIH0KKyAgICAgICAg ICAgICAgICAvLyBJZiB3ZSBoYXZlIGEgYmFja3RyYWNrIGxhYmVsLCBjb25uZWN0IHRoZSBkYXRh bGFiZWwgdG8gaXQgZGlyZWN0bHkuCisgICAgICAgICAgICAgICAgaWYgKG1fYmFja3RyYWNrLmlz TGFiZWwoKSkKKyAgICAgICAgICAgICAgICAgICAgZ2VuZXJhdG9yLT5tX2V4cHJlc3Npb25TdGF0 ZS5tX2JhY2t0cmFja1JlY29yZHMuYXBwZW5kKEFsdGVybmF0aXZlQmFja3RyYWNrUmVjb3JkKGRh dGFMYWJlbCwgbV9iYWNrdHJhY2suZ2V0TGFiZWwoKSkpOworICAgICAgICAgICAgICAgIGVsc2UK KyAgICAgICAgICAgICAgICAgICAgc2V0QmFja3RyYWNrRGF0YUxhYmVsKGRhdGFMYWJlbCk7CiAg ICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgfQogCiAg ICAgICAgIHZvaWQgYWRkQmFja3RyYWNrSnVtcChKdW1wIGp1bXApCkluZGV4OiBMYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lv biA3NjI2MCkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE1IEBACisyMDExLTAxLTIwICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS84ODkwMjAzPiBbUmVnZXhGdXp6XSBDcmFzaCBpbiBnZW5lcmF0ZWQgY29kZSAo NTI3NzMpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01 Mjc3MworCisgICAgICAgIE5ldyB0ZXN0IHRvIHZhbGlkYXRlIGZpeC4KKworICAgICAgICAqIGZh c3QvcmVnZXgvcGFyZW50aGVzZXMtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGZhc3QvcmVnZXgv c2NyaXB0LXRlc3RzL3BhcmVudGhlc2VzLmpzOgorCiAyMDExLTAxLTIwICBNYWNpZWogU3RhY2hv d2lhayAgPG1qc0BhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBSb2Jlbi4K SW5kZXg6IExheW91dFRlc3RzL2Zhc3QvcmVnZXgvcGFyZW50aGVzZXMtZXhwZWN0ZWQudHh0Cj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvcmVnZXgvcGFyZW50aGVzZXMtZXhwZWN0ZWQu dHh0CShyZXZpc2lvbiA3NjI2MCkKKysrIExheW91dFRlc3RzL2Zhc3QvcmVnZXgvcGFyZW50aGVz ZXMtZXhwZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC03NCw2ICs3NCw3IEBAIFBBU1MgcmVn ZXhwNDIuZXhlYygnNDMyMScpIGlzIFsnNCcsJzQnLCcKIFBBU1MgLyg/ISg/PXJ7MH0pezIsfSl8 KCh6KT8pPy9naS50ZXN0KCcnKSBpcyB0cnVlCiBQQVNTIHJlZ2V4cDQzLmV4ZWMoJ1NTUycpIGlz IFsnJ10KIFBBU1MgcmVnZXhwNDQuZXhlYygnU1NTJykgaXMgWycnLHVuZGVmaW5lZF0KK1BBU1Mg cmVnZXhwNDUuZXhlYygndnQnKSBpcyBudWxsCiBQQVNTICdIaSBCb2InLm1hdGNoKC8oUm9iKXwo Qm9iKXwoUm9iZXJ0KXwoQm9iYnkpLykgaXMgWydCb2InLHVuZGVmaW5lZCwnQm9iJyx1bmRlZmlu ZWQsdW5kZWZpbmVkXQogUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQogCkluZGV4OiBM YXlvdXRUZXN0cy9mYXN0L3JlZ2V4L3NjcmlwdC10ZXN0cy9wYXJlbnRoZXNlcy5qcwo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L3JlZ2V4L3NjcmlwdC10ZXN0cy9wYXJlbnRoZXNlcy5q cwkocmV2aXNpb24gNzYyNjApCisrKyBMYXlvdXRUZXN0cy9mYXN0L3JlZ2V4L3NjcmlwdC10ZXN0 cy9wYXJlbnRoZXNlcy5qcwkod29ya2luZyBjb3B5KQpAQCAtMTk5LDYgKzE5OSw5IEBAIHNob3Vs ZEJlKCJyZWdleHA0My5leGVjKCdTU1MnKSIsICJbJyddIikKIHZhciByZWdleHA0NCA9IC8oPyEo PzpcMysocys/KSkpL2d5Owogc2hvdWxkQmUoInJlZ2V4cDQ0LmV4ZWMoJ1NTUycpIiwgIlsnJyx1 bmRlZmluZWRdIik7CiAKK3ZhciByZWdleHA0NSA9IC8oKD8hKD86fCl2ezIsfXwpKS87CitzaG91 bGRCZU51bGwoInJlZ2V4cDQ1LmV4ZWMoJ3Z0JykiKTsKKwogc2hvdWxkQmUoIidIaSBCb2InLm1h dGNoKC8oUm9iKXwoQm9iKXwoUm9iZXJ0KXwoQm9iYnkpLykiLCAiWydCb2InLHVuZGVmaW5lZCwn Qm9iJyx1bmRlZmluZWQsdW5kZWZpbmVkXSIpOwogCiB2YXIgc3VjY2Vzc2Z1bGx5UGFyc2VkID0g dHJ1ZTsK