107847 2013-01-24 11:30:20 -0800 Cleanup sandbox initialization a bit 2013-01-24 15:01:00 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam oldest_to_newest 815661 0 sam 2013-01-24 11:30:20 -0800 Cleanup sandbox initialization a bit 815755 1 184561 sam 2013-01-24 13:12:19 -0800 Created attachment 184561 Patch 815762 2 184561 ap 2013-01-24 13:16:51 -0800 Comment on attachment 184561 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=184561&action=review > Source/WebKit2/Shared/SandboxInitializationParameters.h:62 > + ProfileSelectionMode mode() const { return m_mode; } How about renaming the function accordingly? 815877 3 sam 2013-01-24 15:01:00 -0800 Committed r140730: <http://trac.webkit.org/changeset/140730> 184561 2013-01-24 13:12:19 -0800 2013-01-24 13:16:51 -0800 Patch bug-107847-20130124130911.patch text/plain 19401 sam SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0MDcwMCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQxIEBACisyMDEzLTAxLTI0ICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQ2xlYW51cCBzYW5kYm94IGluaXRpYWxp emF0aW9uIGEgYml0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMDc4NDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcDoKKyAgICAgICAgKFdlYktp dDo6TmV0d29ya1Byb2Nlc3M6OmluaXRpYWxpemVTYW5kYm94KToKKyAgICAgICAgKiBOZXR3b3Jr UHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5oOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL21hYy9O ZXR3b3JrUHJvY2Vzc01hYy5tbToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Byb2Nlc3M6Omlu aXRpYWxpemVTYW5kYm94KToKKyAgICAgICAgKiBQbHVnaW5Qcm9jZXNzL1BsdWdpblByb2Nlc3Mu aDoKKyAgICAgICAgKiBTaGFyZWQvQ2hpbGRQcm9jZXNzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 Q2hpbGRQcm9jZXNzOjppbml0aWFsaXplKToKKyAgICAgICAgKFdlYktpdDo6Q2hpbGRQcm9jZXNz Ojppbml0aWFsaXplU2FuZGJveCk6CisgICAgICAgICogU2hhcmVkL0NoaWxkUHJvY2Vzcy5oOgor ICAgICAgICAoQ2hpbGRQcm9jZXNzKToKKyAgICAgICAgKiBTaGFyZWQvU2FuZGJveEluaXRpYWxp emF0aW9uUGFyYW1ldGVycy5oOgorICAgICAgICAoU2FuZGJveEluaXRpYWxpemF0aW9uUGFyYW1l dGVycyk6CisgICAgICAgIChXZWJLaXQ6OlNhbmRib3hJbml0aWFsaXphdGlvblBhcmFtZXRlcnM6 Om1vZGUpOgorICAgICAgICAoV2ViS2l0OjpTYW5kYm94SW5pdGlhbGl6YXRpb25QYXJhbWV0ZXJz OjpzZXRPdmVycmlkZVNhbmRib3hQcm9maWxlUGF0aCk6CisgICAgICAgIChXZWJLaXQ6OlNhbmRi b3hJbml0aWFsaXphdGlvblBhcmFtZXRlcnM6Om92ZXJyaWRlU2FuZGJveFByb2ZpbGVQYXRoKToK KyAgICAgICAgKFdlYktpdDo6U2FuZGJveEluaXRpYWxpemF0aW9uUGFyYW1ldGVyczo6c2V0U2Fu ZGJveFByb2ZpbGUpOgorICAgICAgICAoV2ViS2l0OjpTYW5kYm94SW5pdGlhbGl6YXRpb25QYXJh bWV0ZXJzOjpzYW5kYm94UHJvZmlsZSk6CisgICAgICAgIChXZWJLaXQ6OlNhbmRib3hJbml0aWFs aXphdGlvblBhcmFtZXRlcnM6OlNhbmRib3hJbml0aWFsaXphdGlvblBhcmFtZXRlcnMpOgorICAg ICAgICAoV2ViS2l0OjpTYW5kYm94SW5pdGlhbGl6YXRpb25QYXJhbWV0ZXJzOjp+U2FuZGJveElu aXRpYWxpemF0aW9uUGFyYW1ldGVycyk6CisgICAgICAgICogU2hhcmVkL21hYy9DaGlsZFByb2Nl c3NNYWMubW06CisgICAgICAgIChXZWJLaXQ6OkNoaWxkUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFs aXplKToKKyAgICAgICAgKFdlYktpdDo6Q2hpbGRQcm9jZXNzOjppbml0aWFsaXplU2FuZGJveCk6 CisgICAgICAgICogU2hhcmVkL21hYy9TYW5kYm94SW5pdGlhbGlhdGlvblBhcmFtZXRlcnNNYWMu bW06CisgICAgICAgIChXZWJLaXQ6OlNhbmRib3hJbml0aWFsaXphdGlvblBhcmFtZXRlcnM6OlNh bmRib3hJbml0aWFsaXphdGlvblBhcmFtZXRlcnMpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2Vi UHJvY2Vzcy5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6OmluaXRpYWxpemVTYW5k Ym94KToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlByb2Nlc3MuaDoKKyAgICAgICAgKiBXZWJQ cm9jZXNzL21hYy9XZWJQcm9jZXNzTWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpDaGlsZFByb2Nl c3M6OmluaXRpYWxpemVTYW5kYm94KToKKwogMjAxMy0wMS0yNCAgQ2hyaXN0b3BoZSBEdW1leiAg PGNocmlzdG9waGUuZHVtZXpAaW50ZWwuY29tPgogCiAgICAgICAgIFtFRkxdW1dLMl0gVXNlIEMg QVBJIGluc2lkZSBld2tfZmF2aWNvbl9kYXRhYmFzZQpJbmRleDogU291cmNlL1dlYktpdDIvTmV0 d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcAkocmV2aXNpb24gMTQwNjU1KQor KysgU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0yMTYsNyArMjE2LDcgQEAgdm9pZCBOZXR3b3JrUHJvY2Vzczo6aW5pdGlh bGl6ZVByb2Nlc3NOYQogewogfQogCi12b2lkIE5ldHdvcmtQcm9jZXNzOjpwcm9jZXNzVXBkYXRl U2FuZGJveEluaXRpYWxpemF0aW9uUGFyYW1ldGVycyhjb25zdCBDaGlsZFByb2Nlc3NJbml0aWFs aXphdGlvblBhcmFtZXRlcnMmLCBTYW5kYm94SW5pdGlhbGl6YXRpb25QYXJhbWV0ZXJzJikKK3Zv aWQgTmV0d29ya1Byb2Nlc3M6OmluaXRpYWxpemVTYW5kYm94KGNvbnN0IENoaWxkUHJvY2Vzc0lu aXRpYWxpemF0aW9uUGFyYW1ldGVycyYsIFNhbmRib3hJbml0aWFsaXphdGlvblBhcmFtZXRlcnMm KQogewogfQogI2VuZGlmCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3 b3JrUHJvY2Vzcy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNz L05ldHdvcmtQcm9jZXNzLmgJKHJldmlzaW9uIDE0MDY1NSkKKysrIFNvdXJjZS9XZWJLaXQyL05l dHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmgJKHdvcmtpbmcgY29weSkKQEAgLTc4LDkgKzc4 LDkgQEAgcHJpdmF0ZToKIAogICAgIC8vIENoaWxkUHJvY2VzcwogICAgIHZpcnR1YWwgdm9pZCBp bml0aWFsaXplUHJvY2Vzc05hbWUoY29uc3QgQ2hpbGRQcm9jZXNzSW5pdGlhbGl6YXRpb25QYXJh bWV0ZXJzJikgT1ZFUlJJREU7CisgICAgdmlydHVhbCB2b2lkIGluaXRpYWxpemVTYW5kYm94KGNv bnN0IENoaWxkUHJvY2Vzc0luaXRpYWxpemF0aW9uUGFyYW1ldGVycyYsIFNhbmRib3hJbml0aWFs aXphdGlvblBhcmFtZXRlcnMmKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIHZvaWQgaW5pdGlhbGl6 ZUNvbm5lY3Rpb24oQ29yZUlQQzo6Q29ubmVjdGlvbiopIE9WRVJSSURFOwogICAgIHZpcnR1YWwg Ym9vbCBzaG91bGRUZXJtaW5hdGUoKSBPVkVSUklERTsKLSAgICB2aXJ0dWFsIHZvaWQgcHJvY2Vz c1VwZGF0ZVNhbmRib3hJbml0aWFsaXphdGlvblBhcmFtZXRlcnMoY29uc3QgQ2hpbGRQcm9jZXNz SW5pdGlhbGl6YXRpb25QYXJhbWV0ZXJzJiwgU2FuZGJveEluaXRpYWxpemF0aW9uUGFyYW1ldGVy cyYpIE9WRVJSSURFOwogCiAgICAgLy8gQ29yZUlQQzo6Q29ubmVjdGlvbjo6Q2xpZW50CiAgICAg dmlydHVhbCB2b2lkIGRpZFJlY2VpdmVNZXNzYWdlKENvcmVJUEM6OkNvbm5lY3Rpb24qLCBDb3Jl SVBDOjpNZXNzYWdlSUQsIENvcmVJUEM6Ok1lc3NhZ2VEZWNvZGVyJikgT1ZFUlJJREU7CkluZGV4 OiBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9tYWMvTmV0d29ya1Byb2Nlc3NNYWMubW0K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvbWFjL05ldHdvcmtQ cm9jZXNzTWFjLm1tCShyZXZpc2lvbiAxNDA2NTUpCisrKyBTb3VyY2UvV2ViS2l0Mi9OZXR3b3Jr UHJvY2Vzcy9tYWMvTmV0d29ya1Byb2Nlc3NNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTE3OCwx MCArMTc4LDEyIEBAIHZvaWQgTmV0d29ya1Byb2Nlc3M6OmFsbG93U3BlY2lmaWNIVFRQU0MKICAg ICBbTlNVUkxSZXF1ZXN0IHNldEFsbG93c1NwZWNpZmljSFRUUFNDZXJ0aWZpY2F0ZTooTlNBcnJh eSAqKWNlcnRpZmljYXRlSW5mby5jZXJ0aWZpY2F0ZUNoYWluKCkgZm9ySG9zdDooTlNTdHJpbmcg Kilob3N0XTsKIH0KIAotLy8gRklYTUU6IFJlbW92ZSB3aGVuIHRoZSBwcm9jZXNzIGhhcyBhIHBy b2ZpbGUuCi12b2lkIE5ldHdvcmtQcm9jZXNzOjpwcm9jZXNzVXBkYXRlU2FuZGJveEluaXRpYWxp emF0aW9uUGFyYW1ldGVycyhjb25zdCBDaGlsZFByb2Nlc3NJbml0aWFsaXphdGlvblBhcmFtZXRl cnMmLCBTYW5kYm94SW5pdGlhbGl6YXRpb25QYXJhbWV0ZXJzJiBwYXJhbWV0ZXJzKQordm9pZCBO ZXR3b3JrUHJvY2Vzczo6aW5pdGlhbGl6ZVNhbmRib3goY29uc3QgQ2hpbGRQcm9jZXNzSW5pdGlh bGl6YXRpb25QYXJhbWV0ZXJzJiBwYXJhbWV0ZXJzLCBTYW5kYm94SW5pdGlhbGl6YXRpb25QYXJh bWV0ZXJzJiBzYW5kYm94UGFyYW1ldGVycykKIHsKLSAgICBwYXJhbWV0ZXJzLnNldFNhbmRib3hQ cm9maWxlUGF0aChTdHJpbmcoKSk7CisgICAgLy8gRklYTUU6IFJlbW92ZSB3aGVuIHRoZSBwcm9j ZXNzIGhhcyBhIHByb2ZpbGUuCisgICAgc2FuZGJveFBhcmFtZXRlcnMuc2V0T3ZlcnJpZGVTYW5k Ym94UHJvZmlsZVBhdGgoU3RyaW5nKCkpOworCisgICAgQ2hpbGRQcm9jZXNzOjppbml0aWFsaXpl U2FuZGJveChwYXJhbWV0ZXJzLCBzYW5kYm94UGFyYW1ldGVycyk7CiB9CiAKIH0gLy8gbmFtZXNw YWNlIFdlYktpdApJbmRleDogU291cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9QbHVnaW5Qcm9j ZXNzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9QbHVnaW5Q cm9jZXNzLmgJKHJldmlzaW9uIDE0MDY1NSkKKysrIFNvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nl c3MvUGx1Z2luUHJvY2Vzcy5oCSh3b3JraW5nIGNvcHkpCkBAIC03Nyw3ICs3Nyw3IEBAIHByaXZh dGU6CiAgICAgdmlydHVhbCBib29sIHNob3VsZFRlcm1pbmF0ZSgpIE9WRVJSSURFOwogCiAgICAg Ly8gRklYTUU6IFBsdWdpblByb2Nlc3Mgc2hvdWxkIHN3aXRjaCB0byBjb21tb24gY29kZSBmb3Ig c2FuZGJveCBpbml0aWFsaXphdGlvbi4KLSAgICB2aXJ0dWFsIHZvaWQgaW5pdGlhbGl6ZVNhbmRi b3goY29uc3QgQ2hpbGRQcm9jZXNzSW5pdGlhbGl6YXRpb25QYXJhbWV0ZXJzJikgT1ZFUlJJREUg eyB9CisgICAgdmlydHVhbCB2b2lkIGluaXRpYWxpemVTYW5kYm94KGNvbnN0IENoaWxkUHJvY2Vz c0luaXRpYWxpemF0aW9uUGFyYW1ldGVycyYsIFNhbmRib3hJbml0aWFsaXphdGlvblBhcmFtZXRl cnMmKSBPVkVSUklERSB7IH0KIAogICAgIHZvaWQgcGxhdGZvcm1Jbml0aWFsaXplUHJvY2Vzcyhj b25zdCBDaGlsZFByb2Nlc3NJbml0aWFsaXphdGlvblBhcmFtZXRlcnMmKTsKIApJbmRleDogU291 cmNlL1dlYktpdDIvU2hhcmVkL0NoaWxkUHJvY2Vzcy5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdDIvU2hhcmVkL0NoaWxkUHJvY2Vzcy5jcHAJKHJldmlzaW9uIDE0MDY1NSkKKysrIFNv dXJjZS9XZWJLaXQyL1NoYXJlZC9DaGlsZFByb2Nlc3MuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0y Niw3ICsyNiw3IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiQ2hpbGRQcm9jZXNz LmgiCiAKLSNpbmNsdWRlICJXZWJLaXQySW5pdGlhbGl6ZS5oIgorI2luY2x1ZGUgIlNhbmRib3hJ bml0aWFsaXphdGlvblBhcmFtZXRlcnMuaCIKIAogI2lmICFPUyhXSU5ET1dTKQogI2luY2x1ZGUg PHVuaXN0ZC5oPgpAQCAtNzAsNyArNzAsOSBAQCB2b2lkIENoaWxkUHJvY2Vzczo6aW5pdGlhbGl6 ZShjb25zdCBDaGlsCiAKICAgICBpbml0aWFsaXplUHJvY2VzcyhwYXJhbWV0ZXJzKTsKICAgICBp bml0aWFsaXplUHJvY2Vzc05hbWUocGFyYW1ldGVycyk7Ci0gICAgaW5pdGlhbGl6ZVNhbmRib3go cGFyYW1ldGVycyk7CisKKyAgICBTYW5kYm94SW5pdGlhbGl6YXRpb25QYXJhbWV0ZXJzIHNhbmRi b3hQYXJhbWV0ZXJzOworICAgIGluaXRpYWxpemVTYW5kYm94KHBhcmFtZXRlcnMsIHNhbmRib3hQ YXJhbWV0ZXJzKTsKICAgICAKICAgICBtX2Nvbm5lY3Rpb24gPSBDb3JlSVBDOjpDb25uZWN0aW9u OjpjcmVhdGVDbGllbnRDb25uZWN0aW9uKHBhcmFtZXRlcnMuY29ubmVjdGlvbklkZW50aWZpZXIs IHRoaXMsIFJ1bkxvb3A6Om1haW4oKSk7CiAgICAgbV9jb25uZWN0aW9uLT5zZXREaWRDbG9zZU9u Q29ubmVjdGlvbldvcmtRdWV1ZUNhbGxiYWNrKGRpZENsb3NlT25Db25uZWN0aW9uV29ya1F1ZXVl KTsKQEAgLTg2LDE2ICs4OCw2IEBAIHZvaWQgQ2hpbGRQcm9jZXNzOjppbml0aWFsaXplUHJvY2Vz c05hbWUKIHsKIH0KIAotI2lmICFQTEFURk9STShNQUMpCi12b2lkIENoaWxkUHJvY2Vzczo6aW5p dGlhbGl6ZVNhbmRib3goY29uc3QgQ2hpbGRQcm9jZXNzSW5pdGlhbGl6YXRpb25QYXJhbWV0ZXJz JikKLXsKLX0KLSNlbmRpZgotCi12b2lkIENoaWxkUHJvY2Vzczo6cHJvY2Vzc1VwZGF0ZVNhbmRi b3hJbml0aWFsaXphdGlvblBhcmFtZXRlcnMoY29uc3QgQ2hpbGRQcm9jZXNzSW5pdGlhbGl6YXRp b25QYXJhbWV0ZXJzJiwgU2FuZGJveEluaXRpYWxpemF0aW9uUGFyYW1ldGVycyYpCi17Ci19Ci0K IHZvaWQgQ2hpbGRQcm9jZXNzOjppbml0aWFsaXplQ29ubmVjdGlvbihDb3JlSVBDOjpDb25uZWN0 aW9uKikKIHsKIH0KQEAgLTE1Niw2ICsxNDgsMTAgQEAgdm9pZCBDaGlsZFByb2Nlc3M6OnRlcm1p bmF0ZSgpCiB2b2lkIENoaWxkUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplKCkKIHsKIH0KKwor dm9pZCBDaGlsZFByb2Nlc3M6OmluaXRpYWxpemVTYW5kYm94KGNvbnN0IENoaWxkUHJvY2Vzc0lu aXRpYWxpemF0aW9uUGFyYW1ldGVycyYsIFNhbmRib3hJbml0aWFsaXphdGlvblBhcmFtZXRlcnMm KQoreworfQogI2VuZGlmCiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogU291cmNlL1dl YktpdDIvU2hhcmVkL0NoaWxkUHJvY2Vzcy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQy L1NoYXJlZC9DaGlsZFByb2Nlc3MuaAkocmV2aXNpb24gMTQwNjU1KQorKysgU291cmNlL1dlYktp dDIvU2hhcmVkL0NoaWxkUHJvY2Vzcy5oCSh3b3JraW5nIGNvcHkpCkBAIC03OSw2ICs3OSw3IEBA IHByb3RlY3RlZDoKIAogICAgIHZpcnR1YWwgdm9pZCBpbml0aWFsaXplUHJvY2Vzcyhjb25zdCBD aGlsZFByb2Nlc3NJbml0aWFsaXphdGlvblBhcmFtZXRlcnMmKTsKICAgICB2aXJ0dWFsIHZvaWQg aW5pdGlhbGl6ZVByb2Nlc3NOYW1lKGNvbnN0IENoaWxkUHJvY2Vzc0luaXRpYWxpemF0aW9uUGFy YW1ldGVycyYpOworICAgIHZpcnR1YWwgdm9pZCBpbml0aWFsaXplU2FuZGJveChjb25zdCBDaGls ZFByb2Nlc3NJbml0aWFsaXphdGlvblBhcmFtZXRlcnMmLCBTYW5kYm94SW5pdGlhbGl6YXRpb25Q YXJhbWV0ZXJzJik7CiAgICAgdmlydHVhbCB2b2lkIGluaXRpYWxpemVDb25uZWN0aW9uKENvcmVJ UEM6OkNvbm5lY3Rpb24qKTsKIAogICAgIHZpcnR1YWwgYm9vbCBzaG91bGRUZXJtaW5hdGUoKSA9 IDA7CkBAIC04OCw5ICs4OSw2IEBAIHByaXZhdGU6CiAgICAgdm9pZCB0ZXJtaW5hdGlvblRpbWVy RmlyZWQoKTsKIAogICAgIHZvaWQgcGxhdGZvcm1Jbml0aWFsaXplKCk7Ci0gICAgLy8gRklYTUU6 IFRoaXMgZnVuY3Rpb24gaXMgdmlydHVhbCBvbmx5IGJlY2F1c2UgUGx1Z2luUHJvY2VzcyBuZWVk cyB0byBieXBhc3MgaXQuIEl0IHNob3VsZCBzd2l0Y2ggdG8gY29tbW9uIGNvZGUuCi0gICAgdmly dHVhbCB2b2lkIGluaXRpYWxpemVTYW5kYm94KGNvbnN0IENoaWxkUHJvY2Vzc0luaXRpYWxpemF0 aW9uUGFyYW1ldGVycyYpOwotICAgIHZpcnR1YWwgdm9pZCBwcm9jZXNzVXBkYXRlU2FuZGJveElu aXRpYWxpemF0aW9uUGFyYW1ldGVycyhjb25zdCBDaGlsZFByb2Nlc3NJbml0aWFsaXphdGlvblBh cmFtZXRlcnMmLCBTYW5kYm94SW5pdGlhbGl6YXRpb25QYXJhbWV0ZXJzJik7CiAKICAgICAvLyBU aGUgdGltZW91dCwgaW4gc2Vjb25kcywgYmVmb3JlIHRoaXMgcHJvY2VzcyB3aWxsIGJlIHRlcm1p bmF0ZWQgaWYgdGVybWluYXRpb24KICAgICAvLyBoYXMgYmVlbiBlbmFibGVkLiBJZiB0aGUgdGlt ZW91dCBpcyAwIHNlY29uZHMsIHRoZSBwcm9jZXNzIHdpbGwgYmUgdGVybWluYXRlZCBpbW1lZGlh dGVseS4KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9TYW5kYm94SW5pdGlhbGl6YXRpb25Q YXJhbWV0ZXJzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvU2hhcmVkL1NhbmRib3hJ bml0aWFsaXphdGlvblBhcmFtZXRlcnMuaAkocmV2aXNpb24gMTQwNjU1KQorKysgU291cmNlL1dl YktpdDIvU2hhcmVkL1NhbmRib3hJbml0aWFsaXphdGlvblBhcmFtZXRlcnMuaAkod29ya2luZyBj b3B5KQpAQCAtMjksMTYgKzI5LDE5IEBACiAjaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogI2luY2x1 ZGUgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgogCisjaWYgUExBVEZPUk0oTUFDKQorT0JKQ19DTEFT UyBOU1N0cmluZzsKKyNlbmRpZgorCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAogY2xhc3MgU2FuZGJv eEluaXRpYWxpemF0aW9uUGFyYW1ldGVycyB7Ci1XVEZfTUFLRV9OT05DT1BZQUJMRShTYW5kYm94 SW5pdGlhbGl6YXRpb25QYXJhbWV0ZXJzKTsKKyAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShTYW5k Ym94SW5pdGlhbGl6YXRpb25QYXJhbWV0ZXJzKTsKIHB1YmxpYzoKLQotI2lmIFBMQVRGT1JNKE1B QykKICAgICBTYW5kYm94SW5pdGlhbGl6YXRpb25QYXJhbWV0ZXJzKCk7CiAgICAgflNhbmRib3hJ bml0aWFsaXphdGlvblBhcmFtZXRlcnMoKTsKIAorI2lmIFBMQVRGT1JNKE1BQykKICAgICAvLyBO YW1lIG11c3QgYmUgYSBsaXRlcmFsLgogICAgIHZvaWQgYWRkQ29uZkRpcmVjdG9yeVBhcmFtZXRl cihjb25zdCBjaGFyKiBuYW1lLCBpbnQgY29uZklEKTsKICAgICB2b2lkIGFkZFBhdGhQYXJhbWV0 ZXIoY29uc3QgY2hhciogbmFtZSwgTlNTdHJpbmcgKnBhdGgpOwpAQCAtNTAsMTEgKzUzLDM3IEBA IHB1YmxpYzoKICAgICBjb25zdCBjaGFyKiBuYW1lKHNpemVfdCBpbmRleCkgY29uc3Q7CiAgICAg Y29uc3QgY2hhciogdmFsdWUoc2l6ZV90IGluZGV4KSBjb25zdDsKIAotICAgIHZvaWQgc2V0U2Fu ZGJveFByb2ZpbGVQYXRoKGNvbnN0IFN0cmluZyYgcGF0aCkgeyBtX3NhbmRib3hQcm9maWxlUGF0 aCA9IHBhdGg7IG1fc2FuZGJveFByb2ZpbGUgPSBTdHJpbmcoKTsgfQotICAgIGNvbnN0IFN0cmlu ZyYgc2FuZGJveFByb2ZpbGVQYXRoKCkgY29uc3QgeyByZXR1cm4gbV9zYW5kYm94UHJvZmlsZVBh dGg7IH0KLQotICAgIHZvaWQgc2V0U2FuZGJveFByb2ZpbGUoY29uc3QgU3RyaW5nJiBwcm9maWxl KSB7IG1fc2FuZGJveFByb2ZpbGVQYXRoID0gU3RyaW5nKCk7IG1fc2FuZGJveFByb2ZpbGUgPSBw cm9maWxlOyB9Ci0gICAgY29uc3QgU3RyaW5nJiBzYW5kYm94UHJvZmlsZSgpIGNvbnN0IHsgcmV0 dXJuIG1fc2FuZGJveFByb2ZpbGU7IH0KKyAgICBlbnVtIFByb2ZpbGVTZWxlY3Rpb25Nb2RlIHsK KyAgICAgICAgVXNlRGVmYXVsdFNhbmRib3hQcm9maWxlUGF0aCwKKyAgICAgICAgVXNlT3ZlcnJp ZGVTYW5kYm94UHJvZmlsZVBhdGgsCisgICAgICAgIFVzZVNhbmRib3hQcm9maWxlCisgICAgfTsK KworICAgIFByb2ZpbGVTZWxlY3Rpb25Nb2RlIG1vZGUoKSBjb25zdCB7IHJldHVybiBtX21vZGU7 IH0KKworICAgIHZvaWQgc2V0T3ZlcnJpZGVTYW5kYm94UHJvZmlsZVBhdGgoY29uc3QgU3RyaW5n JiBwYXRoKQorICAgIHsKKyAgICAgICAgbV9tb2RlID0gVXNlT3ZlcnJpZGVTYW5kYm94UHJvZmls ZVBhdGg7CisgICAgICAgIG1fb3ZlcnJpZGVTYW5kYm94UHJvZmlsZVBhdGhPclNhbmRib3hQcm9m aWxlID0gcGF0aDsKKyAgICB9CisKKyAgICBjb25zdCBTdHJpbmcmIG92ZXJyaWRlU2FuZGJveFBy b2ZpbGVQYXRoKCkgY29uc3QKKyAgICB7CisgICAgICAgIEFTU0VSVChtX21vZGUgPT0gVXNlT3Zl cnJpZGVTYW5kYm94UHJvZmlsZVBhdGgpOworICAgICAgICByZXR1cm4gbV9vdmVycmlkZVNhbmRi b3hQcm9maWxlUGF0aE9yU2FuZGJveFByb2ZpbGU7CisgICAgfQorCisgICAgdm9pZCBzZXRTYW5k Ym94UHJvZmlsZShjb25zdCBTdHJpbmcmIHByb2ZpbGUpCisgICAgeworICAgICAgICBtX21vZGUg PSBVc2VTYW5kYm94UHJvZmlsZTsKKyAgICAgICAgbV9vdmVycmlkZVNhbmRib3hQcm9maWxlUGF0 aE9yU2FuZGJveFByb2ZpbGUgPSBwcm9maWxlOworICAgIH0KKworICAgIGNvbnN0IFN0cmluZyYg c2FuZGJveFByb2ZpbGUoKSBjb25zdAorICAgIHsKKyAgICAgICAgQVNTRVJUKG1fbW9kZSA9PSBV c2VTYW5kYm94UHJvZmlsZSk7CisgICAgICAgIHJldHVybiBtX292ZXJyaWRlU2FuZGJveFByb2Zp bGVQYXRoT3JTYW5kYm94UHJvZmlsZTsKKyAgICB9CiAKICAgICB2b2lkIHNldFN5c3RlbURpcmVj dG9yeVN1ZmZpeChjb25zdCBTdHJpbmcmIHN1ZmZpeCkgeyBtX3N5c3RlbURpcmVjdG9yeVN1ZmZp eCA9IHN1ZmZpeDsgfQogICAgIGNvbnN0IFN0cmluZyYgc3lzdGVtRGlyZWN0b3J5U3VmZml4KCkg Y29uc3QgeyByZXR1cm4gbV9zeXN0ZW1EaXJlY3RvcnlTdWZmaXg7IH0KQEAgLTY3LDExICs5Niwy MSBAQCBwcml2YXRlOgogICAgIG11dGFibGUgVmVjdG9yPGNvbnN0IGNoYXIqPiBtX25hbWVkUGFy YW1ldGVyczsKICAgICBTdHJpbmcgbV9zeXN0ZW1EaXJlY3RvcnlTdWZmaXg7CiAKLSAgICBTdHJp bmcgbV9zYW5kYm94UHJvZmlsZVBhdGg7Ci0gICAgU3RyaW5nIG1fc2FuZGJveFByb2ZpbGU7Cisg ICAgUHJvZmlsZVNlbGVjdGlvbk1vZGUgbV9tb2RlOworICAgIFN0cmluZyBtX292ZXJyaWRlU2Fu ZGJveFByb2ZpbGVQYXRoT3JTYW5kYm94UHJvZmlsZTsKICNlbmRpZgogfTsKIAorI2lmICFQTEFU Rk9STShNQUMpCitTYW5kYm94SW5pdGlhbGl6YXRpb25QYXJhbWV0ZXJzOjpTYW5kYm94SW5pdGlh bGl6YXRpb25QYXJhbWV0ZXJzKCkKK3sKK30KKworU2FuZGJveEluaXRpYWxpemF0aW9uUGFyYW1l dGVyczo6flNhbmRib3hJbml0aWFsaXphdGlvblBhcmFtZXRlcnMoKQorewogfQorI2VuZGlmCisK K30gLy8gbmFtZXNwYWNlIFdlYktpdAogCiAjZW5kaWYgLy8gU2FuZGJveEluaXRpYWxpemF0aW9u UGFyYW1ldGVyc19oCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL0NoaWxkUHJvY2Vz c01hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL0NoaWxkUHJv Y2Vzc01hYy5tbQkocmV2aXNpb24gMTQwNjU1KQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL21h Yy9DaGlsZFByb2Nlc3NNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTc2LDE4ICs3NiwxNCBAQCB2 b2lkIENoaWxkUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplKCkKICNlbmRpZgogICAgIC8vIFN0 YXJ0aW5nIGFzIHVub2NjbHVkZWQuICBUaGUgcHJveHkgZm9yIHRoaXMgcHJvY2VzcyB3aWxsIHNl dCB0aGUgYWN0dWFsIHZhbHVlIGZyb20gZGlkRmluaXNoTGF1bmNoaW5nKCkuCiAgICAgc2V0QXBw bGljYXRpb25Jc09jY2x1ZGVkKGZhbHNlKTsKLX0KIAotdm9pZCBDaGlsZFByb2Nlc3M6OmluaXRp YWxpemVTYW5kYm94KGNvbnN0IENoaWxkUHJvY2Vzc0luaXRpYWxpemF0aW9uUGFyYW1ldGVycyYg cGFyYW1ldGVycykKLXsKICAgICBbW05TRmlsZU1hbmFnZXIgZGVmYXVsdE1hbmFnZXJdIGNoYW5n ZUN1cnJlbnREaXJlY3RvcnlQYXRoOltbTlNCdW5kbGUgbWFpbkJ1bmRsZV0gYnVuZGxlUGF0aF1d OworfQogCi0gICAgU2FuZGJveEluaXRpYWxpemF0aW9uUGFyYW1ldGVycyBzYW5kYm94UGFyYW1l dGVyczsKLQordm9pZCBDaGlsZFByb2Nlc3M6OmluaXRpYWxpemVTYW5kYm94KGNvbnN0IENoaWxk UHJvY2Vzc0luaXRpYWxpemF0aW9uUGFyYW1ldGVycyYgcGFyYW1ldGVycywgU2FuZGJveEluaXRp YWxpemF0aW9uUGFyYW1ldGVycyYgc2FuZGJveFBhcmFtZXRlcnMpCit7CiAgICAgTlNCdW5kbGUg KndlYmtpdDJCdW5kbGUgPSBbTlNCdW5kbGUgYnVuZGxlRm9yQ2xhc3M6TlNDbGFzc0Zyb21TdHJp bmcoQCJXS1ZpZXciKV07Ci0gICAgTlNTdHJpbmcgKmRlZmF1bHRQcm9maWxlUGF0aCA9IFt3ZWJr aXQyQnVuZGxlIHBhdGhGb3JSZXNvdXJjZTpbW05TQnVuZGxlIG1haW5CdW5kbGVdIGJ1bmRsZUlk ZW50aWZpZXJdIG9mVHlwZTpAInNiIl07Ci0KLSAgICBzYW5kYm94UGFyYW1ldGVycy5zZXRTYW5k Ym94UHJvZmlsZVBhdGgoZGVmYXVsdFByb2ZpbGVQYXRoKTsKKyAgICBTdHJpbmcgZGVmYXVsdFBy b2ZpbGVQYXRoID0gW3dlYmtpdDJCdW5kbGUgcGF0aEZvclJlc291cmNlOltbTlNCdW5kbGUgbWFp bkJ1bmRsZV0gYnVuZGxlSWRlbnRpZmllcl0gb2ZUeXBlOkAic2IiXTsKIAogICAgIFN0cmluZyBk ZWZhdWx0U3lzdGVtRGlyZWN0b3J5U3VmZml4ID0gW1tOU0J1bmRsZSBtYWluQnVuZGxlXSBidW5k bGVJZGVudGlmaWVyXSArIHBhcmFtZXRlcnMuY2xpZW50SWRlbnRpZmllcjsKICAgICBzYW5kYm94 UGFyYW1ldGVycy5zZXRTeXN0ZW1EaXJlY3RvcnlTdWZmaXgoZGVmYXVsdFN5c3RlbURpcmVjdG9y eVN1ZmZpeCk7CkBAIC0xMDcsOCArMTAzLDYgQEAgdm9pZCBDaGlsZFByb2Nlc3M6OmluaXRpYWxp emVTYW5kYm94KGNvbgogCiAgICAgc2FuZGJveFBhcmFtZXRlcnMuYWRkUGF0aFBhcmFtZXRlcigi SE9NRV9ESVIiLCBwd2QucHdfZGlyKTsKIAotICAgIHByb2Nlc3NVcGRhdGVTYW5kYm94SW5pdGlh bGl6YXRpb25QYXJhbWV0ZXJzKHBhcmFtZXRlcnMsIHNhbmRib3hQYXJhbWV0ZXJzKTsKLQogI2lm IF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTA4MAogICAgIC8vIFVzZSBwcml2 YXRlIHRlbXBvcmFyeSBhbmQgY2FjaGUgZGlyZWN0b3JpZXMuCiAgICAgc2V0ZW52KCJESVJIRUxQ RVJfVVNFUl9ESVJfU1VGRklYIiwgZmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKHNhbmRib3hQYXJh bWV0ZXJzLnN5c3RlbURpcmVjdG9yeVN1ZmZpeCgpKS5kYXRhKCksIDApOwpAQCAtMTIwLDggKzEx NCwxMSBAQCB2b2lkIENoaWxkUHJvY2Vzczo6aW5pdGlhbGl6ZVNhbmRib3goY29uCiAgICAgc2V0 ZW52KCJUTVBESVIiLCB0ZW1wb3JhcnlEaXJlY3RvcnksIDEpOwogI2VuZGlmCiAKLSAgICBpZiAo IXNhbmRib3hQYXJhbWV0ZXJzLnNhbmRib3hQcm9maWxlUGF0aCgpLmlzRW1wdHkoKSkgewotICAg ICAgICBDU3RyaW5nIHByb2ZpbGVQYXRoID0gZmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKHNhbmRi b3hQYXJhbWV0ZXJzLnNhbmRib3hQcm9maWxlUGF0aCgpKTsKKyAgICBzd2l0Y2ggKHNhbmRib3hQ YXJhbWV0ZXJzLm1vZGUoKSkgeworICAgIGNhc2UgU2FuZGJveEluaXRpYWxpemF0aW9uUGFyYW1l dGVyczo6VXNlRGVmYXVsdFNhbmRib3hQcm9maWxlUGF0aDoKKyAgICBjYXNlIFNhbmRib3hJbml0 aWFsaXphdGlvblBhcmFtZXRlcnM6OlVzZU92ZXJyaWRlU2FuZGJveFByb2ZpbGVQYXRoOiB7Cisg ICAgICAgIFN0cmluZyBzYW5kYm94UHJvZmlsZVBhdGggPSBzYW5kYm94UGFyYW1ldGVycy5tb2Rl KCkgPT0gU2FuZGJveEluaXRpYWxpemF0aW9uUGFyYW1ldGVyczo6VXNlRGVmYXVsdFNhbmRib3hQ cm9maWxlUGF0aCA/IGRlZmF1bHRQcm9maWxlUGF0aCA6IHNhbmRib3hQYXJhbWV0ZXJzLm92ZXJy aWRlU2FuZGJveFByb2ZpbGVQYXRoKCk7CisgICAgICAgIENTdHJpbmcgcHJvZmlsZVBhdGggPSBm aWxlU3lzdGVtUmVwcmVzZW50YXRpb24oc2FuZGJveFByb2ZpbGVQYXRoKTsKICAgICAgICAgY2hh ciogZXJyb3JCdWY7CiAgICAgICAgIGlmIChzYW5kYm94X2luaXRfd2l0aF9wYXJhbWV0ZXJzKHBy b2ZpbGVQYXRoLmRhdGEoKSwgU0FOREJPWF9OQU1FRF9FWFRFUk5BTCwgc2FuZGJveFBhcmFtZXRl cnMubmFtZWRQYXJhbWV0ZXJBcnJheSgpLCAmZXJyb3JCdWYpKSB7CiAgICAgICAgICAgICBXVEZM b2dBbHdheXMoIiVzOiBDb3VsZG4ndCBpbml0aWFsaXplIHNhbmRib3ggcHJvZmlsZSBbJXNdLCBl cnJvciAnJXMnXG4iLCBnZXRwcm9nbmFtZSgpLCBwcm9maWxlUGF0aC5kYXRhKCksIGVycm9yQnVm KTsKQEAgLTEyOSw3ICsxMjYsMTAgQEAgdm9pZCBDaGlsZFByb2Nlc3M6OmluaXRpYWxpemVTYW5k Ym94KGNvbgogICAgICAgICAgICAgICAgIFdURkxvZ0Fsd2F5cygiJXM9JXNcbiIsIHNhbmRib3hQ YXJhbWV0ZXJzLm5hbWUoaSksIHNhbmRib3hQYXJhbWV0ZXJzLnZhbHVlKGkpKTsKICAgICAgICAg ICAgIGV4aXQoRVhfTk9QRVJNKTsKICAgICAgICAgfQotICAgIH0gZWxzZSBpZiAoIXNhbmRib3hQ YXJhbWV0ZXJzLnNhbmRib3hQcm9maWxlKCkuaXNFbXB0eSgpKSB7CisKKyAgICAgICAgYnJlYWs7 CisgICAgfQorICAgIGNhc2UgU2FuZGJveEluaXRpYWxpemF0aW9uUGFyYW1ldGVyczo6VXNlU2Fu ZGJveFByb2ZpbGU6IHsKICAgICAgICAgY2hhciogZXJyb3JCdWY7CiAgICAgICAgIGlmIChzYW5k Ym94X2luaXRfd2l0aF9wYXJhbWV0ZXJzKHNhbmRib3hQYXJhbWV0ZXJzLnNhbmRib3hQcm9maWxl KCkudXRmOCgpLmRhdGEoKSwgMCwgc2FuZGJveFBhcmFtZXRlcnMubmFtZWRQYXJhbWV0ZXJBcnJh eSgpLCAmZXJyb3JCdWYpKSB7CiAgICAgICAgICAgICBXVEZMb2dBbHdheXMoIiVzOiBDb3VsZG4n dCBpbml0aWFsaXplIHNhbmRib3ggcHJvZmlsZSwgZXJyb3IgJyVzJ1xuIiwgZ2V0cHJvZ25hbWUo KSwgZXJyb3JCdWYpOwpAQCAtMTM3LDYgKzEzNyw5IEBAIHZvaWQgQ2hpbGRQcm9jZXNzOjppbml0 aWFsaXplU2FuZGJveChjb24KICAgICAgICAgICAgICAgICBXVEZMb2dBbHdheXMoIiVzPSVzXG4i LCBzYW5kYm94UGFyYW1ldGVycy5uYW1lKGkpLCBzYW5kYm94UGFyYW1ldGVycy52YWx1ZShpKSk7 CiAgICAgICAgICAgICBleGl0KEVYX05PUEVSTSk7CiAgICAgICAgIH0KKworICAgICAgICBicmVh azsKKyAgICB9CiAgICAgfQogCiAgICAgLy8gVGhpcyB3aWxsIG92ZXJyaWRlIExTRmlsZVF1YXJh bnRpbmVFbmFibGVkIGZyb20gSW5mby5wbGlzdCB1bmxlc3Mgc2FuZGJveCBxdWFyYW50aW5lIGlz IGdsb2JhbGx5IGRpc2FibGVkLgpJbmRleDogU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9TYW5k Ym94SW5pdGlhbGlhdGlvblBhcmFtZXRlcnNNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdDIvU2hhcmVkL21hYy9TYW5kYm94SW5pdGlhbGlhdGlvblBhcmFtZXRlcnNNYWMubW0JKHJl dmlzaW9uIDE0MDY1NSkKKysrIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvU2FuZGJveEluaXRp YWxpYXRpb25QYXJhbWV0ZXJzTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yOSw2ICsyOSw3IEBA CiBuYW1lc3BhY2UgV2ViS2l0IHsKIAogU2FuZGJveEluaXRpYWxpemF0aW9uUGFyYW1ldGVyczo6 U2FuZGJveEluaXRpYWxpemF0aW9uUGFyYW1ldGVycygpCisgICAgOiBtX21vZGUoVXNlRGVmYXVs dFNhbmRib3hQcm9maWxlUGF0aCkKIHsKIH0KIApAQCAtOTMsNCArOTQsNCBAQCBjb25zdCBjaGFy KiBTYW5kYm94SW5pdGlhbGl6YXRpb25QYXJhbWV0CiAgICAgcmV0dXJuIG1fbmFtZWRQYXJhbWV0 ZXJzW2luZGV4ICogMiArIDFdOwogfQogCi19Cit9IC8vIG5hbWVzcGFjZSBXZWJLaXQKSW5kZXg6 IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcAkocmV2aXNpb24gMTQwNjU1 KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMTA3OSw3ICsxMDc5LDcgQEAgdm9pZCBXZWJQcm9jZXNzOjppbml0aWFsaXplUHJv Y2Vzc05hbWUoYwogewogfQogCi12b2lkIFdlYlByb2Nlc3M6OnByb2Nlc3NVcGRhdGVTYW5kYm94 SW5pdGlhbGl6YXRpb25QYXJhbWV0ZXJzKGNvbnN0IENoaWxkUHJvY2Vzc0luaXRpYWxpemF0aW9u UGFyYW1ldGVycyYsIFNhbmRib3hJbml0aWFsaXphdGlvblBhcmFtZXRlcnMmKQordm9pZCBXZWJQ cm9jZXNzOjppbml0aWFsaXplU2FuZGJveChjb25zdCBDaGlsZFByb2Nlc3NJbml0aWFsaXphdGlv blBhcmFtZXRlcnMmLCBTYW5kYm94SW5pdGlhbGl6YXRpb25QYXJhbWV0ZXJzJikKIHsKIH0KIApJ bmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmgJKHJldmlzaW9uIDE0MDY1 NSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5oCSh3b3JraW5nIGNv cHkpCkBAIC0yMDYsNiArMjA2LDcgQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgaW5pdGlhbGl6ZVdl YlByb2Nlc3MoY29uc3QgV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycyYsIENvcmVJUEM6Ok1l c3NhZ2VEZWNvZGVyJik7CiAgICAgdm9pZCBwbGF0Zm9ybUluaXRpYWxpemVXZWJQcm9jZXNzKGNv bnN0IFdlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMmLCBDb3JlSVBDOjpNZXNzYWdlRGVjb2Rl ciYpOworCiAgICAgdm9pZCBwbGF0Zm9ybVRlcm1pbmF0ZSgpOwogICAgIHZvaWQgcmVnaXN0ZXJV UkxTY2hlbWVBc0VtcHR5RG9jdW1lbnQoY29uc3QgU3RyaW5nJik7CiAgICAgdm9pZCByZWdpc3Rl clVSTFNjaGVtZUFzU2VjdXJlKGNvbnN0IFN0cmluZyYpIGNvbnN0OwpAQCAtMjY2LDEwICsyNjcs MTAgQEAgcHJpdmF0ZToKICAgICAvLyBDaGlsZFByb2Nlc3MKICAgICB2aXJ0dWFsIHZvaWQgaW5p dGlhbGl6ZVByb2Nlc3MoY29uc3QgQ2hpbGRQcm9jZXNzSW5pdGlhbGl6YXRpb25QYXJhbWV0ZXJz JikgT1ZFUlJJREU7CiAgICAgdmlydHVhbCB2b2lkIGluaXRpYWxpemVQcm9jZXNzTmFtZShjb25z dCBDaGlsZFByb2Nlc3NJbml0aWFsaXphdGlvblBhcmFtZXRlcnMmKSBPVkVSUklERTsKKyAgICB2 aXJ0dWFsIHZvaWQgaW5pdGlhbGl6ZVNhbmRib3goY29uc3QgQ2hpbGRQcm9jZXNzSW5pdGlhbGl6 YXRpb25QYXJhbWV0ZXJzJiwgU2FuZGJveEluaXRpYWxpemF0aW9uUGFyYW1ldGVycyYpIE9WRVJS SURFOwogICAgIHZpcnR1YWwgdm9pZCBpbml0aWFsaXplQ29ubmVjdGlvbihDb3JlSVBDOjpDb25u ZWN0aW9uKikgT1ZFUlJJREU7CiAgICAgdmlydHVhbCBib29sIHNob3VsZFRlcm1pbmF0ZSgpIE9W RVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCB0ZXJtaW5hdGUoKSBPVkVSUklERTsKLSAgICB2aXJ0 dWFsIHZvaWQgcHJvY2Vzc1VwZGF0ZVNhbmRib3hJbml0aWFsaXphdGlvblBhcmFtZXRlcnMoY29u c3QgQ2hpbGRQcm9jZXNzSW5pdGlhbGl6YXRpb25QYXJhbWV0ZXJzJiwgU2FuZGJveEluaXRpYWxp emF0aW9uUGFyYW1ldGVycyYpIE9WRVJSSURFOwogCiAgICAgdm9pZCBwbGF0Zm9ybUluaXRpYWxp emVQcm9jZXNzKGNvbnN0IENoaWxkUHJvY2Vzc0luaXRpYWxpemF0aW9uUGFyYW1ldGVycyYpOwog CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL21hYy9XZWJQcm9jZXNzTWFjLm1tCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvbWFjL1dlYlByb2Nlc3NNYWMu bW0JKHJldmlzaW9uIDE0MDY1NSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvbWFjL1dl YlByb2Nlc3NNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTE0Niw3ICsxNDYsNyBAQCBzdGF0aWMg aWQgTlNBcHBsaWNhdGlvbkFjY2Vzc2liaWxpdHlGb2N1CiAKICAgICByZXR1cm4gW3BhZ2UtPmFj Y2Vzc2liaWxpdHlSZW1vdGVPYmplY3QoKSBhY2Nlc3NpYmlsaXR5Rm9jdXNlZFVJRWxlbWVudF07 CiB9Ci0gICAgCisKIHZvaWQgV2ViUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHJvY2Vz cyhjb25zdCBXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzJiBwYXJhbWV0ZXJzLCBDb3JlSVBD OjpNZXNzYWdlRGVjb2RlciYpCiB7CiAgICAgU2FuZGJveEV4dGVuc2lvbjo6Y29uc3VtZVBlcm1h bmVudGx5KHBhcmFtZXRlcnMudWlQcm9jZXNzQnVuZGxlUmVzb3VyY2VQYXRoRXh0ZW5zaW9uSGFu ZGxlKTsKQEAgLTIwMywxMSArMjAzLDEzIEBAIHZvaWQgV2ViUHJvY2Vzczo6cGxhdGZvcm1UZXJt aW5hdGUoKQogICAgIH0KIH0KIAotdm9pZCBXZWJQcm9jZXNzOjpwcm9jZXNzVXBkYXRlU2FuZGJv eEluaXRpYWxpemF0aW9uUGFyYW1ldGVycyhjb25zdCBDaGlsZFByb2Nlc3NJbml0aWFsaXphdGlv blBhcmFtZXRlcnMmLCBTYW5kYm94SW5pdGlhbGl6YXRpb25QYXJhbWV0ZXJzJiBwYXJhbWV0ZXJz KQordm9pZCBXZWJQcm9jZXNzOjppbml0aWFsaXplU2FuZGJveChjb25zdCBDaGlsZFByb2Nlc3NJ bml0aWFsaXphdGlvblBhcmFtZXRlcnMmIHBhcmFtZXRlcnMsIFNhbmRib3hJbml0aWFsaXphdGlv blBhcmFtZXRlcnMmIHNhbmRib3hQYXJhbWV0ZXJzKQogewogICAgIC8vIE5lZWQgdG8gb3Zlcmlk ZSB0aGUgZGVmYXVsdCwgYmVjYXVzZSBzZXJ2aWNlIGhhcyBhIGRpZmZlcmVudCBidW5kbGUgSUQu CiAgICAgTlNCdW5kbGUgKndlYmtpdDJCdW5kbGUgPSBbTlNCdW5kbGUgYnVuZGxlRm9yQ2xhc3M6 TlNDbGFzc0Zyb21TdHJpbmcoQCJXS1ZpZXciKV07Ci0gICAgcGFyYW1ldGVycy5zZXRTYW5kYm94 UHJvZmlsZVBhdGgoW3dlYmtpdDJCdW5kbGUgcGF0aEZvclJlc291cmNlOkAiY29tLmFwcGxlLldl YlByb2Nlc3MiIG9mVHlwZTpAInNiIl0pOworICAgIHNhbmRib3hQYXJhbWV0ZXJzLnNldE92ZXJy aWRlU2FuZGJveFByb2ZpbGVQYXRoKFt3ZWJraXQyQnVuZGxlIHBhdGhGb3JSZXNvdXJjZTpAImNv bS5hcHBsZS5XZWJQcm9jZXNzIiBvZlR5cGU6QCJzYiJdKTsKKworICAgIENoaWxkUHJvY2Vzczo6 aW5pdGlhbGl6ZVNhbmRib3gocGFyYW1ldGVycywgc2FuZGJveFBhcmFtZXRlcnMpOwogfQogCiB9 IC8vIG5hbWVzcGFjZSBXZWJLaXQK