213808 2020-06-30 12:05:04 -0700 App-bound JavaScript and Navigation failures should have specific error codes 2020-06-30 15:21:39 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 beidson beidson katherine_cheney timothy oldest_to_newest 1667655 0 beidson 2020-06-30 12:05:04 -0700 App-bound JavaScript and Navigation failures should have specific error codes <rdar://problem/64940268> 1667660 1 403219 beidson 2020-06-30 12:08:09 -0700 Created attachment 403219 Patch 1667729 2 beidson 2020-06-30 14:09:04 -0700 (Was holding off on r? until we ran the updated tests on the simulator. They worked) r? 1667734 3 403219 katherine_cheney 2020-06-30 14:15:53 -0700 Comment on attachment 403219 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=403219&action=review LGTM, just the one comment about the error message wording. Thanks for adding this! > Source/WebKit/UIProcess/API/Cocoa/WKError.mm:81 > + return WEB_UI_STRING("Attempted to navigation away from an app-bound domain or navigate after using restricted APIs", "WKErrorNavigationAppBoundDomain description"); This probably should be "Attempted to navigate" 1667741 4 403241 beidson 2020-06-30 14:27:34 -0700 Created attachment 403241 Patch for landing 1667764 5 ews-feeder 2020-06-30 15:21:39 -0700 Committed r263774: <https://trac.webkit.org/changeset/263774> All reviewed patches have been landed. Closing bug and clearing flags on attachment 403241. 403219 2020-06-30 12:08:09 -0700 2020-06-30 14:18:28 -0700 Patch patch text/plain 17254 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjM2UyODc0ODViNC4uZDMxNDlkNWZiODYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNCBAQAorMjAyMC0wNi0zMCAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+ CisKKyAgICAgICAgQXBwLWJvdW5kIEphdmFTY3JpcHQgYW5kIE5hdmlnYXRpb24gZmFpbHVyZXMg c2hvdWxkIGhhdmUgc3BlY2lmaWMgZXJyb3IgY29kZXMuCisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS82NDk0MDI2OD4gYW5kIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MTM4MDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBD b3ZlcmVkIGJ5IEFQSSB0ZXN0cy4KKworICAgICAgICAqIGJpbmRpbmdzL2pzL0V4Y2VwdGlvbkRl dGFpbHMuaDoKKwogMjAyMC0wNi0zMCAgSmFzb24gTGF3cmVuY2UgIDxsYXdyZW5jZS5qQGFwcGxl LmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByZXZlcnRpbmcgcjI2Mzc1My4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0V4Y2VwdGlvbkRldGFpbHMuaCBiL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0V4Y2VwdGlvbkRldGFpbHMuaAppbmRleCBiZDNiZDczZGRi Mi4uNjAzM2Y4MDNiNGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0V4 Y2VwdGlvbkRldGFpbHMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9FeGNlcHRp b25EZXRhaWxzLmgKQEAgLTMzLDYgKzMzLDcgQEAgc3RydWN0IEV4Y2VwdGlvbkRldGFpbHMgewog ICAgIGVudW0gY2xhc3MgVHlwZSA6IHVpbnQ4X3QgewogICAgICAgICBTY3JpcHQsCiAgICAgICAg IEludmFsaWRUYXJnZXRGcmFtZSwKKyAgICAgICAgQXBwQm91bmREb21haW4sCiAgICAgfTsKIAog ICAgIFN0cmluZyBtZXNzYWdlOwpAQCAtNTMsNyArNTQsOCBAQCB0ZW1wbGF0ZTw+IHN0cnVjdCBF bnVtVHJhaXRzPFdlYkNvcmU6OkV4Y2VwdGlvbkRldGFpbHM6OlR5cGU+IHsKICAgICB1c2luZyB2 YWx1ZXMgPSBFbnVtVmFsdWVzPAogICAgICAgICBXZWJDb3JlOjpFeGNlcHRpb25EZXRhaWxzOjpU eXBlLAogICAgICAgICBXZWJDb3JlOjpFeGNlcHRpb25EZXRhaWxzOjpUeXBlOjpTY3JpcHQsCi0g ICAgICAgIFdlYkNvcmU6OkV4Y2VwdGlvbkRldGFpbHM6OlR5cGU6OkludmFsaWRUYXJnZXRGcmFt ZQorICAgICAgICBXZWJDb3JlOjpFeGNlcHRpb25EZXRhaWxzOjpUeXBlOjpJbnZhbGlkVGFyZ2V0 RnJhbWUsCisgICAgICAgIFdlYkNvcmU6OkV4Y2VwdGlvbkRldGFpbHM6OlR5cGU6OkFwcEJvdW5k RG9tYWluCiAgICAgPjsKIH07CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxv ZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGYzMjEzMWQxY2M2Li43ZmY0NGEyNDA4 NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktp dC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNyBAQAorMjAyMC0wNi0zMCAgQnJhZHkgRWlkc29uICA8 YmVpZHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgQXBwLWJvdW5kIEphdmFTY3JpcHQgYW5kIE5h dmlnYXRpb24gZmFpbHVyZXMgc2hvdWxkIGhhdmUgc3BlY2lmaWMgZXJyb3IgY29kZXMuCisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS82NDk0MDI2OD4gYW5kIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMTM4MDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tFcnJvci5oOgorICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tFcnJvci5tbToKKyAgICAgICAgKGxvY2FsaXplZERl c2NyaXB0aW9uRm9yRXJyb3JDb2RlKToKKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tXZWJWaWV3Lm1tOgorICAgICAgICAobnNFcnJvckZyb21FeGNlcHRpb25EZXRhaWxzKToKKwor ICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9XZWJQYWdlUHJveHlDb2NvYS5tbToKKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZVByb3h5OjplcnJvckZvclVucGVybWl0dGVkQXBwQm91bmREb21haW5O YXZpZ2F0aW9uKToKKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rp b24pOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKworICAgICAgICAqIFdl YlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6 cnVuSmF2YVNjcmlwdCk6CisKIDIwMjAtMDYtMzAgIEFudG9pbmUgUXVpbnQgIDxncmFvdXRzQHdl YmtpdC5vcmc+CiAKICAgICAgICAgW2lPU10gQ3Jhc2ggdW5kZXIgV2ViS2l0OjpXZWJQYWdlOjpn ZXRGb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9Db2NvYS9XS0Vycm9yLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvQ29jb2EvV0tFcnJvci5oCmluZGV4IDgxYTY2OTFkMTJmLi5hMGE4YTdkYmVjOCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLRXJyb3IuaAorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tFcnJvci5oCkBAIC00NSw2ICs0NSw4 IEBAIFdLX0VYVEVSTiBOU1N0cmluZyAqIGNvbnN0IFdLRXJyb3JEb21haW4gV0tfQVBJX0FWQUlM QUJMRShtYWNvcygxMC4xMCksIGlvcyg4LjApCiAgQGNvbnN0YW50IFdLRXJyb3JDb250ZW50UnVs ZUxpc3RTdG9yZVZlcnNpb25NaXNtYXRjaCAgSW5kaWNhdGVzIHRoYXQgdGhlIFdLVXNlckNvbnRl bnRSdWxlTGlzdCB2ZXJzaW9uIGRpZCBub3QgbWF0Y2ggdGhlIGxhdGVzdC4KICBAY29uc3RhbnQg V0tFcnJvckF0dHJpYnV0ZWRTdHJpbmdDb250ZW50RmFpbGVkVG9Mb2FkICBJbmRpY2F0ZXMgdGhh dCB0aGUgYXR0cmlidXRlZCBzdHJpbmcgY29udGVudCBmYWlsZWQgdG8gbG9hZC4KICBAY29uc3Rh bnQgV0tFcnJvckF0dHJpYnV0ZWRTdHJpbmdDb250ZW50TG9hZFRpbWVkT3V0ICBJbmRpY2F0ZXMg dGhhdCBsb2FkaW5nIGF0dHJpYnV0ZWQgc3RyaW5nIGNvbnRlbnQgdGltZWQgb3V0LgorIEBjb25z dGFudCBXS0Vycm9yTmF2aWdhdGlvbkFwcEJvdW5kRG9tYWluICBJbmRpY2F0ZXMgdGhhdCBhIG5h dmlnYXRpb24gZmFpbGVkIGR1ZSB0byBhbiBhcHAtYm91bmQgZG9tYWluIHJlc3RyaWN0aW9uLgor IEBjb25zdGFudCBXS0Vycm9ySmF2YVNjcmlwdEFwcEJvdW5kRG9tYWluICBJbmRpY2F0ZXMgdGhh dCBKYXZhU2NyaXB0IGV4ZWN1dGlvbiBmYWlsZWQgZHVlIHRvIGFuIGFwcC1ib3VuZCBkb21haW4g cmVzdHJpY3Rpb24uCiAgKi8KIHR5cGVkZWYgTlNfRU5VTShOU0ludGVnZXIsIFdLRXJyb3JDb2Rl KSB7CiAgICAgV0tFcnJvclVua25vd24gPSAxLApAQCAtNTksNiArNjEsOCBAQCB0eXBlZGVmIE5T X0VOVU0oTlNJbnRlZ2VyLCBXS0Vycm9yQ29kZSkgewogICAgIFdLRXJyb3JBdHRyaWJ1dGVkU3Ry aW5nQ29udGVudEZhaWxlZFRvTG9hZCBXS19BUElfQVZBSUxBQkxFKG1hY29zKDEwLjE1KSwgaW9z KDEzLjApKSwKICAgICBXS0Vycm9yQXR0cmlidXRlZFN0cmluZ0NvbnRlbnRMb2FkVGltZWRPdXQg V0tfQVBJX0FWQUlMQUJMRShtYWNvcygxMC4xNSksIGlvcygxMy4wKSksCiAgICAgV0tFcnJvckph dmFTY3JpcHRJbnZhbGlkRnJhbWVUYXJnZXQgV0tfQVBJX0FWQUlMQUJMRShtYWNvcyhXS19NQUNf VEJBKSwgaW9zKFdLX0lPU19UQkEpKSwKKyAgICBXS0Vycm9yTmF2aWdhdGlvbkFwcEJvdW5kRG9t YWluIFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJBKSks CisgICAgV0tFcnJvckphdmFTY3JpcHRBcHBCb3VuZERvbWFpbiBXS19BUElfQVZBSUxBQkxFKG1h Y29zKFdLX01BQ19UQkEpLCBpb3MoV0tfSU9TX1RCQSkpLAogfSBXS19BUElfQVZBSUxBQkxFKG1h Y29zKDEwLjEwKSwgaW9zKDguMCkpOwogCiBOU19BU1NVTUVfTk9OTlVMTF9FTkQKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS0Vycm9yLm1tIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLRXJyb3IubW0KaW5kZXggZWVjNzZkYTgwNGMu LmZjMzE1MzExYTI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29j b2EvV0tFcnJvci5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tF cnJvci5tbQpAQCAtNzYsNiArNzYsMTIgQEAgTlNTdHJpbmcgKmxvY2FsaXplZERlc2NyaXB0aW9u Rm9yRXJyb3JDb2RlKFdLRXJyb3JDb2RlIGVycm9yQ29kZSkKIAogICAgIGNhc2UgV0tFcnJvckph dmFTY3JpcHRJbnZhbGlkRnJhbWVUYXJnZXQ6CiAgICAgICAgIHJldHVybiBXRUJfVUlfU1RSSU5H KCJKYXZhU2NyaXB0IGV4ZWN1dGlvbiB0YXJnZXRlZCBhbiBpbnZhbGlkIGZyYW1lIiwgIldLRXJy b3JKYXZhU2NyaXB0SW52YWxpZEZyYW1lVGFyZ2V0IGRlc2NyaXB0aW9uIik7CisKKyAgICBjYXNl IFdLRXJyb3JOYXZpZ2F0aW9uQXBwQm91bmREb21haW46CisgICAgICAgIHJldHVybiBXRUJfVUlf U1RSSU5HKCJBdHRlbXB0ZWQgdG8gbmF2aWdhdGlvbiBhd2F5IGZyb20gYW4gYXBwLWJvdW5kIGRv bWFpbiBvciBuYXZpZ2F0ZSBhZnRlciB1c2luZyByZXN0cmljdGVkIEFQSXMiLCAiV0tFcnJvck5h dmlnYXRpb25BcHBCb3VuZERvbWFpbiBkZXNjcmlwdGlvbiIpOworCisgICAgY2FzZSBXS0Vycm9y SmF2YVNjcmlwdEFwcEJvdW5kRG9tYWluOgorICAgICAgICByZXR1cm4gV0VCX1VJX1NUUklORygi SmF2YVNjcmlwdCBleGVjdXRpb24gdGFyZ2V0ZWQgYSBmcmFtZSB0aGF0IGlzIG5vdCBpbiBhbiBh cHAtYm91bmQgZG9tYWluIiwgIldLRXJyb3JKYXZhU2NyaXB0QXBwQm91bmREb21haW4gZGVzY3Jp cHRpb24iKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9Db2NvYS9XS1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29j b2EvV0tXZWJWaWV3Lm1tCmluZGV4IDRhMzM4ZWM1M2RmLi4yM2I3YzE5YzFhOSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCkBAIC04NzYsNiAr ODc2LDkgQEAgc3RhdGljIFJldGFpblB0cjxOU0Vycm9yPiBuc0Vycm9yRnJvbUV4Y2VwdGlvbkRl dGFpbHMoY29uc3QgV2ViQ29yZTo6RXhjZXB0aW9uRGUKICAgICBjYXNlIFdlYkNvcmU6OkV4Y2Vw dGlvbkRldGFpbHM6OlR5cGU6OlNjcmlwdDoKICAgICAgICAgZXJyb3JDb2RlID0gV0tFcnJvckph dmFTY3JpcHRFeGNlcHRpb25PY2N1cnJlZDsKICAgICAgICAgYnJlYWs7CisgICAgY2FzZSBXZWJD b3JlOjpFeGNlcHRpb25EZXRhaWxzOjpUeXBlOjpBcHBCb3VuZERvbWFpbjoKKyAgICAgICAgZXJy b3JDb2RlID0gV0tFcnJvckphdmFTY3JpcHRBcHBCb3VuZERvbWFpbjsKKyAgICAgICAgYnJlYWs7 CiAgICAgfQogCiAgICAgW3VzZXJJbmZvIHNldE9iamVjdDpsb2NhbGl6ZWREZXNjcmlwdGlvbkZv ckVycm9yQ29kZShlcnJvckNvZGUpIGZvcktleTpOU0xvY2FsaXplZERlc2NyaXB0aW9uS2V5XTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlBhZ2VQcm94eUNv Y29hLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUGFnZVByb3h5Q29jb2Eu bW0KaW5kZXggNzJlNDgzMzNiOGUuLmM2YzRiNjkzOGVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQYWdlUHJveHlDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQYWdlUHJveHlDb2NvYS5tbQpAQCAtNDEsNiArNDEsNyBA QAogI2ltcG9ydCAiV2ViUGFzdGVib2FyZFByb3h5LmgiCiAjaW1wb3J0ICJXZWJQcm9jZXNzUHJv eHkuaCIKICNpbXBvcnQgIldlYnNpdGVEYXRhU3RvcmUuaCIKKyNpbXBvcnQgIldLRXJyb3JJbnRl cm5hbC5oIgogI2ltcG9ydCA8V2ViQ29yZS9EcmFnSXRlbS5oPgogI2ltcG9ydCA8V2ViQ29yZS9M b2NhbEN1cnJlbnRHcmFwaGljc0NvbnRleHQuaD4KICNpbXBvcnQgPFdlYkNvcmUvTm90SW1wbGVt ZW50ZWQuaD4KQEAgLTMwMSw2ICszMDIsMTEgQEAgdm9pZCBXZWJQYWdlUHJveHk6Omluc2VydERp Y3RhdGVkVGV4dEFzeW5jKGNvbnN0IFN0cmluZyYgdGV4dCwgY29uc3QgRWRpdGluZ1JhbmcKIAog ICAgIHNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6Okluc2VydERpY3RhdGVkVGV4dEFzeW5jIHsgdGV4 dCwgcmVwbGFjZW1lbnRSYW5nZSwgZGljdGF0aW9uQWx0ZXJuYXRpdmVzLCBXVEZNb3ZlKG9wdGlv bnMpIH0pOwogfQorCitSZXNvdXJjZUVycm9yIFdlYlBhZ2VQcm94eTo6ZXJyb3JGb3JVbnBlcm1p dHRlZEFwcEJvdW5kRG9tYWluTmF2aWdhdGlvbihjb25zdCBVUkwmIHVybCkKK3sKKyAgICByZXR1 cm4geyBXS0Vycm9yRG9tYWluLCBXS0Vycm9yTmF2aWdhdGlvbkFwcEJvdW5kRG9tYWluLCB1cmws IGxvY2FsaXplZERlc2NyaXB0aW9uRm9yRXJyb3JDb2RlKFdLRXJyb3JOYXZpZ2F0aW9uQXBwQm91 bmREb21haW4pIH07Cit9CiAgICAgCiAjaWYgRU5BQkxFKEFQUExFX1BBWSkKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggN2E3NDcyNTUwOWQuLjg5ZjRhOGRk NDMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTUyMDQs MTYgKzUyMDQsMTggQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRp b25BY3Rpb24oUmVmPFdlYlByb2Nlc3NQcm94eT4mJiBwcm9jZXMKICAgICAgICAgICAgIH0KICAg ICAgICAgICAgIHJlY2VpdmVkTmF2aWdhdGlvblBvbGljeURlY2lzaW9uKHBvbGljeUFjdGlvbiwg bmF2aWdhdGlvbi5nZXQoKSwgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCwgZnJhbWUsIFdU Rk1vdmUocG9saWNpZXMpLCBXVEZNb3ZlKHNlbmRlcikpOwogICAgICAgICB9OwotICAgICAgICAK KworI2lmIFBMQVRGT1JNKENPQ09BKQogICAgICAgICBpZiAocG9saWN5QWN0aW9uICE9IFBvbGlj eUFjdGlvbjo6SWdub3JlKSB7CiAgICAgICAgICAgICBpZiAoIXNldElzTmF2aWdhdGluZ1RvQXBw Qm91bmREb21haW5BbmRDaGVja0lmUGVybWl0dGVkKGZyYW1lLT5pc01haW5GcmFtZSgpLCBuYXZp Z2F0aW9uLT5jdXJyZW50UmVxdWVzdCgpLnVybCgpLCBpc0FwcEJvdW5kRG9tYWluKSkgewotICAg ICAgICAgICAgICAgIGF1dG8gZXJyb3IgPSBSZXNvdXJjZUVycm9yIHsgU3RyaW5nIHsgfSwgMCwg bmF2aWdhdGlvbi0+Y3VycmVudFJlcXVlc3QoKS51cmwoKSwgIkFwcC1ib3VuZCBkb21haW4gZmFp bHVyZSJfcyB9OworICAgICAgICAgICAgICAgIGF1dG8gZXJyb3IgPSBlcnJvckZvclVucGVybWl0 dGVkQXBwQm91bmREb21haW5OYXZpZ2F0aW9uKG5hdmlnYXRpb24tPmN1cnJlbnRSZXF1ZXN0KCku dXJsKCkpOwogICAgICAgICAgICAgICAgIG1fbmF2aWdhdGlvbkNsaWVudC0+ZGlkRmFpbFByb3Zp c2lvbmFsTmF2aWdhdGlvbldpdGhFcnJvcigqdGhpcywgRnJhbWVJbmZvRGF0YSB7IGZyYW1lSW5m byB9LCBuYXZpZ2F0aW9uLmdldCgpLCBlcnJvciwgdXNlckRhdGFPYmplY3QpOwogICAgICAgICAg ICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SX0lGX0FMTE9XRUQoTG9hZGluZywgIklnbm9yaW5nIHJl cXVlc3QgdG8gbG9hZCB0aGlzIG1haW4gcmVzb3VyY2UgYmVjYXVzZSBpdCBpcyBhdHRlbXB0aW5n IHRvIG5hdmlnYXRlIGF3YXkgZnJvbSBhbiBhcHAtYm91bmQgZG9tYWluIG9yIG5hdmlnYXRlIGFm dGVyIHVzaW5nIHJlc3RyaWN0ZWQgQVBJcyIpOwogICAgICAgICAgICAgICAgIGNvbXBsZXRpb25I YW5kbGVyKFBvbGljeUFjdGlvbjo6SWdub3JlKTsKICAgICAgICAgICAgICAgICByZXR1cm47CiAg ICAgICAgICAgICB9CiAgICAgICAgIH0KKyNlbmRpZgogCiAgICAgICAgIGlmICghbV9wYWdlQ2xp ZW50KQogICAgICAgICAgICAgcmV0dXJuIGNvbXBsZXRpb25IYW5kbGVyKHBvbGljeUFjdGlvbik7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IGFlMTk1YmQ3ZTJmLi4z YzM1YWVhZWNiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKQEAgLTE3 NjAsNiArMTc2MCwxMCBAQCBwdWJsaWM6CiAKICAgICBPcHRpb25hbDxOYXZpZ2F0aW5nVG9BcHBC b3VuZERvbWFpbj4gaXNOYXZpZ2F0aW5nVG9BcHBCb3VuZERvbWFpbigpIGNvbnN0IHsgcmV0dXJu IG1faXNOYXZpZ2F0aW5nVG9BcHBCb3VuZERvbWFpbjsgfQogCisjaWYgUExBVEZPUk0oQ09DT0Ep CisgICAgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciBlcnJvckZvclVucGVybWl0dGVkQXBwQm91bmRE b21haW5OYXZpZ2F0aW9uKGNvbnN0IFVSTCYpOworI2VuZGlmCisKICAgICB2b2lkIGRpc2FibGVT ZXJ2aWNlV29ya2VyRW50aXRsZW1lbnRJbk5ldHdvcmtQcm9jZXNzKCk7CiAgICAgdm9pZCBjbGVh clNlcnZpY2VXb3JrZXJFbnRpdGxlbWVudE92ZXJyaWRlKENvbXBsZXRpb25IYW5kbGVyPHZvaWQo KT4mJik7CiAgICAgICAgIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmNwcAppbmRleCAxYmZlM2JmODIwZi4uNzc5NjY4YmEzMTYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC0zNDU4LDcgKzM0NTgsNyBAQCB2 b2lkIFdlYlBhZ2U6OnJ1bkphdmFTY3JpcHQoV2ViRnJhbWUqIGZyYW1lLCBSdW5KYXZhU2NyaXB0 UGFyYW1ldGVycyYmIHBhcmFtZXRlcgogICAgICAgICBzZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJv eHk6OlNjcmlwdFZhbHVlQ2FsbGJhY2soZGF0YVJlZmVyZW5jZSwgZGV0YWlscywgY2FsbGJhY2tJ RCkpOwogICAgIH07CiAgICAgaWYgKHNob3VsZEVuYWJsZUluQXBwQnJvd3NlclByaXZhY3lQcm90 ZWN0aW9ucygpKSB7Ci0gICAgICAgIHNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6U2NyaXB0 VmFsdWVDYWxsYmFjayh7IH0sIEV4Y2VwdGlvbkRldGFpbHMgeyAiVW5hYmxlIHRvIGV4ZWN1dGUg SmF2YVNjcmlwdCJfcyB9LCBjYWxsYmFja0lEKSk7CisgICAgICAgIHNlbmQoTWVzc2FnZXM6Oldl YlBhZ2VQcm94eTo6U2NyaXB0VmFsdWVDYWxsYmFjayh7IH0sIEV4Y2VwdGlvbkRldGFpbHMgeyAi VW5hYmxlIHRvIGV4ZWN1dGUgSmF2YVNjcmlwdCBpbiBhIGZyYW1lIHRoYXQgaXMgbm90IGluIGFu IGFwcC1ib3VuZCBkb21haW4iX3MsIDAsIDAsIEV4Y2VwdGlvbkRldGFpbHM6OlR5cGU6OkFwcEJv dW5kRG9tYWluIH0sIGNhbGxiYWNrSUQpKTsKICAgICAgICAgaWYgKGF1dG8qIGRvY3VtZW50ID0g bV9wYWdlLT5tYWluRnJhbWUoKS5kb2N1bWVudCgpKQogICAgICAgICAgICAgZG9jdW1lbnQtPmFk ZENvbnNvbGVNZXNzYWdlKE1lc3NhZ2VTb3VyY2U6OlNlY3VyaXR5LCBNZXNzYWdlTGV2ZWw6Oldh cm5pbmcsICJJZ25vcmluZyB1c2VyIHNjcmlwdCBpbmplY3Rpb24gZm9yIG5vbi1hcHAgYm91bmQg ZG9tYWluLiIpOwogICAgICAgICBSRUxFQVNFX0xPR19FUlJPUl9JRl9BTExPV0VEKExvYWRpbmcs ICJydW5KYXZhU2NyaXB0OiBJZ25vcmluZyB1c2VyIHNjcmlwdCBpbmplY3Rpb24gZm9yIG5vbiBh cHAtYm91bmQgZG9tYWluIik7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9D aGFuZ2VMb2cKaW5kZXggNDFiYWZkMDQ4NjQuLmJhODFhODc5ODU4IDEwMDY0NAotLS0gYS9Ub29s cy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjAt MDYtMzAgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAgICAgIEFwcC1i b3VuZCBKYXZhU2NyaXB0IGFuZCBOYXZpZ2F0aW9uIGZhaWx1cmVzIHNob3VsZCBoYXZlIHNwZWNp ZmljIGVycm9yIGNvZGVzLgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjQ5NDAyNjg+IGFuZCBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEzODA4CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdENvY29hL0luQXBwQnJvd3NlclByaXZhY3kubW06CisgICAgICAgIChURVNUKToK KwogMjAyMC0wNi0zMCAgSm9uYXRoYW4gQmVkYXJkICA8amJlZGFyZEBhcHBsZS5jb20+CiAKICAg ICAgICAgW1Rlc3RFeHBlY3RhdGlvbnNdIEFkZCBhcmNoaXRlY3R1cmUgZm9yIEFwcGxlJ3MgcG9y dHMKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvSW5B cHBCcm93c2VyUHJpdmFjeS5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29j b2EvSW5BcHBCcm93c2VyUHJpdmFjeS5tbQppbmRleCA2NzUzYjJmMTgxMS4uNDRjM2IzNmI1M2Ig MTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvSW5BcHBC cm93c2VyUHJpdmFjeS5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENv Y29hL0luQXBwQnJvd3NlclByaXZhY3kubW0KQEAgLTE0OSw2ICsxNDksNyBAQCBURVNUKEluQXBw QnJvd3NlclByaXZhY3ksIE5vbkFwcEJvdW5kRG9tYWluRmFpbGVkVXNlclNjcmlwdEF0U3RhcnQp CiAgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0OkAid2luZG93LndrVXNlclNjcmlwdElu amVjdGVkIiBjb21wbGV0aW9uSGFuZGxlcjpeKGlkIF9OdWxsYWJsZSByZXN1bHQsIE5TRXJyb3Ig KiBfTnVsbGFibGUgZXJyb3IpIHsKICAgICAgICAgRVhQRUNUX0ZBTFNFKHJlc3VsdCk7CiAgICAg ICAgIEVYUEVDVF9UUlVFKCEhZXJyb3IpOworICAgICAgICBFWFBFQ1RfRVEoZXJyb3IuY29kZSwg V0tFcnJvckphdmFTY3JpcHRBcHBCb3VuZERvbWFpbik7CiAgICAgICAgIGlzRG9uZSA9IHRydWU7 CiAgICAgfV07CiAKQEAgLTE4OCw2ICsxODksNyBAQCBURVNUKEluQXBwQnJvd3NlclByaXZhY3ks IE5vbkFwcEJvdW5kRG9tYWluRmFpbGVkVXNlclNjcmlwdEF0RW5kKQogICAgIFt3ZWJWaWV3IGV2 YWx1YXRlSmF2YVNjcmlwdDpAIndpbmRvdy53a1VzZXJTY3JpcHRJbmplY3RlZCIgY29tcGxldGlv bkhhbmRsZXI6XihpZCBfTnVsbGFibGUgcmVzdWx0LCBOU0Vycm9yICogX051bGxhYmxlIGVycm9y KSB7CiAgICAgICAgIEVYUEVDVF9GQUxTRShyZXN1bHQpOwogICAgICAgICBFWFBFQ1RfVFJVRSgh IWVycm9yKTsKKyAgICAgICAgRVhQRUNUX0VRKGVycm9yLmNvZGUsIFdLRXJyb3JKYXZhU2NyaXB0 QXBwQm91bmREb21haW4pOwogICAgICAgICBpc0RvbmUgPSB0cnVlOwogICAgIH1dOwogCkBAIC0y NDIsNiArMjQ0LDcgQEAgVEVTVChJbkFwcEJyb3dzZXJQcml2YWN5LCBOb25BcHBCb3VuZERvbWFp bkZhaWxlZFVzZXJBZ2VudFNjcmlwdHMpCiAgICAgW3dlYlZpZXcyIGV2YWx1YXRlSmF2YVNjcmlw dDpAIndpbmRvdy53a1VzZXJTY3JpcHRJbmplY3RlZCIgY29tcGxldGlvbkhhbmRsZXI6XihpZCBf TnVsbGFibGUgcmVzdWx0LCBOU0Vycm9yICogX051bGxhYmxlIGVycm9yKSB7CiAgICAgICAgIEVY UEVDVF9GQUxTRShyZXN1bHQpOwogICAgICAgICBFWFBFQ1RfVFJVRSghIWVycm9yKTsKKyAgICAg ICAgRVhQRUNUX0VRKGVycm9yLmNvZGUsIFdLRXJyb3JKYXZhU2NyaXB0QXBwQm91bmREb21haW4p OwogICAgICAgICBjbGVhblVwSW5BcHBCcm93c2VyUHJpdmFjeVRlc3RTZXR0aW5ncygpOwogICAg ICAgICBpc0RvbmUgPSB0cnVlOwogICAgIH1dOwpAQCAtMzY0LDcgKzM2Nyw3IEBAIFRFU1QoSW5B cHBCcm93c2VyUHJpdmFjeSwgTm9uQXBwQm91bmRVc2VyU3R5bGVTaGVldEZvclNwZWNpZmljV2Vi Vmlld0ZhaWxzKQogICAgIE5TVVJMUmVxdWVzdCAqcmVxdWVzdCA9IFtOU1VSTFJlcXVlc3QgcmVx dWVzdFdpdGhVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6QCJpbi1hcHAtYnJvd3NlcjovLy9pbi1h cHAtYnJvd3Nlci1wcml2YWN5LXRlc3QtdXNlci1zdHlsZS1zaGVldHMiXV07CiAgICAgW3dlYlZp ZXcgbG9hZFJlcXVlc3Q6cmVxdWVzdF07CiAgICAgTlNFcnJvciAqZXJyb3IgPSBbZGVsZWdhdGUg d2FpdEZvckRpZEZhaWxQcm92aXNpb25hbE5hdmlnYXRpb25FcnJvcl07Ci0gICAgRVhQRUNUX1dL X1NUUkVRKGVycm9yLmxvY2FsaXplZERlc2NyaXB0aW9uLCBAIkFwcC1ib3VuZCBkb21haW4gZmFp bHVyZSIpOworICAgIEVYUEVDVF9FUShlcnJvci5jb2RlLCBXS0Vycm9yTmF2aWdhdGlvbkFwcEJv dW5kRG9tYWluKTsKICAgICBjbGVhblVwSW5BcHBCcm93c2VyUHJpdmFjeVRlc3RTZXR0aW5ncygp OwogfQogCkBAIC0zODcsNyArMzkwLDcgQEAgVEVTVChJbkFwcEJyb3dzZXJQcml2YWN5LCBOb25B cHBCb3VuZFVzZXJTdHlsZVNoZWV0Rm9yQWxsV2ViVmlld3NGYWlscykKICAgICBOU1VSTFJlcXVl c3QgKnJlcXVlc3QgPSBbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltOU1VSTCBVUkxXaXRo U3RyaW5nOkAiaW4tYXBwLWJyb3dzZXI6Ly8vaW4tYXBwLWJyb3dzZXItcHJpdmFjeS10ZXN0LXVz ZXItc3R5bGUtc2hlZXRzIl1dOwogICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OnJlcXVlc3RdOwog ICAgIE5TRXJyb3IgKmVycm9yID0gW2RlbGVnYXRlIHdhaXRGb3JEaWRGYWlsUHJvdmlzaW9uYWxO YXZpZ2F0aW9uRXJyb3JdOwotICAgIEVYUEVDVF9XS19TVFJFUShlcnJvci5sb2NhbGl6ZWREZXNj cmlwdGlvbiwgQCJBcHAtYm91bmQgZG9tYWluIGZhaWx1cmUiKTsKKyAgICBFWFBFQ1RfRVEoZXJy b3IuY29kZSwgV0tFcnJvck5hdmlnYXRpb25BcHBCb3VuZERvbWFpbik7CiAgICAgY2xlYW5VcElu QXBwQnJvd3NlclByaXZhY3lUZXN0U2V0dGluZ3MoKTsKIH0KIApAQCAtNDA5LDcgKzQxMiw3IEBA IFRFU1QoSW5BcHBCcm93c2VyUHJpdmFjeSwgTm9uQXBwQm91bmRVc2VyU3R5bGVTaGVldEFmZmVj dGluZ0FsbEZyYW1lc0ZhaWxzKQogICAgIE5TVVJMUmVxdWVzdCAqcmVxdWVzdCA9IFtOU1VSTFJl cXVlc3QgcmVxdWVzdFdpdGhVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6QCJpbi1hcHAtYnJvd3Nl cjovLy9pbi1hcHAtYnJvd3Nlci1wcml2YWN5LXRlc3QtdXNlci1zdHlsZS1zaGVldHMtaWZyYW1l Il1dOwogICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OnJlcXVlc3RdOwogICAgIE5TRXJyb3IgKmVy cm9yID0gW2RlbGVnYXRlIHdhaXRGb3JEaWRGYWlsUHJvdmlzaW9uYWxOYXZpZ2F0aW9uRXJyb3Jd OwotICAgIEVYUEVDVF9XS19TVFJFUShlcnJvci5sb2NhbGl6ZWREZXNjcmlwdGlvbiwgQCJBcHAt Ym91bmQgZG9tYWluIGZhaWx1cmUiKTsKKyAgICBFWFBFQ1RfRVEoZXJyb3IuY29kZSwgV0tFcnJv ck5hdmlnYXRpb25BcHBCb3VuZERvbWFpbik7CiAgICAgY2xlYW5VcEluQXBwQnJvd3NlclByaXZh Y3lUZXN0U2V0dGluZ3MoKTsKIH0KIApAQCAtODcwLDcgKzg3Myw3IEBAIFRFU1QoSW5BcHBCcm93 c2VyUHJpdmFjeSwgQXBwQm91bmRGbGFnRm9yTm9uQXBwQm91bmREb21haW5GYWlscykKICAgICBO U1VSTFJlcXVlc3QgKnJlcXVlc3QgPSBbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltOU1VS TCBVUkxXaXRoU3RyaW5nOkAiaW4tYXBwLWJyb3dzZXI6Ly8vaW4tYXBwLWJyb3dzZXItcHJpdmFj eS10ZXN0LXVzZXItc3R5bGUtc2hlZXRzIl1dOwogICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OnJl cXVlc3RdOwogICAgIE5TRXJyb3IgKmVycm9yID0gW2RlbGVnYXRlIHdhaXRGb3JEaWRGYWlsUHJv dmlzaW9uYWxOYXZpZ2F0aW9uRXJyb3JdOwotICAgIEVYUEVDVF9XS19TVFJFUShlcnJvci5sb2Nh bGl6ZWREZXNjcmlwdGlvbiwgQCJBcHAtYm91bmQgZG9tYWluIGZhaWx1cmUiKTsKKyAgICBFWFBF Q1RfRVEoZXJyb3IuY29kZSwgV0tFcnJvck5hdmlnYXRpb25BcHBCb3VuZERvbWFpbik7CiAKICAg ICAvLyBNYWtlIHN1cmUgdGhlIGxvYWQgZGlkbid0IGNvbXBsZXRlIGJ5IGNoZWNraW5nIHRoZSBi YWNrZ3JvdW5kIGNvbG9yLgogICAgIC8vIFJlZCB3b3VsZCBpbmRpY2F0ZSBpdCBmaW5pc2hlZCBs b2FkaW5nLgpAQCAtOTAxLDcgKzkwNCw3IEBAIFRFU1QoSW5BcHBCcm93c2VyUHJpdmFjeSwgTmF2 aWdhdGVBd2F5RnJvbUFwcEJvdW5kRG9tYWluV2l0aEFwcEJvdW5kRmxhZ0ZhaWxzKQogICAgIHJl cXVlc3QgPSBbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5n OkAiaW4tYXBwLWJyb3dzZXI6Ly8vaW4tYXBwLWJyb3dzZXItcHJpdmFjeS10ZXN0LXVzZXItc3R5 bGUtc2hlZXRzIl1dOwogICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OnJlcXVlc3RdOwogICAgIE5T RXJyb3IgKmVycm9yID0gW2RlbGVnYXRlIHdhaXRGb3JEaWRGYWlsUHJvdmlzaW9uYWxOYXZpZ2F0 aW9uRXJyb3JdOwotICAgIEVYUEVDVF9XS19TVFJFUShlcnJvci5sb2NhbGl6ZWREZXNjcmlwdGlv biwgQCJBcHAtYm91bmQgZG9tYWluIGZhaWx1cmUiKTsKKyAgICBFWFBFQ1RfRVEoZXJyb3IuY29k ZSwgV0tFcnJvck5hdmlnYXRpb25BcHBCb3VuZERvbWFpbik7CiAKICAgICAvLyBNYWtlIHN1cmUg dGhlIGxvYWQgZGlkbid0IGNvbXBsZXRlIGJ5IGNoZWNraW5nIHRoZSBiYWNrZ3JvdW5kIGNvbG9y LgogICAgIC8vIFJlZCB3b3VsZCBpbmRpY2F0ZSBpdCBmaW5pc2hlZCBsb2FkaW5nLgpAQCAtOTgw LDYgKzk4Myw3IEBAIFRFU1QoSW5BcHBCcm93c2VyUHJpdmFjeSwgV2ViVmlld1dpdGhvdXRBcHBC b3VuZEZsYWdDYW5GcmVlbHlOYXZpZ2F0ZSkKICAgICBpc0RvbmUgPSBmYWxzZTsKICAgICBbd2Vi VmlldyBldmFsdWF0ZUphdmFTY3JpcHQ6QCJ3aW5kb3cud2tVc2VyU2NyaXB0SW5qZWN0ZWQiIGNv bXBsZXRpb25IYW5kbGVyOl4oaWQgX051bGxhYmxlIHJlc3VsdCwgTlNFcnJvciAqIF9OdWxsYWJs ZSBlcnJvcikgewogICAgICAgICBFWFBFQ1RfVFJVRSghIWVycm9yKTsKKyAgICAgICAgRVhQRUNU X0VRKGVycm9yLmNvZGUsIFdLRXJyb3JKYXZhU2NyaXB0QXBwQm91bmREb21haW4pOwogICAgICAg ICBpc0RvbmUgPSB0cnVlOwogICAgIH1dOwogCkBAIC0xMDE3LDcgKzEwMjEsNyBAQCBURVNUKElu QXBwQnJvd3NlclByaXZhY3ksIFdlYlZpZXdDYW5ub3RVcGRhdGVBcHBCb3VuZEZsYWdPbmNlU2V0 KQogICAgIHJlcXVlc3QgPSBbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltOU1VSTCBVUkxX aXRoU3RyaW5nOkAiaW4tYXBwLWJyb3dzZXI6Ly8vaW4tYXBwLWJyb3dzZXItcHJpdmFjeS10ZXN0 LXVzZXItc3R5bGUtc2hlZXRzIl1dOwogICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OnJlcXVlc3Rd OwogICAgIE5TRXJyb3IgKmVycm9yID0gW2RlbGVnYXRlIHdhaXRGb3JEaWRGYWlsUHJvdmlzaW9u YWxOYXZpZ2F0aW9uRXJyb3JdOwotICAgIEVYUEVDVF9XS19TVFJFUShlcnJvci5sb2NhbGl6ZWRE ZXNjcmlwdGlvbiwgQCJBcHAtYm91bmQgZG9tYWluIGZhaWx1cmUiKTsKKyAgICBFWFBFQ1RfRVEo ZXJyb3IuY29kZSwgV0tFcnJvck5hdmlnYXRpb25BcHBCb3VuZERvbWFpbik7CiAKICAgICBjbGVh blVwSW5BcHBCcm93c2VyUHJpdmFjeVRlc3RTZXR0aW5ncygpOwogfQpAQCAtMTA1MCw3ICsxMDU0 LDcgQEAgVEVTVChJbkFwcEJyb3dzZXJQcml2YWN5LCBJbmplY3RTY3JpcHRUaGVuTmF2aWdhdGVU b05vbkFwcEJvdW5kRG9tYWluRmFpbHMpCiAgICAgTlNVUkxSZXF1ZXN0ICpyZXF1ZXN0ID0gW05T VVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAImluLWFwcC1i cm93c2VyOi8vL2luLWFwcC1icm93c2VyLXByaXZhY3ktdGVzdC11c2VyLWFnZW50LXNjcmlwdCJd XTsKICAgICBbd2ViVmlldyBsb2FkUmVxdWVzdDpyZXF1ZXN0XTsKICAgICBOU0Vycm9yICplcnJv ciA9IFtkZWxlZ2F0ZSB3YWl0Rm9yRGlkRmFpbFByb3Zpc2lvbmFsTmF2aWdhdGlvbkVycm9yXTsK LSAgICBFWFBFQ1RfV0tfU1RSRVEoZXJyb3IubG9jYWxpemVkRGVzY3JpcHRpb24sIEAiQXBwLWJv dW5kIGRvbWFpbiBmYWlsdXJlIik7CisgICAgRVhQRUNUX0VRKGVycm9yLmNvZGUsIFdLRXJyb3JO YXZpZ2F0aW9uQXBwQm91bmREb21haW4pOwogfQogCiBURVNUKEluQXBwQnJvd3NlclByaXZhY3ks IFdlYlZpZXdDYXRlZ29yeSkKQEAgLTExMzcsNyArMTE0MSw3IEBAIFRFU1QoSW5BcHBCcm93c2Vy UHJpdmFjeSwgTG9hZEZyb21IVE1MU3RyaW5nc0ZhaWxzSWZOb3RBcHBCb3VuZCkKIAogICAgIFt3 ZWJWaWV3IGxvYWRIVE1MU3RyaW5nOkhUTUwgYmFzZVVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpA ImluLWFwcC1icm93c2VyOi8vL2luLWFwcC1icm93c2VyLXByaXZhY3ktdGVzdC11c2VyLWFnZW50 LXNjcmlwdCJdXTsKICAgICBOU0Vycm9yICplcnJvciA9IFtkZWxlZ2F0ZSB3YWl0Rm9yRGlkRmFp bFByb3Zpc2lvbmFsTmF2aWdhdGlvbkVycm9yXTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoZXJyb3Iu bG9jYWxpemVkRGVzY3JpcHRpb24sIEAiQXBwLWJvdW5kIGRvbWFpbiBmYWlsdXJlIik7CisgICAg RVhQRUNUX0VRKGVycm9yLmNvZGUsIFdLRXJyb3JOYXZpZ2F0aW9uQXBwQm91bmREb21haW4pOwog CiAgICAgaXNEb25lID0gZmFsc2U7CiAgICAgW3dlYlZpZXcgX2lzRm9yY2VkSW50b0FwcEJvdW5k TW9kZTpeKEJPT0wgaXNGb3JjZWRJbnRvQXBwQm91bmRNb2RlKSB7Cg== 403241 2020-06-30 14:27:34 -0700 2020-06-30 15:21:39 -0700 Patch for landing patch text/plain 17354 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjM2UyODc0ODViNC4uNjQxZjM2NmI1ODkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAyMC0wNi0zMCAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+ CisKKyAgICAgICAgQXBwLWJvdW5kIEphdmFTY3JpcHQgYW5kIE5hdmlnYXRpb24gZmFpbHVyZXMg c2hvdWxkIGhhdmUgc3BlY2lmaWMgZXJyb3IgY29kZXMuCisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS82NDk0MDI2OD4gYW5kIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MTM4MDgKKworICAgICAgICBSZXZpZXdlZCBieSBUaW0gSGF0Y2hlci4KKyAgICAgICAgKEluZm9y bWFsbHkgYnkgS2F0ZSBDaGVuZXkpCisKKyAgICAgICAgQ292ZXJlZCBieSBBUEkgdGVzdHMuCisK KyAgICAgICAgKiBiaW5kaW5ncy9qcy9FeGNlcHRpb25EZXRhaWxzLmg6CisKIDIwMjAtMDYtMzAg IEphc29uIExhd3JlbmNlICA8bGF3cmVuY2UuakBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZp ZXdlZCwgcmV2ZXJ0aW5nIHIyNjM3NTMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy9qcy9FeGNlcHRpb25EZXRhaWxzLmggYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9F eGNlcHRpb25EZXRhaWxzLmgKaW5kZXggYmQzYmQ3M2RkYjIuLjYwMzNmODAzYjRjIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9FeGNlcHRpb25EZXRhaWxzLmgKKysrIGIv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvRXhjZXB0aW9uRGV0YWlscy5oCkBAIC0zMyw2ICsz Myw3IEBAIHN0cnVjdCBFeGNlcHRpb25EZXRhaWxzIHsKICAgICBlbnVtIGNsYXNzIFR5cGUgOiB1 aW50OF90IHsKICAgICAgICAgU2NyaXB0LAogICAgICAgICBJbnZhbGlkVGFyZ2V0RnJhbWUsCisg ICAgICAgIEFwcEJvdW5kRG9tYWluLAogICAgIH07CiAKICAgICBTdHJpbmcgbWVzc2FnZTsKQEAg LTUzLDcgKzU0LDggQEAgdGVtcGxhdGU8PiBzdHJ1Y3QgRW51bVRyYWl0czxXZWJDb3JlOjpFeGNl cHRpb25EZXRhaWxzOjpUeXBlPiB7CiAgICAgdXNpbmcgdmFsdWVzID0gRW51bVZhbHVlczwKICAg ICAgICAgV2ViQ29yZTo6RXhjZXB0aW9uRGV0YWlsczo6VHlwZSwKICAgICAgICAgV2ViQ29yZTo6 RXhjZXB0aW9uRGV0YWlsczo6VHlwZTo6U2NyaXB0LAotICAgICAgICBXZWJDb3JlOjpFeGNlcHRp b25EZXRhaWxzOjpUeXBlOjpJbnZhbGlkVGFyZ2V0RnJhbWUKKyAgICAgICAgV2ViQ29yZTo6RXhj ZXB0aW9uRGV0YWlsczo6VHlwZTo6SW52YWxpZFRhcmdldEZyYW1lLAorICAgICAgICBXZWJDb3Jl OjpFeGNlcHRpb25EZXRhaWxzOjpUeXBlOjpBcHBCb3VuZERvbWFpbgogICAgID47CiB9OwogfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5n ZUxvZwppbmRleCBmMzIxMzFkMWNjNi4uYjU2ZDFiNDY0M2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MjggQEAKKzIwMjAtMDYtMzAgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisg ICAgICAgIEFwcC1ib3VuZCBKYXZhU2NyaXB0IGFuZCBOYXZpZ2F0aW9uIGZhaWx1cmVzIHNob3Vs ZCBoYXZlIHNwZWNpZmljIGVycm9yIGNvZGVzLgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjQ5 NDAyNjg+IGFuZCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEzODA4 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgVGltIEhhdGNoZXIuCisgICAgICAgIChJbmZvcm1hbGx5 IGJ5IEthdGUgQ2hlbmV5KQorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS0Vycm9y Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS0Vycm9yLm1tOgorICAgICAgICAo bG9jYWxpemVkRGVzY3JpcHRpb25Gb3JFcnJvckNvZGUpOgorCisgICAgICAgICogVUlQcm9jZXNz L0FQSS9Db2NvYS9XS1dlYlZpZXcubW06CisgICAgICAgIChuc0Vycm9yRnJvbUV4Y2VwdGlvbkRl dGFpbHMpOgorCisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL1dlYlBhZ2VQcm94eUNvY29hLm1t OgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmVycm9yRm9yVW5wZXJtaXR0ZWRBcHBC b3VuZERvbWFpbk5hdmlnYXRpb24pOgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGVjaWRlUG9saWN5Rm9yTmF2 aWdhdGlvbkFjdGlvbik6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorCisg ICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlOjpydW5KYXZhU2NyaXB0KToKKwogMjAyMC0wNi0zMCAgQW50b2luZSBRdWludCAg PGdyYW91dHNAd2Via2l0Lm9yZz4KIAogICAgICAgICBbaU9TXSBDcmFzaCB1bmRlciBXZWJLaXQ6 OldlYlBhZ2U6OmdldEZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24oKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLRXJyb3IuaCBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9Db2NvYS9XS0Vycm9yLmgKaW5kZXggODFhNjY5MWQxMmYuLmEwYThhN2Ri ZWM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tFcnJv ci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS0Vycm9yLmgKQEAg LTQ1LDYgKzQ1LDggQEAgV0tfRVhURVJOIE5TU3RyaW5nICogY29uc3QgV0tFcnJvckRvbWFpbiBX S19BUElfQVZBSUxBQkxFKG1hY29zKDEwLjEwKSwgaW9zKDguMCkKICBAY29uc3RhbnQgV0tFcnJv ckNvbnRlbnRSdWxlTGlzdFN0b3JlVmVyc2lvbk1pc21hdGNoICBJbmRpY2F0ZXMgdGhhdCB0aGUg V0tVc2VyQ29udGVudFJ1bGVMaXN0IHZlcnNpb24gZGlkIG5vdCBtYXRjaCB0aGUgbGF0ZXN0Lgog IEBjb25zdGFudCBXS0Vycm9yQXR0cmlidXRlZFN0cmluZ0NvbnRlbnRGYWlsZWRUb0xvYWQgIElu ZGljYXRlcyB0aGF0IHRoZSBhdHRyaWJ1dGVkIHN0cmluZyBjb250ZW50IGZhaWxlZCB0byBsb2Fk LgogIEBjb25zdGFudCBXS0Vycm9yQXR0cmlidXRlZFN0cmluZ0NvbnRlbnRMb2FkVGltZWRPdXQg IEluZGljYXRlcyB0aGF0IGxvYWRpbmcgYXR0cmlidXRlZCBzdHJpbmcgY29udGVudCB0aW1lZCBv dXQuCisgQGNvbnN0YW50IFdLRXJyb3JOYXZpZ2F0aW9uQXBwQm91bmREb21haW4gIEluZGljYXRl cyB0aGF0IGEgbmF2aWdhdGlvbiBmYWlsZWQgZHVlIHRvIGFuIGFwcC1ib3VuZCBkb21haW4gcmVz dHJpY3Rpb24uCisgQGNvbnN0YW50IFdLRXJyb3JKYXZhU2NyaXB0QXBwQm91bmREb21haW4gIElu ZGljYXRlcyB0aGF0IEphdmFTY3JpcHQgZXhlY3V0aW9uIGZhaWxlZCBkdWUgdG8gYW4gYXBwLWJv dW5kIGRvbWFpbiByZXN0cmljdGlvbi4KICAqLwogdHlwZWRlZiBOU19FTlVNKE5TSW50ZWdlciwg V0tFcnJvckNvZGUpIHsKICAgICBXS0Vycm9yVW5rbm93biA9IDEsCkBAIC01OSw2ICs2MSw4IEBA IHR5cGVkZWYgTlNfRU5VTShOU0ludGVnZXIsIFdLRXJyb3JDb2RlKSB7CiAgICAgV0tFcnJvckF0 dHJpYnV0ZWRTdHJpbmdDb250ZW50RmFpbGVkVG9Mb2FkIFdLX0FQSV9BVkFJTEFCTEUobWFjb3Mo MTAuMTUpLCBpb3MoMTMuMCkpLAogICAgIFdLRXJyb3JBdHRyaWJ1dGVkU3RyaW5nQ29udGVudExv YWRUaW1lZE91dCBXS19BUElfQVZBSUxBQkxFKG1hY29zKDEwLjE1KSwgaW9zKDEzLjApKSwKICAg ICBXS0Vycm9ySmF2YVNjcmlwdEludmFsaWRGcmFtZVRhcmdldCBXS19BUElfQVZBSUxBQkxFKG1h Y29zKFdLX01BQ19UQkEpLCBpb3MoV0tfSU9TX1RCQSkpLAorICAgIFdLRXJyb3JOYXZpZ2F0aW9u QXBwQm91bmREb21haW4gV0tfQVBJX0FWQUlMQUJMRShtYWNvcyhXS19NQUNfVEJBKSwgaW9zKFdL X0lPU19UQkEpKSwKKyAgICBXS0Vycm9ySmF2YVNjcmlwdEFwcEJvdW5kRG9tYWluIFdLX0FQSV9B VkFJTEFCTEUobWFjb3MoV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJBKSksCiB9IFdLX0FQSV9B VkFJTEFCTEUobWFjb3MoMTAuMTApLCBpb3MoOC4wKSk7CiAKIE5TX0FTU1VNRV9OT05OVUxMX0VO RApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLRXJyb3Iu bW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tFcnJvci5tbQppbmRleCBl ZWM3NmRhODA0Yy4uZWYwNWUwYWIxNDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9Db2NvYS9XS0Vycm9yLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS9Db2NvYS9XS0Vycm9yLm1tCkBAIC03Niw2ICs3NiwxMiBAQCBOU1N0cmluZyAqbG9jYWxpemVk RGVzY3JpcHRpb25Gb3JFcnJvckNvZGUoV0tFcnJvckNvZGUgZXJyb3JDb2RlKQogCiAgICAgY2Fz ZSBXS0Vycm9ySmF2YVNjcmlwdEludmFsaWRGcmFtZVRhcmdldDoKICAgICAgICAgcmV0dXJuIFdF Ql9VSV9TVFJJTkcoIkphdmFTY3JpcHQgZXhlY3V0aW9uIHRhcmdldGVkIGFuIGludmFsaWQgZnJh bWUiLCAiV0tFcnJvckphdmFTY3JpcHRJbnZhbGlkRnJhbWVUYXJnZXQgZGVzY3JpcHRpb24iKTsK KworICAgIGNhc2UgV0tFcnJvck5hdmlnYXRpb25BcHBCb3VuZERvbWFpbjoKKyAgICAgICAgcmV0 dXJuIFdFQl9VSV9TVFJJTkcoIkF0dGVtcHRlZCB0byBuYXZpZ2F0ZSBhd2F5IGZyb20gYW4gYXBw LWJvdW5kIGRvbWFpbiBvciBuYXZpZ2F0ZSBhZnRlciB1c2luZyByZXN0cmljdGVkIEFQSXMiLCAi V0tFcnJvck5hdmlnYXRpb25BcHBCb3VuZERvbWFpbiBkZXNjcmlwdGlvbiIpOworCisgICAgY2Fz ZSBXS0Vycm9ySmF2YVNjcmlwdEFwcEJvdW5kRG9tYWluOgorICAgICAgICByZXR1cm4gV0VCX1VJ X1NUUklORygiSmF2YVNjcmlwdCBleGVjdXRpb24gdGFyZ2V0ZWQgYSBmcmFtZSB0aGF0IGlzIG5v dCBpbiBhbiBhcHAtYm91bmQgZG9tYWluIiwgIldLRXJyb3JKYXZhU2NyaXB0QXBwQm91bmREb21h aW4gZGVzY3JpcHRpb24iKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCmluZGV4IDRhMzM4ZWM1M2RmLi4yM2I3YzE5YzFhOSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5t bQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCkBA IC04NzYsNiArODc2LDkgQEAgc3RhdGljIFJldGFpblB0cjxOU0Vycm9yPiBuc0Vycm9yRnJvbUV4 Y2VwdGlvbkRldGFpbHMoY29uc3QgV2ViQ29yZTo6RXhjZXB0aW9uRGUKICAgICBjYXNlIFdlYkNv cmU6OkV4Y2VwdGlvbkRldGFpbHM6OlR5cGU6OlNjcmlwdDoKICAgICAgICAgZXJyb3JDb2RlID0g V0tFcnJvckphdmFTY3JpcHRFeGNlcHRpb25PY2N1cnJlZDsKICAgICAgICAgYnJlYWs7CisgICAg Y2FzZSBXZWJDb3JlOjpFeGNlcHRpb25EZXRhaWxzOjpUeXBlOjpBcHBCb3VuZERvbWFpbjoKKyAg ICAgICAgZXJyb3JDb2RlID0gV0tFcnJvckphdmFTY3JpcHRBcHBCb3VuZERvbWFpbjsKKyAgICAg ICAgYnJlYWs7CiAgICAgfQogCiAgICAgW3VzZXJJbmZvIHNldE9iamVjdDpsb2NhbGl6ZWREZXNj cmlwdGlvbkZvckVycm9yQ29kZShlcnJvckNvZGUpIGZvcktleTpOU0xvY2FsaXplZERlc2NyaXB0 aW9uS2V5XTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlBh Z2VQcm94eUNvY29hLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUGFnZVBy b3h5Q29jb2EubW0KaW5kZXggNzJlNDgzMzNiOGUuLmM2YzRiNjkzOGVlIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQYWdlUHJveHlDb2NvYS5tbQorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQYWdlUHJveHlDb2NvYS5tbQpAQCAtNDEs NiArNDEsNyBAQAogI2ltcG9ydCAiV2ViUGFzdGVib2FyZFByb3h5LmgiCiAjaW1wb3J0ICJXZWJQ cm9jZXNzUHJveHkuaCIKICNpbXBvcnQgIldlYnNpdGVEYXRhU3RvcmUuaCIKKyNpbXBvcnQgIldL RXJyb3JJbnRlcm5hbC5oIgogI2ltcG9ydCA8V2ViQ29yZS9EcmFnSXRlbS5oPgogI2ltcG9ydCA8 V2ViQ29yZS9Mb2NhbEN1cnJlbnRHcmFwaGljc0NvbnRleHQuaD4KICNpbXBvcnQgPFdlYkNvcmUv Tm90SW1wbGVtZW50ZWQuaD4KQEAgLTMwMSw2ICszMDIsMTEgQEAgdm9pZCBXZWJQYWdlUHJveHk6 Omluc2VydERpY3RhdGVkVGV4dEFzeW5jKGNvbnN0IFN0cmluZyYgdGV4dCwgY29uc3QgRWRpdGlu Z1JhbmcKIAogICAgIHNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6Okluc2VydERpY3RhdGVkVGV4dEFz eW5jIHsgdGV4dCwgcmVwbGFjZW1lbnRSYW5nZSwgZGljdGF0aW9uQWx0ZXJuYXRpdmVzLCBXVEZN b3ZlKG9wdGlvbnMpIH0pOwogfQorCitSZXNvdXJjZUVycm9yIFdlYlBhZ2VQcm94eTo6ZXJyb3JG b3JVbnBlcm1pdHRlZEFwcEJvdW5kRG9tYWluTmF2aWdhdGlvbihjb25zdCBVUkwmIHVybCkKK3sK KyAgICByZXR1cm4geyBXS0Vycm9yRG9tYWluLCBXS0Vycm9yTmF2aWdhdGlvbkFwcEJvdW5kRG9t YWluLCB1cmwsIGxvY2FsaXplZERlc2NyaXB0aW9uRm9yRXJyb3JDb2RlKFdLRXJyb3JOYXZpZ2F0 aW9uQXBwQm91bmREb21haW4pIH07Cit9CiAgICAgCiAjaWYgRU5BQkxFKEFQUExFX1BBWSkKIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggN2E3NDcyNTUwOWQu Ljg5ZjRhOGRkNDMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAK QEAgLTUyMDQsMTYgKzUyMDQsMTggQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRlY2lkZVBvbGljeUZv ck5hdmlnYXRpb25BY3Rpb24oUmVmPFdlYlByb2Nlc3NQcm94eT4mJiBwcm9jZXMKICAgICAgICAg ICAgIH0KICAgICAgICAgICAgIHJlY2VpdmVkTmF2aWdhdGlvblBvbGljeURlY2lzaW9uKHBvbGlj eUFjdGlvbiwgbmF2aWdhdGlvbi5nZXQoKSwgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCwg ZnJhbWUsIFdURk1vdmUocG9saWNpZXMpLCBXVEZNb3ZlKHNlbmRlcikpOwogICAgICAgICB9Owot ICAgICAgICAKKworI2lmIFBMQVRGT1JNKENPQ09BKQogICAgICAgICBpZiAocG9saWN5QWN0aW9u ICE9IFBvbGljeUFjdGlvbjo6SWdub3JlKSB7CiAgICAgICAgICAgICBpZiAoIXNldElzTmF2aWdh dGluZ1RvQXBwQm91bmREb21haW5BbmRDaGVja0lmUGVybWl0dGVkKGZyYW1lLT5pc01haW5GcmFt ZSgpLCBuYXZpZ2F0aW9uLT5jdXJyZW50UmVxdWVzdCgpLnVybCgpLCBpc0FwcEJvdW5kRG9tYWlu KSkgewotICAgICAgICAgICAgICAgIGF1dG8gZXJyb3IgPSBSZXNvdXJjZUVycm9yIHsgU3RyaW5n IHsgfSwgMCwgbmF2aWdhdGlvbi0+Y3VycmVudFJlcXVlc3QoKS51cmwoKSwgIkFwcC1ib3VuZCBk b21haW4gZmFpbHVyZSJfcyB9OworICAgICAgICAgICAgICAgIGF1dG8gZXJyb3IgPSBlcnJvckZv clVucGVybWl0dGVkQXBwQm91bmREb21haW5OYXZpZ2F0aW9uKG5hdmlnYXRpb24tPmN1cnJlbnRS ZXF1ZXN0KCkudXJsKCkpOwogICAgICAgICAgICAgICAgIG1fbmF2aWdhdGlvbkNsaWVudC0+ZGlk RmFpbFByb3Zpc2lvbmFsTmF2aWdhdGlvbldpdGhFcnJvcigqdGhpcywgRnJhbWVJbmZvRGF0YSB7 IGZyYW1lSW5mbyB9LCBuYXZpZ2F0aW9uLmdldCgpLCBlcnJvciwgdXNlckRhdGFPYmplY3QpOwog ICAgICAgICAgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SX0lGX0FMTE9XRUQoTG9hZGluZywgIkln bm9yaW5nIHJlcXVlc3QgdG8gbG9hZCB0aGlzIG1haW4gcmVzb3VyY2UgYmVjYXVzZSBpdCBpcyBh dHRlbXB0aW5nIHRvIG5hdmlnYXRlIGF3YXkgZnJvbSBhbiBhcHAtYm91bmQgZG9tYWluIG9yIG5h dmlnYXRlIGFmdGVyIHVzaW5nIHJlc3RyaWN0ZWQgQVBJcyIpOwogICAgICAgICAgICAgICAgIGNv bXBsZXRpb25IYW5kbGVyKFBvbGljeUFjdGlvbjo6SWdub3JlKTsKICAgICAgICAgICAgICAgICBy ZXR1cm47CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KKyNlbmRpZgogCiAgICAgICAgIGlmICgh bV9wYWdlQ2xpZW50KQogICAgICAgICAgICAgcmV0dXJuIGNvbXBsZXRpb25IYW5kbGVyKHBvbGlj eUFjdGlvbik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IGFlMTk1 YmQ3ZTJmLi4zYzM1YWVhZWNiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmgKQEAgLTE3NjAsNiArMTc2MCwxMCBAQCBwdWJsaWM6CiAKICAgICBPcHRpb25hbDxOYXZpZ2F0 aW5nVG9BcHBCb3VuZERvbWFpbj4gaXNOYXZpZ2F0aW5nVG9BcHBCb3VuZERvbWFpbigpIGNvbnN0 IHsgcmV0dXJuIG1faXNOYXZpZ2F0aW5nVG9BcHBCb3VuZERvbWFpbjsgfQogCisjaWYgUExBVEZP Uk0oQ09DT0EpCisgICAgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciBlcnJvckZvclVucGVybWl0dGVk QXBwQm91bmREb21haW5OYXZpZ2F0aW9uKGNvbnN0IFVSTCYpOworI2VuZGlmCisKICAgICB2b2lk IGRpc2FibGVTZXJ2aWNlV29ya2VyRW50aXRsZW1lbnRJbk5ldHdvcmtQcm9jZXNzKCk7CiAgICAg dm9pZCBjbGVhclNlcnZpY2VXb3JrZXJFbnRpdGxlbWVudE92ZXJyaWRlKENvbXBsZXRpb25IYW5k bGVyPHZvaWQoKT4mJik7CiAgICAgICAgIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLmNwcAppbmRleCAxYmZlM2JmODIwZi4uNzc5NjY4YmEzMTYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC0zNDU4LDcgKzM0 NTgsNyBAQCB2b2lkIFdlYlBhZ2U6OnJ1bkphdmFTY3JpcHQoV2ViRnJhbWUqIGZyYW1lLCBSdW5K YXZhU2NyaXB0UGFyYW1ldGVycyYmIHBhcmFtZXRlcgogICAgICAgICBzZW5kKE1lc3NhZ2VzOjpX ZWJQYWdlUHJveHk6OlNjcmlwdFZhbHVlQ2FsbGJhY2soZGF0YVJlZmVyZW5jZSwgZGV0YWlscywg Y2FsbGJhY2tJRCkpOwogICAgIH07CiAgICAgaWYgKHNob3VsZEVuYWJsZUluQXBwQnJvd3NlclBy aXZhY3lQcm90ZWN0aW9ucygpKSB7Ci0gICAgICAgIHNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94 eTo6U2NyaXB0VmFsdWVDYWxsYmFjayh7IH0sIEV4Y2VwdGlvbkRldGFpbHMgeyAiVW5hYmxlIHRv IGV4ZWN1dGUgSmF2YVNjcmlwdCJfcyB9LCBjYWxsYmFja0lEKSk7CisgICAgICAgIHNlbmQoTWVz c2FnZXM6OldlYlBhZ2VQcm94eTo6U2NyaXB0VmFsdWVDYWxsYmFjayh7IH0sIEV4Y2VwdGlvbkRl dGFpbHMgeyAiVW5hYmxlIHRvIGV4ZWN1dGUgSmF2YVNjcmlwdCBpbiBhIGZyYW1lIHRoYXQgaXMg bm90IGluIGFuIGFwcC1ib3VuZCBkb21haW4iX3MsIDAsIDAsIEV4Y2VwdGlvbkRldGFpbHM6OlR5 cGU6OkFwcEJvdW5kRG9tYWluIH0sIGNhbGxiYWNrSUQpKTsKICAgICAgICAgaWYgKGF1dG8qIGRv Y3VtZW50ID0gbV9wYWdlLT5tYWluRnJhbWUoKS5kb2N1bWVudCgpKQogICAgICAgICAgICAgZG9j dW1lbnQtPmFkZENvbnNvbGVNZXNzYWdlKE1lc3NhZ2VTb3VyY2U6OlNlY3VyaXR5LCBNZXNzYWdl TGV2ZWw6Oldhcm5pbmcsICJJZ25vcmluZyB1c2VyIHNjcmlwdCBpbmplY3Rpb24gZm9yIG5vbi1h cHAgYm91bmQgZG9tYWluLiIpOwogICAgICAgICBSRUxFQVNFX0xPR19FUlJPUl9JRl9BTExPV0VE KExvYWRpbmcsICJydW5KYXZhU2NyaXB0OiBJZ25vcmluZyB1c2VyIHNjcmlwdCBpbmplY3Rpb24g Zm9yIG5vbiBhcHAtYm91bmQgZG9tYWluIik7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDFiYWZkMDQ4NjQuLjc0ODJmNDlmNTQ4IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQg QEAKKzIwMjAtMDYtMzAgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgIEFwcC1ib3VuZCBKYXZhU2NyaXB0IGFuZCBOYXZpZ2F0aW9uIGZhaWx1cmVzIHNob3VsZCBo YXZlIHNwZWNpZmljIGVycm9yIGNvZGVzLgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjQ5NDAy Njg+IGFuZCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEzODA4CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgVGltIEhhdGNoZXIuCisgICAgICAgIChJbmZvcm1hbGx5IGJ5 IEthdGUgQ2hlbmV5KQorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2Nv YS9JbkFwcEJyb3dzZXJQcml2YWN5Lm1tOgorICAgICAgICAoVEVTVCk6CisKIDIwMjAtMDYtMzAg IEpvbmF0aGFuIEJlZGFyZCAgPGpiZWRhcmRAYXBwbGUuY29tPgogCiAgICAgICAgIFtUZXN0RXhw ZWN0YXRpb25zXSBBZGQgYXJjaGl0ZWN0dXJlIGZvciBBcHBsZSdzIHBvcnRzCmRpZmYgLS1naXQg YS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0luQXBwQnJvd3NlclByaXZh Y3kubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0luQXBwQnJvd3Nl clByaXZhY3kubW0KaW5kZXggNjc1M2IyZjE4MTEuLjQ0YzNiMzZiNTNiIDEwMDY0NAotLS0gYS9U b29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0luQXBwQnJvd3NlclByaXZhY3ku bW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9JbkFwcEJyb3dz ZXJQcml2YWN5Lm1tCkBAIC0xNDksNiArMTQ5LDcgQEAgVEVTVChJbkFwcEJyb3dzZXJQcml2YWN5 LCBOb25BcHBCb3VuZERvbWFpbkZhaWxlZFVzZXJTY3JpcHRBdFN0YXJ0KQogICAgIFt3ZWJWaWV3 IGV2YWx1YXRlSmF2YVNjcmlwdDpAIndpbmRvdy53a1VzZXJTY3JpcHRJbmplY3RlZCIgY29tcGxl dGlvbkhhbmRsZXI6XihpZCBfTnVsbGFibGUgcmVzdWx0LCBOU0Vycm9yICogX051bGxhYmxlIGVy cm9yKSB7CiAgICAgICAgIEVYUEVDVF9GQUxTRShyZXN1bHQpOwogICAgICAgICBFWFBFQ1RfVFJV RSghIWVycm9yKTsKKyAgICAgICAgRVhQRUNUX0VRKGVycm9yLmNvZGUsIFdLRXJyb3JKYXZhU2Ny aXB0QXBwQm91bmREb21haW4pOwogICAgICAgICBpc0RvbmUgPSB0cnVlOwogICAgIH1dOwogCkBA IC0xODgsNiArMTg5LDcgQEAgVEVTVChJbkFwcEJyb3dzZXJQcml2YWN5LCBOb25BcHBCb3VuZERv bWFpbkZhaWxlZFVzZXJTY3JpcHRBdEVuZCkKICAgICBbd2ViVmlldyBldmFsdWF0ZUphdmFTY3Jp cHQ6QCJ3aW5kb3cud2tVc2VyU2NyaXB0SW5qZWN0ZWQiIGNvbXBsZXRpb25IYW5kbGVyOl4oaWQg X051bGxhYmxlIHJlc3VsdCwgTlNFcnJvciAqIF9OdWxsYWJsZSBlcnJvcikgewogICAgICAgICBF WFBFQ1RfRkFMU0UocmVzdWx0KTsKICAgICAgICAgRVhQRUNUX1RSVUUoISFlcnJvcik7CisgICAg ICAgIEVYUEVDVF9FUShlcnJvci5jb2RlLCBXS0Vycm9ySmF2YVNjcmlwdEFwcEJvdW5kRG9tYWlu KTsKICAgICAgICAgaXNEb25lID0gdHJ1ZTsKICAgICB9XTsKIApAQCAtMjQyLDYgKzI0NCw3IEBA IFRFU1QoSW5BcHBCcm93c2VyUHJpdmFjeSwgTm9uQXBwQm91bmREb21haW5GYWlsZWRVc2VyQWdl bnRTY3JpcHRzKQogICAgIFt3ZWJWaWV3MiBldmFsdWF0ZUphdmFTY3JpcHQ6QCJ3aW5kb3cud2tV c2VyU2NyaXB0SW5qZWN0ZWQiIGNvbXBsZXRpb25IYW5kbGVyOl4oaWQgX051bGxhYmxlIHJlc3Vs dCwgTlNFcnJvciAqIF9OdWxsYWJsZSBlcnJvcikgewogICAgICAgICBFWFBFQ1RfRkFMU0UocmVz dWx0KTsKICAgICAgICAgRVhQRUNUX1RSVUUoISFlcnJvcik7CisgICAgICAgIEVYUEVDVF9FUShl cnJvci5jb2RlLCBXS0Vycm9ySmF2YVNjcmlwdEFwcEJvdW5kRG9tYWluKTsKICAgICAgICAgY2xl YW5VcEluQXBwQnJvd3NlclByaXZhY3lUZXN0U2V0dGluZ3MoKTsKICAgICAgICAgaXNEb25lID0g dHJ1ZTsKICAgICB9XTsKQEAgLTM2NCw3ICszNjcsNyBAQCBURVNUKEluQXBwQnJvd3NlclByaXZh Y3ksIE5vbkFwcEJvdW5kVXNlclN0eWxlU2hlZXRGb3JTcGVjaWZpY1dlYlZpZXdGYWlscykKICAg ICBOU1VSTFJlcXVlc3QgKnJlcXVlc3QgPSBbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltO U1VSTCBVUkxXaXRoU3RyaW5nOkAiaW4tYXBwLWJyb3dzZXI6Ly8vaW4tYXBwLWJyb3dzZXItcHJp dmFjeS10ZXN0LXVzZXItc3R5bGUtc2hlZXRzIl1dOwogICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0 OnJlcXVlc3RdOwogICAgIE5TRXJyb3IgKmVycm9yID0gW2RlbGVnYXRlIHdhaXRGb3JEaWRGYWls UHJvdmlzaW9uYWxOYXZpZ2F0aW9uRXJyb3JdOwotICAgIEVYUEVDVF9XS19TVFJFUShlcnJvci5s b2NhbGl6ZWREZXNjcmlwdGlvbiwgQCJBcHAtYm91bmQgZG9tYWluIGZhaWx1cmUiKTsKKyAgICBF WFBFQ1RfRVEoZXJyb3IuY29kZSwgV0tFcnJvck5hdmlnYXRpb25BcHBCb3VuZERvbWFpbik7CiAg ICAgY2xlYW5VcEluQXBwQnJvd3NlclByaXZhY3lUZXN0U2V0dGluZ3MoKTsKIH0KIApAQCAtMzg3 LDcgKzM5MCw3IEBAIFRFU1QoSW5BcHBCcm93c2VyUHJpdmFjeSwgTm9uQXBwQm91bmRVc2VyU3R5 bGVTaGVldEZvckFsbFdlYlZpZXdzRmFpbHMpCiAgICAgTlNVUkxSZXF1ZXN0ICpyZXF1ZXN0ID0g W05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAImluLWFw cC1icm93c2VyOi8vL2luLWFwcC1icm93c2VyLXByaXZhY3ktdGVzdC11c2VyLXN0eWxlLXNoZWV0 cyJdXTsKICAgICBbd2ViVmlldyBsb2FkUmVxdWVzdDpyZXF1ZXN0XTsKICAgICBOU0Vycm9yICpl cnJvciA9IFtkZWxlZ2F0ZSB3YWl0Rm9yRGlkRmFpbFByb3Zpc2lvbmFsTmF2aWdhdGlvbkVycm9y XTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoZXJyb3IubG9jYWxpemVkRGVzY3JpcHRpb24sIEAiQXBw LWJvdW5kIGRvbWFpbiBmYWlsdXJlIik7CisgICAgRVhQRUNUX0VRKGVycm9yLmNvZGUsIFdLRXJy b3JOYXZpZ2F0aW9uQXBwQm91bmREb21haW4pOwogICAgIGNsZWFuVXBJbkFwcEJyb3dzZXJQcml2 YWN5VGVzdFNldHRpbmdzKCk7CiB9CiAKQEAgLTQwOSw3ICs0MTIsNyBAQCBURVNUKEluQXBwQnJv d3NlclByaXZhY3ksIE5vbkFwcEJvdW5kVXNlclN0eWxlU2hlZXRBZmZlY3RpbmdBbGxGcmFtZXNG YWlscykKICAgICBOU1VSTFJlcXVlc3QgKnJlcXVlc3QgPSBbTlNVUkxSZXF1ZXN0IHJlcXVlc3RX aXRoVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5nOkAiaW4tYXBwLWJyb3dzZXI6Ly8vaW4tYXBwLWJy b3dzZXItcHJpdmFjeS10ZXN0LXVzZXItc3R5bGUtc2hlZXRzLWlmcmFtZSJdXTsKICAgICBbd2Vi VmlldyBsb2FkUmVxdWVzdDpyZXF1ZXN0XTsKICAgICBOU0Vycm9yICplcnJvciA9IFtkZWxlZ2F0 ZSB3YWl0Rm9yRGlkRmFpbFByb3Zpc2lvbmFsTmF2aWdhdGlvbkVycm9yXTsKLSAgICBFWFBFQ1Rf V0tfU1RSRVEoZXJyb3IubG9jYWxpemVkRGVzY3JpcHRpb24sIEAiQXBwLWJvdW5kIGRvbWFpbiBm YWlsdXJlIik7CisgICAgRVhQRUNUX0VRKGVycm9yLmNvZGUsIFdLRXJyb3JOYXZpZ2F0aW9uQXBw Qm91bmREb21haW4pOwogICAgIGNsZWFuVXBJbkFwcEJyb3dzZXJQcml2YWN5VGVzdFNldHRpbmdz KCk7CiB9CiAKQEAgLTg3MCw3ICs4NzMsNyBAQCBURVNUKEluQXBwQnJvd3NlclByaXZhY3ksIEFw cEJvdW5kRmxhZ0Zvck5vbkFwcEJvdW5kRG9tYWluRmFpbHMpCiAgICAgTlNVUkxSZXF1ZXN0ICpy ZXF1ZXN0ID0gW05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0cmlu ZzpAImluLWFwcC1icm93c2VyOi8vL2luLWFwcC1icm93c2VyLXByaXZhY3ktdGVzdC11c2VyLXN0 eWxlLXNoZWV0cyJdXTsKICAgICBbd2ViVmlldyBsb2FkUmVxdWVzdDpyZXF1ZXN0XTsKICAgICBO U0Vycm9yICplcnJvciA9IFtkZWxlZ2F0ZSB3YWl0Rm9yRGlkRmFpbFByb3Zpc2lvbmFsTmF2aWdh dGlvbkVycm9yXTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoZXJyb3IubG9jYWxpemVkRGVzY3JpcHRp b24sIEAiQXBwLWJvdW5kIGRvbWFpbiBmYWlsdXJlIik7CisgICAgRVhQRUNUX0VRKGVycm9yLmNv ZGUsIFdLRXJyb3JOYXZpZ2F0aW9uQXBwQm91bmREb21haW4pOwogCiAgICAgLy8gTWFrZSBzdXJl IHRoZSBsb2FkIGRpZG4ndCBjb21wbGV0ZSBieSBjaGVja2luZyB0aGUgYmFja2dyb3VuZCBjb2xv ci4KICAgICAvLyBSZWQgd291bGQgaW5kaWNhdGUgaXQgZmluaXNoZWQgbG9hZGluZy4KQEAgLTkw MSw3ICs5MDQsNyBAQCBURVNUKEluQXBwQnJvd3NlclByaXZhY3ksIE5hdmlnYXRlQXdheUZyb21B cHBCb3VuZERvbWFpbldpdGhBcHBCb3VuZEZsYWdGYWlscykKICAgICByZXF1ZXN0ID0gW05TVVJM UmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAImluLWFwcC1icm93 c2VyOi8vL2luLWFwcC1icm93c2VyLXByaXZhY3ktdGVzdC11c2VyLXN0eWxlLXNoZWV0cyJdXTsK ICAgICBbd2ViVmlldyBsb2FkUmVxdWVzdDpyZXF1ZXN0XTsKICAgICBOU0Vycm9yICplcnJvciA9 IFtkZWxlZ2F0ZSB3YWl0Rm9yRGlkRmFpbFByb3Zpc2lvbmFsTmF2aWdhdGlvbkVycm9yXTsKLSAg ICBFWFBFQ1RfV0tfU1RSRVEoZXJyb3IubG9jYWxpemVkRGVzY3JpcHRpb24sIEAiQXBwLWJvdW5k IGRvbWFpbiBmYWlsdXJlIik7CisgICAgRVhQRUNUX0VRKGVycm9yLmNvZGUsIFdLRXJyb3JOYXZp Z2F0aW9uQXBwQm91bmREb21haW4pOwogCiAgICAgLy8gTWFrZSBzdXJlIHRoZSBsb2FkIGRpZG4n dCBjb21wbGV0ZSBieSBjaGVja2luZyB0aGUgYmFja2dyb3VuZCBjb2xvci4KICAgICAvLyBSZWQg d291bGQgaW5kaWNhdGUgaXQgZmluaXNoZWQgbG9hZGluZy4KQEAgLTk4MCw2ICs5ODMsNyBAQCBU RVNUKEluQXBwQnJvd3NlclByaXZhY3ksIFdlYlZpZXdXaXRob3V0QXBwQm91bmRGbGFnQ2FuRnJl ZWx5TmF2aWdhdGUpCiAgICAgaXNEb25lID0gZmFsc2U7CiAgICAgW3dlYlZpZXcgZXZhbHVhdGVK YXZhU2NyaXB0OkAid2luZG93LndrVXNlclNjcmlwdEluamVjdGVkIiBjb21wbGV0aW9uSGFuZGxl cjpeKGlkIF9OdWxsYWJsZSByZXN1bHQsIE5TRXJyb3IgKiBfTnVsbGFibGUgZXJyb3IpIHsKICAg ICAgICAgRVhQRUNUX1RSVUUoISFlcnJvcik7CisgICAgICAgIEVYUEVDVF9FUShlcnJvci5jb2Rl LCBXS0Vycm9ySmF2YVNjcmlwdEFwcEJvdW5kRG9tYWluKTsKICAgICAgICAgaXNEb25lID0gdHJ1 ZTsKICAgICB9XTsKIApAQCAtMTAxNyw3ICsxMDIxLDcgQEAgVEVTVChJbkFwcEJyb3dzZXJQcml2 YWN5LCBXZWJWaWV3Q2Fubm90VXBkYXRlQXBwQm91bmRGbGFnT25jZVNldCkKICAgICByZXF1ZXN0 ID0gW05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAImlu LWFwcC1icm93c2VyOi8vL2luLWFwcC1icm93c2VyLXByaXZhY3ktdGVzdC11c2VyLXN0eWxlLXNo ZWV0cyJdXTsKICAgICBbd2ViVmlldyBsb2FkUmVxdWVzdDpyZXF1ZXN0XTsKICAgICBOU0Vycm9y ICplcnJvciA9IFtkZWxlZ2F0ZSB3YWl0Rm9yRGlkRmFpbFByb3Zpc2lvbmFsTmF2aWdhdGlvbkVy cm9yXTsKLSAgICBFWFBFQ1RfV0tfU1RSRVEoZXJyb3IubG9jYWxpemVkRGVzY3JpcHRpb24sIEAi QXBwLWJvdW5kIGRvbWFpbiBmYWlsdXJlIik7CisgICAgRVhQRUNUX0VRKGVycm9yLmNvZGUsIFdL RXJyb3JOYXZpZ2F0aW9uQXBwQm91bmREb21haW4pOwogCiAgICAgY2xlYW5VcEluQXBwQnJvd3Nl clByaXZhY3lUZXN0U2V0dGluZ3MoKTsKIH0KQEAgLTEwNTAsNyArMTA1NCw3IEBAIFRFU1QoSW5B cHBCcm93c2VyUHJpdmFjeSwgSW5qZWN0U2NyaXB0VGhlbk5hdmlnYXRlVG9Ob25BcHBCb3VuZERv bWFpbkZhaWxzKQogICAgIE5TVVJMUmVxdWVzdCAqcmVxdWVzdCA9IFtOU1VSTFJlcXVlc3QgcmVx dWVzdFdpdGhVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6QCJpbi1hcHAtYnJvd3NlcjovLy9pbi1h cHAtYnJvd3Nlci1wcml2YWN5LXRlc3QtdXNlci1hZ2VudC1zY3JpcHQiXV07CiAgICAgW3dlYlZp ZXcgbG9hZFJlcXVlc3Q6cmVxdWVzdF07CiAgICAgTlNFcnJvciAqZXJyb3IgPSBbZGVsZWdhdGUg d2FpdEZvckRpZEZhaWxQcm92aXNpb25hbE5hdmlnYXRpb25FcnJvcl07Ci0gICAgRVhQRUNUX1dL X1NUUkVRKGVycm9yLmxvY2FsaXplZERlc2NyaXB0aW9uLCBAIkFwcC1ib3VuZCBkb21haW4gZmFp bHVyZSIpOworICAgIEVYUEVDVF9FUShlcnJvci5jb2RlLCBXS0Vycm9yTmF2aWdhdGlvbkFwcEJv dW5kRG9tYWluKTsKIH0KIAogVEVTVChJbkFwcEJyb3dzZXJQcml2YWN5LCBXZWJWaWV3Q2F0ZWdv cnkpCkBAIC0xMTM3LDcgKzExNDEsNyBAQCBURVNUKEluQXBwQnJvd3NlclByaXZhY3ksIExvYWRG cm9tSFRNTFN0cmluZ3NGYWlsc0lmTm90QXBwQm91bmQpCiAKICAgICBbd2ViVmlldyBsb2FkSFRN TFN0cmluZzpIVE1MIGJhc2VVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6QCJpbi1hcHAtYnJvd3Nl cjovLy9pbi1hcHAtYnJvd3Nlci1wcml2YWN5LXRlc3QtdXNlci1hZ2VudC1zY3JpcHQiXV07CiAg ICAgTlNFcnJvciAqZXJyb3IgPSBbZGVsZWdhdGUgd2FpdEZvckRpZEZhaWxQcm92aXNpb25hbE5h dmlnYXRpb25FcnJvcl07Ci0gICAgRVhQRUNUX1dLX1NUUkVRKGVycm9yLmxvY2FsaXplZERlc2Ny aXB0aW9uLCBAIkFwcC1ib3VuZCBkb21haW4gZmFpbHVyZSIpOworICAgIEVYUEVDVF9FUShlcnJv ci5jb2RlLCBXS0Vycm9yTmF2aWdhdGlvbkFwcEJvdW5kRG9tYWluKTsKIAogICAgIGlzRG9uZSA9 IGZhbHNlOwogICAgIFt3ZWJWaWV3IF9pc0ZvcmNlZEludG9BcHBCb3VuZE1vZGU6XihCT09MIGlz Rm9yY2VkSW50b0FwcEJvdW5kTW9kZSkgewo=