143069 2015-03-25 20:06:29 -0700 Update prepare-ChangeLog to work with ES6 Class syntax 2015-03-25 21:38:23 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 joepeck joepeck commit-queue dbates rniwa timothy oldest_to_newest 1080167 0 joepeck 2015-03-25 20:06:29 -0700 * SUMMARY Update prepare-ChangeLog to work with ES6 Class syntax. Currently it doesn't understand method syntax, so any modifications to Web Inspector files with class syntax produces nothing. 1080168 1 249465 joepeck 2015-03-25 20:07:15 -0700 Created attachment 249465 [PATCH] Proposed Fix 1080169 2 249465 joepeck 2015-03-25 20:08:37 -0700 Comment on attachment 249465 [PATCH] Proposed Fix I just realized there are tests. Let me add some quick tests. 1080174 3 249468 joepeck 2015-03-25 20:21:17 -0700 Created attachment 249468 [PATCH] Proposed Fix 1080175 4 249468 joepeck 2015-03-25 20:26:57 -0700 Comment on attachment 249468 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=249468&action=review > Tools/Scripts/prepare-ChangeLog:1393 > + $currentMethod =~ s/\.{2,}/\./g; # Removes consecutive periods. I have a feeling this line is not needed, insect later when this is pop'd it'll do this. So cq- and I can fix locally if that is the case. 1080177 5 249469 joepeck 2015-03-25 20:37:04 -0700 Created attachment 249469 [PATCH] Proposed Fix Nope, that caused issue. But I still tweaked things just a bit to remove duplicated work. 1080192 6 249469 commit-queue 2015-03-25 21:38:19 -0700 Comment on attachment 249469 [PATCH] Proposed Fix Clearing flags on attachment: 249469 Committed r181996: <http://trac.webkit.org/changeset/181996> 1080193 7 commit-queue 2015-03-25 21:38:23 -0700 All reviewed patches have been landed. Closing bug. 249465 2015-03-25 20:07:15 -0700 2015-03-25 20:21:17 -0700 [PATCH] Proposed Fix pco.patch text/plain 10569 joepeck ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAwZjcy ZTZkLi5hMDM5YWNiIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTUtMDMtMjUgIEpvc2VwaCBQZWNvcmFybyAgPHBl Y29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBVcGRhdGUgcHJlcGFyZS1DaGFuZ2VMb2cgdG8g d29yayB3aXRoIEVTNiBDbGFzcyBzeW50YXgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE0MzA2OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZzoKKyAgICAgICAg KGdldF9mdW5jdGlvbl9saW5lX3Jhbmdlc19mb3JfamF2YXNjcmlwdCk6CisKIDIwMTUtMDMtMjUg IEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBb Q29udGVudCBFeHRlbnNpb25zXSBBZGQgbXVsdGktREZBIGNvbXBpbGluZyBhbmQgaW50ZXJwcmV0 aW5nLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZyBiL1Rvb2xz L1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cKaW5kZXggYzc3MTRhMy4uNWU1YmM3NSAxMDA3NTUK LS0tIGEvVG9vbHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZworKysgYi9Ub29scy9TY3JpcHRz L3ByZXBhcmUtQ2hhbmdlTG9nCkBAIC0xMjUwLDE4ICsxMjUwLDQ4IEBAIHN1YiBnZXRfZnVuY3Rp b25fbGluZV9yYW5nZXNfZm9yX2phdmEoJCQpCiAKIAogIyBSZWFkIGEgZmlsZSBhbmQgZ2V0IGFs bCB0aGUgbGluZSByYW5nZXMgb2YgdGhlIHRoaW5ncyB0aGF0IGxvb2sgbGlrZQotIyBKYXZhU2Ny aXB0IGZ1bmN0aW9ucy4KKyMgSmF2YVNjcmlwdCBmdW5jdGlvbnMgb3IgbWV0aG9kcy4KICMKICMg QSBmdW5jdGlvbiBuYW1lIGlzIHRoZSB3b3JkIHRoYXQgaW1tZWRpYXRlbHkgZm9sbG93cyBgZnVu Y3Rpb24nIHdoZW4KLSMgZm9sbG93ZWQgYnkgYW4gb3BlbiBjdXJseSBicmFjZS4gSXQgY2FuIGFw cGVhciBhdCB0aGUgdG9wIGxldmVsLCBvcgotIyBpbnNpZGUgb3RoZXIgZnVuY3Rpb25zLgorIyBm b2xsb3dlZCBieSBhbiBvcGVuIGN1cmx5IGJyYWNlLiBJdCBjYW4gYXBwZWFyIGF0IHRoZSB0b3Ag bGV2ZWwsCisjIG9yIGluc2lkZSBvdGhlciBmdW5jdGlvbnMuIEZvciBleGFtcGxlOgogIwotIyBB biBhbm9ueW1vdXMgZnVuY3Rpb24gbmFtZSBpcyB0aGUgaWRlbnRpZmllciBjaGFpbiBpbW1lZGlh dGVseSBiZWZvcmUKKyMgICAgZnVuY3Rpb24gbmFtZSgpIHsgLy8gKG5hbWUpCisjICAgICAgICBm dW5jdGlvbiBpbm5lcigpIHsgfSAvLyAobmFtZS5pbm5lcikKKyMgICAgfQorIworIyBBbiBhbm9u eW1vdXMgZnVuY3Rpb24gbmFtZSBpcyB0aGUgaWRlbnRpZmllciBvbiB0aGUgbGVmdCBoYW5kIHNp ZGUgb2YKICMgYW4gYXNzaWdubWVudCB3aXRoIHRoZSBlcXVhbHMgb3BlcmF0b3Igb3Igb2JqZWN0 IG5vdGF0aW9uIHRoYXQgaGFzIGEKLSMgdmFsdWUgc3RhcnRpbmcgd2l0aCBgZnVuY3Rpb24nIGZv bGxvd2VkIGJ5IGFuIG9wZW4gY3VybHkgYnJhY2UuCisjIHZhbHVlIHN0YXJ0aW5nIHdpdGggYGZ1 bmN0aW9uJyBmb2xsb3dlZCBhbiBvcGVuIGN1cmx5IGJyYWNlLgorIyBGb3IgZXhhbXBsZToKKyMK KyMgICAgbmFtZXNwYWNlID0geworIyAgICAgICAgbmFtZTogZnVuY3Rpb24oKSB7fSAvLyAobmFt ZXNwYWNlLm5hbWUpCisjICAgIH0KKyMgICAgbmFtZXNwYWNlLkZvbyA9IGZ1bmN0aW9uKCkge30g Ly8gKG5hbWVzcGFjZS5Gb28pCiAjCiAjIEEgZ2V0dGVyIG9yIHNldHRlciBuYW1lIGlzIHRoZSB3 b3JkIHRoYXQgaW1tZWRpYXRlbHkgZm9sbG93cyBgZ2V0JyBvcgotIyBgc2V0JyB3aGVuIGZvbGxv d2VkIGJ5IGFuIG9wZW4gY3VybHkgYnJhY2UgLgorIyBgc2V0JyB3aGVuIGZvbGxvd2VkIGJ5IHBh cmFtcyBhbmQgYW4gb3BlbiBjdXJseSBicmFjZS4gRm9yIGV4YW1wbGU6CisjCisjICAgIG5hbWVz cGFjZSA9IHsKKyMgICAgICBnZXQgZm9vKCkge30gLy8gKG5hbWVzcGFjZS5nZXQgZm9vKQorIyAg ICB9CisjCisjIEEgbWV0aG9kIG5hbWUgaXMgdGhlIHdvcmQgaW1tZWRpYXRlbHkgYmVmb3JlIHBh cmVudGhlc2lzLCB3aXRoIGFuIG9wZW4KKyMgY3VybHkgYnJhY2UgaW1tZWRpYXRlbHkgZm9sbG93 aW5nIGNsb3NpbmcgcGFyZW50aGVzaXMuIEZvciBzaW1wbGlmaWNhdGlvbgorIyB3ZSBvbmx5IHBh cnNlIGZvciBtZXRob2RzIGluc2lkZSBvZiBhIGNsYXNzLiBBbmQgZm9yIGEgY2xhc3MgZXhwcmVz c2lvbgorIyB3ZSB0YWtlIHRoZSBhc3NpZ25tZW50IGlkZW50aWZpZXIgaW5zdGVhZCBvZiB0aGUg Y2xhc3MgbmFtZSBmb3IgbmFtZXNwYWNpbmcuCisjCisjICAgIG5hbWVzcGFjZS5Gb28gPSBjbGFz cyBEb2VzTm90TWF0dGVyIGV4dGVuZHMgQmFyIHsKKyMgICAgICAgIGNvbnN0cnVjdG9yKCkge30g Ly8gKG5hbWVzcGFjZS5Gb28pCisjICAgICAgICBzdGF0aWMgc3RhdGljTWV0aG9kKCkge30gLy8g KG5hbWVzcGFjZS5Gb28uc3RhdGljTWV0aG9kKQorIyAgICAgICAgaW5zdGFuY2VNZXRob2QoKSB7 fSAvLyAobmFtZXNwYWNlLkZvby5wcm90b3R5cGUuaW5zdGFuY2VNZXRob2QpCisjICAgICAgICBn ZXQgZ2V0dGVyKCkge30gLy8gKG5hbWVzcGFjZS5Gb28ucHJvdG90eXBlLmdldCBnZXR0ZXIpCisj ICAgIH0KKyMgICAgY2xhc3MgQ2xhc3NOYW1lIHsKKyMgICAgICAgIGNvbnN0cnVjdG9yKCkge30g Ly8gKENsYXNzTmFtZSkKKyMgICAgICAgIG1ldGhvZCgpIHt9IC8vIChDbGFzc05hbWUucHJvdG90 eXBlLm1ldGhvZCkKKyMgICAgfQogIwogIyBDb21tZW50IGhhbmRsaW5nIGlzIHNpbXBsZS1taW5k ZWQgYnV0IHdpbGwgd29yayBmb3IgYWxsIGJ1dCBwYXRob2xvZ2ljYWwgY2FzZXMuCiAjCkBAIC0x MjczLDYgKzEzMDMsNyBAQCBzdWIgZ2V0X2Z1bmN0aW9uX2xpbmVfcmFuZ2VzX2Zvcl9qYXZhc2Ny aXB0KCQkKQogCiAgICAgbXkgQGN1cnJlbnRTY29wZXM7CiAgICAgbXkgQGN1cnJlbnRJZGVudGlm aWVyczsKKyAgICBteSBAY3VycmVudFBhcnNpbmdNb2RlID0gKCJnbG9iYWwiKTsKICAgICBteSBA Y3VycmVudEZ1bmN0aW9uTmFtZXM7CiAgICAgbXkgQGN1cnJlbnRGdW5jdGlvbkRlcHRoczsKICAg ICBteSBAY3VycmVudEZ1bmN0aW9uU3RhcnRMaW5lczsKQEAgLTEyODEsMTQgKzEzMTIsMjAgQEAg c3ViIGdldF9mdW5jdGlvbl9saW5lX3Jhbmdlc19mb3JfamF2YXNjcmlwdCgkJCkKIAogICAgIG15 ICRpbkNvbW1lbnQgPSAwOwogICAgIG15ICRpblF1b3RlZFRleHQgPSAiIjsKKyAgICBteSAkaW5F eHRlbmRzID0gMDsKKyAgICBteSAkaW5NZXRob2QgPSAwOwogICAgIG15ICRwYXJlbnRoZXNlc0Rl cHRoID0gMDsKICAgICBteSAkYnJhY2VzRGVwdGggPSAwOwogCisgICAgbXkgJGNsYXNzSnVzdFNl ZW4gPSAwOworICAgIG15ICRwYXJlbnRoZXNpc0p1c3RTZWVuID0gMDsKICAgICBteSAkZnVuY3Rp b25KdXN0U2VlbiA9IDA7CiAgICAgbXkgJGdldHRlckp1c3RTZWVuID0gMDsKICAgICBteSAkc2V0 dGVySnVzdFNlZW4gPSAwOwogICAgIG15ICRhc3NpZ25tZW50SnVzdFNlZW4gPSAwOworICAgIG15 ICRzdGF0aWNPckNvbnRydWN0b3JTZWVuID0gMDsKIAorICAgIG15ICRwb3NzaWJsZU1ldGhvZE5h bWUgPSAiIjsKICAgICBteSAkd29yZCA9ICIiOwogCiAgICAgd2hpbGUgKDwkZmlsZUhhbmRsZT4p IHsKQEAgLTEzMjYsMzggKzEzNjMsNjkgQEAgc3ViIGdldF9mdW5jdGlvbl9saW5lX3Jhbmdlc19m b3JfamF2YXNjcmlwdCgkJCkKIAogICAgICAgICAjIEZpbmQgZnVuY3Rpb24gbmFtZXMuCiAgICAg ICAgIHdoaWxlIChtLShcdyt8Wygpe309OjssXSktZykgeworICAgICAgICAgICAgIyBTa2lwIGV2 ZXJ5dGhpbmcgdW50aWwgInsiIGFmdGVyIGV4dGVuZHMuCisgICAgICAgICAgICBpZiAoJGluRXh0 ZW5kcykgeworICAgICAgICAgICAgICAgIG5leHQgaWYgJDEgbmUgJ3snOworICAgICAgICAgICAg ICAgICRpbkV4dGVuZHMgPSAwOworICAgICAgICAgICAgfQorCiAgICAgICAgICAgICAjIE9wZW4g cGFyZW50aGVzaXMuCiAgICAgICAgICAgICBpZiAoJDEgZXEgJygnKSB7CiAgICAgICAgICAgICAg ICAgJHBhcmVudGhlc2VzRGVwdGgrKzsKKyAgICAgICAgICAgICAgICAkcG9zc2libGVNZXRob2RO YW1lID0gam9pbignLicsIEBjdXJyZW50SWRlbnRpZmllcnMpOwogICAgICAgICAgICAgICAgIG5l eHQ7CiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgICMgQ2xvc2UgcGFyZW50aGVzaXMuCiAg ICAgICAgICAgICBpZiAoJDEgZXEgJyknKSB7CiAgICAgICAgICAgICAgICAgJHBhcmVudGhlc2Vz RGVwdGgtLTsKKyAgICAgICAgICAgICAgICAkcGFyZW50aGVzaXNKdXN0U2VlbiA9IDE7CiAgICAg ICAgICAgICAgICAgbmV4dDsKICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgIyBPcGVuIGJy YWNlLgogICAgICAgICAgICAgaWYgKCQxIGVxICd7JykgewotICAgICAgICAgICAgICAgIHB1c2go QGN1cnJlbnRTY29wZXMsIGpvaW4oIi4iLCBAY3VycmVudElkZW50aWZpZXJzKSk7Ci0gICAgICAg ICAgICAgICAgQGN1cnJlbnRJZGVudGlmaWVycyA9ICgpOworICAgICAgICAgICAgICAgIG15ICRt ZXRob2ROYW1lID0gIiI7CisKKyAgICAgICAgICAgICAgICAjIE1ldGhvZC4KKyAgICAgICAgICAg ICAgICBpZiAoJGN1cnJlbnRQYXJzaW5nTW9kZVskI2N1cnJlbnRQYXJzaW5nTW9kZV0gZXEgJ2Ns YXNzJyBhbmQgJHBhcmVudGhlc2lzSnVzdFNlZW4gYW5kICgkc3RhdGljT3JDb250cnVjdG9yU2Vl biBvciAkcG9zc2libGVNZXRob2ROYW1lKSkgeworICAgICAgICAgICAgICAgICAgICBteSAkY3Vy cmVudE1ldGhvZCA9IGpvaW4oJy4nLCBAY3VycmVudFNjb3BlcywgJHN0YXRpY09yQ29udHJ1Y3Rv clNlZW4gPyAiIiA6ICJwcm90b3R5cGUiLCAkcG9zc2libGVNZXRob2ROYW1lKTsKKyAgICAgICAg ICAgICAgICAgICAgJGN1cnJlbnRNZXRob2QgPX4gcy9cLnsyLH0vXC4vZzsgIyBSZW1vdmVzIGNv bnNlY3V0aXZlIHBlcmlvZHMuCisgICAgICAgICAgICAgICAgICAgICRjdXJyZW50TWV0aG9kID1+ IHMvXC4kLy87ICMgUmVtb3ZlIHRyYWlsaW5nIHBlcmlvZC4KKworICAgICAgICAgICAgICAgICAg ICAkbWV0aG9kTmFtZSA9IGpvaW4oJy4nLCAkc3RhdGljT3JDb250cnVjdG9yU2VlbiA/ICIiIDog InByb3RvdHlwZSIsICRwb3NzaWJsZU1ldGhvZE5hbWUpOworICAgICAgICAgICAgICAgICAgICAk bWV0aG9kTmFtZSA9fiBzL1wuezIsfS9cLi9nOyAjIFJlbW92ZXMgY29uc2VjdXRpdmUgcGVyaW9k cy4KKyAgICAgICAgICAgICAgICAgICAgJG1ldGhvZE5hbWUgPX4gcy9cLiQvLzsgIyBSZW1vdmUg dHJhaWxpbmcgcGVyaW9kLgorCisgICAgICAgICAgICAgICAgICAgIHB1c2goQGN1cnJlbnRQYXJz aW5nTW9kZSwgIm1ldGhvZCIpOworICAgICAgICAgICAgICAgICAgICBwdXNoKEBjdXJyZW50RnVu Y3Rpb25OYW1lcywgJGN1cnJlbnRNZXRob2QpOworICAgICAgICAgICAgICAgICAgICBwdXNoKEBj dXJyZW50RnVuY3Rpb25EZXB0aHMsICRicmFjZXNEZXB0aCk7CisgICAgICAgICAgICAgICAgICAg IHB1c2goQGN1cnJlbnRGdW5jdGlvblN0YXJ0TGluZXMsICQuKTsKKyAgICAgICAgICAgICAgICB9 CiAKICAgICAgICAgICAgICAgICAkYnJhY2VzRGVwdGgrKzsKKyAgICAgICAgICAgICAgICAkZnVu Y3Rpb25KdXN0U2VlbiA9IDA7CisKKyAgICAgICAgICAgICAgICBwdXNoKEBjdXJyZW50U2NvcGVz LCBqb2luKCIuIiwgJG1ldGhvZE5hbWUgPyAkbWV0aG9kTmFtZSA6IEBjdXJyZW50SWRlbnRpZmll cnMpKTsKKyAgICAgICAgICAgICAgICBAY3VycmVudElkZW50aWZpZXJzID0gKCk7CisKKyAgICAg ICAgICAgICAgICAkc3RhdGljT3JDb250cnVjdG9yU2VlbiA9IDA7CiAgICAgICAgICAgICAgICAg bmV4dDsKICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgIyBDbG9zZSBicmFjZS4KICAgICAg ICAgICAgIGlmICgkMSBlcSAnfScpIHsKICAgICAgICAgICAgICAgICAkYnJhY2VzRGVwdGgtLTsK KyAgICAgICAgICAgICAgICAkZnVuY3Rpb25KdXN0U2VlbiA9IDA7CiAKICAgICAgICAgICAgICAg ICBpZiAoQGN1cnJlbnRGdW5jdGlvbkRlcHRocyBhbmQgJGJyYWNlc0RlcHRoID09ICRjdXJyZW50 RnVuY3Rpb25EZXB0aHNbJCNjdXJyZW50RnVuY3Rpb25EZXB0aHNdKSB7CiAgICAgICAgICAgICAg ICAgICAgIHBvcChAY3VycmVudEZ1bmN0aW9uRGVwdGhzKTsKKyAgICAgICAgICAgICAgICAgICAg cG9wKEBjdXJyZW50UGFyc2luZ01vZGUpOwogCi0gICAgICAgICAgICAgICAgICAgIG15ICRjdXJy ZW50RnVuY3Rpb24gPSBwb3AoQGN1cnJlbnRGdW5jdGlvbk5hbWVzKTsKKyAgICAgICAgICAgICAg ICAgICAgbXkgJGN1cnJlbnROYW1lID0gcG9wKEBjdXJyZW50RnVuY3Rpb25OYW1lcyk7CiAgICAg ICAgICAgICAgICAgICAgIG15ICRzdGFydCA9IHBvcChAY3VycmVudEZ1bmN0aW9uU3RhcnRMaW5l cyk7CiAKLSAgICAgICAgICAgICAgICAgICAgcHVzaChAcmFuZ2VzLCBbJHN0YXJ0LCAkLiwgJGN1 cnJlbnRGdW5jdGlvbl0pOworICAgICAgICAgICAgICAgICAgICBwdXNoKEByYW5nZXMsIFskc3Rh cnQsICQuLCAkY3VycmVudE5hbWVdKTsKICAgICAgICAgICAgICAgICB9CiAKICAgICAgICAgICAg ICAgICBwb3AoQGN1cnJlbnRTY29wZXMpOwpAQCAtMTM3Miw2ICsxNDQwLDE4IEBAIHN1YiBnZXRf ZnVuY3Rpb25fbGluZV9yYW5nZXNfZm9yX2phdmFzY3JpcHQoJCQpCiAgICAgICAgICAgICAgICAg bmV4dDsKICAgICAgICAgICAgIH0KIAorICAgICAgICAgICAgIyBDbGFzcy4KKyAgICAgICAgICAg IGlmICgkMSBlcSAnY2xhc3MnKSB7CisgICAgICAgICAgICAgICAgJGNsYXNzSnVzdFNlZW4gPSAx OworICAgICAgICAgICAgICAgIG5leHQ7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgICMg RXh0ZW5kcy4KKyAgICAgICAgICAgIGlmICgkMSBlcSAnZXh0ZW5kcycpIHsKKyAgICAgICAgICAg ICAgICAkaW5FeHRlbmRzID0gMTsKKyAgICAgICAgICAgICAgICBuZXh0OworICAgICAgICAgICAg fQorCiAgICAgICAgICAgICAjIEZ1bmN0aW9uLgogICAgICAgICAgICAgaWYgKCQxIGVxICdmdW5j dGlvbicpIHsKICAgICAgICAgICAgICAgICAkZnVuY3Rpb25KdXN0U2VlbiA9IDE7CkBAIC0xMzgw LDYgKzE0NjAsNyBAQCBzdWIgZ2V0X2Z1bmN0aW9uX2xpbmVfcmFuZ2VzX2Zvcl9qYXZhc2NyaXB0 KCQkKQogICAgICAgICAgICAgICAgICAgICBteSAkY3VycmVudEZ1bmN0aW9uID0gam9pbignLics IChAY3VycmVudFNjb3BlcywgQGN1cnJlbnRJZGVudGlmaWVycykpOwogICAgICAgICAgICAgICAg ICAgICAkY3VycmVudEZ1bmN0aW9uID1+IHMvXC57Mix9L1wuL2c7ICMgUmVtb3ZlcyBjb25zZWN1 dGl2ZSBwZXJpb2RzLgogCisgICAgICAgICAgICAgICAgICAgIHB1c2goQGN1cnJlbnRQYXJzaW5n TW9kZSwgImZ1bmN0aW9uIik7CiAgICAgICAgICAgICAgICAgICAgIHB1c2goQGN1cnJlbnRGdW5j dGlvbk5hbWVzLCAkY3VycmVudEZ1bmN0aW9uKTsKICAgICAgICAgICAgICAgICAgICAgcHVzaChA Y3VycmVudEZ1bmN0aW9uRGVwdGhzLCAkYnJhY2VzRGVwdGgpOwogICAgICAgICAgICAgICAgICAg ICBwdXNoKEBjdXJyZW50RnVuY3Rpb25TdGFydExpbmVzLCAkLik7CkBAIC0xNDAwLDYgKzE0ODEs MTIgQEAgc3ViIGdldF9mdW5jdGlvbl9saW5lX3Jhbmdlc19mb3JfamF2YXNjcmlwdCgkJCkKICAg ICAgICAgICAgICAgICBuZXh0OwogICAgICAgICAgICAgfQogCisgICAgICAgICAgICAjIFN0YXRp Yy4KKyAgICAgICAgICAgIGlmICgkMSBlcSAnc3RhdGljJyBvciAkMSBlcSAnY29uc3RydWN0b3In KSB7CisgICAgICAgICAgICAgICAgJHN0YXRpY09yQ29udHJ1Y3RvclNlZW4gPSAxOworICAgICAg ICAgICAgICAgIG5leHQ7CisgICAgICAgICAgICB9CisKICAgICAgICAgICAgICMgQXNzaWdubWVu dCBvcGVyYXRvci4KICAgICAgICAgICAgIGlmICgkMSBlcSAnPScgb3IgJDEgZXEgJzonKSB7CiAg ICAgICAgICAgICAgICAgJGFzc2lnbm1lbnRKdXN0U2VlbiA9IDE7CkBAIC0xNDEwLDE1ICsxNDk3 LDM4IEBAIHN1YiBnZXRfZnVuY3Rpb25fbGluZV9yYW5nZXNfZm9yX2phdmFzY3JpcHQoJCQpCiAK ICAgICAgICAgICAgICMgV29yZC4KICAgICAgICAgICAgICR3b3JkID0gJDE7Ci0gICAgICAgICAg ICAkd29yZCA9ICJnZXQgJHdvcmQiIGlmICRnZXR0ZXJKdXN0U2VlbjsKLSAgICAgICAgICAgICR3 b3JkID0gInNldCAkd29yZCIgaWYgJHNldHRlckp1c3RTZWVuOwogCi0gICAgICAgICAgICBpZiAo KCRmdW5jdGlvbkp1c3RTZWVuIGFuZCAhJGFzc2lnbm1lbnRKdXN0U2Vlbikgb3IgJGdldHRlckp1 c3RTZWVuIG9yICRzZXR0ZXJKdXN0U2VlbikgeworICAgICAgICAgICAgaWYgKCRjbGFzc0p1c3RT ZWVuKSB7CisgICAgICAgICAgICAgICAgcHVzaChAY3VycmVudElkZW50aWZpZXJzLCAkd29yZCkg aWYgISRhc3NpZ25tZW50SnVzdFNlZW47CisKKyAgICAgICAgICAgICAgICBteSAkY3VycmVudENs YXNzID0gam9pbignLicsIChAY3VycmVudFNjb3BlcywgQGN1cnJlbnRJZGVudGlmaWVycykpOwor ICAgICAgICAgICAgICAgICRjdXJyZW50Q2xhc3MgPX4gcy9cLnsyLH0vXC4vZzsgIyBSZW1vdmVz IGNvbnNlY3V0aXZlIHBlcmlvZHMuCisKKyAgICAgICAgICAgICAgICBwdXNoKEBjdXJyZW50UGFy c2luZ01vZGUsICJjbGFzcyIpOworICAgICAgICAgICAgICAgIHB1c2goQGN1cnJlbnRGdW5jdGlv bk5hbWVzLCAkY3VycmVudENsYXNzKTsKKyAgICAgICAgICAgICAgICBwdXNoKEBjdXJyZW50RnVu Y3Rpb25EZXB0aHMsICRicmFjZXNEZXB0aCk7CisgICAgICAgICAgICAgICAgcHVzaChAY3VycmVu dEZ1bmN0aW9uU3RhcnRMaW5lcywgJC4pOworICAgICAgICAgICAgfSBlbHNpZiAoJGdldHRlckp1 c3RTZWVuIG9yICRzZXR0ZXJKdXN0U2VlbikgeworICAgICAgICAgICAgICAgICR3b3JkID0gImdl dCAkd29yZCIgaWYgJGdldHRlckp1c3RTZWVuOworICAgICAgICAgICAgICAgICR3b3JkID0gInNl dCAkd29yZCIgaWYgJHNldHRlckp1c3RTZWVuOworCisgICAgICAgICAgICAgICAgcHVzaChAY3Vy cmVudElkZW50aWZpZXJzLCAkd29yZCk7CisKKyAgICAgICAgICAgICAgICBteSAkbW9kZSA9ICRj dXJyZW50UGFyc2luZ01vZGVbJCNjdXJyZW50UGFyc2luZ01vZGVdOworICAgICAgICAgICAgICAg IG15ICRjdXJyZW50RnVuY3Rpb24gPSBqb2luKCcuJywgKEBjdXJyZW50U2NvcGVzLCAoJG1vZGUg ZXEgJ2NsYXNzJykgPyAicHJvdG90eXBlIiA6ICIiLCBAY3VycmVudElkZW50aWZpZXJzKSk7Cisg ICAgICAgICAgICAgICAgJGN1cnJlbnRGdW5jdGlvbiA9fiBzL1wuezIsfS9cLi9nOyAjIFJlbW92 ZXMgY29uc2VjdXRpdmUgcGVyaW9kcy4KKworICAgICAgICAgICAgICAgIHB1c2goQGN1cnJlbnRQ YXJzaW5nTW9kZSwgImZ1bmN0aW9uIik7CisgICAgICAgICAgICAgICAgcHVzaChAY3VycmVudEZ1 bmN0aW9uTmFtZXMsICRjdXJyZW50RnVuY3Rpb24pOworICAgICAgICAgICAgICAgIHB1c2goQGN1 cnJlbnRGdW5jdGlvbkRlcHRocywgJGJyYWNlc0RlcHRoKTsKKyAgICAgICAgICAgICAgICBwdXNo KEBjdXJyZW50RnVuY3Rpb25TdGFydExpbmVzLCAkLik7CisgICAgICAgICAgICB9IGVsc2lmICgk ZnVuY3Rpb25KdXN0U2VlbiBhbmQgISRhc3NpZ25tZW50SnVzdFNlZW4pIHsKICAgICAgICAgICAg ICAgICBwdXNoKEBjdXJyZW50SWRlbnRpZmllcnMsICR3b3JkKTsKIAogICAgICAgICAgICAgICAg IG15ICRjdXJyZW50RnVuY3Rpb24gPSBqb2luKCcuJywgKEBjdXJyZW50U2NvcGVzLCBAY3VycmVu dElkZW50aWZpZXJzKSk7CiAgICAgICAgICAgICAgICAgJGN1cnJlbnRGdW5jdGlvbiA9fiBzL1wu ezIsfS9cLi9nOyAjIFJlbW92ZXMgY29uc2VjdXRpdmUgcGVyaW9kcy4KIAorICAgICAgICAgICAg ICAgIHB1c2goQGN1cnJlbnRQYXJzaW5nTW9kZSwgImZ1bmN0aW9uIik7CiAgICAgICAgICAgICAg ICAgcHVzaChAY3VycmVudEZ1bmN0aW9uTmFtZXMsICRjdXJyZW50RnVuY3Rpb24pOwogICAgICAg ICAgICAgICAgIHB1c2goQGN1cnJlbnRGdW5jdGlvbkRlcHRocywgJGJyYWNlc0RlcHRoKTsKICAg ICAgICAgICAgICAgICBwdXNoKEBjdXJyZW50RnVuY3Rpb25TdGFydExpbmVzLCAkLik7CkBAIC0x NDI2LDYgKzE1MzYsOCBAQCBzdWIgZ2V0X2Z1bmN0aW9uX2xpbmVfcmFuZ2VzX2Zvcl9qYXZhc2Ny aXB0KCQkKQogICAgICAgICAgICAgICAgIHB1c2goQGN1cnJlbnRJZGVudGlmaWVycywgJHdvcmQp OwogICAgICAgICAgICAgfQogCisgICAgICAgICAgICAkY2xhc3NKdXN0U2VlbiA9IDA7CisgICAg ICAgICAgICAkcGFyZW50aGVzaXNKdXN0U2VlbiA9IDA7CiAgICAgICAgICAgICAkZnVuY3Rpb25K dXN0U2VlbiA9IDA7CiAgICAgICAgICAgICAkZ2V0dGVySnVzdFNlZW4gPSAwOwogICAgICAgICAg ICAgJHNldHRlckp1c3RTZWVuID0gMDsK 249468 2015-03-25 20:21:17 -0700 2015-03-25 20:37:04 -0700 [PATCH] Proposed Fix better.patch text/plain 13982 joepeck ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAwZjcy ZTZkLi42ODIwMzBhIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTUtMDMtMjUgIEpvc2VwaCBQZWNvcmFybyAgPHBl Y29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBVcGRhdGUgcHJlcGFyZS1DaGFuZ2VMb2cgdG8g d29yayB3aXRoIEVTNiBDbGFzcyBzeW50YXgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE0MzA2OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZzoKKyAgICAgICAg KGdldF9mdW5jdGlvbl9saW5lX3Jhbmdlc19mb3JfamF2YXNjcmlwdCk6CisgICAgICAgIEJldHRl ciBoYW5kbGUgRVM2IENsYXNzIHN5bnRheC4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cGVy bC9wcmVwYXJlLUNoYW5nZUxvZ191bml0dGVzdC9yZXNvdXJjZXMvamF2YXNjcmlwdF91bml0dGVz dHMtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cGVybC9wcmVwYXJlLUNo YW5nZUxvZ191bml0dGVzdC9yZXNvdXJjZXMvamF2YXNjcmlwdF91bml0dGVzdHMuanM6CisgICAg ICAgIChCYXNlQ2xhc3MpOgorICAgICAgICAoRGVyaXZlZENsYXNzKToKKyAgICAgICAgKERlcml2 ZWRDbGFzcy5zdGF0aWNNZXRob2QpOgorICAgICAgICAoRGVyaXZlZENsYXNzLnByb3RvdHlwZS5t ZXRob2QubmVzdGVkRnVuY3Rpb25JbnNpZGVNZXRob2QpOgorICAgICAgICAoRGVyaXZlZENsYXNz LnByb3RvdHlwZS5tZXRob2QpOgorICAgICAgICAoRGVyaXZlZENsYXNzLnByb3RvdHlwZS5nZXQg Z2V0dGVyKToKKyAgICAgICAgKG5hbWVzcGFjZS5NeUNsYXNzKToKKyAgICAgICAgKG5hbWVzcGFj ZS5NeUNsYXNzLnN0YXRpY01ldGhvZCk6CisgICAgICAgIChuYW1lc3BhY2UuTXlDbGFzcy5wcm90 b3R5cGUubWV0aG9kLm5lc3RlZEZ1bmN0aW9uSW5zaWRlTWV0aG9kKToKKyAgICAgICAgKG5hbWVz cGFjZS5NeUNsYXNzLnByb3RvdHlwZS5tZXRob2QpOgorICAgICAgICAobmFtZXNwYWNlLk15Q2xh c3MucHJvdG90eXBlLmdldCBnZXR0ZXIpOgorICAgICAgICBQcm9vZiEKKwogMjAxNS0wMy0yNSAg QWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFtD b250ZW50IEV4dGVuc2lvbnNdIEFkZCBtdWx0aS1ERkEgY29tcGlsaW5nIGFuZCBpbnRlcnByZXRp bmcuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nIGIvVG9vbHMv U2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZwppbmRleCBjNzcxNGEzLi41ZTViYzc1IDEwMDc1NQot LS0gYS9Ub29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL1NjcmlwdHMv cHJlcGFyZS1DaGFuZ2VMb2cKQEAgLTEyNTAsMTggKzEyNTAsNDggQEAgc3ViIGdldF9mdW5jdGlv bl9saW5lX3Jhbmdlc19mb3JfamF2YSgkJCkKIAogCiAjIFJlYWQgYSBmaWxlIGFuZCBnZXQgYWxs IHRoZSBsaW5lIHJhbmdlcyBvZiB0aGUgdGhpbmdzIHRoYXQgbG9vayBsaWtlCi0jIEphdmFTY3Jp cHQgZnVuY3Rpb25zLgorIyBKYXZhU2NyaXB0IGZ1bmN0aW9ucyBvciBtZXRob2RzLgogIwogIyBB IGZ1bmN0aW9uIG5hbWUgaXMgdGhlIHdvcmQgdGhhdCBpbW1lZGlhdGVseSBmb2xsb3dzIGBmdW5j dGlvbicgd2hlbgotIyBmb2xsb3dlZCBieSBhbiBvcGVuIGN1cmx5IGJyYWNlLiBJdCBjYW4gYXBw ZWFyIGF0IHRoZSB0b3AgbGV2ZWwsIG9yCi0jIGluc2lkZSBvdGhlciBmdW5jdGlvbnMuCisjIGZv bGxvd2VkIGJ5IGFuIG9wZW4gY3VybHkgYnJhY2UuIEl0IGNhbiBhcHBlYXIgYXQgdGhlIHRvcCBs ZXZlbCwKKyMgb3IgaW5zaWRlIG90aGVyIGZ1bmN0aW9ucy4gRm9yIGV4YW1wbGU6CiAjCi0jIEFu IGFub255bW91cyBmdW5jdGlvbiBuYW1lIGlzIHRoZSBpZGVudGlmaWVyIGNoYWluIGltbWVkaWF0 ZWx5IGJlZm9yZQorIyAgICBmdW5jdGlvbiBuYW1lKCkgeyAvLyAobmFtZSkKKyMgICAgICAgIGZ1 bmN0aW9uIGlubmVyKCkgeyB9IC8vIChuYW1lLmlubmVyKQorIyAgICB9CisjCisjIEFuIGFub255 bW91cyBmdW5jdGlvbiBuYW1lIGlzIHRoZSBpZGVudGlmaWVyIG9uIHRoZSBsZWZ0IGhhbmQgc2lk ZSBvZgogIyBhbiBhc3NpZ25tZW50IHdpdGggdGhlIGVxdWFscyBvcGVyYXRvciBvciBvYmplY3Qg bm90YXRpb24gdGhhdCBoYXMgYQotIyB2YWx1ZSBzdGFydGluZyB3aXRoIGBmdW5jdGlvbicgZm9s bG93ZWQgYnkgYW4gb3BlbiBjdXJseSBicmFjZS4KKyMgdmFsdWUgc3RhcnRpbmcgd2l0aCBgZnVu Y3Rpb24nIGZvbGxvd2VkIGFuIG9wZW4gY3VybHkgYnJhY2UuCisjIEZvciBleGFtcGxlOgorIwor IyAgICBuYW1lc3BhY2UgPSB7CisjICAgICAgICBuYW1lOiBmdW5jdGlvbigpIHt9IC8vIChuYW1l c3BhY2UubmFtZSkKKyMgICAgfQorIyAgICBuYW1lc3BhY2UuRm9vID0gZnVuY3Rpb24oKSB7fSAv LyAobmFtZXNwYWNlLkZvbykKICMKICMgQSBnZXR0ZXIgb3Igc2V0dGVyIG5hbWUgaXMgdGhlIHdv cmQgdGhhdCBpbW1lZGlhdGVseSBmb2xsb3dzIGBnZXQnIG9yCi0jIGBzZXQnIHdoZW4gZm9sbG93 ZWQgYnkgYW4gb3BlbiBjdXJseSBicmFjZSAuCisjIGBzZXQnIHdoZW4gZm9sbG93ZWQgYnkgcGFy YW1zIGFuZCBhbiBvcGVuIGN1cmx5IGJyYWNlLiBGb3IgZXhhbXBsZToKKyMKKyMgICAgbmFtZXNw YWNlID0geworIyAgICAgIGdldCBmb28oKSB7fSAvLyAobmFtZXNwYWNlLmdldCBmb28pCisjICAg IH0KKyMKKyMgQSBtZXRob2QgbmFtZSBpcyB0aGUgd29yZCBpbW1lZGlhdGVseSBiZWZvcmUgcGFy ZW50aGVzaXMsIHdpdGggYW4gb3BlbgorIyBjdXJseSBicmFjZSBpbW1lZGlhdGVseSBmb2xsb3dp bmcgY2xvc2luZyBwYXJlbnRoZXNpcy4gRm9yIHNpbXBsaWZpY2F0aW9uCisjIHdlIG9ubHkgcGFy c2UgZm9yIG1ldGhvZHMgaW5zaWRlIG9mIGEgY2xhc3MuIEFuZCBmb3IgYSBjbGFzcyBleHByZXNz aW9uCisjIHdlIHRha2UgdGhlIGFzc2lnbm1lbnQgaWRlbnRpZmllciBpbnN0ZWFkIG9mIHRoZSBj bGFzcyBuYW1lIGZvciBuYW1lc3BhY2luZy4KKyMKKyMgICAgbmFtZXNwYWNlLkZvbyA9IGNsYXNz IERvZXNOb3RNYXR0ZXIgZXh0ZW5kcyBCYXIgeworIyAgICAgICAgY29uc3RydWN0b3IoKSB7fSAv LyAobmFtZXNwYWNlLkZvbykKKyMgICAgICAgIHN0YXRpYyBzdGF0aWNNZXRob2QoKSB7fSAvLyAo bmFtZXNwYWNlLkZvby5zdGF0aWNNZXRob2QpCisjICAgICAgICBpbnN0YW5jZU1ldGhvZCgpIHt9 IC8vIChuYW1lc3BhY2UuRm9vLnByb3RvdHlwZS5pbnN0YW5jZU1ldGhvZCkKKyMgICAgICAgIGdl dCBnZXR0ZXIoKSB7fSAvLyAobmFtZXNwYWNlLkZvby5wcm90b3R5cGUuZ2V0IGdldHRlcikKKyMg ICAgfQorIyAgICBjbGFzcyBDbGFzc05hbWUgeworIyAgICAgICAgY29uc3RydWN0b3IoKSB7fSAv LyAoQ2xhc3NOYW1lKQorIyAgICAgICAgbWV0aG9kKCkge30gLy8gKENsYXNzTmFtZS5wcm90b3R5 cGUubWV0aG9kKQorIyAgICB9CiAjCiAjIENvbW1lbnQgaGFuZGxpbmcgaXMgc2ltcGxlLW1pbmRl ZCBidXQgd2lsbCB3b3JrIGZvciBhbGwgYnV0IHBhdGhvbG9naWNhbCBjYXNlcy4KICMKQEAgLTEy NzMsNiArMTMwMyw3IEBAIHN1YiBnZXRfZnVuY3Rpb25fbGluZV9yYW5nZXNfZm9yX2phdmFzY3Jp cHQoJCQpCiAKICAgICBteSBAY3VycmVudFNjb3BlczsKICAgICBteSBAY3VycmVudElkZW50aWZp ZXJzOworICAgIG15IEBjdXJyZW50UGFyc2luZ01vZGUgPSAoImdsb2JhbCIpOwogICAgIG15IEBj dXJyZW50RnVuY3Rpb25OYW1lczsKICAgICBteSBAY3VycmVudEZ1bmN0aW9uRGVwdGhzOwogICAg IG15IEBjdXJyZW50RnVuY3Rpb25TdGFydExpbmVzOwpAQCAtMTI4MSwxNCArMTMxMiwyMCBAQCBz dWIgZ2V0X2Z1bmN0aW9uX2xpbmVfcmFuZ2VzX2Zvcl9qYXZhc2NyaXB0KCQkKQogCiAgICAgbXkg JGluQ29tbWVudCA9IDA7CiAgICAgbXkgJGluUXVvdGVkVGV4dCA9ICIiOworICAgIG15ICRpbkV4 dGVuZHMgPSAwOworICAgIG15ICRpbk1ldGhvZCA9IDA7CiAgICAgbXkgJHBhcmVudGhlc2VzRGVw dGggPSAwOwogICAgIG15ICRicmFjZXNEZXB0aCA9IDA7CiAKKyAgICBteSAkY2xhc3NKdXN0U2Vl biA9IDA7CisgICAgbXkgJHBhcmVudGhlc2lzSnVzdFNlZW4gPSAwOwogICAgIG15ICRmdW5jdGlv bkp1c3RTZWVuID0gMDsKICAgICBteSAkZ2V0dGVySnVzdFNlZW4gPSAwOwogICAgIG15ICRzZXR0 ZXJKdXN0U2VlbiA9IDA7CiAgICAgbXkgJGFzc2lnbm1lbnRKdXN0U2VlbiA9IDA7CisgICAgbXkg JHN0YXRpY09yQ29udHJ1Y3RvclNlZW4gPSAwOwogCisgICAgbXkgJHBvc3NpYmxlTWV0aG9kTmFt ZSA9ICIiOwogICAgIG15ICR3b3JkID0gIiI7CiAKICAgICB3aGlsZSAoPCRmaWxlSGFuZGxlPikg ewpAQCAtMTMyNiwzOCArMTM2Myw2OSBAQCBzdWIgZ2V0X2Z1bmN0aW9uX2xpbmVfcmFuZ2VzX2Zv cl9qYXZhc2NyaXB0KCQkKQogCiAgICAgICAgICMgRmluZCBmdW5jdGlvbiBuYW1lcy4KICAgICAg ICAgd2hpbGUgKG0tKFx3K3xbKCl7fT06OyxdKS1nKSB7CisgICAgICAgICAgICAjIFNraXAgZXZl cnl0aGluZyB1bnRpbCAieyIgYWZ0ZXIgZXh0ZW5kcy4KKyAgICAgICAgICAgIGlmICgkaW5FeHRl bmRzKSB7CisgICAgICAgICAgICAgICAgbmV4dCBpZiAkMSBuZSAneyc7CisgICAgICAgICAgICAg ICAgJGluRXh0ZW5kcyA9IDA7CisgICAgICAgICAgICB9CisKICAgICAgICAgICAgICMgT3BlbiBw YXJlbnRoZXNpcy4KICAgICAgICAgICAgIGlmICgkMSBlcSAnKCcpIHsKICAgICAgICAgICAgICAg ICAkcGFyZW50aGVzZXNEZXB0aCsrOworICAgICAgICAgICAgICAgICRwb3NzaWJsZU1ldGhvZE5h bWUgPSBqb2luKCcuJywgQGN1cnJlbnRJZGVudGlmaWVycyk7CiAgICAgICAgICAgICAgICAgbmV4 dDsKICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgIyBDbG9zZSBwYXJlbnRoZXNpcy4KICAg ICAgICAgICAgIGlmICgkMSBlcSAnKScpIHsKICAgICAgICAgICAgICAgICAkcGFyZW50aGVzZXNE ZXB0aC0tOworICAgICAgICAgICAgICAgICRwYXJlbnRoZXNpc0p1c3RTZWVuID0gMTsKICAgICAg ICAgICAgICAgICBuZXh0OwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICAjIE9wZW4gYnJh Y2UuCiAgICAgICAgICAgICBpZiAoJDEgZXEgJ3snKSB7Ci0gICAgICAgICAgICAgICAgcHVzaChA Y3VycmVudFNjb3Blcywgam9pbigiLiIsIEBjdXJyZW50SWRlbnRpZmllcnMpKTsKLSAgICAgICAg ICAgICAgICBAY3VycmVudElkZW50aWZpZXJzID0gKCk7CisgICAgICAgICAgICAgICAgbXkgJG1l dGhvZE5hbWUgPSAiIjsKKworICAgICAgICAgICAgICAgICMgTWV0aG9kLgorICAgICAgICAgICAg ICAgIGlmICgkY3VycmVudFBhcnNpbmdNb2RlWyQjY3VycmVudFBhcnNpbmdNb2RlXSBlcSAnY2xh c3MnIGFuZCAkcGFyZW50aGVzaXNKdXN0U2VlbiBhbmQgKCRzdGF0aWNPckNvbnRydWN0b3JTZWVu IG9yICRwb3NzaWJsZU1ldGhvZE5hbWUpKSB7CisgICAgICAgICAgICAgICAgICAgIG15ICRjdXJy ZW50TWV0aG9kID0gam9pbignLicsIEBjdXJyZW50U2NvcGVzLCAkc3RhdGljT3JDb250cnVjdG9y U2VlbiA/ICIiIDogInByb3RvdHlwZSIsICRwb3NzaWJsZU1ldGhvZE5hbWUpOworICAgICAgICAg ICAgICAgICAgICAkY3VycmVudE1ldGhvZCA9fiBzL1wuezIsfS9cLi9nOyAjIFJlbW92ZXMgY29u c2VjdXRpdmUgcGVyaW9kcy4KKyAgICAgICAgICAgICAgICAgICAgJGN1cnJlbnRNZXRob2QgPX4g cy9cLiQvLzsgIyBSZW1vdmUgdHJhaWxpbmcgcGVyaW9kLgorCisgICAgICAgICAgICAgICAgICAg ICRtZXRob2ROYW1lID0gam9pbignLicsICRzdGF0aWNPckNvbnRydWN0b3JTZWVuID8gIiIgOiAi cHJvdG90eXBlIiwgJHBvc3NpYmxlTWV0aG9kTmFtZSk7CisgICAgICAgICAgICAgICAgICAgICRt ZXRob2ROYW1lID1+IHMvXC57Mix9L1wuL2c7ICMgUmVtb3ZlcyBjb25zZWN1dGl2ZSBwZXJpb2Rz LgorICAgICAgICAgICAgICAgICAgICAkbWV0aG9kTmFtZSA9fiBzL1wuJC8vOyAjIFJlbW92ZSB0 cmFpbGluZyBwZXJpb2QuCisKKyAgICAgICAgICAgICAgICAgICAgcHVzaChAY3VycmVudFBhcnNp bmdNb2RlLCAibWV0aG9kIik7CisgICAgICAgICAgICAgICAgICAgIHB1c2goQGN1cnJlbnRGdW5j dGlvbk5hbWVzLCAkY3VycmVudE1ldGhvZCk7CisgICAgICAgICAgICAgICAgICAgIHB1c2goQGN1 cnJlbnRGdW5jdGlvbkRlcHRocywgJGJyYWNlc0RlcHRoKTsKKyAgICAgICAgICAgICAgICAgICAg cHVzaChAY3VycmVudEZ1bmN0aW9uU3RhcnRMaW5lcywgJC4pOworICAgICAgICAgICAgICAgIH0K IAogICAgICAgICAgICAgICAgICRicmFjZXNEZXB0aCsrOworICAgICAgICAgICAgICAgICRmdW5j dGlvbkp1c3RTZWVuID0gMDsKKworICAgICAgICAgICAgICAgIHB1c2goQGN1cnJlbnRTY29wZXMs IGpvaW4oIi4iLCAkbWV0aG9kTmFtZSA/ICRtZXRob2ROYW1lIDogQGN1cnJlbnRJZGVudGlmaWVy cykpOworICAgICAgICAgICAgICAgIEBjdXJyZW50SWRlbnRpZmllcnMgPSAoKTsKKworICAgICAg ICAgICAgICAgICRzdGF0aWNPckNvbnRydWN0b3JTZWVuID0gMDsKICAgICAgICAgICAgICAgICBu ZXh0OwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICAjIENsb3NlIGJyYWNlLgogICAgICAg ICAgICAgaWYgKCQxIGVxICd9JykgewogICAgICAgICAgICAgICAgICRicmFjZXNEZXB0aC0tOwor ICAgICAgICAgICAgICAgICRmdW5jdGlvbkp1c3RTZWVuID0gMDsKIAogICAgICAgICAgICAgICAg IGlmIChAY3VycmVudEZ1bmN0aW9uRGVwdGhzIGFuZCAkYnJhY2VzRGVwdGggPT0gJGN1cnJlbnRG dW5jdGlvbkRlcHRoc1skI2N1cnJlbnRGdW5jdGlvbkRlcHRoc10pIHsKICAgICAgICAgICAgICAg ICAgICAgcG9wKEBjdXJyZW50RnVuY3Rpb25EZXB0aHMpOworICAgICAgICAgICAgICAgICAgICBw b3AoQGN1cnJlbnRQYXJzaW5nTW9kZSk7CiAKLSAgICAgICAgICAgICAgICAgICAgbXkgJGN1cnJl bnRGdW5jdGlvbiA9IHBvcChAY3VycmVudEZ1bmN0aW9uTmFtZXMpOworICAgICAgICAgICAgICAg ICAgICBteSAkY3VycmVudE5hbWUgPSBwb3AoQGN1cnJlbnRGdW5jdGlvbk5hbWVzKTsKICAgICAg ICAgICAgICAgICAgICAgbXkgJHN0YXJ0ID0gcG9wKEBjdXJyZW50RnVuY3Rpb25TdGFydExpbmVz KTsKIAotICAgICAgICAgICAgICAgICAgICBwdXNoKEByYW5nZXMsIFskc3RhcnQsICQuLCAkY3Vy cmVudEZ1bmN0aW9uXSk7CisgICAgICAgICAgICAgICAgICAgIHB1c2goQHJhbmdlcywgWyRzdGFy dCwgJC4sICRjdXJyZW50TmFtZV0pOwogICAgICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAg ICAgIHBvcChAY3VycmVudFNjb3Blcyk7CkBAIC0xMzcyLDYgKzE0NDAsMTggQEAgc3ViIGdldF9m dW5jdGlvbl9saW5lX3Jhbmdlc19mb3JfamF2YXNjcmlwdCgkJCkKICAgICAgICAgICAgICAgICBu ZXh0OwogICAgICAgICAgICAgfQogCisgICAgICAgICAgICAjIENsYXNzLgorICAgICAgICAgICAg aWYgKCQxIGVxICdjbGFzcycpIHsKKyAgICAgICAgICAgICAgICAkY2xhc3NKdXN0U2VlbiA9IDE7 CisgICAgICAgICAgICAgICAgbmV4dDsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgIyBF eHRlbmRzLgorICAgICAgICAgICAgaWYgKCQxIGVxICdleHRlbmRzJykgeworICAgICAgICAgICAg ICAgICRpbkV4dGVuZHMgPSAxOworICAgICAgICAgICAgICAgIG5leHQ7CisgICAgICAgICAgICB9 CisKICAgICAgICAgICAgICMgRnVuY3Rpb24uCiAgICAgICAgICAgICBpZiAoJDEgZXEgJ2Z1bmN0 aW9uJykgewogICAgICAgICAgICAgICAgICRmdW5jdGlvbkp1c3RTZWVuID0gMTsKQEAgLTEzODAs NiArMTQ2MCw3IEBAIHN1YiBnZXRfZnVuY3Rpb25fbGluZV9yYW5nZXNfZm9yX2phdmFzY3JpcHQo JCQpCiAgICAgICAgICAgICAgICAgICAgIG15ICRjdXJyZW50RnVuY3Rpb24gPSBqb2luKCcuJywg KEBjdXJyZW50U2NvcGVzLCBAY3VycmVudElkZW50aWZpZXJzKSk7CiAgICAgICAgICAgICAgICAg ICAgICRjdXJyZW50RnVuY3Rpb24gPX4gcy9cLnsyLH0vXC4vZzsgIyBSZW1vdmVzIGNvbnNlY3V0 aXZlIHBlcmlvZHMuCiAKKyAgICAgICAgICAgICAgICAgICAgcHVzaChAY3VycmVudFBhcnNpbmdN b2RlLCAiZnVuY3Rpb24iKTsKICAgICAgICAgICAgICAgICAgICAgcHVzaChAY3VycmVudEZ1bmN0 aW9uTmFtZXMsICRjdXJyZW50RnVuY3Rpb24pOwogICAgICAgICAgICAgICAgICAgICBwdXNoKEBj dXJyZW50RnVuY3Rpb25EZXB0aHMsICRicmFjZXNEZXB0aCk7CiAgICAgICAgICAgICAgICAgICAg IHB1c2goQGN1cnJlbnRGdW5jdGlvblN0YXJ0TGluZXMsICQuKTsKQEAgLTE0MDAsNiArMTQ4MSwx MiBAQCBzdWIgZ2V0X2Z1bmN0aW9uX2xpbmVfcmFuZ2VzX2Zvcl9qYXZhc2NyaXB0KCQkKQogICAg ICAgICAgICAgICAgIG5leHQ7CiAgICAgICAgICAgICB9CiAKKyAgICAgICAgICAgICMgU3RhdGlj LgorICAgICAgICAgICAgaWYgKCQxIGVxICdzdGF0aWMnIG9yICQxIGVxICdjb25zdHJ1Y3Rvcicp IHsKKyAgICAgICAgICAgICAgICAkc3RhdGljT3JDb250cnVjdG9yU2VlbiA9IDE7CisgICAgICAg ICAgICAgICAgbmV4dDsKKyAgICAgICAgICAgIH0KKwogICAgICAgICAgICAgIyBBc3NpZ25tZW50 IG9wZXJhdG9yLgogICAgICAgICAgICAgaWYgKCQxIGVxICc9JyBvciAkMSBlcSAnOicpIHsKICAg ICAgICAgICAgICAgICAkYXNzaWdubWVudEp1c3RTZWVuID0gMTsKQEAgLTE0MTAsMTUgKzE0OTcs MzggQEAgc3ViIGdldF9mdW5jdGlvbl9saW5lX3Jhbmdlc19mb3JfamF2YXNjcmlwdCgkJCkKIAog ICAgICAgICAgICAgIyBXb3JkLgogICAgICAgICAgICAgJHdvcmQgPSAkMTsKLSAgICAgICAgICAg ICR3b3JkID0gImdldCAkd29yZCIgaWYgJGdldHRlckp1c3RTZWVuOwotICAgICAgICAgICAgJHdv cmQgPSAic2V0ICR3b3JkIiBpZiAkc2V0dGVySnVzdFNlZW47CiAKLSAgICAgICAgICAgIGlmICgo JGZ1bmN0aW9uSnVzdFNlZW4gYW5kICEkYXNzaWdubWVudEp1c3RTZWVuKSBvciAkZ2V0dGVySnVz dFNlZW4gb3IgJHNldHRlckp1c3RTZWVuKSB7CisgICAgICAgICAgICBpZiAoJGNsYXNzSnVzdFNl ZW4pIHsKKyAgICAgICAgICAgICAgICBwdXNoKEBjdXJyZW50SWRlbnRpZmllcnMsICR3b3JkKSBp ZiAhJGFzc2lnbm1lbnRKdXN0U2VlbjsKKworICAgICAgICAgICAgICAgIG15ICRjdXJyZW50Q2xh c3MgPSBqb2luKCcuJywgKEBjdXJyZW50U2NvcGVzLCBAY3VycmVudElkZW50aWZpZXJzKSk7Cisg ICAgICAgICAgICAgICAgJGN1cnJlbnRDbGFzcyA9fiBzL1wuezIsfS9cLi9nOyAjIFJlbW92ZXMg Y29uc2VjdXRpdmUgcGVyaW9kcy4KKworICAgICAgICAgICAgICAgIHB1c2goQGN1cnJlbnRQYXJz aW5nTW9kZSwgImNsYXNzIik7CisgICAgICAgICAgICAgICAgcHVzaChAY3VycmVudEZ1bmN0aW9u TmFtZXMsICRjdXJyZW50Q2xhc3MpOworICAgICAgICAgICAgICAgIHB1c2goQGN1cnJlbnRGdW5j dGlvbkRlcHRocywgJGJyYWNlc0RlcHRoKTsKKyAgICAgICAgICAgICAgICBwdXNoKEBjdXJyZW50 RnVuY3Rpb25TdGFydExpbmVzLCAkLik7CisgICAgICAgICAgICB9IGVsc2lmICgkZ2V0dGVySnVz dFNlZW4gb3IgJHNldHRlckp1c3RTZWVuKSB7CisgICAgICAgICAgICAgICAgJHdvcmQgPSAiZ2V0 ICR3b3JkIiBpZiAkZ2V0dGVySnVzdFNlZW47CisgICAgICAgICAgICAgICAgJHdvcmQgPSAic2V0 ICR3b3JkIiBpZiAkc2V0dGVySnVzdFNlZW47CisKKyAgICAgICAgICAgICAgICBwdXNoKEBjdXJy ZW50SWRlbnRpZmllcnMsICR3b3JkKTsKKworICAgICAgICAgICAgICAgIG15ICRtb2RlID0gJGN1 cnJlbnRQYXJzaW5nTW9kZVskI2N1cnJlbnRQYXJzaW5nTW9kZV07CisgICAgICAgICAgICAgICAg bXkgJGN1cnJlbnRGdW5jdGlvbiA9IGpvaW4oJy4nLCAoQGN1cnJlbnRTY29wZXMsICgkbW9kZSBl cSAnY2xhc3MnKSA/ICJwcm90b3R5cGUiIDogIiIsIEBjdXJyZW50SWRlbnRpZmllcnMpKTsKKyAg ICAgICAgICAgICAgICAkY3VycmVudEZ1bmN0aW9uID1+IHMvXC57Mix9L1wuL2c7ICMgUmVtb3Zl cyBjb25zZWN1dGl2ZSBwZXJpb2RzLgorCisgICAgICAgICAgICAgICAgcHVzaChAY3VycmVudFBh cnNpbmdNb2RlLCAiZnVuY3Rpb24iKTsKKyAgICAgICAgICAgICAgICBwdXNoKEBjdXJyZW50RnVu Y3Rpb25OYW1lcywgJGN1cnJlbnRGdW5jdGlvbik7CisgICAgICAgICAgICAgICAgcHVzaChAY3Vy cmVudEZ1bmN0aW9uRGVwdGhzLCAkYnJhY2VzRGVwdGgpOworICAgICAgICAgICAgICAgIHB1c2go QGN1cnJlbnRGdW5jdGlvblN0YXJ0TGluZXMsICQuKTsKKyAgICAgICAgICAgIH0gZWxzaWYgKCRm dW5jdGlvbkp1c3RTZWVuIGFuZCAhJGFzc2lnbm1lbnRKdXN0U2VlbikgewogICAgICAgICAgICAg ICAgIHB1c2goQGN1cnJlbnRJZGVudGlmaWVycywgJHdvcmQpOwogCiAgICAgICAgICAgICAgICAg bXkgJGN1cnJlbnRGdW5jdGlvbiA9IGpvaW4oJy4nLCAoQGN1cnJlbnRTY29wZXMsIEBjdXJyZW50 SWRlbnRpZmllcnMpKTsKICAgICAgICAgICAgICAgICAkY3VycmVudEZ1bmN0aW9uID1+IHMvXC57 Mix9L1wuL2c7ICMgUmVtb3ZlcyBjb25zZWN1dGl2ZSBwZXJpb2RzLgogCisgICAgICAgICAgICAg ICAgcHVzaChAY3VycmVudFBhcnNpbmdNb2RlLCAiZnVuY3Rpb24iKTsKICAgICAgICAgICAgICAg ICBwdXNoKEBjdXJyZW50RnVuY3Rpb25OYW1lcywgJGN1cnJlbnRGdW5jdGlvbik7CiAgICAgICAg ICAgICAgICAgcHVzaChAY3VycmVudEZ1bmN0aW9uRGVwdGhzLCAkYnJhY2VzRGVwdGgpOwogICAg ICAgICAgICAgICAgIHB1c2goQGN1cnJlbnRGdW5jdGlvblN0YXJ0TGluZXMsICQuKTsKQEAgLTE0 MjYsNiArMTUzNiw4IEBAIHN1YiBnZXRfZnVuY3Rpb25fbGluZV9yYW5nZXNfZm9yX2phdmFzY3Jp cHQoJCQpCiAgICAgICAgICAgICAgICAgcHVzaChAY3VycmVudElkZW50aWZpZXJzLCAkd29yZCk7 CiAgICAgICAgICAgICB9CiAKKyAgICAgICAgICAgICRjbGFzc0p1c3RTZWVuID0gMDsKKyAgICAg ICAgICAgICRwYXJlbnRoZXNpc0p1c3RTZWVuID0gMDsKICAgICAgICAgICAgICRmdW5jdGlvbkp1 c3RTZWVuID0gMDsKICAgICAgICAgICAgICRnZXR0ZXJKdXN0U2VlbiA9IDA7CiAgICAgICAgICAg ICAkc2V0dGVySnVzdFNlZW4gPSAwOwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw ZXJsL3ByZXBhcmUtQ2hhbmdlTG9nX3VuaXR0ZXN0L3Jlc291cmNlcy9qYXZhc2NyaXB0X3VuaXR0 ZXN0cy1leHBlY3RlZC50eHQgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHBlcmwvcHJlcGFyZS1DaGFu Z2VMb2dfdW5pdHRlc3QvcmVzb3VyY2VzL2phdmFzY3JpcHRfdW5pdHRlc3RzLWV4cGVjdGVkLnR4 dAppbmRleCAzNWEzMDgwLi5lMDM5NzMwIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtp dHBlcmwvcHJlcGFyZS1DaGFuZ2VMb2dfdW5pdHRlc3QvcmVzb3VyY2VzL2phdmFzY3JpcHRfdW5p dHRlc3RzLWV4cGVjdGVkLnR4dAorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHBlcmwvcHJlcGFy ZS1DaGFuZ2VMb2dfdW5pdHRlc3QvcmVzb3VyY2VzL2phdmFzY3JpcHRfdW5pdHRlc3RzLWV4cGVj dGVkLnR4dApAQCAtMTMxLDYgKzEzMSw3NiBAQAogICAgICAgJzEyOCcsCiAgICAgICAnMTUwJywK ICAgICAgICdmdW5jMTYnCisgICAgXSwKKyAgICBbCisgICAgICAxNTIsCisgICAgICAxNTIsCisg ICAgICAnQmFzZUNsYXNzJworICAgIF0sCisgICAgWworICAgICAgMTUyLAorICAgICAgMTUyLAor ICAgICAgJ0Jhc2VDbGFzcycKKyAgICBdLAorICAgIFsKKyAgICAgIDE1NiwKKyAgICAgIDE1OCwK KyAgICAgICdEZXJpdmVkQ2xhc3MnCisgICAgXSwKKyAgICBbCisgICAgICAxNjEsCisgICAgICAx NjIsCisgICAgICAnRGVyaXZlZENsYXNzLnN0YXRpY01ldGhvZCcKKyAgICBdLAorICAgIFsKKyAg ICAgIDE2NiwKKyAgICAgIDE2OCwKKyAgICAgICdEZXJpdmVkQ2xhc3MucHJvdG90eXBlLm1ldGhv ZC5uZXN0ZWRGdW5jdGlvbkluc2lkZU1ldGhvZCcKKyAgICBdLAorICAgIFsKKyAgICAgIDE2NSwK KyAgICAgIDE2OSwKKyAgICAgICdEZXJpdmVkQ2xhc3MucHJvdG90eXBlLm1ldGhvZCcKKyAgICBd LAorICAgIFsKKyAgICAgIDE3MSwKKyAgICAgIDE3MSwKKyAgICAgICdEZXJpdmVkQ2xhc3MucHJv dG90eXBlLmdldCBnZXR0ZXInCisgICAgXSwKKyAgICBbCisgICAgICAxNTQsCisgICAgICAxNzIs CisgICAgICAnRGVyaXZlZENsYXNzJworICAgIF0sCisgICAgWworICAgICAgMTc3LAorICAgICAg MTc4LAorICAgICAgJ25hbWVzcGFjZS5NeUNsYXNzJworICAgIF0sCisgICAgWworICAgICAgMTgx LAorICAgICAgMTgyLAorICAgICAgJ25hbWVzcGFjZS5NeUNsYXNzLnN0YXRpY01ldGhvZCcKKyAg ICBdLAorICAgIFsKKyAgICAgIDE4NiwKKyAgICAgIDE4OCwKKyAgICAgICduYW1lc3BhY2UuTXlD bGFzcy5wcm90b3R5cGUubWV0aG9kLm5lc3RlZEZ1bmN0aW9uSW5zaWRlTWV0aG9kJworICAgIF0s CisgICAgWworICAgICAgMTg1LAorICAgICAgMTg5LAorICAgICAgJ25hbWVzcGFjZS5NeUNsYXNz LnByb3RvdHlwZS5tZXRob2QnCisgICAgXSwKKyAgICBbCisgICAgICAxOTEsCisgICAgICAxOTEs CisgICAgICAnbmFtZXNwYWNlLk15Q2xhc3MucHJvdG90eXBlLmdldCBnZXR0ZXInCisgICAgXSwK KyAgICBbCisgICAgICAxNzUsCisgICAgICAxOTIsCisgICAgICAnbmFtZXNwYWNlLk15Q2xhc3Mn CiAgICAgXQogICBdCiB9CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHBlcmwvcHJl cGFyZS1DaGFuZ2VMb2dfdW5pdHRlc3QvcmVzb3VyY2VzL2phdmFzY3JpcHRfdW5pdHRlc3RzLmpz IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRwZXJsL3ByZXBhcmUtQ2hhbmdlTG9nX3VuaXR0ZXN0L3Jl c291cmNlcy9qYXZhc2NyaXB0X3VuaXR0ZXN0cy5qcwppbmRleCA5M2QxZDRjLi41Mjc4MGFmIDEw MDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHBlcmwvcHJlcGFyZS1DaGFuZ2VMb2dfdW5p dHRlc3QvcmVzb3VyY2VzL2phdmFzY3JpcHRfdW5pdHRlc3RzLmpzCisrKyBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cGVybC9wcmVwYXJlLUNoYW5nZUxvZ191bml0dGVzdC9yZXNvdXJjZXMvamF2YXNj cmlwdF91bml0dGVzdHMuanMKQEAgLTE0OCwzICsxNDgsNDUgQEAgZnVuY3Rpb24gZnVuYzE2KCkK ICAgICAgICAgICAgICAgIHJldHVybiAxMjM7CiAgICAgICAgICAgIH0pOwogfQorCitjbGFzcyBC YXNlQ2xhc3MgeyBjb25zdHJ1Y3RvcigpIHt9IH07CisKK2NsYXNzIERlcml2ZWRDbGFzcyBleHRl bmRzIEJhc2VDbGFzcyB7CisgICAgY29uc3RydWN0b3IoKQorICAgIHsKKyAgICAgICAgc3VwZXIo KTsKKyAgICB9CisKKyAgICBzdGF0aWMgc3RhdGljTWV0aG9kKCkKKyAgICB7CisgICAgfQorCisg ICAgbWV0aG9kKGEsIGIpCisgICAgeworICAgICAgICBmdW5jdGlvbiBuZXN0ZWRGdW5jdGlvbklu c2lkZU1ldGhvZCgpIHsKKyAgICAgICAgICAgIC8vIC4uCisgICAgICAgIH0KKyAgICB9CisKKyAg ICBnZXQgZ2V0dGVyKCkgeyB9Cit9CisKK3ZhciBuYW1lc3BhY2UgPSB7fTsKK25hbWVzcGFjZS5N eUNsYXNzID0gY2xhc3MgSWdub3JlZE5hbWUgeworICAgIGNvbnN0cnVjdG9yKCkKKyAgICB7Cisg ICAgfQorCisgICAgc3RhdGljIHN0YXRpY01ldGhvZCgpCisgICAgeworICAgIH0KKworICAgIG1l dGhvZChhLCBiKQorICAgIHsKKyAgICAgICAgZnVuY3Rpb24gbmVzdGVkRnVuY3Rpb25JbnNpZGVN ZXRob2QoKSB7CisgICAgICAgICAgICAvLyAuLgorICAgICAgICB9CisgICAgfQorCisgICAgZ2V0 IGdldHRlcigpIHsgfQorfQo= 249469 2015-03-25 20:37:04 -0700 2015-03-25 21:38:19 -0700 [PATCH] Proposed Fix little-better.patch text/plain 13930 joepeck ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAwZjcy ZTZkLi42ODIwMzBhIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTUtMDMtMjUgIEpvc2VwaCBQZWNvcmFybyAgPHBl Y29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBVcGRhdGUgcHJlcGFyZS1DaGFuZ2VMb2cgdG8g d29yayB3aXRoIEVTNiBDbGFzcyBzeW50YXgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE0MzA2OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZzoKKyAgICAgICAg KGdldF9mdW5jdGlvbl9saW5lX3Jhbmdlc19mb3JfamF2YXNjcmlwdCk6CisgICAgICAgIEJldHRl ciBoYW5kbGUgRVM2IENsYXNzIHN5bnRheC4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cGVy bC9wcmVwYXJlLUNoYW5nZUxvZ191bml0dGVzdC9yZXNvdXJjZXMvamF2YXNjcmlwdF91bml0dGVz dHMtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cGVybC9wcmVwYXJlLUNo YW5nZUxvZ191bml0dGVzdC9yZXNvdXJjZXMvamF2YXNjcmlwdF91bml0dGVzdHMuanM6CisgICAg ICAgIChCYXNlQ2xhc3MpOgorICAgICAgICAoRGVyaXZlZENsYXNzKToKKyAgICAgICAgKERlcml2 ZWRDbGFzcy5zdGF0aWNNZXRob2QpOgorICAgICAgICAoRGVyaXZlZENsYXNzLnByb3RvdHlwZS5t ZXRob2QubmVzdGVkRnVuY3Rpb25JbnNpZGVNZXRob2QpOgorICAgICAgICAoRGVyaXZlZENsYXNz LnByb3RvdHlwZS5tZXRob2QpOgorICAgICAgICAoRGVyaXZlZENsYXNzLnByb3RvdHlwZS5nZXQg Z2V0dGVyKToKKyAgICAgICAgKG5hbWVzcGFjZS5NeUNsYXNzKToKKyAgICAgICAgKG5hbWVzcGFj ZS5NeUNsYXNzLnN0YXRpY01ldGhvZCk6CisgICAgICAgIChuYW1lc3BhY2UuTXlDbGFzcy5wcm90 b3R5cGUubWV0aG9kLm5lc3RlZEZ1bmN0aW9uSW5zaWRlTWV0aG9kKToKKyAgICAgICAgKG5hbWVz cGFjZS5NeUNsYXNzLnByb3RvdHlwZS5tZXRob2QpOgorICAgICAgICAobmFtZXNwYWNlLk15Q2xh c3MucHJvdG90eXBlLmdldCBnZXR0ZXIpOgorICAgICAgICBQcm9vZiEKKwogMjAxNS0wMy0yNSAg QWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFtD b250ZW50IEV4dGVuc2lvbnNdIEFkZCBtdWx0aS1ERkEgY29tcGlsaW5nIGFuZCBpbnRlcnByZXRp bmcuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nIGIvVG9vbHMv U2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZwppbmRleCBjNzcxNGEzLi5lYmE4YWFlIDEwMDc1NQot LS0gYS9Ub29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL1NjcmlwdHMv cHJlcGFyZS1DaGFuZ2VMb2cKQEAgLTEyNTAsMTggKzEyNTAsNDggQEAgc3ViIGdldF9mdW5jdGlv bl9saW5lX3Jhbmdlc19mb3JfamF2YSgkJCkKIAogCiAjIFJlYWQgYSBmaWxlIGFuZCBnZXQgYWxs IHRoZSBsaW5lIHJhbmdlcyBvZiB0aGUgdGhpbmdzIHRoYXQgbG9vayBsaWtlCi0jIEphdmFTY3Jp cHQgZnVuY3Rpb25zLgorIyBKYXZhU2NyaXB0IGZ1bmN0aW9ucyBvciBtZXRob2RzLgogIwogIyBB IGZ1bmN0aW9uIG5hbWUgaXMgdGhlIHdvcmQgdGhhdCBpbW1lZGlhdGVseSBmb2xsb3dzIGBmdW5j dGlvbicgd2hlbgotIyBmb2xsb3dlZCBieSBhbiBvcGVuIGN1cmx5IGJyYWNlLiBJdCBjYW4gYXBw ZWFyIGF0IHRoZSB0b3AgbGV2ZWwsIG9yCi0jIGluc2lkZSBvdGhlciBmdW5jdGlvbnMuCisjIGZv bGxvd2VkIGJ5IGFuIG9wZW4gY3VybHkgYnJhY2UuIEl0IGNhbiBhcHBlYXIgYXQgdGhlIHRvcCBs ZXZlbCwKKyMgb3IgaW5zaWRlIG90aGVyIGZ1bmN0aW9ucy4gRm9yIGV4YW1wbGU6CiAjCi0jIEFu IGFub255bW91cyBmdW5jdGlvbiBuYW1lIGlzIHRoZSBpZGVudGlmaWVyIGNoYWluIGltbWVkaWF0 ZWx5IGJlZm9yZQorIyAgICBmdW5jdGlvbiBuYW1lKCkgeyAvLyAobmFtZSkKKyMgICAgICAgIGZ1 bmN0aW9uIGlubmVyKCkgeyB9IC8vIChuYW1lLmlubmVyKQorIyAgICB9CisjCisjIEFuIGFub255 bW91cyBmdW5jdGlvbiBuYW1lIGlzIHRoZSBpZGVudGlmaWVyIG9uIHRoZSBsZWZ0IGhhbmQgc2lk ZSBvZgogIyBhbiBhc3NpZ25tZW50IHdpdGggdGhlIGVxdWFscyBvcGVyYXRvciBvciBvYmplY3Qg bm90YXRpb24gdGhhdCBoYXMgYQotIyB2YWx1ZSBzdGFydGluZyB3aXRoIGBmdW5jdGlvbicgZm9s bG93ZWQgYnkgYW4gb3BlbiBjdXJseSBicmFjZS4KKyMgdmFsdWUgc3RhcnRpbmcgd2l0aCBgZnVu Y3Rpb24nIGZvbGxvd2VkIGFuIG9wZW4gY3VybHkgYnJhY2UuCisjIEZvciBleGFtcGxlOgorIwor IyAgICBuYW1lc3BhY2UgPSB7CisjICAgICAgICBuYW1lOiBmdW5jdGlvbigpIHt9IC8vIChuYW1l c3BhY2UubmFtZSkKKyMgICAgfQorIyAgICBuYW1lc3BhY2UuRm9vID0gZnVuY3Rpb24oKSB7fSAv LyAobmFtZXNwYWNlLkZvbykKICMKICMgQSBnZXR0ZXIgb3Igc2V0dGVyIG5hbWUgaXMgdGhlIHdv cmQgdGhhdCBpbW1lZGlhdGVseSBmb2xsb3dzIGBnZXQnIG9yCi0jIGBzZXQnIHdoZW4gZm9sbG93 ZWQgYnkgYW4gb3BlbiBjdXJseSBicmFjZSAuCisjIGBzZXQnIHdoZW4gZm9sbG93ZWQgYnkgcGFy YW1zIGFuZCBhbiBvcGVuIGN1cmx5IGJyYWNlLiBGb3IgZXhhbXBsZToKKyMKKyMgICAgbmFtZXNw YWNlID0geworIyAgICAgIGdldCBmb28oKSB7fSAvLyAobmFtZXNwYWNlLmdldCBmb28pCisjICAg IH0KKyMKKyMgQSBtZXRob2QgbmFtZSBpcyB0aGUgd29yZCBpbW1lZGlhdGVseSBiZWZvcmUgcGFy ZW50aGVzaXMsIHdpdGggYW4gb3BlbgorIyBjdXJseSBicmFjZSBpbW1lZGlhdGVseSBmb2xsb3dp bmcgY2xvc2luZyBwYXJlbnRoZXNpcy4gRm9yIHNpbXBsaWZpY2F0aW9uCisjIHdlIG9ubHkgcGFy c2UgZm9yIG1ldGhvZHMgaW5zaWRlIG9mIGEgY2xhc3MuIEFuZCBmb3IgYSBjbGFzcyBleHByZXNz aW9uCisjIHdlIHRha2UgdGhlIGFzc2lnbm1lbnQgaWRlbnRpZmllciBpbnN0ZWFkIG9mIHRoZSBj bGFzcyBuYW1lIGZvciBuYW1lc3BhY2luZy4KKyMKKyMgICAgbmFtZXNwYWNlLkZvbyA9IGNsYXNz IERvZXNOb3RNYXR0ZXIgZXh0ZW5kcyBCYXIgeworIyAgICAgICAgY29uc3RydWN0b3IoKSB7fSAv LyAobmFtZXNwYWNlLkZvbykKKyMgICAgICAgIHN0YXRpYyBzdGF0aWNNZXRob2QoKSB7fSAvLyAo bmFtZXNwYWNlLkZvby5zdGF0aWNNZXRob2QpCisjICAgICAgICBpbnN0YW5jZU1ldGhvZCgpIHt9 IC8vIChuYW1lc3BhY2UuRm9vLnByb3RvdHlwZS5pbnN0YW5jZU1ldGhvZCkKKyMgICAgICAgIGdl dCBnZXR0ZXIoKSB7fSAvLyAobmFtZXNwYWNlLkZvby5wcm90b3R5cGUuZ2V0IGdldHRlcikKKyMg ICAgfQorIyAgICBjbGFzcyBDbGFzc05hbWUgeworIyAgICAgICAgY29uc3RydWN0b3IoKSB7fSAv LyAoQ2xhc3NOYW1lKQorIyAgICAgICAgbWV0aG9kKCkge30gLy8gKENsYXNzTmFtZS5wcm90b3R5 cGUubWV0aG9kKQorIyAgICB9CiAjCiAjIENvbW1lbnQgaGFuZGxpbmcgaXMgc2ltcGxlLW1pbmRl ZCBidXQgd2lsbCB3b3JrIGZvciBhbGwgYnV0IHBhdGhvbG9naWNhbCBjYXNlcy4KICMKQEAgLTEy NzMsNiArMTMwMyw3IEBAIHN1YiBnZXRfZnVuY3Rpb25fbGluZV9yYW5nZXNfZm9yX2phdmFzY3Jp cHQoJCQpCiAKICAgICBteSBAY3VycmVudFNjb3BlczsKICAgICBteSBAY3VycmVudElkZW50aWZp ZXJzOworICAgIG15IEBjdXJyZW50UGFyc2luZ01vZGUgPSAoImdsb2JhbCIpOwogICAgIG15IEBj dXJyZW50RnVuY3Rpb25OYW1lczsKICAgICBteSBAY3VycmVudEZ1bmN0aW9uRGVwdGhzOwogICAg IG15IEBjdXJyZW50RnVuY3Rpb25TdGFydExpbmVzOwpAQCAtMTI4MSwxNCArMTMxMiwyMCBAQCBz dWIgZ2V0X2Z1bmN0aW9uX2xpbmVfcmFuZ2VzX2Zvcl9qYXZhc2NyaXB0KCQkKQogCiAgICAgbXkg JGluQ29tbWVudCA9IDA7CiAgICAgbXkgJGluUXVvdGVkVGV4dCA9ICIiOworICAgIG15ICRpbkV4 dGVuZHMgPSAwOworICAgIG15ICRpbk1ldGhvZCA9IDA7CiAgICAgbXkgJHBhcmVudGhlc2VzRGVw dGggPSAwOwogICAgIG15ICRicmFjZXNEZXB0aCA9IDA7CiAKKyAgICBteSAkY2xhc3NKdXN0U2Vl biA9IDA7CisgICAgbXkgJHBhcmVudGhlc2lzSnVzdFNlZW4gPSAwOwogICAgIG15ICRmdW5jdGlv bkp1c3RTZWVuID0gMDsKICAgICBteSAkZ2V0dGVySnVzdFNlZW4gPSAwOwogICAgIG15ICRzZXR0 ZXJKdXN0U2VlbiA9IDA7CiAgICAgbXkgJGFzc2lnbm1lbnRKdXN0U2VlbiA9IDA7CisgICAgbXkg JHN0YXRpY09yQ29udHJ1Y3RvclNlZW4gPSAwOwogCisgICAgbXkgJHBvc3NpYmxlTWV0aG9kTmFt ZSA9ICIiOwogICAgIG15ICR3b3JkID0gIiI7CiAKICAgICB3aGlsZSAoPCRmaWxlSGFuZGxlPikg ewpAQCAtMTMyNiwzOCArMTM2Myw2OSBAQCBzdWIgZ2V0X2Z1bmN0aW9uX2xpbmVfcmFuZ2VzX2Zv cl9qYXZhc2NyaXB0KCQkKQogCiAgICAgICAgICMgRmluZCBmdW5jdGlvbiBuYW1lcy4KICAgICAg ICAgd2hpbGUgKG0tKFx3K3xbKCl7fT06OyxdKS1nKSB7CisgICAgICAgICAgICAjIFNraXAgZXZl cnl0aGluZyB1bnRpbCAieyIgYWZ0ZXIgZXh0ZW5kcy4KKyAgICAgICAgICAgIGlmICgkaW5FeHRl bmRzKSB7CisgICAgICAgICAgICAgICAgbmV4dCBpZiAkMSBuZSAneyc7CisgICAgICAgICAgICAg ICAgJGluRXh0ZW5kcyA9IDA7CisgICAgICAgICAgICB9CisKICAgICAgICAgICAgICMgT3BlbiBw YXJlbnRoZXNpcy4KICAgICAgICAgICAgIGlmICgkMSBlcSAnKCcpIHsKICAgICAgICAgICAgICAg ICAkcGFyZW50aGVzZXNEZXB0aCsrOworICAgICAgICAgICAgICAgICRwb3NzaWJsZU1ldGhvZE5h bWUgPSBqb2luKCcuJywgQGN1cnJlbnRJZGVudGlmaWVycyk7CiAgICAgICAgICAgICAgICAgbmV4 dDsKICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgIyBDbG9zZSBwYXJlbnRoZXNpcy4KICAg ICAgICAgICAgIGlmICgkMSBlcSAnKScpIHsKICAgICAgICAgICAgICAgICAkcGFyZW50aGVzZXNE ZXB0aC0tOworICAgICAgICAgICAgICAgICRwYXJlbnRoZXNpc0p1c3RTZWVuID0gMTsKICAgICAg ICAgICAgICAgICBuZXh0OwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICAjIE9wZW4gYnJh Y2UuCiAgICAgICAgICAgICBpZiAoJDEgZXEgJ3snKSB7Ci0gICAgICAgICAgICAgICAgcHVzaChA Y3VycmVudFNjb3Blcywgam9pbigiLiIsIEBjdXJyZW50SWRlbnRpZmllcnMpKTsKLSAgICAgICAg ICAgICAgICBAY3VycmVudElkZW50aWZpZXJzID0gKCk7CisgICAgICAgICAgICAgICAgbXkgJG1l dGhvZE5hbWUgPSAiIjsKKworICAgICAgICAgICAgICAgICMgTWV0aG9kLgorICAgICAgICAgICAg ICAgIGlmICgkY3VycmVudFBhcnNpbmdNb2RlWyQjY3VycmVudFBhcnNpbmdNb2RlXSBlcSAnY2xh c3MnIGFuZCAkcGFyZW50aGVzaXNKdXN0U2VlbiBhbmQgKCRzdGF0aWNPckNvbnRydWN0b3JTZWVu IG9yICRwb3NzaWJsZU1ldGhvZE5hbWUpKSB7CisgICAgICAgICAgICAgICAgICAgICRtZXRob2RO YW1lID0gam9pbignLicsICRzdGF0aWNPckNvbnRydWN0b3JTZWVuID8gIiIgOiAicHJvdG90eXBl IiwgJHBvc3NpYmxlTWV0aG9kTmFtZSk7CisgICAgICAgICAgICAgICAgICAgICRtZXRob2ROYW1l ID1+IHMvXC57Mix9L1wuL2c7ICMgUmVtb3ZlcyBjb25zZWN1dGl2ZSBwZXJpb2RzLgorICAgICAg ICAgICAgICAgICAgICAkbWV0aG9kTmFtZSA9fiBzL1wuJC8vOyAjIFJlbW92ZSB0cmFpbGluZyBw ZXJpb2QuCisKKyAgICAgICAgICAgICAgICAgICAgbXkgJGN1cnJlbnRNZXRob2QgPSBqb2luKCcu JywgQGN1cnJlbnRTY29wZXMsICRtZXRob2ROYW1lKTsKKyAgICAgICAgICAgICAgICAgICAgJGN1 cnJlbnRNZXRob2QgPX4gcy9cLnsyLH0vXC4vZzsgIyBSZW1vdmVzIGNvbnNlY3V0aXZlIHBlcmlv ZHMuCisgICAgICAgICAgICAgICAgICAgICRjdXJyZW50TWV0aG9kID1+IHMvXC4kLy87ICMgUmVt b3ZlIHRyYWlsaW5nIHBlcmlvZC4KKworICAgICAgICAgICAgICAgICAgICBwdXNoKEBjdXJyZW50 UGFyc2luZ01vZGUsICJtZXRob2QiKTsKKyAgICAgICAgICAgICAgICAgICAgcHVzaChAY3VycmVu dEZ1bmN0aW9uTmFtZXMsICRjdXJyZW50TWV0aG9kKTsKKyAgICAgICAgICAgICAgICAgICAgcHVz aChAY3VycmVudEZ1bmN0aW9uRGVwdGhzLCAkYnJhY2VzRGVwdGgpOworICAgICAgICAgICAgICAg ICAgICBwdXNoKEBjdXJyZW50RnVuY3Rpb25TdGFydExpbmVzLCAkLik7CisgICAgICAgICAgICAg ICAgfQogCiAgICAgICAgICAgICAgICAgJGJyYWNlc0RlcHRoKys7CisgICAgICAgICAgICAgICAg JGZ1bmN0aW9uSnVzdFNlZW4gPSAwOworCisgICAgICAgICAgICAgICAgcHVzaChAY3VycmVudFNj b3Blcywgam9pbignLicsICRtZXRob2ROYW1lID8gJG1ldGhvZE5hbWUgOiBAY3VycmVudElkZW50 aWZpZXJzKSk7CisgICAgICAgICAgICAgICAgQGN1cnJlbnRJZGVudGlmaWVycyA9ICgpOworCisg ICAgICAgICAgICAgICAgJHN0YXRpY09yQ29udHJ1Y3RvclNlZW4gPSAwOwogICAgICAgICAgICAg ICAgIG5leHQ7CiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgICMgQ2xvc2UgYnJhY2UuCiAg ICAgICAgICAgICBpZiAoJDEgZXEgJ30nKSB7CiAgICAgICAgICAgICAgICAgJGJyYWNlc0RlcHRo LS07CisgICAgICAgICAgICAgICAgJGZ1bmN0aW9uSnVzdFNlZW4gPSAwOwogCiAgICAgICAgICAg ICAgICAgaWYgKEBjdXJyZW50RnVuY3Rpb25EZXB0aHMgYW5kICRicmFjZXNEZXB0aCA9PSAkY3Vy cmVudEZ1bmN0aW9uRGVwdGhzWyQjY3VycmVudEZ1bmN0aW9uRGVwdGhzXSkgewogICAgICAgICAg ICAgICAgICAgICBwb3AoQGN1cnJlbnRGdW5jdGlvbkRlcHRocyk7CisgICAgICAgICAgICAgICAg ICAgIHBvcChAY3VycmVudFBhcnNpbmdNb2RlKTsKIAotICAgICAgICAgICAgICAgICAgICBteSAk Y3VycmVudEZ1bmN0aW9uID0gcG9wKEBjdXJyZW50RnVuY3Rpb25OYW1lcyk7CisgICAgICAgICAg ICAgICAgICAgIG15ICRjdXJyZW50TmFtZSA9IHBvcChAY3VycmVudEZ1bmN0aW9uTmFtZXMpOwog ICAgICAgICAgICAgICAgICAgICBteSAkc3RhcnQgPSBwb3AoQGN1cnJlbnRGdW5jdGlvblN0YXJ0 TGluZXMpOwogCi0gICAgICAgICAgICAgICAgICAgIHB1c2goQHJhbmdlcywgWyRzdGFydCwgJC4s ICRjdXJyZW50RnVuY3Rpb25dKTsKKyAgICAgICAgICAgICAgICAgICAgcHVzaChAcmFuZ2VzLCBb JHN0YXJ0LCAkLiwgJGN1cnJlbnROYW1lXSk7CiAgICAgICAgICAgICAgICAgfQogCiAgICAgICAg ICAgICAgICAgcG9wKEBjdXJyZW50U2NvcGVzKTsKQEAgLTEzNzIsNiArMTQ0MCwxOCBAQCBzdWIg Z2V0X2Z1bmN0aW9uX2xpbmVfcmFuZ2VzX2Zvcl9qYXZhc2NyaXB0KCQkKQogICAgICAgICAgICAg ICAgIG5leHQ7CiAgICAgICAgICAgICB9CiAKKyAgICAgICAgICAgICMgQ2xhc3MuCisgICAgICAg ICAgICBpZiAoJDEgZXEgJ2NsYXNzJykgeworICAgICAgICAgICAgICAgICRjbGFzc0p1c3RTZWVu ID0gMTsKKyAgICAgICAgICAgICAgICBuZXh0OworICAgICAgICAgICAgfQorCisgICAgICAgICAg ICAjIEV4dGVuZHMuCisgICAgICAgICAgICBpZiAoJDEgZXEgJ2V4dGVuZHMnKSB7CisgICAgICAg ICAgICAgICAgJGluRXh0ZW5kcyA9IDE7CisgICAgICAgICAgICAgICAgbmV4dDsKKyAgICAgICAg ICAgIH0KKwogICAgICAgICAgICAgIyBGdW5jdGlvbi4KICAgICAgICAgICAgIGlmICgkMSBlcSAn ZnVuY3Rpb24nKSB7CiAgICAgICAgICAgICAgICAgJGZ1bmN0aW9uSnVzdFNlZW4gPSAxOwpAQCAt MTM4MCw2ICsxNDYwLDcgQEAgc3ViIGdldF9mdW5jdGlvbl9saW5lX3Jhbmdlc19mb3JfamF2YXNj cmlwdCgkJCkKICAgICAgICAgICAgICAgICAgICAgbXkgJGN1cnJlbnRGdW5jdGlvbiA9IGpvaW4o Jy4nLCAoQGN1cnJlbnRTY29wZXMsIEBjdXJyZW50SWRlbnRpZmllcnMpKTsKICAgICAgICAgICAg ICAgICAgICAgJGN1cnJlbnRGdW5jdGlvbiA9fiBzL1wuezIsfS9cLi9nOyAjIFJlbW92ZXMgY29u c2VjdXRpdmUgcGVyaW9kcy4KIAorICAgICAgICAgICAgICAgICAgICBwdXNoKEBjdXJyZW50UGFy c2luZ01vZGUsICJmdW5jdGlvbiIpOwogICAgICAgICAgICAgICAgICAgICBwdXNoKEBjdXJyZW50 RnVuY3Rpb25OYW1lcywgJGN1cnJlbnRGdW5jdGlvbik7CiAgICAgICAgICAgICAgICAgICAgIHB1 c2goQGN1cnJlbnRGdW5jdGlvbkRlcHRocywgJGJyYWNlc0RlcHRoKTsKICAgICAgICAgICAgICAg ICAgICAgcHVzaChAY3VycmVudEZ1bmN0aW9uU3RhcnRMaW5lcywgJC4pOwpAQCAtMTQwMCw2ICsx NDgxLDEyIEBAIHN1YiBnZXRfZnVuY3Rpb25fbGluZV9yYW5nZXNfZm9yX2phdmFzY3JpcHQoJCQp CiAgICAgICAgICAgICAgICAgbmV4dDsKICAgICAgICAgICAgIH0KIAorICAgICAgICAgICAgIyBT dGF0aWMuCisgICAgICAgICAgICBpZiAoJDEgZXEgJ3N0YXRpYycgb3IgJDEgZXEgJ2NvbnN0cnVj dG9yJykgeworICAgICAgICAgICAgICAgICRzdGF0aWNPckNvbnRydWN0b3JTZWVuID0gMTsKKyAg ICAgICAgICAgICAgICBuZXh0OworICAgICAgICAgICAgfQorCiAgICAgICAgICAgICAjIEFzc2ln bm1lbnQgb3BlcmF0b3IuCiAgICAgICAgICAgICBpZiAoJDEgZXEgJz0nIG9yICQxIGVxICc6Jykg ewogICAgICAgICAgICAgICAgICRhc3NpZ25tZW50SnVzdFNlZW4gPSAxOwpAQCAtMTQxMCwxNSAr MTQ5NywzOCBAQCBzdWIgZ2V0X2Z1bmN0aW9uX2xpbmVfcmFuZ2VzX2Zvcl9qYXZhc2NyaXB0KCQk KQogCiAgICAgICAgICAgICAjIFdvcmQuCiAgICAgICAgICAgICAkd29yZCA9ICQxOwotICAgICAg ICAgICAgJHdvcmQgPSAiZ2V0ICR3b3JkIiBpZiAkZ2V0dGVySnVzdFNlZW47Ci0gICAgICAgICAg ICAkd29yZCA9ICJzZXQgJHdvcmQiIGlmICRzZXR0ZXJKdXN0U2VlbjsKIAotICAgICAgICAgICAg aWYgKCgkZnVuY3Rpb25KdXN0U2VlbiBhbmQgISRhc3NpZ25tZW50SnVzdFNlZW4pIG9yICRnZXR0 ZXJKdXN0U2VlbiBvciAkc2V0dGVySnVzdFNlZW4pIHsKKyAgICAgICAgICAgIGlmICgkY2xhc3NK dXN0U2VlbikgeworICAgICAgICAgICAgICAgIHB1c2goQGN1cnJlbnRJZGVudGlmaWVycywgJHdv cmQpIGlmICEkYXNzaWdubWVudEp1c3RTZWVuOworCisgICAgICAgICAgICAgICAgbXkgJGN1cnJl bnRDbGFzcyA9IGpvaW4oJy4nLCAoQGN1cnJlbnRTY29wZXMsIEBjdXJyZW50SWRlbnRpZmllcnMp KTsKKyAgICAgICAgICAgICAgICAkY3VycmVudENsYXNzID1+IHMvXC57Mix9L1wuL2c7ICMgUmVt b3ZlcyBjb25zZWN1dGl2ZSBwZXJpb2RzLgorCisgICAgICAgICAgICAgICAgcHVzaChAY3VycmVu dFBhcnNpbmdNb2RlLCAiY2xhc3MiKTsKKyAgICAgICAgICAgICAgICBwdXNoKEBjdXJyZW50RnVu Y3Rpb25OYW1lcywgJGN1cnJlbnRDbGFzcyk7CisgICAgICAgICAgICAgICAgcHVzaChAY3VycmVu dEZ1bmN0aW9uRGVwdGhzLCAkYnJhY2VzRGVwdGgpOworICAgICAgICAgICAgICAgIHB1c2goQGN1 cnJlbnRGdW5jdGlvblN0YXJ0TGluZXMsICQuKTsKKyAgICAgICAgICAgIH0gZWxzaWYgKCRnZXR0 ZXJKdXN0U2VlbiBvciAkc2V0dGVySnVzdFNlZW4pIHsKKyAgICAgICAgICAgICAgICAkd29yZCA9 ICJnZXQgJHdvcmQiIGlmICRnZXR0ZXJKdXN0U2VlbjsKKyAgICAgICAgICAgICAgICAkd29yZCA9 ICJzZXQgJHdvcmQiIGlmICRzZXR0ZXJKdXN0U2VlbjsKKworICAgICAgICAgICAgICAgIHB1c2go QGN1cnJlbnRJZGVudGlmaWVycywgJHdvcmQpOworCisgICAgICAgICAgICAgICAgbXkgJG1vZGUg PSAkY3VycmVudFBhcnNpbmdNb2RlWyQjY3VycmVudFBhcnNpbmdNb2RlXTsKKyAgICAgICAgICAg ICAgICBteSAkY3VycmVudEZ1bmN0aW9uID0gam9pbignLicsIChAY3VycmVudFNjb3BlcywgKCRt b2RlIGVxICdjbGFzcycpID8gInByb3RvdHlwZSIgOiAiIiwgQGN1cnJlbnRJZGVudGlmaWVycykp OworICAgICAgICAgICAgICAgICRjdXJyZW50RnVuY3Rpb24gPX4gcy9cLnsyLH0vXC4vZzsgIyBS ZW1vdmVzIGNvbnNlY3V0aXZlIHBlcmlvZHMuCisKKyAgICAgICAgICAgICAgICBwdXNoKEBjdXJy ZW50UGFyc2luZ01vZGUsICJmdW5jdGlvbiIpOworICAgICAgICAgICAgICAgIHB1c2goQGN1cnJl bnRGdW5jdGlvbk5hbWVzLCAkY3VycmVudEZ1bmN0aW9uKTsKKyAgICAgICAgICAgICAgICBwdXNo KEBjdXJyZW50RnVuY3Rpb25EZXB0aHMsICRicmFjZXNEZXB0aCk7CisgICAgICAgICAgICAgICAg cHVzaChAY3VycmVudEZ1bmN0aW9uU3RhcnRMaW5lcywgJC4pOworICAgICAgICAgICAgfSBlbHNp ZiAoJGZ1bmN0aW9uSnVzdFNlZW4gYW5kICEkYXNzaWdubWVudEp1c3RTZWVuKSB7CiAgICAgICAg ICAgICAgICAgcHVzaChAY3VycmVudElkZW50aWZpZXJzLCAkd29yZCk7CiAKICAgICAgICAgICAg ICAgICBteSAkY3VycmVudEZ1bmN0aW9uID0gam9pbignLicsIChAY3VycmVudFNjb3BlcywgQGN1 cnJlbnRJZGVudGlmaWVycykpOwogICAgICAgICAgICAgICAgICRjdXJyZW50RnVuY3Rpb24gPX4g cy9cLnsyLH0vXC4vZzsgIyBSZW1vdmVzIGNvbnNlY3V0aXZlIHBlcmlvZHMuCiAKKyAgICAgICAg ICAgICAgICBwdXNoKEBjdXJyZW50UGFyc2luZ01vZGUsICJmdW5jdGlvbiIpOwogICAgICAgICAg ICAgICAgIHB1c2goQGN1cnJlbnRGdW5jdGlvbk5hbWVzLCAkY3VycmVudEZ1bmN0aW9uKTsKICAg ICAgICAgICAgICAgICBwdXNoKEBjdXJyZW50RnVuY3Rpb25EZXB0aHMsICRicmFjZXNEZXB0aCk7 CiAgICAgICAgICAgICAgICAgcHVzaChAY3VycmVudEZ1bmN0aW9uU3RhcnRMaW5lcywgJC4pOwpA QCAtMTQyNiw2ICsxNTM2LDggQEAgc3ViIGdldF9mdW5jdGlvbl9saW5lX3Jhbmdlc19mb3JfamF2 YXNjcmlwdCgkJCkKICAgICAgICAgICAgICAgICBwdXNoKEBjdXJyZW50SWRlbnRpZmllcnMsICR3 b3JkKTsKICAgICAgICAgICAgIH0KIAorICAgICAgICAgICAgJGNsYXNzSnVzdFNlZW4gPSAwOwor ICAgICAgICAgICAgJHBhcmVudGhlc2lzSnVzdFNlZW4gPSAwOwogICAgICAgICAgICAgJGZ1bmN0 aW9uSnVzdFNlZW4gPSAwOwogICAgICAgICAgICAgJGdldHRlckp1c3RTZWVuID0gMDsKICAgICAg ICAgICAgICRzZXR0ZXJKdXN0U2VlbiA9IDA7CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dl YmtpdHBlcmwvcHJlcGFyZS1DaGFuZ2VMb2dfdW5pdHRlc3QvcmVzb3VyY2VzL2phdmFzY3JpcHRf dW5pdHRlc3RzLWV4cGVjdGVkLnR4dCBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cGVybC9wcmVwYXJl LUNoYW5nZUxvZ191bml0dGVzdC9yZXNvdXJjZXMvamF2YXNjcmlwdF91bml0dGVzdHMtZXhwZWN0 ZWQudHh0CmluZGV4IDM1YTMwODAuLmUwMzk3MzAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cGVybC9wcmVwYXJlLUNoYW5nZUxvZ191bml0dGVzdC9yZXNvdXJjZXMvamF2YXNjcmlw dF91bml0dGVzdHMtZXhwZWN0ZWQudHh0CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cGVybC9w cmVwYXJlLUNoYW5nZUxvZ191bml0dGVzdC9yZXNvdXJjZXMvamF2YXNjcmlwdF91bml0dGVzdHMt ZXhwZWN0ZWQudHh0CkBAIC0xMzEsNiArMTMxLDc2IEBACiAgICAgICAnMTI4JywKICAgICAgICcx NTAnLAogICAgICAgJ2Z1bmMxNicKKyAgICBdLAorICAgIFsKKyAgICAgIDE1MiwKKyAgICAgIDE1 MiwKKyAgICAgICdCYXNlQ2xhc3MnCisgICAgXSwKKyAgICBbCisgICAgICAxNTIsCisgICAgICAx NTIsCisgICAgICAnQmFzZUNsYXNzJworICAgIF0sCisgICAgWworICAgICAgMTU2LAorICAgICAg MTU4LAorICAgICAgJ0Rlcml2ZWRDbGFzcycKKyAgICBdLAorICAgIFsKKyAgICAgIDE2MSwKKyAg ICAgIDE2MiwKKyAgICAgICdEZXJpdmVkQ2xhc3Muc3RhdGljTWV0aG9kJworICAgIF0sCisgICAg WworICAgICAgMTY2LAorICAgICAgMTY4LAorICAgICAgJ0Rlcml2ZWRDbGFzcy5wcm90b3R5cGUu bWV0aG9kLm5lc3RlZEZ1bmN0aW9uSW5zaWRlTWV0aG9kJworICAgIF0sCisgICAgWworICAgICAg MTY1LAorICAgICAgMTY5LAorICAgICAgJ0Rlcml2ZWRDbGFzcy5wcm90b3R5cGUubWV0aG9kJwor ICAgIF0sCisgICAgWworICAgICAgMTcxLAorICAgICAgMTcxLAorICAgICAgJ0Rlcml2ZWRDbGFz cy5wcm90b3R5cGUuZ2V0IGdldHRlcicKKyAgICBdLAorICAgIFsKKyAgICAgIDE1NCwKKyAgICAg IDE3MiwKKyAgICAgICdEZXJpdmVkQ2xhc3MnCisgICAgXSwKKyAgICBbCisgICAgICAxNzcsCisg ICAgICAxNzgsCisgICAgICAnbmFtZXNwYWNlLk15Q2xhc3MnCisgICAgXSwKKyAgICBbCisgICAg ICAxODEsCisgICAgICAxODIsCisgICAgICAnbmFtZXNwYWNlLk15Q2xhc3Muc3RhdGljTWV0aG9k JworICAgIF0sCisgICAgWworICAgICAgMTg2LAorICAgICAgMTg4LAorICAgICAgJ25hbWVzcGFj ZS5NeUNsYXNzLnByb3RvdHlwZS5tZXRob2QubmVzdGVkRnVuY3Rpb25JbnNpZGVNZXRob2QnCisg ICAgXSwKKyAgICBbCisgICAgICAxODUsCisgICAgICAxODksCisgICAgICAnbmFtZXNwYWNlLk15 Q2xhc3MucHJvdG90eXBlLm1ldGhvZCcKKyAgICBdLAorICAgIFsKKyAgICAgIDE5MSwKKyAgICAg IDE5MSwKKyAgICAgICduYW1lc3BhY2UuTXlDbGFzcy5wcm90b3R5cGUuZ2V0IGdldHRlcicKKyAg ICBdLAorICAgIFsKKyAgICAgIDE3NSwKKyAgICAgIDE5MiwKKyAgICAgICduYW1lc3BhY2UuTXlD bGFzcycKICAgICBdCiAgIF0KIH0KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cGVy bC9wcmVwYXJlLUNoYW5nZUxvZ191bml0dGVzdC9yZXNvdXJjZXMvamF2YXNjcmlwdF91bml0dGVz dHMuanMgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHBlcmwvcHJlcGFyZS1DaGFuZ2VMb2dfdW5pdHRl c3QvcmVzb3VyY2VzL2phdmFzY3JpcHRfdW5pdHRlc3RzLmpzCmluZGV4IDkzZDFkNGMuLjUyNzgw YWYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cGVybC9wcmVwYXJlLUNoYW5nZUxv Z191bml0dGVzdC9yZXNvdXJjZXMvamF2YXNjcmlwdF91bml0dGVzdHMuanMKKysrIGIvVG9vbHMv U2NyaXB0cy93ZWJraXRwZXJsL3ByZXBhcmUtQ2hhbmdlTG9nX3VuaXR0ZXN0L3Jlc291cmNlcy9q YXZhc2NyaXB0X3VuaXR0ZXN0cy5qcwpAQCAtMTQ4LDMgKzE0OCw0NSBAQCBmdW5jdGlvbiBmdW5j MTYoKQogICAgICAgICAgICAgICAgcmV0dXJuIDEyMzsKICAgICAgICAgICAgfSk7CiB9CisKK2Ns YXNzIEJhc2VDbGFzcyB7IGNvbnN0cnVjdG9yKCkge30gfTsKKworY2xhc3MgRGVyaXZlZENsYXNz IGV4dGVuZHMgQmFzZUNsYXNzIHsKKyAgICBjb25zdHJ1Y3RvcigpCisgICAgeworICAgICAgICBz dXBlcigpOworICAgIH0KKworICAgIHN0YXRpYyBzdGF0aWNNZXRob2QoKQorICAgIHsKKyAgICB9 CisKKyAgICBtZXRob2QoYSwgYikKKyAgICB7CisgICAgICAgIGZ1bmN0aW9uIG5lc3RlZEZ1bmN0 aW9uSW5zaWRlTWV0aG9kKCkgeworICAgICAgICAgICAgLy8gLi4KKyAgICAgICAgfQorICAgIH0K KworICAgIGdldCBnZXR0ZXIoKSB7IH0KK30KKwordmFyIG5hbWVzcGFjZSA9IHt9OworbmFtZXNw YWNlLk15Q2xhc3MgPSBjbGFzcyBJZ25vcmVkTmFtZSB7CisgICAgY29uc3RydWN0b3IoKQorICAg IHsKKyAgICB9CisKKyAgICBzdGF0aWMgc3RhdGljTWV0aG9kKCkKKyAgICB7CisgICAgfQorCisg ICAgbWV0aG9kKGEsIGIpCisgICAgeworICAgICAgICBmdW5jdGlvbiBuZXN0ZWRGdW5jdGlvbklu c2lkZU1ldGhvZCgpIHsKKyAgICAgICAgICAgIC8vIC4uCisgICAgICAgIH0KKyAgICB9CisKKyAg ICBnZXQgZ2V0dGVyKCkgeyB9Cit9Cg==