186915 2018-06-22 05:21:52 -0700 [GTK] WebDriver: use a dictionary for session capabilities in StartAutomationSession message 2018-06-25 02:24:33 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned bugs-noreply calvaris ews-watchlist joepeck keith_miller mark.lam msaboff saam zan oldest_to_newest 1435401 0 cgarcia 2018-06-22 05:21:52 -0700 Instead of growing the message signature every we add a new capability, use a dictionary a{sv} and simply add new entries when new capabilities are added. This way we won't need to change the message signature anymore. This broke the test webkit/WebKitAutomationSession/request-session because we changed the signature twice but we didn't update the test. 1435402 1 343320 cgarcia 2018-06-22 05:28:16 -0700 Created attachment 343320 Patch 1435403 2 ews-watchlist 2018-06-22 05:31:11 -0700 Attachment 343320 did not pass style-queue: ERROR: Source/WebDriver/glib/SessionHostGlib.cpp:287: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 1 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 1435417 3 cgarcia 2018-06-22 06:24:04 -0700 Committed r233077: <https://trac.webkit.org/changeset/233077> 343320 2018-06-22 05:28:16 -0700 2018-06-22 06:12:46 -0700 Patch wd-session-capabilities.diff text/plain 10889 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IGQyN2NjNjk3NGZlLi5lN2U2ZWYzYzZkNiAxMDA2 NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTgtMDYtMjIgIENhcmxv cyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIFdl YkRyaXZlcjogdXNlIGEgZGljdGlvbmFyeSBmb3Igc2Vzc2lvbiBjYXBhYmlsaXRpZXMgaW4gU3Rh cnRBdXRvbWF0aW9uU2Vzc2lvbiBtZXNzYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xODY5MTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBVcGRhdGUgU3RhcnRBdXRvbWF0aW9uU2Vzc2lvbiBtZXNzYWdl IGhhbmRsaW5nIHRvIHJlY2VpdmUgYSBkaWN0aW9uYXJ5IG9mIHNlc3Npb24gY2FwYWJpbGl0aWVz LgorCisgICAgICAgICogaW5zcGVjdG9yL3JlbW90ZS9nbGliL1JlbW90ZUluc3BlY3RvclNlcnZl ci5jcHA6CisgICAgICAgIChJbnNwZWN0b3I6OnByb2Nlc3NTZXNzaW9uQ2FwYWJpbGl0aWVzKTog SGVscGVyIG1ldGhvZCB0byBwcm9jZXNzIHRoZSBzZXNzaW9uIGNhcGFiaWxpdGllcy4KKwogMjAx OC0wNi0yMSAgTWFyayBMYW0gIDxtYXJrLmxhbUBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViS2l0 IChKYXZhU2NyaXB0Q29yZSkgY29tcGlsYXRpb24gZXJyb3Igd2l0aCBDbGFuZyDiiaUgNi4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL2dsaWIvUmVt b3RlSW5zcGVjdG9yU2VydmVyLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3Iv cmVtb3RlL2dsaWIvUmVtb3RlSW5zcGVjdG9yU2VydmVyLmNwcAppbmRleCA0ZGYzZDBjMzIzZi4u ZGMwOWM3MmJiY2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3Iv cmVtb3RlL2dsaWIvUmVtb3RlSW5zcGVjdG9yU2VydmVyLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvaW5zcGVjdG9yL3JlbW90ZS9nbGliL1JlbW90ZUluc3BlY3RvclNlcnZlci5jcHAK QEAgLTc5LDggKzc5LDcgQEAgc3RhdGljIGNvbnN0IGNoYXIgaW50cm9zcGVjdGlvblhNTFtdID0K ICAgICAiICAgIDwvbWV0aG9kPiIKICAgICAiICAgIDxtZXRob2QgbmFtZT0nU3RhcnRBdXRvbWF0 aW9uU2Vzc2lvbic+IgogICAgICIgICAgICA8YXJnIHR5cGU9J3MnIG5hbWU9J3Nlc3Npb25JRCcg ZGlyZWN0aW9uPSdpbicvPiIKLSAgICAiICAgICAgPGFyZyB0eXBlPSdiJyBuYW1lPSdhY2NlcHRJ bnNlY3VyZUNlcnRpZmljYXRlcycgZGlyZWN0aW9uPSdpbicvPiIKLSAgICAiICAgICAgPGFyZyB0 eXBlPSdhKHNzKScgbmFtZT0nY2VydGlmaWNhdGVzJyBkaXJlY3Rpb249J2luJy8+IgorICAgICIg ICAgICA8YXJnIHR5cGU9J2F7c3Z9JyBuYW1lPSdjYXBhYmlsaXRpZXMnIGRpcmVjdGlvbj0naW4n Lz4iCiAgICAgIiAgICAgIDxhcmcgdHlwZT0ncycgbmFtZT0nYnJvd3Nlck5hbWUnIGRpcmVjdGlv bj0nb3V0Jy8+IgogICAgICIgICAgICA8YXJnIHR5cGU9J3MnIG5hbWU9J2Jyb3dzZXJWZXJzaW9u JyBkaXJlY3Rpb249J291dCcvPiIKICAgICAiICAgIDwvbWV0aG9kPiIKQEAgLTg4LDYgKzg3LDI2 IEBAIHN0YXRpYyBjb25zdCBjaGFyIGludHJvc3BlY3Rpb25YTUxbXSA9CiAgICAgIjwvbm9kZT4i OwogfQogCitzdGF0aWMgUmVtb3RlSW5zcGVjdG9yOjpDbGllbnQ6OlNlc3Npb25DYXBhYmlsaXRp ZXMgcHJvY2Vzc1Nlc3Npb25DYXBhYmlsaXRpZXMoR1ZhcmlhbnQqIHNlc3Npb25DYXBhYmlsaXRp ZXMpCit7CisgICAgUmVtb3RlSW5zcGVjdG9yOjpDbGllbnQ6OlNlc3Npb25DYXBhYmlsaXRpZXMg Y2FwYWJpbGl0aWVzOworCisgICAgZ2Jvb2xlYW4gYWNjZXB0SW5zZWN1cmVDZXJ0czsKKyAgICBp ZiAoZ192YXJpYW50X2xvb2t1cChzZXNzaW9uQ2FwYWJpbGl0aWVzLCAiYWNjZXB0SW5zZWN1cmVD ZXJ0cyIsICJiIiwgJmFjY2VwdEluc2VjdXJlQ2VydHMpKQorICAgICAgICBjYXBhYmlsaXRpZXMu YWNjZXB0SW5zZWN1cmVDZXJ0aWZpY2F0ZXMgPSBhY2NlcHRJbnNlY3VyZUNlcnRzOworCisgICAg aWYgKEdSZWZQdHI8R1ZhcmlhbnQ+IGNlcnRpZmljYXRlcyA9IGdfdmFyaWFudF9sb29rdXBfdmFs dWUoc2Vzc2lvbkNhcGFiaWxpdGllcywgImNlcnRpZmljYXRlcyIsICBHX1ZBUklBTlRfVFlQRSgi YShzcykiKSkpIHsKKyAgICAgICAgR1ZhcmlhbnRJdGVyIGl0ZXI7CisgICAgICAgIGF1dG8gY2hp bGRDb3VudCA9IGdfdmFyaWFudF9pdGVyX2luaXQoJml0ZXIsIGNlcnRpZmljYXRlcy5nZXQoKSk7 CisgICAgICAgIGNhcGFiaWxpdGllcy5jZXJ0aWZpY2F0ZXMucmVzZXJ2ZUNhcGFjaXR5KGNoaWxk Q291bnQpOworICAgICAgICBjb25zdCBjaGFyKiBob3N0OworICAgICAgICBjb25zdCBjaGFyKiBj ZXJ0aWZpY2F0ZUZpbGU7CisgICAgICAgIHdoaWxlIChnX3ZhcmlhbnRfaXRlcl9sb29wKCZpdGVy LCAiKCZzJnMpIiwgJmhvc3QsICZjZXJ0aWZpY2F0ZUZpbGUpKQorICAgICAgICAgICAgY2FwYWJp bGl0aWVzLmNlcnRpZmljYXRlcy51bmNoZWNrZWRBcHBlbmQoeyBTdHJpbmc6OmZyb21VVEY4KGhv c3QpLCBTdHJpbmc6OmZyb21VVEY4KGNlcnRpZmljYXRlRmlsZSkgfSk7CisgICAgfQorCisgICAg cmV0dXJuIGNhcGFiaWxpdGllczsKK30KIGNvbnN0IEdEQnVzSW50ZXJmYWNlVlRhYmxlIFJlbW90 ZUluc3BlY3RvclNlcnZlcjo6c19pbnRlcmZhY2VWVGFibGUgPSB7CiAgICAgLy8gbWV0aG9kX2Nh bGwKICAgICBbXSAoR0RCdXNDb25uZWN0aW9uKiBjb25uZWN0aW9uLCBjb25zdCBnY2hhciogLypz ZW5kZXIqLywgY29uc3QgZ2NoYXIqIC8qb2JqZWN0UGF0aCovLCBjb25zdCBnY2hhciogLyppbnRl cmZhY2VOYW1lKi8sIGNvbnN0IGdjaGFyKiBtZXRob2ROYW1lLCBHVmFyaWFudCogcGFyYW1ldGVy cywgR0RCdXNNZXRob2RJbnZvY2F0aW9uKiBpbnZvY2F0aW9uLCBncG9pbnRlciB1c2VyRGF0YSkg ewpAQCAtMTI0LDE2ICsxNDMsOSBAQCBjb25zdCBHREJ1c0ludGVyZmFjZVZUYWJsZSBSZW1vdGVJ bnNwZWN0b3JTZXJ2ZXI6OnNfaW50ZXJmYWNlVlRhYmxlID0gewogICAgICAgICAgICAgZ19kYnVz X21ldGhvZF9pbnZvY2F0aW9uX3JldHVybl92YWx1ZShpbnZvY2F0aW9uLCBudWxscHRyKTsKICAg ICAgICAgfSBlbHNlIGlmICghZ19zdHJjbXAwKG1ldGhvZE5hbWUsICJTdGFydEF1dG9tYXRpb25T ZXNzaW9uIikpIHsKICAgICAgICAgICAgIGNvbnN0IGNoYXIqIHNlc3Npb25JRDsKLSAgICAgICAg ICAgIGdib29sZWFuIGFjY2VwdEluc2VjdXJlQ2VydGlmaWNhdGVzOwotICAgICAgICAgICAgR1Vu aXF1ZU91dFB0cjxHVmFyaWFudEl0ZXI+IGNlcnRpZmljYXRlczsKLSAgICAgICAgICAgIGdfdmFy aWFudF9nZXQocGFyYW1ldGVycywgIigmc2JhKHNzKSkiLCAmc2Vzc2lvbklELCAmYWNjZXB0SW5z ZWN1cmVDZXJ0aWZpY2F0ZXMsICZjZXJ0aWZpY2F0ZXMub3V0UHRyKCkpOwotICAgICAgICAgICAg UmVtb3RlSW5zcGVjdG9yOjpDbGllbnQ6OlNlc3Npb25DYXBhYmlsaXRpZXMgY2FwYWJpbGl0aWVz OwotICAgICAgICAgICAgY2FwYWJpbGl0aWVzLmFjY2VwdEluc2VjdXJlQ2VydGlmaWNhdGVzID0g YWNjZXB0SW5zZWN1cmVDZXJ0aWZpY2F0ZXM7Ci0gICAgICAgICAgICBjYXBhYmlsaXRpZXMuY2Vy dGlmaWNhdGVzLnJlc2VydmVDYXBhY2l0eShnX3ZhcmlhbnRfaXRlcl9uX2NoaWxkcmVuKGNlcnRp ZmljYXRlcy5nZXQoKSkpOwotICAgICAgICAgICAgY29uc3QgY2hhciogaG9zdDsKLSAgICAgICAg ICAgIGNvbnN0IGNoYXIqIGNlcnRpZmljYXRlRmlsZTsKLSAgICAgICAgICAgIHdoaWxlIChnX3Zh cmlhbnRfaXRlcl9sb29wKGNlcnRpZmljYXRlcy5nZXQoKSwgIigmcyZzKSIsICZob3N0LCAmY2Vy dGlmaWNhdGVGaWxlKSkKLSAgICAgICAgICAgICAgICBjYXBhYmlsaXRpZXMuY2VydGlmaWNhdGVz LnVuY2hlY2tlZEFwcGVuZCh7IFN0cmluZzo6ZnJvbVVURjgoaG9zdCksIFN0cmluZzo6ZnJvbVVU RjgoY2VydGlmaWNhdGVGaWxlKSB9KTsKKyAgICAgICAgICAgIEdSZWZQdHI8R1ZhcmlhbnQ+IHNl c3Npb25DYXBhYmlsaXRpZXM7CisgICAgICAgICAgICBnX3ZhcmlhbnRfZ2V0KHBhcmFtZXRlcnMs ICIoJnNAYXtzdn0pIiwgJnNlc3Npb25JRCwgJnNlc3Npb25DYXBhYmlsaXRpZXMub3V0UHRyKCkp OworICAgICAgICAgICAgYXV0byBjYXBhYmlsaXRpZXMgPSBwcm9jZXNzU2Vzc2lvbkNhcGFiaWxp dGllcyhzZXNzaW9uQ2FwYWJpbGl0aWVzLmdldCgpKTsKICAgICAgICAgICAgIGluc3BlY3RvclNl cnZlci0+c3RhcnRBdXRvbWF0aW9uU2Vzc2lvbihjb25uZWN0aW9uLCBzZXNzaW9uSUQsIGNhcGFi aWxpdGllcyk7CiAgICAgICAgICAgICBhdXRvIGNsaWVudENhcGFiaWxpdGllcyA9IFJlbW90ZUlu c3BlY3Rvcjo6c2luZ2xldG9uKCkuY2xpZW50Q2FwYWJpbGl0aWVzKCk7CiAgICAgICAgICAgICBn X2RidXNfbWV0aG9kX2ludm9jYXRpb25fcmV0dXJuX3ZhbHVlKGludm9jYXRpb24sIGdfdmFyaWFu dF9uZXcoIihzcykiLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkRyaXZlci9DaGFuZ2VMb2cgYi9T b3VyY2UvV2ViRHJpdmVyL0NoYW5nZUxvZwppbmRleCAzZmIyN2RjMzk4Yi4uMWE2ZWI0NDg4YzYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJEcml2ZXIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJE cml2ZXIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTgtMDYtMjIgIENhcmxvcyBHYXJj aWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIFdlYkRyaXZl cjogdXNlIGEgZGljdGlvbmFyeSBmb3Igc2Vzc2lvbiBjYXBhYmlsaXRpZXMgaW4gU3RhcnRBdXRv bWF0aW9uU2Vzc2lvbiBtZXNzYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xODY5MTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBJbnN0ZWFkIG9mIGdyb3dpbmcgdGhlIG1lc3NhZ2Ugc2lnbmF0dXJlIGV2 ZXJ5IHRpbWUgd2UgYWRkIGEgbmV3IGNhcGFiaWxpdHksIHVzZSBhIGRpY3Rpb25hcnkgYXtzdn0g YW5kIHNpbXBseSBhZGQKKyAgICAgICAgbmV3IGVudHJpZXMgd2hlbiBuZXcgY2FwYWJpbGl0aWVz IGFyZSBhZGRlZC4gVGhpcyB3YXkgd2Ugd29uJ3QgbmVlZCB0byBjaGFuZ2UgdGhlIG1lc3NhZ2Ug c2lnbmF0dXJlIGFueW1vcmUuCisKKyAgICAgICAgKiBTZXNzaW9uSG9zdC5oOgorICAgICAgICAq IGdsaWIvU2Vzc2lvbkhvc3RHbGliLmNwcDoKKyAgICAgICAgKFdlYkRyaXZlcjo6U2Vzc2lvbkhv c3Q6OmJ1aWxkU2Vzc2lvbkNhcGFiaWxpdGllcyBjb25zdCk6IEhlbHBlciB0byBidWlsZCB0aGUg c2Vzc2lvbiBjYXBhYmlsaXRpZXMgZGljdGlvbmFyeS4KKyAgICAgICAgKFdlYkRyaXZlcjo6U2Vz c2lvbkhvc3Q6OnN0YXJ0QXV0b21hdGlvblNlc3Npb24pOgorCiAyMDE4LTA2LTIxICBaYW4gRG9i ZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBXZWJEcml2ZXI6 IGFsbG93IGFwcGx5aW5nIGhvc3Qtc3BlY2lmaWMgVExTIGNlcnRpZmljYXRlcyBmb3IgYXV0b21h dGVkIHNlc3Npb25zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViRHJpdmVyL1Nlc3Npb25Ib3N0Lmgg Yi9Tb3VyY2UvV2ViRHJpdmVyL1Nlc3Npb25Ib3N0LmgKaW5kZXggNzljZTljMWY5MDYuLjhjNDc2 NzYwNjg0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViRHJpdmVyL1Nlc3Npb25Ib3N0LmgKKysrIGIv U291cmNlL1dlYkRyaXZlci9TZXNzaW9uSG9zdC5oCkBAIC04MCw2ICs4MCw3IEBAIHByaXZhdGU6 CiAgICAgdm9pZCBsYXVuY2hCcm93c2VyKEZ1bmN0aW9uPHZvaWQgKHN0ZDo6b3B0aW9uYWw8U3Ry aW5nPiBlcnJvcik+JiYpOwogICAgIHZvaWQgY29ubmVjdFRvQnJvd3NlcihzdGQ6OnVuaXF1ZV9w dHI8Q29ubmVjdFRvQnJvd3NlckFzeW5jRGF0YT4mJik7CiAgICAgYm9vbCBtYXRjaENhcGFiaWxp dGllcyhHVmFyaWFudCopOworICAgIEdWYXJpYW50KiBidWlsZFNlc3Npb25DYXBhYmlsaXRpZXMo KSBjb25zdDsKICAgICB2b2lkIHNldHVwQ29ubmVjdGlvbihHUmVmUHRyPEdEQnVzQ29ubmVjdGlv bj4mJik7CiAgICAgdm9pZCBzZXRUYXJnZXRMaXN0KHVpbnQ2NF90IGNvbm5lY3Rpb25JRCwgVmVj dG9yPFRhcmdldD4mJik7CiAgICAgdm9pZCBzZW5kTWVzc2FnZVRvRnJvbnRlbmQodWludDY0X3Qg Y29ubmVjdGlvbklELCB1aW50NjRfdCB0YXJnZXRJRCwgY29uc3QgY2hhciogbWVzc2FnZSk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViRHJpdmVyL2dsaWIvU2Vzc2lvbkhvc3RHbGliLmNwcCBiL1Nv dXJjZS9XZWJEcml2ZXIvZ2xpYi9TZXNzaW9uSG9zdEdsaWIuY3BwCmluZGV4IGI3OGU5ZTFkMDFi Li40MjI4NWM2NTllZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkRyaXZlci9nbGliL1Nlc3Npb25I b3N0R2xpYi5jcHAKKysrIGIvU291cmNlL1dlYkRyaXZlci9nbGliL1Nlc3Npb25Ib3N0R2xpYi5j cHAKQEAgLTI2MSwyNSArMjYxLDQwIEBAIGJvb2wgU2Vzc2lvbkhvc3Q6Om1hdGNoQ2FwYWJpbGl0 aWVzKEdWYXJpYW50KiBjYXBhYmlsaXRpZXMpCiAgICAgcmV0dXJuIGRpZE1hdGNoOwogfQogCi12 b2lkIFNlc3Npb25Ib3N0OjpzdGFydEF1dG9tYXRpb25TZXNzaW9uKEZ1bmN0aW9uPHZvaWQgKGJv b2wsIHN0ZDo6b3B0aW9uYWw8U3RyaW5nPik+JiYgY29tcGxldGlvbkhhbmRsZXIpCitHVmFyaWFu dCogU2Vzc2lvbkhvc3Q6OmJ1aWxkU2Vzc2lvbkNhcGFiaWxpdGllcygpIGNvbnN0CiB7Ci0gICAg QVNTRVJUKG1fZGJ1c0Nvbm5lY3Rpb24pOwotICAgIEFTU0VSVCghbV9zdGFydFNlc3Npb25Db21w bGV0aW9uSGFuZGxlcik7Ci0gICAgbV9zdGFydFNlc3Npb25Db21wbGV0aW9uSGFuZGxlciA9IFdU Rk1vdmUoY29tcGxldGlvbkhhbmRsZXIpOwotICAgIG1fc2Vzc2lvbklEID0gY3JlYXRlQ2Fub25p Y2FsVVVJRFN0cmluZygpOworICAgIGlmICghbV9jYXBhYmlsaXRpZXMuYWNjZXB0SW5zZWN1cmVD ZXJ0cyAmJiAhbV9jYXBhYmlsaXRpZXMuY2VydGlmaWNhdGVzKQorICAgICAgICByZXR1cm4gbnVs bHB0cjsKKwogICAgIEdWYXJpYW50QnVpbGRlciBidWlsZGVyOwotICAgIGdfdmFyaWFudF9idWls ZGVyX2luaXQoJmJ1aWxkZXIsIEdfVkFSSUFOVF9UWVBFKCJhKHNzKSIpKTsKKyAgICBnX3Zhcmlh bnRfYnVpbGRlcl9pbml0KCZidWlsZGVyLCBHX1ZBUklBTlRfVFlQRSgiYXtzdn0iKSk7CisgICAg aWYgKG1fY2FwYWJpbGl0aWVzLmFjY2VwdEluc2VjdXJlQ2VydHMpCisgICAgICAgIGdfdmFyaWFu dF9idWlsZGVyX2FkZCgmYnVpbGRlciwgIntzdn0iLCAiYWNjZXB0SW5zZWN1cmVDZXJ0cyIsIGdf dmFyaWFudF9uZXdfYm9vbGVhbihtX2NhcGFiaWxpdGllcy5hY2NlcHRJbnNlY3VyZUNlcnRzLnZh bHVlKCkpKTsKKwogICAgIGlmIChtX2NhcGFiaWxpdGllcy5jZXJ0aWZpY2F0ZXMpIHsKKyAgICAg ICAgR1ZhcmlhbnRCdWlsZGVyIGFycmF5QnVpbGRlcjsKKyAgICAgICAgZ192YXJpYW50X2J1aWxk ZXJfaW5pdCgmYXJyYXlCdWlsZGVyLCBHX1ZBUklBTlRfVFlQRSgiYShzcykiKSk7CiAgICAgICAg IGZvciAoYXV0byYgY2VydGlmaWNhdGUgOiAqbV9jYXBhYmlsaXRpZXMuY2VydGlmaWNhdGVzKSB7 Ci0gICAgICAgICAgICBnX3ZhcmlhbnRfYnVpbGRlcl9hZGRfdmFsdWUoJmJ1aWxkZXIsIGdfdmFy aWFudF9uZXcoIihzcykiLAorICAgICAgICAgICAgZ192YXJpYW50X2J1aWxkZXJfYWRkX3ZhbHVl KCZhcnJheUJ1aWxkZXIsIGdfdmFyaWFudF9uZXcoIihzcykiLAogICAgICAgICAgICAgICAgIGNl cnRpZmljYXRlLmZpcnN0LnV0ZjgoKS5kYXRhKCksIGNlcnRpZmljYXRlLnNlY29uZC51dGY4KCku ZGF0YSgpKSk7CiAgICAgICAgIH0KKyAgICAgICAgZ192YXJpYW50X2J1aWxkZXJfYWRkKCZidWls ZGVyLCAie3N2fSIsICJjZXJ0aWZpY2F0ZXMiLCBnX3ZhcmlhbnRfYnVpbGRlcl9lbmQoJmFycmF5 QnVpbGRlcikpOwogICAgIH0KKworICAgIHJldHVybiBnX3ZhcmlhbnRfYnVpbGRlcl9lbmQoJmJ1 aWxkZXIpOworfQorCit2b2lkIFNlc3Npb25Ib3N0OjpzdGFydEF1dG9tYXRpb25TZXNzaW9uKEZ1 bmN0aW9uPHZvaWQgKGJvb2wsIHN0ZDo6b3B0aW9uYWw8U3RyaW5nPik+JiYgY29tcGxldGlvbkhh bmRsZXIpCit7CisgICAgQVNTRVJUKG1fZGJ1c0Nvbm5lY3Rpb24pOworICAgIEFTU0VSVCghbV9z dGFydFNlc3Npb25Db21wbGV0aW9uSGFuZGxlcik7CisgICAgbV9zdGFydFNlc3Npb25Db21wbGV0 aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpOworICAgIG1fc2Vzc2lvbklE ID0gY3JlYXRlQ2Fub25pY2FsVVVJRFN0cmluZygpOwogICAgIGdfZGJ1c19jb25uZWN0aW9uX2Nh bGwobV9kYnVzQ29ubmVjdGlvbi5nZXQoKSwgbnVsbHB0ciwKICAgICAgICAgSU5TUEVDVE9SX0RC VVNfT0JKRUNUX1BBVEgsCiAgICAgICAgIElOU1BFQ1RPUl9EQlVTX0lOVEVSRkFDRSwKICAgICAg ICAgIlN0YXJ0QXV0b21hdGlvblNlc3Npb24iLAotICAgICAgICBnX3ZhcmlhbnRfbmV3KCIoc2Jh KHNzKSkiLCBtX3Nlc3Npb25JRC51dGY4KCkuZGF0YSgpLCBtX2NhcGFiaWxpdGllcy5hY2NlcHRJ bnNlY3VyZUNlcnRzLnZhbHVlX29yKGZhbHNlKSwgJmJ1aWxkZXIpLAorICAgICAgICBnX3Zhcmlh bnRfbmV3KCIoc0Bhe3N2fSkiLCBtX3Nlc3Npb25JRC51dGY4KCkuZGF0YSgpLCBidWlsZFNlc3Np b25DYXBhYmlsaXRpZXMoKSksCiAgICAgICAgIG51bGxwdHIsIEdfREJVU19DQUxMX0ZMQUdTX05P X0FVVE9fU1RBUlQsCiAgICAgICAgIC0xLCBtX2NhbmNlbGxhYmxlLmdldCgpLCBbXShHT2JqZWN0 KiBzb3VyY2UsIEdBc3luY1Jlc3VsdCogcmVzdWx0LCBncG9pbnRlciB1c2VyRGF0YSkgewogICAg ICAgICAgICAgR1VuaXF1ZU91dFB0cjxHRXJyb3I+IGVycm9yOwpkaWZmIC0tZ2l0IGEvVG9vbHMv Q2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDNjODdmYzE5ODdjLi5lYmUwMDBhOGMz YyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE0IEBACisyMDE4LTA2LTIyICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFA aWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBXZWJEcml2ZXI6IHVzZSBhIGRpY3Rpb25hcnkg Zm9yIHNlc3Npb24gY2FwYWJpbGl0aWVzIGluIFN0YXJ0QXV0b21hdGlvblNlc3Npb24gbWVzc2Fn ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg2OTE1 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRl IC93ZWJraXQvV2ViS2l0QXV0b21hdGlvblNlc3Npb24vcmVxdWVzdC1zZXNzaW9uIHRvIHVzZSB0 aGUgbmV3IFN0YXJ0QXV0b21hdGlvblNlc3Npb24gbWVzc2FnZSBzaWduYXR1cmUuCisKKyAgICAg ICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEdMaWIvVGVzdEF1dG9tYXRpb25TZXNzaW9u LmNwcDoKKwogMjAxOC0wNi0yMiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxp YS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gRml4IEdMaWIgdGVzdCAvd2Via2l0L1dlYktp dFNlY3VyaXR5TWFuYWdlci9maWxlLXhociBhZnRlciByMjMxMDAwCmRpZmYgLS1naXQgYS9Ub29s cy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEdMaWIvVGVzdEF1dG9tYXRpb25TZXNzaW9uLmNw cCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R0xpYi9UZXN0QXV0b21hdGlvblNl c3Npb24uY3BwCmluZGV4IDI2YzM3NGU2ZDAyLi5mYjhhOWZmYTg0YSAxMDA2NDQKLS0tIGEvVG9v bHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRHTGliL1Rlc3RBdXRvbWF0aW9uU2Vzc2lvbi5j cHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRHTGliL1Rlc3RBdXRvbWF0 aW9uU2Vzc2lvbi5jcHAKQEAgLTIwOCw3ICsyMDgsNyBAQCBwdWJsaWM6CiAgICAgewogICAgICAg ICBhdXRvIHNpZ25hbElEID0gZ19zaWduYWxfY29ubmVjdChtX3dlYkNvbnRleHQuZ2V0KCksICJh dXRvbWF0aW9uLXN0YXJ0ZWQiLCBHX0NBTExCQUNLKGF1dG9tYXRpb25TdGFydGVkQ2FsbGJhY2sp LCB0aGlzKTsKICAgICAgICAgZ19kYnVzX2Nvbm5lY3Rpb25fY2FsbChtX2Nvbm5lY3Rpb24uZ2V0 KCksIG51bGxwdHIsICIvb3JnL3dlYmtpdC9JbnNwZWN0b3IiLCAib3JnLndlYmtpdC5JbnNwZWN0 b3IiLAotICAgICAgICAgICAgIlN0YXJ0QXV0b21hdGlvblNlc3Npb24iLCBnX3ZhcmlhbnRfbmV3 KCIocykiLCBzZXNzaW9uSUQpLCBudWxscHRyLCBHX0RCVVNfQ0FMTF9GTEFHU19OT19BVVRPX1NU QVJULCAtMSwgbnVsbHB0ciwKKyAgICAgICAgICAgICJTdGFydEF1dG9tYXRpb25TZXNzaW9uIiwg Z192YXJpYW50X25ldygiKHNhe3N2fSkiLCBzZXNzaW9uSUQsIG51bGxwdHIpLCBudWxscHRyLCBH X0RCVVNfQ0FMTF9GTEFHU19OT19BVVRPX1NUQVJULCAtMSwgbnVsbHB0ciwKICAgICAgICAgICAg IFtdKEdPYmplY3QqIHNvdXJjZSwgR0FzeW5jUmVzdWx0KiByZXN1bHQsIGdwb2ludGVyIHVzZXJE YXRhKSB7CiAgICAgICAgICAgICAgICAgYXV0byogdGVzdCA9IHN0YXRpY19jYXN0PEF1dG9tYXRp b25UZXN0Kj4odXNlckRhdGEpOwogICAgICAgICAgICAgICAgIGlmICghdGVzdC0+bV9zZXNzaW9u KQo=