203002 2019-10-15 13:12:17 -0700 Standardize "PageID=" vs "pageID =" in release logging 2019-10-25 01:15:16 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser cdumez commit-queue dbates ews-watchlist ggaren mkwst simon.fraser thorton webkit-bug-importer oldest_to_newest 1580218 0 simon.fraser 2019-10-15 13:12:17 -0700 It's hard to search logs if the output is sometimes "pageID = 6" and others is "(PageID=6)" 1583643 1 381871 cdumez 2019-10-24 20:46:14 -0700 Created attachment 381871 Patch 1583659 2 381871 ggaren 2019-10-24 21:31:33 -0700 Comment on attachment 381871 Patch r=me 1583679 3 commit-queue 2019-10-24 22:47:38 -0700 The commit-queue encountered the following flaky tests while processing attachment 381871: imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/integrity.html bug 203394 (author: ysuzuki@apple.com) The commit-queue is continuing to process your patch. 1583680 4 commit-queue 2019-10-24 22:47:40 -0700 The commit-queue encountered the following flaky tests while processing attachment 381871: The commit-queue is continuing to process your patch. 1583713 5 381871 commit-queue 2019-10-25 01:14:14 -0700 Comment on attachment 381871 Patch Clearing flags on attachment: 381871 Committed r251585: <https://trac.webkit.org/changeset/251585> 1583714 6 commit-queue 2019-10-25 01:14:16 -0700 All reviewed patches have been landed. Closing bug. 1583717 7 webkit-bug-importer 2019-10-25 01:15:16 -0700 <rdar://problem/56611436> 381871 2019-10-24 20:46:14 -0700 2019-10-25 01:14:14 -0700 Patch bug-203002-20191024204614.patch text/plain 52542 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjUxNTc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGI0NDBjMzk2Yzg4NzE3YjFl NWYzMDI2NzkzYTEzY2MzNjhiNDZkYjMuLmE2MGE2MTg3NzFlZTgwMmMzMjJhZWRjZTZjNjllMjE3 Yzc2M2Y0NjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNTIgQEAKKzIwMTktMTAtMjQgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBTdGFuZGFyZGl6ZSAiUGFnZUlEPSIg dnMgInBhZ2VJRCA9IiBpbiByZWxlYXNlIGxvZ2dpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMzAwMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcu bW06CisgICAgICAgICgtW1dLV2ViVmlldyBfZGlkQ29tbWl0TGF5ZXJUcmVlOl0pOgorICAgICAg ICAoLVtXS1dlYlZpZXcgX3VwZGF0ZVZpc2libGVDb250ZW50UmVjdHNdKToKKyAgICAgICAgKC1b V0tXZWJWaWV3IF9jYW5jZWxBbmltYXRlZFJlc2l6ZV0pOgorICAgICAgICAoLVtXS1dlYlZpZXcg X2RpZENvbXBsZXRlQW5pbWF0ZWRSZXNpemVdKToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9iZWdp bkFuaW1hdGVkUmVzaXplV2l0aFVwZGF0ZXM6XSk6CisgICAgICAgICgtW1dLV2ViVmlldyBfZW5k QW5pbWF0ZWRSZXNpemVdKToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9yZXNpemVXaGlsZUhpZGlu Z0NvbnRlbnRXaXRoVXBkYXRlczpdKToKKyAgICAgICAgKiBVSVByb2Nlc3MvUHJvdmlzaW9uYWxQ YWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6UHJv dmlzaW9uYWxQYWdlUHJveHkpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94 eTo6cHJvY2Vzc0RpZFRlcm1pbmF0ZSk6CisgICAgICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFn ZVByb3h5OjpjYW5jZWwpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6 bG9hZERhdGEpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6bG9hZFJl cXVlc3QpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6Z29Ub0JhY2tG b3J3YXJkSXRlbSk6CisgICAgICAgIChXZWJLaXQ6OlByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRD cmVhdGVNYWluRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6 ZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSk6CisgICAgICAgIChXZWJLaXQ6OlByb3Zp c2lvbmFsUGFnZVByb3h5OjpkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUpOgorICAgICAg ICAoV2ViS2l0OjpQcm92aXNpb25hbFBhZ2VQcm94eTo6ZGlkQ29tbWl0TG9hZEZvckZyYW1lKToK KyAgICAgICAgKiBXZWJQcm9jZXNzL05ldHdvcmsvV2ViTG9hZGVyU3RyYXRlZ3kuY3BwOgorICAg ICAgICAoV2ViS2l0OjpXZWJMb2FkZXJTdHJhdGVneTo6bG9hZFJlc291cmNlKToKKyAgICAgICAg KFdlYktpdDo6V2ViTG9hZGVyU3RyYXRlZ3k6OnNjaGVkdWxlTG9hZCk6CisgICAgICAgIChXZWJL aXQ6OldlYkxvYWRlclN0cmF0ZWd5Ojp0cnlMb2FkaW5nVXNpbmdVUkxTY2hlbWVIYW5kbGVyKToK KyAgICAgICAgKFdlYktpdDo6V2ViTG9hZGVyU3RyYXRlZ3k6OnNjaGVkdWxlTG9hZEZyb21OZXR3 b3JrUHJvY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6OldlYkxvYWRlclN0cmF0ZWd5Ojpsb2FkUmVz b3VyY2VTeW5jaHJvbm91c2x5KToKKyAgICAgICAgKiBXZWJQcm9jZXNzL05ldHdvcmsvV2ViUmVz b3VyY2VMb2FkZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRlcjo6d2ls bFNlbmRSZXF1ZXN0KToKKyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkZXI6OmRpZFJl Y2VpdmVSZXNwb25zZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZGVyOjpkaWRS ZWNlaXZlRGF0YSk6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZGVyOjpkaWRGaW5p c2hSZXNvdXJjZUxvYWQpOgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRlcjo6c2Vy dmljZVdvcmtlckRpZE5vdEhhbmRsZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9h ZGVyOjpkaWRGYWlsUmVzb3VyY2VMb2FkKToKKyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3VyY2VM b2FkZXI6OmRpZEJsb2NrQXV0aGVudGljYXRpb25DaGFsbGVuZ2UpOgorICAgICAgICAoV2ViS2l0 OjpXZWJSZXNvdXJjZUxvYWRlcjo6c3RvcExvYWRpbmdBZnRlclhGcmFtZU9wdGlvbnNPckNvbnRl bnRTZWN1cml0eVBvbGljeURlbmllZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9h ZGVyOjpkaWRSZWNlaXZlUmVzb3VyY2UpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1 cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFt ZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRGYWlsUHJvdmlzaW9uYWxMb2FkKToKKyAgICAgICAg KFdlYktpdDo6V2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkRmFpbExvYWQpOgorICAg ICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 V2ViUGFnZTo6ZnJlZXplTGF5ZXJUcmVlKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6dW5m cmVlemVMYXllclRyZWUpOgorCiAyMDE5LTEwLTI0ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBs ZS5jb20+CiAKICAgICAgICAgU2ltcGxpZnkgUHJvY2Vzc1Rocm90dGxlciBpbXBsZW1lbnRhdGlv bgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmll dy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5k ZXggNmY3ZjNlY2M2ZmNhMGJlMTc0ZDRhNjA2MWRjN2FiMmU5Zjk2ZDM2Yi4uNzY4YTRkODU3NDJk YTUxZmEyNjVhY2E5OTkwMzBhNTlmOTk1ZGZlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCkBAIC0yMDQwLDE0ICsyMDQwLDE0IEBAIC0gKHZv aWQpX2RpZENvbW1pdExheWVyVHJlZUR1cmluZ0FuaW1hdGVkUmVzaXplOihjb25zdCBXZWJLaXQ6 OlJlbW90ZUxheWVyVHJlZVRyCiAtICh2b2lkKV9kaWRDb21taXRMYXllclRyZWU6KGNvbnN0IFdl YktpdDo6UmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb24mKWxheWVyVHJlZVRyYW5zYWN0aW9uCiB7 CiAgICAgaWYgKF9kaWREZWZlclVwZGF0ZVZpc2libGVDb250ZW50UmVjdHNGb3JVbnN0YWJsZVNj cm9sbFZpZXcpIHsKLSAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgiJXAgKFBhZ2VJRD0l bGx1KSAtW1dLV2ViVmlldyBfZGlkQ29tbWl0TGF5ZXJUcmVlOl0gLSByZWNlaXZlZCBhIGNvbW1p dCAoJWxsdSkgd2hpbGUgZGVmZXJyaW5nIHZpc2libGUgY29udGVudCByZWN0IHVwZGF0ZXMgKF9k eW5hbWljVmlld3BvcnRVcGRhdGVNb2RlICVkLCBfbmVlZHNSZXNldFZpZXdTdGF0ZUFmdGVyQ29t bWl0TG9hZEZvck1haW5GcmFtZSAlZCAod2FudHMgY29tbWl0ICVsbHUpLCBzaXplQ2hhbmdlZFNp bmNlTGFzdFZpc2libGVDb250ZW50UmVjdFVwZGF0ZSAlZCwgW19zY3JvbGxWaWV3IGlzWm9vbUJv dW5jaW5nXSAlZCwgX2N1cnJlbnRseUFkanVzdGluZ1Njcm9sbFZpZXdJbnNldHNGb3JLZXlib2Fy ZCAlZCkiLAorICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCIlcCAocGFnZVByb3h5SUQ9 JWxsdSkgLVtXS1dlYlZpZXcgX2RpZENvbW1pdExheWVyVHJlZTpdIC0gcmVjZWl2ZWQgYSBjb21t aXQgKCVsbHUpIHdoaWxlIGRlZmVycmluZyB2aXNpYmxlIGNvbnRlbnQgcmVjdCB1cGRhdGVzIChf ZHluYW1pY1ZpZXdwb3J0VXBkYXRlTW9kZSAlZCwgX25lZWRzUmVzZXRWaWV3U3RhdGVBZnRlckNv bW1pdExvYWRGb3JNYWluRnJhbWUgJWQgKHdhbnRzIGNvbW1pdCAlbGx1KSwgc2l6ZUNoYW5nZWRT aW5jZUxhc3RWaXNpYmxlQ29udGVudFJlY3RVcGRhdGUgJWQsIFtfc2Nyb2xsVmlldyBpc1pvb21C b3VuY2luZ10gJWQsIF9jdXJyZW50bHlBZGp1c3RpbmdTY3JvbGxWaWV3SW5zZXRzRm9yS2V5Ym9h cmQgJWQpIiwKICAgICAgICAgc2VsZiwgX3BhZ2UtPmlkZW50aWZpZXIoKS50b1VJbnQ2NCgpLCBs YXllclRyZWVUcmFuc2FjdGlvbi50cmFuc2FjdGlvbklEKCkudG9VSW50NjQoKSwgX2R5bmFtaWNW aWV3cG9ydFVwZGF0ZU1vZGUsIF9uZWVkc1Jlc2V0Vmlld1N0YXRlQWZ0ZXJDb21taXRMb2FkRm9y TWFpbkZyYW1lLCBfZmlyc3RQYWludEFmdGVyQ29tbWl0TG9hZFRyYW5zYWN0aW9uSUQudG9VSW50 NjQoKSwgW19jb250ZW50VmlldyBzaXplQ2hhbmdlZFNpbmNlTGFzdFZpc2libGVDb250ZW50UmVj dFVwZGF0ZV0sIFtfc2Nyb2xsVmlldyBpc1pvb21Cb3VuY2luZ10sIF9jdXJyZW50bHlBZGp1c3Rp bmdTY3JvbGxWaWV3SW5zZXRzRm9yS2V5Ym9hcmQpOwogICAgIH0KIAogICAgIGlmIChfdGltZU9m Rmlyc3RWaXNpYmxlQ29udGVudFJlY3RVcGRhdGVXaXRoUGVuZGluZ0NvbW1pdCkgewogICAgICAg ICBhdXRvIHRpbWVTaW5jZUZpcnN0UmVxdWVzdFdpdGhQZW5kaW5nQ29tbWl0ID0gTW9ub3Rvbmlj VGltZTo6bm93KCkgLSAqX3RpbWVPZkZpcnN0VmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlV2l0aFBl bmRpbmdDb21taXQ7CiAgICAgICAgIGlmICh0aW1lU2luY2VGaXJzdFJlcXVlc3RXaXRoUGVuZGlu Z0NvbW1pdCA+IGRlbGF5QmVmb3JlTm9Db21taXRzTG9nZ2luZykKLSAgICAgICAgICAgIFJFTEVB U0VfTE9HX0lGX0FMTE9XRUQoIiVwIChQYWdlSUQ9JWxsdSkgLVtXS1dlYlZpZXcgX2RpZENvbW1p dExheWVyVHJlZTpdIC0gZmluYWxseSByZWNlaXZlZCBjb21taXQgJS4yZnMgYWZ0ZXIgdmlzaWJs ZSBjb250ZW50IHJlY3QgdXBkYXRlIHJlcXVlc3Q7IHRyYW5zYWN0aW9uSUQgJWxsdSIsIHNlbGYs IF9wYWdlLT5pZGVudGlmaWVyKCkudG9VSW50NjQoKSwgdGltZVNpbmNlRmlyc3RSZXF1ZXN0V2l0 aFBlbmRpbmdDb21taXQudmFsdWUoKSwgbGF5ZXJUcmVlVHJhbnNhY3Rpb24udHJhbnNhY3Rpb25J RCgpLnRvVUludDY0KCkpOworICAgICAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgiJXAg KHBhZ2VQcm94eUlEPSVsbHUpIC1bV0tXZWJWaWV3IF9kaWRDb21taXRMYXllclRyZWU6XSAtIGZp bmFsbHkgcmVjZWl2ZWQgY29tbWl0ICUuMmZzIGFmdGVyIHZpc2libGUgY29udGVudCByZWN0IHVw ZGF0ZSByZXF1ZXN0OyB0cmFuc2FjdGlvbklEICVsbHUiLCBzZWxmLCBfcGFnZS0+aWRlbnRpZmll cigpLnRvVUludDY0KCksIHRpbWVTaW5jZUZpcnN0UmVxdWVzdFdpdGhQZW5kaW5nQ29tbWl0LnZh bHVlKCksIGxheWVyVHJlZVRyYW5zYWN0aW9uLnRyYW5zYWN0aW9uSUQoKS50b1VJbnQ2NCgpKTsK ICAgICAgICAgX3RpbWVPZkZpcnN0VmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlV2l0aFBlbmRpbmdD b21taXQgPSBXVEY6Om51bGxvcHQ7CiAgICAgfQogCkBAIC0zMTQ5LDcgKzMxNDksNyBAQCAtICh2 b2lkKV91cGRhdGVWaXNpYmxlQ29udGVudFJlY3RzCiAgICAgICAgIFtfcGFzc3dvcmRWaWV3IHNl dEZyYW1lOnNlbGYuYm91bmRzXTsKICAgICAgICAgW19jdXN0b21Db250ZW50VmlldyB3ZWJfY29t cHV0ZWRDb250ZW50SW5zZXREaWRDaGFuZ2VdOwogICAgICAgICBfZGlkRGVmZXJVcGRhdGVWaXNp YmxlQ29udGVudFJlY3RzRm9yQW55UmVhc29uID0gWUVTOwotICAgICAgICBSRUxFQVNFX0xPR19J Rl9BTExPV0VEKCIlcCAoUGFnZUlEPSVsbHUpIC1bV0tXZWJWaWV3IF91cGRhdGVWaXNpYmxlQ29u dGVudFJlY3RzOl0gLSB1c2VzU3RhbmRhcmRDb250ZW50VmlldyBpcyBOTywgYmFpbGluZyIsIHNl bGYsIF9wYWdlLT5pZGVudGlmaWVyKCkudG9VSW50NjQoKSk7CisgICAgICAgIFJFTEVBU0VfTE9H X0lGX0FMTE9XRUQoIiVwIChwYWdlUHJveHlJRD0lbGx1KSAtW1dLV2ViVmlldyBfdXBkYXRlVmlz aWJsZUNvbnRlbnRSZWN0czpdIC0gdXNlc1N0YW5kYXJkQ29udGVudFZpZXcgaXMgTk8sIGJhaWxp bmciLCBzZWxmLCBfcGFnZS0+aWRlbnRpZmllcigpLnRvVUludDY0KCkpOwogICAgICAgICByZXR1 cm47CiAgICAgfQogCkBAIC0zMTU3LDEzICszMTU3LDEzIEBAIC0gKHZvaWQpX3VwZGF0ZVZpc2li bGVDb250ZW50UmVjdHMKICAgICBpZiAoX3RpbWVPZkZpcnN0VmlzaWJsZUNvbnRlbnRSZWN0VXBk YXRlV2l0aFBlbmRpbmdDb21taXQpIHsKICAgICAgICAgYXV0byB0aW1lU2luY2VGaXJzdFJlcXVl c3RXaXRoUGVuZGluZ0NvbW1pdCA9IHRpbWVOb3cgLSAqX3RpbWVPZkZpcnN0VmlzaWJsZUNvbnRl bnRSZWN0VXBkYXRlV2l0aFBlbmRpbmdDb21taXQ7CiAgICAgICAgIGlmICh0aW1lU2luY2VGaXJz dFJlcXVlc3RXaXRoUGVuZGluZ0NvbW1pdCA+IGRlbGF5QmVmb3JlTm9Db21taXRzTG9nZ2luZykK LSAgICAgICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoIiVwIChQYWdlSUQ9JWxsdSkgLVtX S1dlYlZpZXcgX3VwZGF0ZVZpc2libGVDb250ZW50UmVjdHM6XSAtIGhhdmUgbm90IHJlY2VpdmVk IGEgY29tbWl0ICUuMmZzIGFmdGVyIHZpc2libGUgY29udGVudCByZWN0IHVwZGF0ZTsgbGFzdFRy YW5zYWN0aW9uSUQgJWxsdSIsIHNlbGYsIF9wYWdlLT5pZGVudGlmaWVyKCkudG9VSW50NjQoKSwg dGltZVNpbmNlRmlyc3RSZXF1ZXN0V2l0aFBlbmRpbmdDb21taXQudmFsdWUoKSwgX2xhc3RUcmFu c2FjdGlvbklELnRvVUludDY0KCkpOworICAgICAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dF RCgiJXAgKHBhZ2VQcm94eUlEPSVsbHUpIC1bV0tXZWJWaWV3IF91cGRhdGVWaXNpYmxlQ29udGVu dFJlY3RzOl0gLSBoYXZlIG5vdCByZWNlaXZlZCBhIGNvbW1pdCAlLjJmcyBhZnRlciB2aXNpYmxl IGNvbnRlbnQgcmVjdCB1cGRhdGU7IGxhc3RUcmFuc2FjdGlvbklEICVsbHUiLCBzZWxmLCBfcGFn ZS0+aWRlbnRpZmllcigpLnRvVUludDY0KCksIHRpbWVTaW5jZUZpcnN0UmVxdWVzdFdpdGhQZW5k aW5nQ29tbWl0LnZhbHVlKCksIF9sYXN0VHJhbnNhY3Rpb25JRC50b1VJbnQ2NCgpKTsKICAgICB9 CiAKICAgICBpZiAoX2ludm9raW5nVUlTY3JvbGxWaWV3RGVsZWdhdGVDYWxsYmFjaykgewogICAg ICAgICBfZGlkRGVmZXJVcGRhdGVWaXNpYmxlQ29udGVudFJlY3RzRm9yVUlTY3JvbGxWaWV3RGVs ZWdhdGVDYWxsYmFjayA9IFlFUzsKICAgICAgICAgX2RpZERlZmVyVXBkYXRlVmlzaWJsZUNvbnRl bnRSZWN0c0ZvckFueVJlYXNvbiA9IFlFUzsKLSAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dF RCgiJXAgKFBhZ2VJRD0lbGx1KSAtW1dLV2ViVmlldyBfdXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0 czpdIC0gX2ludm9raW5nVUlTY3JvbGxWaWV3RGVsZWdhdGVDYWxsYmFjayBpcyBZRVMsIGJhaWxp bmciLCBzZWxmLCBfcGFnZS0+aWRlbnRpZmllcigpLnRvVUludDY0KCkpOworICAgICAgICBSRUxF QVNFX0xPR19JRl9BTExPV0VEKCIlcCAocGFnZVByb3h5SUQ9JWxsdSkgLVtXS1dlYlZpZXcgX3Vw ZGF0ZVZpc2libGVDb250ZW50UmVjdHM6XSAtIF9pbnZva2luZ1VJU2Nyb2xsVmlld0RlbGVnYXRl Q2FsbGJhY2sgaXMgWUVTLCBiYWlsaW5nIiwgc2VsZiwgX3BhZ2UtPmlkZW50aWZpZXIoKS50b1VJ bnQ2NCgpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtMzE3MywxMyArMzE3MywxMyBA QCAtICh2b2lkKV91cGRhdGVWaXNpYmxlQ29udGVudFJlY3RzCiAgICAgICAgIHx8IF9jdXJyZW50 bHlBZGp1c3RpbmdTY3JvbGxWaWV3SW5zZXRzRm9yS2V5Ym9hcmQpIHsKICAgICAgICAgX2RpZERl ZmVyVXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0c0ZvckFueVJlYXNvbiA9IFlFUzsKICAgICAgICAg X2RpZERlZmVyVXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0c0ZvclVuc3RhYmxlU2Nyb2xsVmlldyA9 IFlFUzsKLSAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgiJXAgKFBhZ2VJRD0lbGx1KSAt W1dLV2ViVmlldyBfdXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0czpdIC0gc2Nyb2xsIHZpZXcgc3Rh dGUgaXMgbm9uLXN0YWJsZSwgYmFpbGluZyAoX2R5bmFtaWNWaWV3cG9ydFVwZGF0ZU1vZGUgJWQs IF9uZWVkc1Jlc2V0Vmlld1N0YXRlQWZ0ZXJDb21taXRMb2FkRm9yTWFpbkZyYW1lICVkLCBzaXpl Q2hhbmdlZFNpbmNlTGFzdFZpc2libGVDb250ZW50UmVjdFVwZGF0ZSAlZCwgW19zY3JvbGxWaWV3 IGlzWm9vbUJvdW5jaW5nXSAlZCwgX2N1cnJlbnRseUFkanVzdGluZ1Njcm9sbFZpZXdJbnNldHNG b3JLZXlib2FyZCAlZCkiLAorICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCIlcCAocGFn ZVByb3h5SUQ9JWxsdSkgLVtXS1dlYlZpZXcgX3VwZGF0ZVZpc2libGVDb250ZW50UmVjdHM6XSAt IHNjcm9sbCB2aWV3IHN0YXRlIGlzIG5vbi1zdGFibGUsIGJhaWxpbmcgKF9keW5hbWljVmlld3Bv cnRVcGRhdGVNb2RlICVkLCBfbmVlZHNSZXNldFZpZXdTdGF0ZUFmdGVyQ29tbWl0TG9hZEZvck1h aW5GcmFtZSAlZCwgc2l6ZUNoYW5nZWRTaW5jZUxhc3RWaXNpYmxlQ29udGVudFJlY3RVcGRhdGUg JWQsIFtfc2Nyb2xsVmlldyBpc1pvb21Cb3VuY2luZ10gJWQsIF9jdXJyZW50bHlBZGp1c3RpbmdT Y3JvbGxWaWV3SW5zZXRzRm9yS2V5Ym9hcmQgJWQpIiwKICAgICAgICAgICAgIHNlbGYsIF9wYWdl LT5pZGVudGlmaWVyKCkudG9VSW50NjQoKSwgX2R5bmFtaWNWaWV3cG9ydFVwZGF0ZU1vZGUsIF9u ZWVkc1Jlc2V0Vmlld1N0YXRlQWZ0ZXJDb21taXRMb2FkRm9yTWFpbkZyYW1lLCBbX2NvbnRlbnRW aWV3IHNpemVDaGFuZ2VkU2luY2VMYXN0VmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlXSwgW19zY3Jv bGxWaWV3IGlzWm9vbUJvdW5jaW5nXSwgX2N1cnJlbnRseUFkanVzdGluZ1Njcm9sbFZpZXdJbnNl dHNGb3JLZXlib2FyZCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKICAgICBpZiAoX2RpZERl ZmVyVXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0c0ZvckFueVJlYXNvbikKLSAgICAgICAgUkVMRUFT RV9MT0dfSUZfQUxMT1dFRCgiJXAgKFBhZ2VJRD0lbGx1KSAtW1dLV2ViVmlldyBfdXBkYXRlVmlz aWJsZUNvbnRlbnRSZWN0czpdIC0gcGVyZm9ybWluZyBmaXJzdCB2aXNpYmxlIGNvbnRlbnQgcmVj dCB1cGRhdGUgYWZ0ZXIgZGVmZXJyaW5nIHVwZGF0ZXMiLCBzZWxmLCBfcGFnZS0+aWRlbnRpZmll cigpLnRvVUludDY0KCkpOworICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCIlcCAocGFn ZVByb3h5SUQ9JWxsdSkgLVtXS1dlYlZpZXcgX3VwZGF0ZVZpc2libGVDb250ZW50UmVjdHM6XSAt IHBlcmZvcm1pbmcgZmlyc3QgdmlzaWJsZSBjb250ZW50IHJlY3QgdXBkYXRlIGFmdGVyIGRlZmVy cmluZyB1cGRhdGVzIiwgc2VsZiwgX3BhZ2UtPmlkZW50aWZpZXIoKS50b1VJbnQ2NCgpKTsKIAog ICAgIF9kaWREZWZlclVwZGF0ZVZpc2libGVDb250ZW50UmVjdHNGb3JVSVNjcm9sbFZpZXdEZWxl Z2F0ZUNhbGxiYWNrID0gTk87CiAgICAgX2RpZERlZmVyVXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0 c0ZvclVuc3RhYmxlU2Nyb2xsVmlldyA9IE5POwpAQCAtMzI3Nyw3ICszMjc3LDcgQEAgc3RhdGlj IGludDMyX3QgYWN0aXZlT3JpZW50YXRpb24oV0tXZWJWaWV3ICp3ZWJWaWV3KQogCiAtICh2b2lk KV9jYW5jZWxBbmltYXRlZFJlc2l6ZQogewotICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoIiVw IChQYWdlSUQ9JWxsdSkgLVtXS1dlYlZpZXcgX2NhbmNlbEFuaW1hdGVkUmVzaXplXSBfZHluYW1p Y1ZpZXdwb3J0VXBkYXRlTW9kZSAlZCIsIHNlbGYsIF9wYWdlLT5pZGVudGlmaWVyKCkudG9VSW50 NjQoKSwgX2R5bmFtaWNWaWV3cG9ydFVwZGF0ZU1vZGUpOworICAgIFJFTEVBU0VfTE9HX0lGX0FM TE9XRUQoIiVwIChwYWdlUHJveHlJRD0lbGx1KSAtW1dLV2ViVmlldyBfY2FuY2VsQW5pbWF0ZWRS ZXNpemVdIF9keW5hbWljVmlld3BvcnRVcGRhdGVNb2RlICVkIiwgc2VsZiwgX3BhZ2UtPmlkZW50 aWZpZXIoKS50b1VJbnQ2NCgpLCBfZHluYW1pY1ZpZXdwb3J0VXBkYXRlTW9kZSk7CiAKICAgICBp ZiAoX2R5bmFtaWNWaWV3cG9ydFVwZGF0ZU1vZGUgPT0gV2ViS2l0OjpEeW5hbWljVmlld3BvcnRV cGRhdGVNb2RlOjpOb3RSZXNpemluZykKICAgICAgICAgcmV0dXJuOwpAQCAtMzMxMyw3ICszMzEz LDcgQEAgLSAodm9pZClfZGlkQ29tcGxldGVBbmltYXRlZFJlc2l6ZQogICAgICAgICByZXR1cm47 CiAgICAgfQogCi0gICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgiJXAgKFBhZ2VJRD0lbGx1KSAt W1dLV2ViVmlldyBfZGlkQ29tcGxldGVBbmltYXRlZFJlc2l6ZV0iLCBzZWxmLCBfcGFnZS0+aWRl bnRpZmllcigpLnRvVUludDY0KCkpOworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoIiVwIChw YWdlUHJveHlJRD0lbGx1KSAtW1dLV2ViVmlldyBfZGlkQ29tcGxldGVBbmltYXRlZFJlc2l6ZV0i LCBzZWxmLCBfcGFnZS0+aWRlbnRpZmllcigpLnRvVUludDY0KCkpOwogCiAgICAgTlNVSW50ZWdl ciBpbmRleE9mUmVzaXplQW5pbWF0aW9uVmlldyA9IFtbX3Njcm9sbFZpZXcgc3Vidmlld3NdIGlu ZGV4T2ZPYmplY3Q6X3Jlc2l6ZUFuaW1hdGlvblZpZXcuZ2V0KCldOwogICAgIFtfc2Nyb2xsVmll dyBpbnNlcnRTdWJ2aWV3Ol9jb250ZW50Vmlldy5nZXQoKSBhdEluZGV4OmluZGV4T2ZSZXNpemVB bmltYXRpb25WaWV3XTsKQEAgLTYyNDYsNyArNjI0Niw3IEBAIC0gKHZvaWQpX2JlZ2luQW5pbWF0 ZWRSZXNpemVXaXRoVXBkYXRlczoodm9pZCAoXikodm9pZCkpdXBkYXRlQmxvY2sKICAgICAgICAg cmV0dXJuOwogICAgIH0KIAotICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoIiVwIChQYWdlSUQ9 JWxsdSkgLVtXS1dlYlZpZXcgX2JlZ2luQW5pbWF0ZWRSZXNpemVXaXRoVXBkYXRlczpdIiwgc2Vs ZiwgX3BhZ2UtPmlkZW50aWZpZXIoKS50b1VJbnQ2NCgpKTsKKyAgICBSRUxFQVNFX0xPR19JRl9B TExPV0VEKCIlcCAocGFnZVByb3h5SUQ9JWxsdSkgLVtXS1dlYlZpZXcgX2JlZ2luQW5pbWF0ZWRS ZXNpemVXaXRoVXBkYXRlczpdIiwgc2VsZiwgX3BhZ2UtPmlkZW50aWZpZXIoKS50b1VJbnQ2NCgp KTsKIAogICAgIF9keW5hbWljVmlld3BvcnRVcGRhdGVNb2RlID0gV2ViS2l0OjpEeW5hbWljVmll d3BvcnRVcGRhdGVNb2RlOjpSZXNpemluZ1dpdGhBbmltYXRpb247CiAKQEAgLTYzNjAsNyArNjM2 MCw3IEBAIC0gKHZvaWQpX2JlZ2luQW5pbWF0ZWRSZXNpemVXaXRoVXBkYXRlczoodm9pZCAoXiko dm9pZCkpdXBkYXRlQmxvY2sKIAogLSAodm9pZClfZW5kQW5pbWF0ZWRSZXNpemUKIHsKLSAgICBS RUxFQVNFX0xPR19JRl9BTExPV0VEKCIlcCAoUGFnZUlEPSVsbHUpIC1bV0tXZWJWaWV3IF9lbmRB bmltYXRlZFJlc2l6ZV0gX2R5bmFtaWNWaWV3cG9ydFVwZGF0ZU1vZGUgJWQiLCBzZWxmLCBfcGFn ZS0+aWRlbnRpZmllcigpLnRvVUludDY0KCksIF9keW5hbWljVmlld3BvcnRVcGRhdGVNb2RlKTsK KyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCIlcCAocGFnZVByb3h5SUQ9JWxsdSkgLVtXS1dl YlZpZXcgX2VuZEFuaW1hdGVkUmVzaXplXSBfZHluYW1pY1ZpZXdwb3J0VXBkYXRlTW9kZSAlZCIs IHNlbGYsIF9wYWdlLT5pZGVudGlmaWVyKCkudG9VSW50NjQoKSwgX2R5bmFtaWNWaWV3cG9ydFVw ZGF0ZU1vZGUpOwogCiAgICAgLy8gSWYgd2UgYWxyZWFkeSBoYXZlIGFuIHVwLXRvLWRhdGUgbGF5 ZXIgdHJlZSwgaW1tZWRpYXRlbHkgY29tcGxldGUKICAgICAvLyB0aGUgcmVzaXplLiBPdGhlcndp c2UsIHdlIHdpbGwgZGVmZXIgY29tcGxldGlvbiB1bnRpbCB3ZSBkby4KQEAgLTYzNzEsNyArNjM3 MSw3IEBAIC0gKHZvaWQpX2VuZEFuaW1hdGVkUmVzaXplCiAKIC0gKHZvaWQpX3Jlc2l6ZVdoaWxl SGlkaW5nQ29udGVudFdpdGhVcGRhdGVzOih2b2lkICheKSh2b2lkKSl1cGRhdGVCbG9jawogewot ICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoIiVwIChQYWdlSUQ9JWxsdSkgLVtXS1dlYlZpZXcg X3Jlc2l6ZVdoaWxlSGlkaW5nQ29udGVudFdpdGhVcGRhdGVzOl0iLCBzZWxmLCBfcGFnZS0+aWRl bnRpZmllcigpLnRvVUludDY0KCkpOworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoIiVwIChw YWdlUHJveHlJRD0lbGx1KSAtW1dLV2ViVmlldyBfcmVzaXplV2hpbGVIaWRpbmdDb250ZW50V2l0 aFVwZGF0ZXM6XSIsIHNlbGYsIF9wYWdlLT5pZGVudGlmaWVyKCkudG9VSW50NjQoKSk7CiAKICAg ICBbc2VsZiBfYmVnaW5BbmltYXRlZFJlc2l6ZVdpdGhVcGRhdGVzOnVwZGF0ZUJsb2NrXTsKICAg ICBpZiAoX2R5bmFtaWNWaWV3cG9ydFVwZGF0ZU1vZGUgPT0gV2ViS2l0OjpEeW5hbWljVmlld3Bv cnRVcGRhdGVNb2RlOjpSZXNpemluZ1dpdGhBbmltYXRpb24pIHsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1Byb3Zpc2lvbmFsUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1Byb3Zpc2lvbmFsUGFnZVByb3h5LmNwcAppbmRleCA4Y2NlYjA5ZmQyYTgz MzM3MWFjNzVjZTQwYWUyNGIxNjBmZmRiNjNkLi43ZWM1YTZiMWIwZGU0N2ZhNjdjMjdhMzg3MWEw NjM3OWE4MjUyN2ExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm92aXNp b25hbFBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvdmlzaW9u YWxQYWdlUHJveHkuY3BwCkBAIC02Niw3ICs2Niw3IEBAIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpQ cm92aXNpb25hbFBhZ2VQcm94eShXZWJQYWdlUHJveHkmIHBhZ2UsIFJlZjxXZWJQcm9jZXNzUHJv CiAgICAgLCBtX3N1c3BlbnNpb25Ub2tlbihtX3Byb2Nlc3MtPnRocm90dGxlcigpLmZvcmVncm91 bmRBY3Rpdml0eVRva2VuKCkpCiAjZW5kaWYKIHsKLSAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VE KFByb2Nlc3NTd2FwcGluZywgIlByb3Zpc2lvbmFsUGFnZVByb3h5OiBwYWdlUHJveHlJRCA9ICUi IFBSSXU2NCAiIHdlYlBhZ2VJRCA9ICUiIFBSSXU2NCAiIG5hdmlnYXRpb25JRCA9ICUiIFBSSXU2 NCAiIHN1c3BlbmRlZFBhZ2U6ICVwIiwgbV9wYWdlLmlkZW50aWZpZXIoKS50b1VJbnQ2NCgpLCBt X3dlYlBhZ2VJRC50b1VJbnQ2NCgpLCBuYXZpZ2F0aW9uSUQsIHN1c3BlbmRlZFBhZ2UuZ2V0KCkp OworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoUHJvY2Vzc1N3YXBwaW5nLCAiUHJvdmlzaW9u YWxQYWdlUHJveHk6IHBhZ2VQcm94eUlEPSUiIFBSSXU2NCAiIHdlYlBhZ2VJRD0lIiBQUkl1NjQg IiBuYXZpZ2F0aW9uSUQ9JSIgUFJJdTY0ICIgc3VzcGVuZGVkUGFnZTogJXAiLCBtX3BhZ2UuaWRl bnRpZmllcigpLnRvVUludDY0KCksIG1fd2ViUGFnZUlELnRvVUludDY0KCksIG5hdmlnYXRpb25J RCwgc3VzcGVuZGVkUGFnZS5nZXQoKSk7CiAKICAgICBtX3Byb2Nlc3MtPmFkZE1lc3NhZ2VSZWNl aXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fd2Vi UGFnZUlELCAqdGhpcyk7CiAgICAgbV9wcm9jZXNzLT5hZGRQcm92aXNpb25hbFBhZ2VQcm94eSgq dGhpcyk7CkBAIC0xMDgsNyArMTA4LDcgQEAgUHJvdmlzaW9uYWxQYWdlUHJveHk6On5Qcm92aXNp b25hbFBhZ2VQcm94eSgpCiAKIHZvaWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OnByb2Nlc3NEaWRU ZXJtaW5hdGUoKQogewotICAgIFJFTEVBU0VfTE9HX0VSUk9SX0lGX0FMTE9XRUQoUHJvY2Vzc1N3 YXBwaW5nLCAicHJvY2Vzc0RpZFRlcm1pbmF0ZTogcGFnZVByb3h5SUQgPSAlIiBQUkl1NjQgIiB3 ZWJQYWdlSUQgPSAlIiBQUkl1NjQsIG1fcGFnZS5pZGVudGlmaWVyKCkudG9VSW50NjQoKSwgbV93 ZWJQYWdlSUQudG9VSW50NjQoKSk7CisgICAgUkVMRUFTRV9MT0dfRVJST1JfSUZfQUxMT1dFRChQ cm9jZXNzU3dhcHBpbmcsICJwcm9jZXNzRGlkVGVybWluYXRlOiBwYWdlUHJveHlJRD0lIiBQUkl1 NjQgIiB3ZWJQYWdlSUQ9JSIgUFJJdTY0LCBtX3BhZ2UuaWRlbnRpZmllcigpLnRvVUludDY0KCks IG1fd2ViUGFnZUlELnRvVUludDY0KCkpOwogICAgIG1fcGFnZS5wcm92aXNpb25hbFByb2Nlc3NE aWRUZXJtaW5hdGUoKTsKIH0KIApAQCAtMTI1LDcgKzEyNSw3IEBAIHZvaWQgUHJvdmlzaW9uYWxQ YWdlUHJveHk6OmNhbmNlbCgpCiAgICAgICAgIAogICAgIEFTU0VSVChtX3Byb2Nlc3MtPnN0YXRl KCkgPT0gV2ViUHJvY2Vzc1Byb3h5OjpTdGF0ZTo6UnVubmluZyk7CiAKLSAgICBSRUxFQVNFX0xP R19JRl9BTExPV0VEKFByb2Nlc3NTd2FwcGluZywgImNhbmNlbDogU2ltdWxhdGluZyBhIGRpZEZh aWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSBmb3IgcGFnZVByb3h5SUQgPSAlIiBQUkl1NjQgIiB3 ZWJQYWdlSUQgPSAlIiBQUkl1NjQsIG1fcGFnZS5pZGVudGlmaWVyKCkudG9VSW50NjQoKSwgbV93 ZWJQYWdlSUQudG9VSW50NjQoKSk7CisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChQcm9jZXNz U3dhcHBpbmcsICJjYW5jZWw6IFNpbXVsYXRpbmcgYSBkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9y RnJhbWUgZm9yIHBhZ2VQcm94eUlEPSUiIFBSSXU2NCAiIHdlYlBhZ2VJRD0lIiBQUkl1NjQsIG1f cGFnZS5pZGVudGlmaWVyKCkudG9VSW50NjQoKSwgbV93ZWJQYWdlSUQudG9VSW50NjQoKSk7CiAg ICAgQVNTRVJUKG1fbWFpbkZyYW1lKTsKICAgICBhdXRvIGVycm9yID0gV2ViS2l0OjpjYW5jZWxs ZWRFcnJvcihtX3JlcXVlc3QpOwogICAgIGVycm9yLnNldFR5cGUoV2ViQ29yZTo6UmVzb3VyY2VF cnJvcjo6VHlwZTo6Q2FuY2VsbGF0aW9uKTsKQEAgLTE0NCwxNCArMTQ0LDE0IEBAIHZvaWQgUHJv dmlzaW9uYWxQYWdlUHJveHk6OmluaXRpYWxpemVXZWJQYWdlKCkKIAogdm9pZCBQcm92aXNpb25h bFBhZ2VQcm94eTo6bG9hZERhdGEoQVBJOjpOYXZpZ2F0aW9uJiBuYXZpZ2F0aW9uLCBjb25zdCBJ UEM6OkRhdGFSZWZlcmVuY2UmIGRhdGEsIGNvbnN0IFN0cmluZyYgTUlNRVR5cGUsIGNvbnN0IFN0 cmluZyYgZW5jb2RpbmcsIGNvbnN0IFN0cmluZyYgYmFzZVVSTCwgQVBJOjpPYmplY3QqIHVzZXJE YXRhLCBPcHRpb25hbDxXZWJzaXRlUG9saWNpZXNEYXRhPiYmIHdlYnNpdGVQb2xpY2llcykKIHsK LSAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3NTd2FwcGluZywgImxvYWREYXRhOiBw YWdlUHJveHlJRCA9ICUiIFBSSXU2NCAiIHdlYlBhZ2VJRCA9ICUiIFBSSXU2NCwgbV9wYWdlLmlk ZW50aWZpZXIoKS50b1VJbnQ2NCgpLCBtX3dlYlBhZ2VJRC50b1VJbnQ2NCgpKTsKKyAgICBSRUxF QVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3NTd2FwcGluZywgImxvYWREYXRhOiBwYWdlUHJveHlJ RD0lIiBQUkl1NjQgIiB3ZWJQYWdlSUQ9JSIgUFJJdTY0LCBtX3BhZ2UuaWRlbnRpZmllcigpLnRv VUludDY0KCksIG1fd2ViUGFnZUlELnRvVUludDY0KCkpOwogCiAgICAgbV9wYWdlLmxvYWREYXRh V2l0aE5hdmlnYXRpb25TaGFyZWQobV9wcm9jZXNzLmNvcHlSZWYoKSwgbV93ZWJQYWdlSUQsIG5h dmlnYXRpb24sIGRhdGEsIE1JTUVUeXBlLCBlbmNvZGluZywgYmFzZVVSTCwgdXNlckRhdGEsIFdl YkNvcmU6OlNob3VsZFRyZWF0QXNDb250aW51aW5nTG9hZDo6WWVzLCBXVEZNb3ZlKHdlYnNpdGVQ b2xpY2llcykpOwogfQogCiB2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5Ojpsb2FkUmVxdWVzdChB UEk6Ok5hdmlnYXRpb24mIG5hdmlnYXRpb24sIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYmIHJl cXVlc3QsIFdlYkNvcmU6OlNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3kgc2hvdWxkT3BlbkV4 dGVybmFsVVJMc1BvbGljeSwgQVBJOjpPYmplY3QqIHVzZXJEYXRhLCBPcHRpb25hbDxXZWJzaXRl UG9saWNpZXNEYXRhPiYmIHdlYnNpdGVQb2xpY2llcykKIHsKLSAgICBSRUxFQVNFX0xPR19JRl9B TExPV0VEKFByb2Nlc3NTd2FwcGluZywgImxvYWRSZXF1ZXN0OiBwYWdlUHJveHlJRCA9ICUiIFBS SXU2NCAiIHdlYlBhZ2VJRCA9ICUiIFBSSXU2NCwgbV9wYWdlLmlkZW50aWZpZXIoKS50b1VJbnQ2 NCgpLCBtX3dlYlBhZ2VJRC50b1VJbnQ2NCgpKTsKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VE KFByb2Nlc3NTd2FwcGluZywgImxvYWRSZXF1ZXN0OiBwYWdlUHJveHlJRD0lIiBQUkl1NjQgIiB3 ZWJQYWdlSUQ9JSIgUFJJdTY0LCBtX3BhZ2UuaWRlbnRpZmllcigpLnRvVUludDY0KCksIG1fd2Vi UGFnZUlELnRvVUludDY0KCkpOwogCiAgICAgLy8gSWYgdGhpcyBpcyBhIGNsaWVudC1zaWRlIHJl ZGlyZWN0IGNvbnRpbnVpbmcgaW4gYSBuZXcgcHJvY2VzcywgdGhlbiB0aGUgbmV3IHByb2Nlc3Mg d2lsbCBvdmVyd3JpdGUgdGhlIGZyb21JdGVtJ3MgVVJMLiBJbiB0aGlzIGNhc2UsCiAgICAgLy8g d2UgbmVlZCB0byBtYWtlIHN1cmUgd2UgdXBkYXRlIGZyb21JdGVtJ3MgcHJvY2Vzc0lkZW50aWZp ZXIgYXMgd2Ugd2FudCBmdXR1cmUgbmF2aWdhdGlvbnMgdG8gdGhpcyBCYWNrRm9yd2FyZCBpdGVt IHRvIGhhcHBlbiBpbiB0aGUKQEAgLTE2NCw3ICsxNjQsNyBAQCB2b2lkIFByb3Zpc2lvbmFsUGFn ZVByb3h5Ojpsb2FkUmVxdWVzdChBUEk6Ok5hdmlnYXRpb24mIG5hdmlnYXRpb24sIFdlYkNvcmU6 OlJlcwogCiB2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5Ojpnb1RvQmFja0ZvcndhcmRJdGVtKEFQ STo6TmF2aWdhdGlvbiYgbmF2aWdhdGlvbiwgV2ViQmFja0ZvcndhcmRMaXN0SXRlbSYgaXRlbSwg T3B0aW9uYWw8V2Vic2l0ZVBvbGljaWVzRGF0YT4mJiB3ZWJzaXRlUG9saWNpZXMpCiB7Ci0gICAg UkVMRUFTRV9MT0dfSUZfQUxMT1dFRChQcm9jZXNzU3dhcHBpbmcsICJnb1RvQmFja0ZvcndhcmRJ dGVtOiBwYWdlUHJveHlJRCA9ICUiIFBSSXU2NCAiIHdlYlBhZ2VJRCA9ICUiIFBSSXU2NCwgbV9w YWdlLmlkZW50aWZpZXIoKS50b1VJbnQ2NCgpLCBtX3dlYlBhZ2VJRC50b1VJbnQ2NCgpKTsKKyAg ICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3NTd2FwcGluZywgImdvVG9CYWNrRm9yd2Fy ZEl0ZW06IHBhZ2VQcm94eUlEPSUiIFBSSXU2NCAiIHdlYlBhZ2VJRD0lIiBQUkl1NjQsIG1fcGFn ZS5pZGVudGlmaWVyKCkudG9VSW50NjQoKSwgbV93ZWJQYWdlSUQudG9VSW50NjQoKSk7CiAKICAg ICBhdXRvIGl0ZW1TdGF0ZXMgPSBtX3BhZ2UuYmFja0ZvcndhcmRMaXN0KCkuZmlsdGVyZWRJdGVt U3RhdGVzKFt0aGlzLCB0YXJnZXRJdGVtID0gJml0ZW1dKGF1dG8mIGl0ZW0pIHsKICAgICAgICAg aWYgKGF1dG8qIGJhY2tGb3J3YXJkQ2FjaGVFbnRyeSA9IGl0ZW0uYmFja0ZvcndhcmRDYWNoZUVu dHJ5KCkpIHsKQEAgLTE4OSw3ICsxODksNyBAQCBpbmxpbmUgYm9vbCBQcm92aXNpb25hbFBhZ2VQ cm94eTo6dmFsaWRhdGVJbnB1dChGcmFtZUlkZW50aWZpZXIgZnJhbWVJRCwgY29uc3QgTwogCiB2 b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRDcmVhdGVNYWluRnJhbWUoRnJhbWVJZGVudGlm aWVyIGZyYW1lSUQpCiB7Ci0gICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChQcm9jZXNzU3dhcHBp bmcsICJkaWRDcmVhdGVNYWluRnJhbWU6IHBhZ2VQcm94eUlEID0gJSIgUFJJdTY0ICIgd2ViUGFn ZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQsIG1fcGFnZS5pZGVudGlmaWVy KCkudG9VSW50NjQoKSwgbV93ZWJQYWdlSUQudG9VSW50NjQoKSwgZnJhbWVJRC50b1VJbnQ2NCgp KTsKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3NTd2FwcGluZywgImRpZENyZWF0 ZU1haW5GcmFtZTogcGFnZVByb3h5SUQ9JSIgUFJJdTY0ICIgd2ViUGFnZUlEPSUiIFBSSXU2NCAi LCBmcmFtZUlEPSUiIFBSSXU2NCwgbV9wYWdlLmlkZW50aWZpZXIoKS50b1VJbnQ2NCgpLCBtX3dl YlBhZ2VJRC50b1VJbnQ2NCgpLCBmcmFtZUlELnRvVUludDY0KCkpOwogICAgIEFTU0VSVCghbV9t YWluRnJhbWUpOwogCiAgICAgbV9tYWluRnJhbWUgPSBXZWJGcmFtZVByb3h5OjpjcmVhdGUobV9w YWdlLCBmcmFtZUlEKTsKQEAgLTIyNyw3ICsyMjcsNyBAQCB2b2lkIFByb3Zpc2lvbmFsUGFnZVBy b3h5OjpkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKEZyYW1lSWRlbnRpZmllciBmcmFt ZQogICAgIGlmICghdmFsaWRhdGVJbnB1dChmcmFtZUlELCBuYXZpZ2F0aW9uSUQpKQogICAgICAg ICByZXR1cm47CiAKLSAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3NTd2FwcGluZywg ImRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU6IHBhZ2VQcm94eUlEID0gJSIgUFJJdTY0 ICIgd2ViUGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgbmF2aWdh dGlvbklEID0gJSIgUFJJdTY0LCBtX3BhZ2UuaWRlbnRpZmllcigpLnRvVUludDY0KCksIG1fd2Vi UGFnZUlELnRvVUludDY0KCksIGZyYW1lSUQudG9VSW50NjQoKSwgbmF2aWdhdGlvbklEKTsKKyAg ICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKFByb2Nlc3NTd2FwcGluZywgImRpZFN0YXJ0UHJvdmlz aW9uYWxMb2FkRm9yRnJhbWU6IHBhZ2VQcm94eUlEPSUiIFBSSXU2NCAiIHdlYlBhZ2VJRD0lIiBQ Ukl1NjQgIiwgZnJhbWVJRD0lIiBQUkl1NjQgIiwgbmF2aWdhdGlvbklEPSUiIFBSSXU2NCwgbV9w YWdlLmlkZW50aWZpZXIoKS50b1VJbnQ2NCgpLCBtX3dlYlBhZ2VJRC50b1VJbnQ2NCgpLCBmcmFt ZUlELnRvVUludDY0KCksIG5hdmlnYXRpb25JRCk7CiAgICAgQVNTRVJUKG1fcHJvdmlzaW9uYWxM b2FkVVJMLmlzTnVsbCgpKTsKICAgICBtX3Byb3Zpc2lvbmFsTG9hZFVSTCA9IHVybDsKIApAQCAt MjQ3LDcgKzI0Nyw3IEBAIHZvaWQgUHJvdmlzaW9uYWxQYWdlUHJveHk6OmRpZEZhaWxQcm92aXNp b25hbExvYWRGb3JGcmFtZShGcmFtZUlkZW50aWZpZXIgZnJhbWVJCiAgICAgaWYgKCF2YWxpZGF0 ZUlucHV0KGZyYW1lSUQsIG5hdmlnYXRpb25JRCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIFJF TEVBU0VfTE9HX0VSUk9SX0lGX0FMTE9XRUQoUHJvY2Vzc1N3YXBwaW5nLCAiZGlkRmFpbFByb3Zp c2lvbmFsTG9hZEZvckZyYW1lOiBwYWdlUHJveHlJRCA9ICUiIFBSSXU2NCAiIHdlYlBhZ2VJRCA9 ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0ICIsIG5hdmlnYXRpb25JRCA9ICUiIFBS SXU2NCwgbV9wYWdlLmlkZW50aWZpZXIoKS50b1VJbnQ2NCgpLCBtX3dlYlBhZ2VJRC50b1VJbnQ2 NCgpLCBmcmFtZUlELnRvVUludDY0KCksIG5hdmlnYXRpb25JRCk7CisgICAgUkVMRUFTRV9MT0df RVJST1JfSUZfQUxMT1dFRChQcm9jZXNzU3dhcHBpbmcsICJkaWRGYWlsUHJvdmlzaW9uYWxMb2Fk Rm9yRnJhbWU6IHBhZ2VQcm94eUlEPSUiIFBSSXU2NCAiIHdlYlBhZ2VJRD0lIiBQUkl1NjQgIiwg ZnJhbWVJRD0lIiBQUkl1NjQgIiwgbmF2aWdhdGlvbklEPSUiIFBSSXU2NCwgbV9wYWdlLmlkZW50 aWZpZXIoKS50b1VJbnQ2NCgpLCBtX3dlYlBhZ2VJRC50b1VJbnQ2NCgpLCBmcmFtZUlELnRvVUlu dDY0KCksIG5hdmlnYXRpb25JRCk7CiAgICAgQVNTRVJUKCFtX3Byb3Zpc2lvbmFsTG9hZFVSTC5p c051bGwoKSk7CiAgICAgbV9wcm92aXNpb25hbExvYWRVUkwgPSB7IH07CiAKQEAgLTI2Myw3ICsy NjMsNyBAQCB2b2lkIFByb3Zpc2lvbmFsUGFnZVByb3h5OjpkaWRDb21taXRMb2FkRm9yRnJhbWUo RnJhbWVJZGVudGlmaWVyIGZyYW1lSUQsIHVpbnQ2NAogICAgIGlmICghdmFsaWRhdGVJbnB1dChm cmFtZUlELCBuYXZpZ2F0aW9uSUQpKQogICAgICAgICByZXR1cm47CiAKLSAgICBSRUxFQVNFX0xP R19JRl9BTExPV0VEKFByb2Nlc3NTd2FwcGluZywgImRpZENvbW1pdExvYWRGb3JGcmFtZTogcGFn ZVByb3h5SUQgPSAlIiBQUkl1NjQgIiB3ZWJQYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9 ICUiIFBSSXU2NCAiLCBuYXZpZ2F0aW9uSUQgPSAlIiBQUkl1NjQsIG1fcGFnZS5pZGVudGlmaWVy KCkudG9VSW50NjQoKSwgbV93ZWJQYWdlSUQudG9VSW50NjQoKSwgZnJhbWVJRC50b1VJbnQ2NCgp LCBuYXZpZ2F0aW9uSUQpOworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoUHJvY2Vzc1N3YXBw aW5nLCAiZGlkQ29tbWl0TG9hZEZvckZyYW1lOiBwYWdlUHJveHlJRD0lIiBQUkl1NjQgIiB3ZWJQ YWdlSUQ9JSIgUFJJdTY0ICIsIGZyYW1lSUQ9JSIgUFJJdTY0ICIsIG5hdmlnYXRpb25JRCA9ICUi IFBSSXU2NCwgbV9wYWdlLmlkZW50aWZpZXIoKS50b1VJbnQ2NCgpLCBtX3dlYlBhZ2VJRC50b1VJ bnQ2NCgpLCBmcmFtZUlELnRvVUludDY0KCksIG5hdmlnYXRpb25JRCk7CiAgICAgbV9wcm92aXNp b25hbExvYWRVUkwgPSB7IH07CiAgICAgbV9wcm9jZXNzLT5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIo TWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3dlYlBhZ2VJ RCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYkxv YWRlclN0cmF0ZWd5LmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYkxv YWRlclN0cmF0ZWd5LmNwcAppbmRleCBhOTVmN2MxOGFlMmQyNjRiMTEyYmE3MjUyZmM5MzA1OGYw YTQ4NDJmLi41MDZhMmYyNjFlOWViNzQ2NzI2NzhmYmM3OTJlYmMxYmJhZWU0MmI2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5j cHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05ldHdvcmsvV2ViTG9hZGVyU3RyYXRl Z3kuY3BwCkBAIC05Nyw3ICs5Nyw3IEBAIHZvaWQgV2ViTG9hZGVyU3RyYXRlZ3k6OmxvYWRSZXNv dXJjZShGcmFtZSYgZnJhbWUsIENhY2hlZFJlc291cmNlJiByZXNvdXJjZSwgUmVzCiAgICAgICAg IGlmIChsb2FkZXIpCiAgICAgICAgICAgICBzY2hlZHVsZUxvYWQoKmxvYWRlciwgcmVzb3VyY2Uu Z2V0KCksIHJlZmVycmVyUG9saWN5ID09IFJlZmVycmVyUG9saWN5OjpOb1JlZmVycmVyV2hlbkRv d25ncmFkZSk7CiAgICAgICAgIGVsc2UKLSAgICAgICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9X RUQoImxvYWRSZXNvdXJjZTogVW5hYmxlIHRvIGNyZWF0ZSBTdWJyZXNvdXJjZUxvYWRlciAoZnJh bWUgPSAlcCIsICZmcmFtZSk7CisgICAgICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJs b2FkUmVzb3VyY2U6IFVuYWJsZSB0byBjcmVhdGUgU3VicmVzb3VyY2VMb2FkZXIgKGZyYW1lPSVw IiwgJmZyYW1lKTsKICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoV1RGTW92ZShsb2FkZXIpKTsK ICAgICB9KTsKIH0KQEAgLTE3NCw3ICsxNzQsNyBAQCB2b2lkIFdlYkxvYWRlclN0cmF0ZWd5Ojpz Y2hlZHVsZUxvYWQoUmVzb3VyY2VMb2FkZXImIHJlc291cmNlTG9hZGVyLCBDYWNoZWRSZXNvdQog ICAgIC8vIHRoZW4gd2Ugc2hvdWxkIHJlbWVtYmVyIHRoZSBSZXNvdXJjZUxvYWRlciBpbiBvdXIg cmVjb3JkcyBidXQgbm90IHNjaGVkdWxlIGl0IGluIHRoZSBOZXR3b3JrUHJvY2Vzcy4KICAgICBp ZiAocmVzb3VyY2VMb2FkZXIuZG9jdW1lbnRMb2FkZXIoKS0+c2NoZWR1bGVBcmNoaXZlTG9hZChy ZXNvdXJjZUxvYWRlciwgcmVzb3VyY2VMb2FkZXIucmVxdWVzdCgpKSkgewogICAgICAgICBMT0co TmV0d29ya1NjaGVkdWxpbmcsICIoV2ViUHJvY2VzcykgV2ViTG9hZGVyU3RyYXRlZ3k6OnNjaGVk dWxlTG9hZCwgdXJsICclcycgd2lsbCBiZSBoYW5kbGVkIGFzIGFuIGFyY2hpdmUgcmVzb3VyY2Uu IiwgcmVzb3VyY2VMb2FkZXIudXJsKCkuc3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7Ci0gICAgICAg IFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoInNjaGVkdWxlTG9hZDogVVJMIHdpbGwgYmUgaGFuZGxl ZCBhcyBhbiBhcmNoaXZlIHJlc291cmNlIChmcmFtZSA9ICVwLCBwYWdlSUQgPSAlIiBQUkl1NjQg IiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCByZXNvdXJjZUlEID0gJSIgUFJJdTY0ICIpIiwgcmVz b3VyY2VMb2FkZXIuZnJhbWUoKSwgdHJhY2tpbmdQYXJhbWV0ZXJzLnBhZ2VJRC50b1VJbnQ2NCgp LCB0cmFja2luZ1BhcmFtZXRlcnMuZnJhbWVJRC50b1VJbnQ2NCgpLCBpZGVudGlmaWVyKTsKKyAg ICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgic2NoZWR1bGVMb2FkOiBVUkwgd2lsbCBiZSBo YW5kbGVkIGFzIGFuIGFyY2hpdmUgcmVzb3VyY2UgKGZyYW1lPSVwLCB3ZWJQYWdlSUQ9JSIgUFJJ dTY0ICIsIGZyYW1lSUQ9JSIgUFJJdTY0ICIsIHJlc291cmNlSUQ9JSIgUFJJdTY0ICIpIiwgcmVz b3VyY2VMb2FkZXIuZnJhbWUoKSwgdHJhY2tpbmdQYXJhbWV0ZXJzLnBhZ2VJRC50b1VJbnQ2NCgp LCB0cmFja2luZ1BhcmFtZXRlcnMuZnJhbWVJRC50b1VJbnQ2NCgpLCBpZGVudGlmaWVyKTsKICAg ICAgICAgbV93ZWJSZXNvdXJjZUxvYWRlcnMuc2V0KGlkZW50aWZpZXIsIFdlYlJlc291cmNlTG9h ZGVyOjpjcmVhdGUocmVzb3VyY2VMb2FkZXIsIHRyYWNraW5nUGFyYW1ldGVycykpOwogICAgICAg ICByZXR1cm47CiAgICAgfQpAQCAtMTgyLDE0ICsxODIsMTQgQEAgdm9pZCBXZWJMb2FkZXJTdHJh dGVneTo6c2NoZWR1bGVMb2FkKFJlc291cmNlTG9hZGVyJiByZXNvdXJjZUxvYWRlciwgQ2FjaGVk UmVzb3UKIAogICAgIGlmIChyZXNvdXJjZUxvYWRlci5kb2N1bWVudExvYWRlcigpLT5hcHBsaWNh dGlvbkNhY2hlSG9zdCgpLm1heWJlTG9hZFJlc291cmNlKHJlc291cmNlTG9hZGVyLCByZXNvdXJj ZUxvYWRlci5yZXF1ZXN0KCksIHJlc291cmNlTG9hZGVyLnJlcXVlc3QoKS51cmwoKSkpIHsKICAg ICAgICAgTE9HKE5ldHdvcmtTY2hlZHVsaW5nLCAiKFdlYlByb2Nlc3MpIFdlYkxvYWRlclN0cmF0 ZWd5OjpzY2hlZHVsZUxvYWQsIHVybCAnJXMnIHdpbGwgYmUgbG9hZGVkIGZyb20gYXBwbGljYXRp b24gY2FjaGUuIiwgcmVzb3VyY2VMb2FkZXIudXJsKCkuc3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7 Ci0gICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoInNjaGVkdWxlTG9hZDogVVJMIHdpbGwg YmUgbG9hZGVkIGZyb20gYXBwbGljYXRpb24gY2FjaGUgKGZyYW1lID0gJXAsIHBhZ2VJRCA9ICUi IFBSSXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0ICIsIHJlc291cmNlSUQgPSAlIiBQUkl1NjQg IikiLCByZXNvdXJjZUxvYWRlci5mcmFtZSgpLCB0cmFja2luZ1BhcmFtZXRlcnMucGFnZUlELnRv VUludDY0KCksIHRyYWNraW5nUGFyYW1ldGVycy5mcmFtZUlELnRvVUludDY0KCksIGlkZW50aWZp ZXIpOworICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJzY2hlZHVsZUxvYWQ6IFVSTCB3 aWxsIGJlIGxvYWRlZCBmcm9tIGFwcGxpY2F0aW9uIGNhY2hlIChmcmFtZT0lcCwgd2ViUGFnZUlE PSUiIFBSSXU2NCAiLCBmcmFtZUlEPSUiIFBSSXU2NCAiLCByZXNvdXJjZUlEPSUiIFBSSXU2NCAi KSIsIHJlc291cmNlTG9hZGVyLmZyYW1lKCksIHRyYWNraW5nUGFyYW1ldGVycy5wYWdlSUQudG9V SW50NjQoKSwgdHJhY2tpbmdQYXJhbWV0ZXJzLmZyYW1lSUQudG9VSW50NjQoKSwgaWRlbnRpZmll cik7CiAgICAgICAgIG1fd2ViUmVzb3VyY2VMb2FkZXJzLnNldChpZGVudGlmaWVyLCBXZWJSZXNv dXJjZUxvYWRlcjo6Y3JlYXRlKHJlc291cmNlTG9hZGVyLCB0cmFja2luZ1BhcmFtZXRlcnMpKTsK ICAgICAgICAgcmV0dXJuOwogICAgIH0KIAogICAgIGlmIChyZXNvdXJjZUxvYWRlci5yZXF1ZXN0 KCkudXJsKCkucHJvdG9jb2xJc0RhdGEoKSkgewogICAgICAgICBMT0coTmV0d29ya1NjaGVkdWxp bmcsICIoV2ViUHJvY2VzcykgV2ViTG9hZGVyU3RyYXRlZ3k6OnNjaGVkdWxlTG9hZCwgdXJsICcl cycgd2lsbCBiZSBsb2FkZWQgYXMgZGF0YS4iLCByZXNvdXJjZUxvYWRlci51cmwoKS5zdHJpbmco KS51dGY4KCkuZGF0YSgpKTsKLSAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgic2NoZWR1 bGVMb2FkOiBVUkwgd2lsbCBiZSBsb2FkZWQgYXMgZGF0YSAoZnJhbWUgPSAlcCwgcGFnZUlEID0g JSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgcmVzb3VyY2VJRCA9ICUiIFBSSXU2 NCAiKSIsIHJlc291cmNlTG9hZGVyLmZyYW1lKCksIHRyYWNraW5nUGFyYW1ldGVycy5wYWdlSUQu dG9VSW50NjQoKSwgdHJhY2tpbmdQYXJhbWV0ZXJzLmZyYW1lSUQudG9VSW50NjQoKSwgaWRlbnRp Zmllcik7CisgICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoInNjaGVkdWxlTG9hZDogVVJM IHdpbGwgYmUgbG9hZGVkIGFzIGRhdGEgKGZyYW1lPSVwLCB3ZWJQYWdlSUQ9JSIgUFJJdTY0ICIs IGZyYW1lSUQ9JSIgUFJJdTY0ICIsIHJlc291cmNlSUQ9JSIgUFJJdTY0ICIpIiwgcmVzb3VyY2VM b2FkZXIuZnJhbWUoKSwgdHJhY2tpbmdQYXJhbWV0ZXJzLnBhZ2VJRC50b1VJbnQ2NCgpLCB0cmFj a2luZ1BhcmFtZXRlcnMuZnJhbWVJRC50b1VJbnQ2NCgpLCBpZGVudGlmaWVyKTsKICAgICAgICAg c3RhcnRMb2NhbExvYWQocmVzb3VyY2VMb2FkZXIpOwogICAgICAgICByZXR1cm47CiAgICAgfQpA QCAtMTk3LDcgKzE5Nyw3IEBAIHZvaWQgV2ViTG9hZGVyU3RyYXRlZ3k6OnNjaGVkdWxlTG9hZChS ZXNvdXJjZUxvYWRlciYgcmVzb3VyY2VMb2FkZXIsIENhY2hlZFJlc291CiAjaWYgVVNFKFFVSUNL X0xPT0spCiAgICAgaWYgKGlzUXVpY2tMb29rUHJldmlld1VSTChyZXNvdXJjZUxvYWRlci5yZXF1 ZXN0KCkudXJsKCkpKSB7CiAgICAgICAgIExPRyhOZXR3b3JrU2NoZWR1bGluZywgIihXZWJQcm9j ZXNzKSBXZWJMb2FkZXJTdHJhdGVneTo6c2NoZWR1bGVMb2FkLCB1cmwgJyVzJyB3aWxsIGJlIGhh bmRsZWQgYXMgYSBRdWlja0xvb2sgcmVzb3VyY2UuIiwgcmVzb3VyY2VMb2FkZXIudXJsKCkuc3Ry aW5nKCkudXRmOCgpLmRhdGEoKSk7Ci0gICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoInNj aGVkdWxlTG9hZDogVVJMIHdpbGwgYmUgaGFuZGxlZCBhcyBhIFF1aWNrTG9vayByZXNvdXJjZSAo ZnJhbWUgPSAlcCwgcGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwg cmVzb3VyY2VJRCA9ICUiIFBSSXU2NCAiKSIsIHJlc291cmNlTG9hZGVyLmZyYW1lKCksIHRyYWNr aW5nUGFyYW1ldGVycy5wYWdlSUQudG9VSW50NjQoKSwgdHJhY2tpbmdQYXJhbWV0ZXJzLmZyYW1l SUQudG9VSW50NjQoKSwgaWRlbnRpZmllcik7CisgICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9X RUQoInNjaGVkdWxlTG9hZDogVVJMIHdpbGwgYmUgaGFuZGxlZCBhcyBhIFF1aWNrTG9vayByZXNv dXJjZSAoZnJhbWU9JXAsIHdlYlBhZ2VJRD0lIiBQUkl1NjQgIiwgZnJhbWVJRD0lIiBQUkl1NjQg IiwgcmVzb3VyY2VJRD0lIiBQUkl1NjQgIikiLCByZXNvdXJjZUxvYWRlci5mcmFtZSgpLCB0cmFj a2luZ1BhcmFtZXRlcnMucGFnZUlELnRvVUludDY0KCksIHRyYWNraW5nUGFyYW1ldGVycy5mcmFt ZUlELnRvVUludDY0KCksIGlkZW50aWZpZXIpOwogICAgICAgICBzdGFydExvY2FsTG9hZChyZXNv dXJjZUxvYWRlcik7CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC0yMDgsMTggKzIwOCwxOCBA QCB2b2lkIFdlYkxvYWRlclN0cmF0ZWd5OjpzY2hlZHVsZUxvYWQoUmVzb3VyY2VMb2FkZXImIHJl c291cmNlTG9hZGVyLCBDYWNoZWRSZXNvdQogICAgIC8vIGh0dHBzOi8vYmxvZ3MuZ25vbWUub3Jn L2FsZXhsLzIwMTIvMDEvMjYvcmVzb3VyY2VzLWluLWdsaWIvCiAgICAgaWYgKHJlc291cmNlTG9h ZGVyLnJlcXVlc3QoKS51cmwoKS5wcm90b2NvbElzKCJyZXNvdXJjZSIpKSB7CiAgICAgICAgIExP RyhOZXR3b3JrU2NoZWR1bGluZywgIihXZWJQcm9jZXNzKSBXZWJMb2FkZXJTdHJhdGVneTo6c2No ZWR1bGVMb2FkLCB1cmwgJyVzJyB3aWxsIGJlIGhhbmRsZWQgYXMgYSBHUmVzb3VyY2UuIiwgcmVz b3VyY2VMb2FkZXIudXJsKCkuc3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7Ci0gICAgICAgIFJFTEVB U0VfTE9HX0lGX0FMTE9XRUQoInNjaGVkdWxlTG9hZDogVVJMIHdpbGwgYmUgaGFuZGxlZCBhcyBh IEdSZXNvdXJjZSAoZnJhbWUgPSAlcCwgcGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAl IiBQUkl1NjQgIiwgcmVzb3VyY2VJRCA9ICUiIFBSSXU2NCAiKSIsIHJlc291cmNlTG9hZGVyLmZy YW1lKCksIHRyYWNraW5nUGFyYW1ldGVycy5wYWdlSUQudG9VSW50NjQoKSwgdHJhY2tpbmdQYXJh bWV0ZXJzLmZyYW1lSUQudG9VSW50NjQoKSwgaWRlbnRpZmllcik7CisgICAgICAgIFJFTEVBU0Vf TE9HX0lGX0FMTE9XRUQoInNjaGVkdWxlTG9hZDogVVJMIHdpbGwgYmUgaGFuZGxlZCBhcyBhIEdS ZXNvdXJjZSAoZnJhbWU9JXAsIHdlYlBhZ2VJRD0lIiBQUkl1NjQgIiwgZnJhbWVJRD0lIiBQUkl1 NjQgIiwgcmVzb3VyY2VJRD0lIiBQUkl1NjQgIikiLCByZXNvdXJjZUxvYWRlci5mcmFtZSgpLCB0 cmFja2luZ1BhcmFtZXRlcnMucGFnZUlELnRvVUludDY0KCksIHRyYWNraW5nUGFyYW1ldGVycy5m cmFtZUlELnRvVUludDY0KCksIGlkZW50aWZpZXIpOwogICAgICAgICBzdGFydExvY2FsTG9hZChy ZXNvdXJjZUxvYWRlcik7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAjZW5kaWYKIAogICAgIGlm ICghdHJ5TG9hZGluZ1VzaW5nVVJMU2NoZW1lSGFuZGxlcihyZXNvdXJjZUxvYWRlcikpIHsKLSAg ICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgic2NoZWR1bGVMb2FkOiBVUkwgd2lsbCBiZSBz Y2hlZHVsZWQgd2l0aCB0aGUgTmV0d29ya1Byb2Nlc3MgKGZyYW1lID0gJXAsIHBhZ2VJRCA9ICUi IFBSSXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0ICIsIHJlc291cmNlSUQgPSAlIiBQUkl1NjQg IikiLCByZXNvdXJjZUxvYWRlci5mcmFtZSgpLCB0cmFja2luZ1BhcmFtZXRlcnMucGFnZUlELnRv VUludDY0KCksIHRyYWNraW5nUGFyYW1ldGVycy5mcmFtZUlELnRvVUludDY0KCksIGlkZW50aWZp ZXIpOworICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJzY2hlZHVsZUxvYWQ6IFVSTCB3 aWxsIGJlIHNjaGVkdWxlZCB3aXRoIHRoZSBOZXR3b3JrUHJvY2VzcyAoZnJhbWU9JXAsIHdlYlBh Z2VJRD0lIiBQUkl1NjQgIiwgZnJhbWVJRD0lIiBQUkl1NjQgIiwgcmVzb3VyY2VJRD0lIiBQUkl1 NjQgIikiLCByZXNvdXJjZUxvYWRlci5mcmFtZSgpLCB0cmFja2luZ1BhcmFtZXRlcnMucGFnZUlE LnRvVUludDY0KCksIHRyYWNraW5nUGFyYW1ldGVycy5mcmFtZUlELnRvVUludDY0KCksIGlkZW50 aWZpZXIpOwogICAgICAgICBzY2hlZHVsZUxvYWRGcm9tTmV0d29ya1Byb2Nlc3MocmVzb3VyY2VM b2FkZXIsIHJlc291cmNlTG9hZGVyLnJlcXVlc3QoKSwgdHJhY2tpbmdQYXJhbWV0ZXJzLCBzaG91 bGRDbGVhclJlZmVycmVyT25IVFRQU1RvSFRUUFJlZGlyZWN0LCBtYXhpbXVtQnVmZmVyaW5nVGlt ZShyZXNvdXJjZSkpOwogICAgICAgICByZXR1cm47CiAgICAgfQotICAgIFJFTEVBU0VfTE9HX0lG X0FMTE9XRUQoInNjaGVkdWxlTG9hZDogVVJMIG5vdCBoYW5kbGVkIGJ5IGFueSBoYW5kbGVycyAo ZnJhbWUgPSAlcCwgcGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwg cmVzb3VyY2VJRCA9ICUiIFBSSXU2NCAiKSIsIHJlc291cmNlTG9hZGVyLmZyYW1lKCksIHRyYWNr aW5nUGFyYW1ldGVycy5wYWdlSUQudG9VSW50NjQoKSwgdHJhY2tpbmdQYXJhbWV0ZXJzLmZyYW1l SUQudG9VSW50NjQoKSwgaWRlbnRpZmllcik7CisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgi c2NoZWR1bGVMb2FkOiBVUkwgbm90IGhhbmRsZWQgYnkgYW55IGhhbmRsZXJzIChmcmFtZT0lcCwg d2ViUGFnZUlEPSUiIFBSSXU2NCAiLCBmcmFtZUlEPSUiIFBSSXU2NCAiLCByZXNvdXJjZUlEPSUi IFBSSXU2NCAiKSIsIHJlc291cmNlTG9hZGVyLmZyYW1lKCksIHRyYWNraW5nUGFyYW1ldGVycy5w YWdlSUQudG9VSW50NjQoKSwgdHJhY2tpbmdQYXJhbWV0ZXJzLmZyYW1lSUQudG9VSW50NjQoKSwg aWRlbnRpZmllcik7CiB9CiAKIGJvb2wgV2ViTG9hZGVyU3RyYXRlZ3k6OnRyeUxvYWRpbmdVc2lu Z1VSTFNjaGVtZUhhbmRsZXIoUmVzb3VyY2VMb2FkZXImIHJlc291cmNlTG9hZGVyKQpAQCAtMjMw LDcgKzIzMCw3IEBAIGJvb2wgV2ViTG9hZGVyU3RyYXRlZ3k6OnRyeUxvYWRpbmdVc2luZ1VSTFNj aGVtZUhhbmRsZXIoUmVzb3VyY2VMb2FkZXImIHJlc291cmNlCiAgICAgaWYgKHdlYlBhZ2UpIHsK ICAgICAgICAgaWYgKGF1dG8qIGhhbmRsZXIgPSB3ZWJQYWdlLT51cmxTY2hlbWVIYW5kbGVyRm9y U2NoZW1lKHJlc291cmNlTG9hZGVyLnJlcXVlc3QoKS51cmwoKS5wcm90b2NvbCgpLnRvU3RyaW5n V2l0aG91dENvcHlpbmcoKSkpIHsKICAgICAgICAgICAgIExPRyhOZXR3b3JrU2NoZWR1bGluZywg IihXZWJQcm9jZXNzKSBXZWJMb2FkZXJTdHJhdGVneTo6c2NoZWR1bGVMb2FkLCBVUkwgJyVzJyB3 aWxsIGJlIGhhbmRsZWQgYnkgYSBVSVByb2Nlc3MgVVJMIHNjaGVtZSBoYW5kbGVyLiIsIHJlc291 cmNlTG9hZGVyLnVybCgpLnN0cmluZygpLnV0ZjgoKS5kYXRhKCkpOwotICAgICAgICAgICAgUkVM RUFTRV9MT0dfSUZfQUxMT1dFRCgic2NoZWR1bGVMb2FkOiBVUkwgd2lsbCBiZSBoYW5kbGVkIGJ5 IGEgVUlQcm9jZXNzIFVSTCBzY2hlbWUgaGFuZGxlciAoZnJhbWUgPSAlcCwgcmVzb3VyY2VJRCA9 ICVsdSkiLCByZXNvdXJjZUxvYWRlci5mcmFtZSgpLCByZXNvdXJjZUxvYWRlci5pZGVudGlmaWVy KCkpOworICAgICAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgic2NoZWR1bGVMb2FkOiBV Ukwgd2lsbCBiZSBoYW5kbGVkIGJ5IGEgVUlQcm9jZXNzIFVSTCBzY2hlbWUgaGFuZGxlciAoZnJh bWU9JXAsIHJlc291cmNlSUQ9JWx1KSIsIHJlc291cmNlTG9hZGVyLmZyYW1lKCksIHJlc291cmNl TG9hZGVyLmlkZW50aWZpZXIoKSk7CiAKICAgICAgICAgICAgIGhhbmRsZXItPnN0YXJ0TmV3VGFz ayhyZXNvdXJjZUxvYWRlcik7CiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKQEAgLTMyMSw3ICsz MjEsNyBAQCB2b2lkIFdlYkxvYWRlclN0cmF0ZWd5OjpzY2hlZHVsZUxvYWRGcm9tTmV0d29ya1By b2Nlc3MoUmVzb3VyY2VMb2FkZXImIHJlc291cmNlTAogICAgIGlmIChsb2FkUGFyYW1ldGVycy5v cHRpb25zLm1vZGUgIT0gRmV0Y2hPcHRpb25zOjpNb2RlOjpOYXZpZ2F0ZSkgewogICAgICAgICBB U1NFUlQobG9hZFBhcmFtZXRlcnMuc291cmNlT3JpZ2luKTsKICAgICAgICAgaWYgKCFsb2FkUGFy YW1ldGVycy5zb3VyY2VPcmlnaW4pIHsKLSAgICAgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SX0lG X0FMTE9XRUQoInNjaGVkdWxlTG9hZDogbm8gc291cmNlT3JpZ2luIChmcmFtZSA9ICVwLCBwcmlv cml0eSA9ICVkLCBwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCBy ZXNvdXJjZUlEID0gJSIgUFJJdTY0ICIpIiwgcmVzb3VyY2VMb2FkZXIuZnJhbWUoKSwgc3RhdGlj X2Nhc3Q8aW50PihyZXNvdXJjZUxvYWRlci5yZXF1ZXN0KCkucHJpb3JpdHkoKSksIGxvYWRQYXJh bWV0ZXJzLndlYlBhZ2VJRC50b1VJbnQ2NCgpLCBsb2FkUGFyYW1ldGVycy53ZWJGcmFtZUlELnRv VUludDY0KCksIGxvYWRQYXJhbWV0ZXJzLmlkZW50aWZpZXIpOworICAgICAgICAgICAgUkVMRUFT RV9MT0dfRVJST1JfSUZfQUxMT1dFRCgic2NoZWR1bGVMb2FkOiBubyBzb3VyY2VPcmlnaW4gKGZy YW1lPSVwLCBwcmlvcml0eT0lZCwgd2ViUGFnZUlEPSUiIFBSSXU2NCAiLCBmcmFtZUlEPSUiIFBS SXU2NCAiLCByZXNvdXJjZUlEPSUiIFBSSXU2NCAiKSIsIHJlc291cmNlTG9hZGVyLmZyYW1lKCks IHN0YXRpY19jYXN0PGludD4ocmVzb3VyY2VMb2FkZXIucmVxdWVzdCgpLnByaW9yaXR5KCkpLCBs b2FkUGFyYW1ldGVycy53ZWJQYWdlSUQudG9VSW50NjQoKSwgbG9hZFBhcmFtZXRlcnMud2ViRnJh bWVJRC50b1VJbnQ2NCgpLCBsb2FkUGFyYW1ldGVycy5pZGVudGlmaWVyKTsKICAgICAgICAgICAg IHNjaGVkdWxlSW50ZXJuYWxseUZhaWxlZExvYWQocmVzb3VyY2VMb2FkZXIpOwogICAgICAgICAg ICAgcmV0dXJuOwogICAgICAgICB9CkBAIC0zNDQsOSArMzQ0LDkgQEAgdm9pZCBXZWJMb2FkZXJT dHJhdGVneTo6c2NoZWR1bGVMb2FkRnJvbU5ldHdvcmtQcm9jZXNzKFJlc291cmNlTG9hZGVyJiBy ZXNvdXJjZUwKIAogICAgIEFTU0VSVCgobG9hZFBhcmFtZXRlcnMud2ViUGFnZUlEICYmIGxvYWRQ YXJhbWV0ZXJzLndlYkZyYW1lSUQpIHx8IGxvYWRQYXJhbWV0ZXJzLmNsaWVudENyZWRlbnRpYWxQ b2xpY3kgPT0gQ2xpZW50Q3JlZGVudGlhbFBvbGljeTo6Q2Fubm90QXNrQ2xpZW50Rm9yQ3JlZGVu dGlhbHMpOwogCi0gICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgic2NoZWR1bGVMb2FkOiBSZXNv dXJjZSBpcyBiZWluZyBzY2hlZHVsZWQgd2l0aCB0aGUgTmV0d29ya1Byb2Nlc3MgKGZyYW1lID0g JXAsIHByaW9yaXR5ID0gJWQsIHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJ dTY0ICIsIHJlc291cmNlSUQgPSAlIiBQUkl1NjQgIikiLCByZXNvdXJjZUxvYWRlci5mcmFtZSgp LCBzdGF0aWNfY2FzdDxpbnQ+KHJlc291cmNlTG9hZGVyLnJlcXVlc3QoKS5wcmlvcml0eSgpKSwg bG9hZFBhcmFtZXRlcnMud2ViUGFnZUlELnRvVUludDY0KCksIGxvYWRQYXJhbWV0ZXJzLndlYkZy YW1lSUQudG9VSW50NjQoKSwgbG9hZFBhcmFtZXRlcnMuaWRlbnRpZmllcik7CisgICAgUkVMRUFT RV9MT0dfSUZfQUxMT1dFRCgic2NoZWR1bGVMb2FkOiBSZXNvdXJjZSBpcyBiZWluZyBzY2hlZHVs ZWQgd2l0aCB0aGUgTmV0d29ya1Byb2Nlc3MgKGZyYW1lPSVwLCBwcmlvcml0eT0lZCwgd2ViUGFn ZUlEPSUiIFBSSXU2NCAiLCBmcmFtZUlEPSUiIFBSSXU2NCAiLCByZXNvdXJjZUlEPSUiIFBSSXU2 NCAiKSIsIHJlc291cmNlTG9hZGVyLmZyYW1lKCksIHN0YXRpY19jYXN0PGludD4ocmVzb3VyY2VM b2FkZXIucmVxdWVzdCgpLnByaW9yaXR5KCkpLCBsb2FkUGFyYW1ldGVycy53ZWJQYWdlSUQudG9V SW50NjQoKSwgbG9hZFBhcmFtZXRlcnMud2ViRnJhbWVJRC50b1VJbnQ2NCgpLCBsb2FkUGFyYW1l dGVycy5pZGVudGlmaWVyKTsKICAgICBpZiAoIVdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLmVuc3Vy ZU5ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbigpLmNvbm5lY3Rpb24oKS5zZW5kKE1lc3NhZ2VzOjpO ZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6U2NoZWR1bGVSZXNvdXJjZUxvYWQobG9hZFBh cmFtZXRlcnMpLCAwKSkgewotICAgICAgICBSRUxFQVNFX0xPR19FUlJPUl9JRl9BTExPV0VEKCJz Y2hlZHVsZUxvYWQ6IFVuYWJsZSB0byBzY2hlZHVsZSByZXNvdXJjZSB3aXRoIHRoZSBOZXR3b3Jr UHJvY2VzcyAoZnJhbWUgPSAlcCwgcHJpb3JpdHkgPSAlZCwgcGFnZUlEID0gJSIgUFJJdTY0ICIs IGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgcmVzb3VyY2VJRCA9ICUiIFBSSXU2NCAiKSIsIHJlc291 cmNlTG9hZGVyLmZyYW1lKCksIHN0YXRpY19jYXN0PGludD4ocmVzb3VyY2VMb2FkZXIucmVxdWVz dCgpLnByaW9yaXR5KCkpLCBsb2FkUGFyYW1ldGVycy53ZWJQYWdlSUQudG9VSW50NjQoKSwgbG9h ZFBhcmFtZXRlcnMud2ViRnJhbWVJRC50b1VJbnQ2NCgpLCBsb2FkUGFyYW1ldGVycy5pZGVudGlm aWVyKTsKKyAgICAgICAgUkVMRUFTRV9MT0dfRVJST1JfSUZfQUxMT1dFRCgic2NoZWR1bGVMb2Fk OiBVbmFibGUgdG8gc2NoZWR1bGUgcmVzb3VyY2Ugd2l0aCB0aGUgTmV0d29ya1Byb2Nlc3MgKGZy YW1lPSVwLCBwcmlvcml0eT0lZCwgd2ViUGFnZUlEPSUiIFBSSXU2NCAiLCBmcmFtZUlEPSUiIFBS SXU2NCAiLCByZXNvdXJjZUlEPSUiIFBSSXU2NCAiKSIsIHJlc291cmNlTG9hZGVyLmZyYW1lKCks IHN0YXRpY19jYXN0PGludD4ocmVzb3VyY2VMb2FkZXIucmVxdWVzdCgpLnByaW9yaXR5KCkpLCBs b2FkUGFyYW1ldGVycy53ZWJQYWdlSUQudG9VSW50NjQoKSwgbG9hZFBhcmFtZXRlcnMud2ViRnJh bWVJRC50b1VJbnQ2NCgpLCBsb2FkUGFyYW1ldGVycy5pZGVudGlmaWVyKTsKICAgICAgICAgLy8g V2UgcHJvYmFibHkgZmFpbGVkIHRvIHNjaGVkdWxlIHRoaXMgbG9hZCB3aXRoIHRoZSBOZXR3b3Jr UHJvY2VzcyBiZWNhdXNlIGl0IGhhZCBjcmFzaGVkLgogICAgICAgICAvLyBUaGlzIGxvYWQgd2ls bCBuZXZlciBzdWNjZWVkIHNvIHdlIHdpbGwgc2NoZWR1bGUgaXQgdG8gZmFpbCBhc3luY2hyb25v dXNseS4KICAgICAgICAgc2NoZWR1bGVJbnRlcm5hbGx5RmFpbGVkTG9hZChyZXNvdXJjZUxvYWRl cik7CkBAIC01MTYsMTMgKzUxNiwxMyBAQCB2b2lkIFdlYkxvYWRlclN0cmF0ZWd5Ojpsb2FkUmVz b3VyY2VTeW5jaHJvbm91c2x5KEZyYW1lTG9hZGVyJiBmcmFtZUxvYWRlciwgdW5zaQogCiAgICAg YXV0byogZG9jdW1lbnQgPSBmcmFtZUxvYWRlci5mcmFtZSgpLmRvY3VtZW50KCk7CiAgICAgaWYg KCFkb2N1bWVudCkgewotICAgICAgICBSRUxFQVNFX0xPR19FUlJPUl9JRl9BTExPV0VEKCJsb2Fk UmVzb3VyY2VTeW5jaHJvbm91c2x5OiBubyBkb2N1bWVudCAocGFnZUlEID0gJSIgUFJJdTY0ICIs IGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgcmVzb3VyY2VJRCA9ICVsdSkiLCBwYWdlSUQudG9VSW50 NjQoKSwgZnJhbWVJRC50b1VJbnQ2NCgpLCByZXNvdXJjZUxvYWRJZGVudGlmaWVyKTsKKyAgICAg ICAgUkVMRUFTRV9MT0dfRVJST1JfSUZfQUxMT1dFRCgibG9hZFJlc291cmNlU3luY2hyb25vdXNs eTogbm8gZG9jdW1lbnQgKHdlYlBhZ2VJRD0lIiBQUkl1NjQgIiwgZnJhbWVJRD0lIiBQUkl1NjQg IiwgcmVzb3VyY2VJRD0lbHUpIiwgcGFnZUlELnRvVUludDY0KCksIGZyYW1lSUQudG9VSW50NjQo KSwgcmVzb3VyY2VMb2FkSWRlbnRpZmllcik7CiAgICAgICAgIGVycm9yID0gaW50ZXJuYWxFcnJv cihyZXF1ZXN0LnVybCgpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAogICAgIGlmIChhdXRv IHN5bmNMb2FkUmVzdWx0ID0gdHJ5TG9hZGluZ1N5bmNocm9ub3VzbHlVc2luZ1VSTFNjaGVtZUhh bmRsZXIoZnJhbWVMb2FkZXIsIHJlc291cmNlTG9hZElkZW50aWZpZXIsIHJlcXVlc3QpKSB7Ci0g ICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SX0lGX0FMTE9XRUQoImxvYWRSZXNvdXJjZVN5bmNocm9u b3VzbHk6IGZhaWxlZCBjYWxsaW5nIHRyeUxvYWRpbmdTeW5jaHJvbm91c2x5VXNpbmdVUkxTY2hl bWVIYW5kbGVyIChwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCBy ZXNvdXJjZUlEID0gJWx1LCBlcnJvciA9ICVkKSIsIHBhZ2VJRC50b1VJbnQ2NCgpLCBmcmFtZUlE LnRvVUludDY0KCksIHJlc291cmNlTG9hZElkZW50aWZpZXIsIHN5bmNMb2FkUmVzdWx0LT5lcnJv ci5lcnJvckNvZGUoKSk7CisgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SX0lGX0FMTE9XRUQoImxv YWRSZXNvdXJjZVN5bmNocm9ub3VzbHk6IGZhaWxlZCBjYWxsaW5nIHRyeUxvYWRpbmdTeW5jaHJv bm91c2x5VXNpbmdVUkxTY2hlbWVIYW5kbGVyICh3ZWJQYWdlSUQ9JSIgUFJJdTY0ICIsIGZyYW1l SUQ9JSIgUFJJdTY0ICIsIHJlc291cmNlSUQ9JWx1LCBlcnJvcj0lZCkiLCBwYWdlSUQudG9VSW50 NjQoKSwgZnJhbWVJRC50b1VJbnQ2NCgpLCByZXNvdXJjZUxvYWRJZGVudGlmaWVyLCBzeW5jTG9h ZFJlc3VsdC0+ZXJyb3IuZXJyb3JDb2RlKCkpOwogICAgICAgICBlcnJvciA9IFdURk1vdmUoc3lu Y0xvYWRSZXN1bHQtPmVycm9yKTsKICAgICAgICAgcmVzcG9uc2UgPSBXVEZNb3ZlKHN5bmNMb2Fk UmVzdWx0LT5yZXNwb25zZSk7CiAgICAgICAgIGRhdGEgPSBXVEZNb3ZlKHN5bmNMb2FkUmVzdWx0 LT5kYXRhKTsKQEAgLTU2NSw3ICs1NjUsNyBAQCB2b2lkIFdlYkxvYWRlclN0cmF0ZWd5Ojpsb2Fk UmVzb3VyY2VTeW5jaHJvbm91c2x5KEZyYW1lTG9hZGVyJiBmcmFtZUxvYWRlciwgdW5zaQogICAg ICAgICBXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5wYXJlbnRQcm9jZXNzQ29ubmVjdGlvbigpLT5z ZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNzUG9vbDo6U2V0V2ViUHJvY2Vzc0hhc1VwbG9hZHMgeyBQ cm9jZXNzOjppZGVudGlmaWVyKCkgfSwgMCk7CiAKICAgICBpZiAoIVdlYlByb2Nlc3M6OnNpbmds ZXRvbigpLmVuc3VyZU5ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbigpLmNvbm5lY3Rpb24oKS5zZW5k U3luYyhNZXNzYWdlczo6TmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OlBlcmZvcm1TeW5j aHJvbm91c0xvYWQobG9hZFBhcmFtZXRlcnMpLCBNZXNzYWdlczo6TmV0d29ya0Nvbm5lY3Rpb25U b1dlYlByb2Nlc3M6OlBlcmZvcm1TeW5jaHJvbm91c0xvYWQ6OlJlcGx5KGVycm9yLCByZXNwb25z ZSwgZGF0YSksIDApKSB7Ci0gICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SX0lGX0FMTE9XRUQoImxv YWRSZXNvdXJjZVN5bmNocm9ub3VzbHk6IGZhaWxlZCBzZW5kaW5nIHN5bmNocm9ub3VzIG5ldHdv cmsgcHJvY2VzcyBtZXNzYWdlIChwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBS SXU2NCAiLCByZXNvdXJjZUlEID0gJWx1KSIsIHBhZ2VJRC50b1VJbnQ2NCgpLCBmcmFtZUlELnRv VUludDY0KCksIHJlc291cmNlTG9hZElkZW50aWZpZXIpOworICAgICAgICBSRUxFQVNFX0xPR19F UlJPUl9JRl9BTExPV0VEKCJsb2FkUmVzb3VyY2VTeW5jaHJvbm91c2x5OiBmYWlsZWQgc2VuZGlu ZyBzeW5jaHJvbm91cyBuZXR3b3JrIHByb2Nlc3MgbWVzc2FnZSAod2ViUGFnZUlEPSUiIFBSSXU2 NCAiLCBmcmFtZUlEPSUiIFBSSXU2NCAiLCByZXNvdXJjZUlEPSVsdSkiLCBwYWdlSUQudG9VSW50 NjQoKSwgZnJhbWVJRC50b1VJbnQ2NCgpLCByZXNvdXJjZUxvYWRJZGVudGlmaWVyKTsKICAgICAg ICAgaWYgKGF1dG8qIHBhZ2UgPSB3ZWJQYWdlID8gd2ViUGFnZS0+Y29yZVBhZ2UoKSA6IG51bGxw dHIpCiAgICAgICAgICAgICBwYWdlLT5kaWFnbm9zdGljTG9nZ2luZ0NsaWVudCgpLmxvZ0RpYWdu b3N0aWNNZXNzYWdlKFdlYkNvcmU6OkRpYWdub3N0aWNMb2dnaW5nS2V5czo6aW50ZXJuYWxFcnJv cktleSgpLCBXZWJDb3JlOjpEaWFnbm9zdGljTG9nZ2luZ0tleXM6OnN5bmNocm9ub3VzTWVzc2Fn ZUZhaWxlZEtleSgpLCBXZWJDb3JlOjpTaG91bGRTYW1wbGU6Ok5vKTsKICAgICAgICAgcmVzcG9u c2UgPSBSZXNvdXJjZVJlc3BvbnNlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvTmV0d29yay9XZWJSZXNvdXJjZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvTmV0d29yay9XZWJSZXNvdXJjZUxvYWRlci5jcHAKaW5kZXggMDg1ZDUwOWQ2ZTkxMmVm ZjQ2MzI3ZDc4ODkyYmVhNGZiZTcyZWFhNi4uMjE5NDU2Yzg2NTJhNTBhZTkyNWVmMDIwMDJlMTI0 NzZjMTg0OTIyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05ldHdvcmsv V2ViUmVzb3VyY2VMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3 b3JrL1dlYlJlc291cmNlTG9hZGVyLmNwcApAQCAtOTcsMTYgKzk3LDE2IEBAIHZvaWQgV2ViUmVz b3VyY2VMb2FkZXI6OndpbGxTZW5kUmVxdWVzdChSZXNvdXJjZVJlcXVlc3QmJiBwcm9wb3NlZFJl cXVlc3QsIFJlc291CiAgICAgUmVmPFdlYlJlc291cmNlTG9hZGVyPiBwcm90ZWN0ZWRUaGlzKCp0 aGlzKTsKIAogICAgIExPRyhOZXR3b3JrLCAiKFdlYlByb2Nlc3MpIFdlYlJlc291cmNlTG9hZGVy Ojp3aWxsU2VuZFJlcXVlc3QgdG8gJyVzJyIsIHByb3Bvc2VkUmVxdWVzdC51cmwoKS5zdHJpbmco KS5sYXRpbjEoKS5kYXRhKCkpOwotICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoIndpbGxTZW5k UmVxdWVzdDogKHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0ICIsIHJl c291cmNlSUQgPSAlIiBQUkl1NjQgIikiLCBtX3RyYWNraW5nUGFyYW1ldGVycy5wYWdlSUQudG9V SW50NjQoKSwgbV90cmFja2luZ1BhcmFtZXRlcnMuZnJhbWVJRC50b1VJbnQ2NCgpLCBtX3RyYWNr aW5nUGFyYW1ldGVycy5yZXNvdXJjZUlEKTsKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJ3 aWxsU2VuZFJlcXVlc3Q6ICh3ZWJQYWdlSUQ9JSIgUFJJdTY0ICIsIGZyYW1lSUQ9JSIgUFJJdTY0 ICIsIHJlc291cmNlSUQ9JSIgUFJJdTY0ICIpIiwgbV90cmFja2luZ1BhcmFtZXRlcnMucGFnZUlE LnRvVUludDY0KCksIG1fdHJhY2tpbmdQYXJhbWV0ZXJzLmZyYW1lSUQudG9VSW50NjQoKSwgbV90 cmFja2luZ1BhcmFtZXRlcnMucmVzb3VyY2VJRCk7CiAKICAgICBpZiAobV9jb3JlTG9hZGVyLT5k b2N1bWVudExvYWRlcigpLT5hcHBsaWNhdGlvbkNhY2hlSG9zdCgpLm1heWJlTG9hZEZhbGxiYWNr Rm9yUmVkaXJlY3QobV9jb3JlTG9hZGVyLmdldCgpLCBwcm9wb3NlZFJlcXVlc3QsIHJlZGlyZWN0 UmVzcG9uc2UpKSB7Ci0gICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoIndpbGxTZW5kUmVx dWVzdDogZXhpdGluZyBlYXJseSBiZWNhdXNlIG1heWJlTG9hZEZhbGxiYWNrRm9yUmVkaXJlY3Qg cmV0dXJuZWQgZmFsc2UgKHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0 ICIsIHJlc291cmNlSUQgPSAlIiBQUkl1NjQgIikiLCBtX3RyYWNraW5nUGFyYW1ldGVycy5wYWdl SUQudG9VSW50NjQoKSwgbV90cmFja2luZ1BhcmFtZXRlcnMuZnJhbWVJRC50b1VJbnQ2NCgpLCBt X3RyYWNraW5nUGFyYW1ldGVycy5yZXNvdXJjZUlEKTsKKyAgICAgICAgUkVMRUFTRV9MT0dfSUZf QUxMT1dFRCgid2lsbFNlbmRSZXF1ZXN0OiBleGl0aW5nIGVhcmx5IGJlY2F1c2UgbWF5YmVMb2Fk RmFsbGJhY2tGb3JSZWRpcmVjdCByZXR1cm5lZCBmYWxzZSAod2ViUGFnZUlEPSUiIFBSSXU2NCAi LCBmcmFtZUlEPSUiIFBSSXU2NCAiLCByZXNvdXJjZUlEPSUiIFBSSXU2NCAiKSIsIG1fdHJhY2tp bmdQYXJhbWV0ZXJzLnBhZ2VJRC50b1VJbnQ2NCgpLCBtX3RyYWNraW5nUGFyYW1ldGVycy5mcmFt ZUlELnRvVUludDY0KCksIG1fdHJhY2tpbmdQYXJhbWV0ZXJzLnJlc291cmNlSUQpOwogICAgICAg ICByZXR1cm47CiAgICAgfQogCiAgICAgbV9jb3JlTG9hZGVyLT53aWxsU2VuZFJlcXVlc3QoV1RG TW92ZShwcm9wb3NlZFJlcXVlc3QpLCByZWRpcmVjdFJlc3BvbnNlLCBbdGhpcywgcHJvdGVjdGVk VGhpcyA9IFdURk1vdmUocHJvdGVjdGVkVGhpcyldKFJlc291cmNlUmVxdWVzdCYmIHJlcXVlc3Qp IHsKICAgICAgICAgaWYgKCFtX2NvcmVMb2FkZXIgfHwgIW1fY29yZUxvYWRlci0+aWRlbnRpZmll cigpKSB7Ci0gICAgICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJ3aWxsU2VuZFJlcXVl c3Q6IGV4aXRpbmcgZWFybHkgYmVjYXVzZSBubyBjb3JlbG9hZGVyIG9yIGlkZW50aWZpZXIgKHBh Z2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0ICIsIHJlc291cmNlSUQgPSAl IiBQUkl1NjQgIikiLCBtX3RyYWNraW5nUGFyYW1ldGVycy5wYWdlSUQudG9VSW50NjQoKSwgbV90 cmFja2luZ1BhcmFtZXRlcnMuZnJhbWVJRC50b1VJbnQ2NCgpLCBtX3RyYWNraW5nUGFyYW1ldGVy cy5yZXNvdXJjZUlEKTsKKyAgICAgICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoIndpbGxT ZW5kUmVxdWVzdDogZXhpdGluZyBlYXJseSBiZWNhdXNlIG5vIGNvcmVsb2FkZXIgb3IgaWRlbnRp ZmllciAod2ViUGFnZUlEPSUiIFBSSXU2NCAiLCBmcmFtZUlEPSUiIFBSSXU2NCAiLCByZXNvdXJj ZUlEPSUiIFBSSXU2NCAiKSIsIG1fdHJhY2tpbmdQYXJhbWV0ZXJzLnBhZ2VJRC50b1VJbnQ2NCgp LCBtX3RyYWNraW5nUGFyYW1ldGVycy5mcmFtZUlELnRvVUludDY0KCksIG1fdHJhY2tpbmdQYXJh bWV0ZXJzLnJlc291cmNlSUQpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKQEAg LTEyMiwxMiArMTIyLDEyIEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkZXI6OmRpZFNlbmREYXRhKHVp bnQ2NF90IGJ5dGVzU2VudCwgdWludDY0X3QgdG90YWxCeXRlc1RvQmVTCiB2b2lkIFdlYlJlc291 cmNlTG9hZGVyOjpkaWRSZWNlaXZlUmVzcG9uc2UoY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVz cG9uc2UsIGJvb2wgbmVlZHNDb250aW51ZURpZFJlY2VpdmVSZXNwb25zZU1lc3NhZ2UpCiB7CiAg ICAgTE9HKE5ldHdvcmssICIoV2ViUHJvY2VzcykgV2ViUmVzb3VyY2VMb2FkZXI6OmRpZFJlY2Vp dmVSZXNwb25zZSBmb3IgJyVzJy4gU3RhdHVzICVkLiIsIG1fY29yZUxvYWRlci0+dXJsKCkuc3Ry aW5nKCkubGF0aW4xKCkuZGF0YSgpLCByZXNwb25zZS5odHRwU3RhdHVzQ29kZSgpKTsKLSAgICBS RUxFQVNFX0xPR19JRl9BTExPV0VEKCJkaWRSZWNlaXZlUmVzcG9uc2U6IChwYWdlSUQgPSAlIiBQ Ukl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCByZXNvdXJjZUlEID0gJSIgUFJJdTY0ICIs IHN0YXR1cyA9ICVkKSIsIG1fdHJhY2tpbmdQYXJhbWV0ZXJzLnBhZ2VJRC50b1VJbnQ2NCgpLCBt X3RyYWNraW5nUGFyYW1ldGVycy5mcmFtZUlELnRvVUludDY0KCksIG1fdHJhY2tpbmdQYXJhbWV0 ZXJzLnJlc291cmNlSUQsIHJlc3BvbnNlLmh0dHBTdGF0dXNDb2RlKCkpOworICAgIFJFTEVBU0Vf TE9HX0lGX0FMTE9XRUQoImRpZFJlY2VpdmVSZXNwb25zZTogKHdlYlBhZ2VJRD0lIiBQUkl1NjQg IiwgZnJhbWVJRD0lIiBQUkl1NjQgIiwgcmVzb3VyY2VJRD0lIiBQUkl1NjQgIiwgc3RhdHVzPSVk KSIsIG1fdHJhY2tpbmdQYXJhbWV0ZXJzLnBhZ2VJRC50b1VJbnQ2NCgpLCBtX3RyYWNraW5nUGFy YW1ldGVycy5mcmFtZUlELnRvVUludDY0KCksIG1fdHJhY2tpbmdQYXJhbWV0ZXJzLnJlc291cmNl SUQsIHJlc3BvbnNlLmh0dHBTdGF0dXNDb2RlKCkpOwogCiAgICAgUmVmPFdlYlJlc291cmNlTG9h ZGVyPiBwcm90ZWN0ZWRUaGlzKCp0aGlzKTsKIAogICAgIGlmIChtX2NvcmVMb2FkZXItPmRvY3Vt ZW50TG9hZGVyKCktPmFwcGxpY2F0aW9uQ2FjaGVIb3N0KCkubWF5YmVMb2FkRmFsbGJhY2tGb3JS ZXNwb25zZShtX2NvcmVMb2FkZXIuZ2V0KCksIHJlc3BvbnNlKSkgewotICAgICAgICBSRUxFQVNF X0xPR19JRl9BTExPV0VEKCJkaWRSZWNlaXZlUmVzcG9uc2U6IG5vdCBjb250aW51aW5nIGxvYWQg YmVjYXVzZSB0aGUgY29udGVudCBpcyBhbHJlYWR5IGNhY2hlZCAocGFnZUlEID0gJSIgUFJJdTY0 ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgcmVzb3VyY2VJRCA9ICUiIFBSSXU2NCAiKSIsIG1f dHJhY2tpbmdQYXJhbWV0ZXJzLnBhZ2VJRC50b1VJbnQ2NCgpLCBtX3RyYWNraW5nUGFyYW1ldGVy cy5mcmFtZUlELnRvVUludDY0KCksIG1fdHJhY2tpbmdQYXJhbWV0ZXJzLnJlc291cmNlSUQpOwor ICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJkaWRSZWNlaXZlUmVzcG9uc2U6IG5vdCBj b250aW51aW5nIGxvYWQgYmVjYXVzZSB0aGUgY29udGVudCBpcyBhbHJlYWR5IGNhY2hlZCAod2Vi UGFnZUlEPSUiIFBSSXU2NCAiLCBmcmFtZUlEPSUiIFBSSXU2NCAiLCByZXNvdXJjZUlEPSUiIFBS SXU2NCAiKSIsIG1fdHJhY2tpbmdQYXJhbWV0ZXJzLnBhZ2VJRC50b1VJbnQ2NCgpLCBtX3RyYWNr aW5nUGFyYW1ldGVycy5mcmFtZUlELnRvVUludDY0KCksIG1fdHJhY2tpbmdQYXJhbWV0ZXJzLnJl c291cmNlSUQpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC0xNDQsNyArMTQ0LDcgQEAg dm9pZCBXZWJSZXNvdXJjZUxvYWRlcjo6ZGlkUmVjZWl2ZVJlc3BvbnNlKGNvbnN0IFJlc291cmNl UmVzcG9uc2UmIHJlc3BvbnNlLCBib28KICAgICAgICAgICAgIGlmIChtX2NvcmVMb2FkZXIgJiYg bV9jb3JlTG9hZGVyLT5pZGVudGlmaWVyKCkpCiAgICAgICAgICAgICAgICAgc2VuZChNZXNzYWdl czo6TmV0d29ya1Jlc291cmNlTG9hZGVyOjpDb250aW51ZURpZFJlY2VpdmVSZXNwb25zZSgpKTsK ICAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VE KCJkaWRSZWNlaXZlUmVzcG9uc2U6IG5vdCBjb250aW51aW5nIGxvYWQgYmVjYXVzZSBubyBjb3Jl TG9hZGVyIG9yIG5vIElEIChwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2 NCAiLCByZXNvdXJjZUlEID0gJSIgUFJJdTY0ICIpIiwgbV90cmFja2luZ1BhcmFtZXRlcnMucGFn ZUlELnRvVUludDY0KCksIG1fdHJhY2tpbmdQYXJhbWV0ZXJzLmZyYW1lSUQudG9VSW50NjQoKSwg bV90cmFja2luZ1BhcmFtZXRlcnMucmVzb3VyY2VJRCk7CisgICAgICAgICAgICAgICAgUkVMRUFT RV9MT0dfSUZfQUxMT1dFRCgiZGlkUmVjZWl2ZVJlc3BvbnNlOiBub3QgY29udGludWluZyBsb2Fk IGJlY2F1c2Ugbm8gY29yZUxvYWRlciBvciBubyBJRCAod2ViUGFnZUlEPSUiIFBSSXU2NCAiLCBm cmFtZUlEPSUiIFBSSXU2NCAiLCByZXNvdXJjZUlEPSUiIFBSSXU2NCAiKSIsIG1fdHJhY2tpbmdQ YXJhbWV0ZXJzLnBhZ2VJRC50b1VJbnQ2NCgpLCBtX3RyYWNraW5nUGFyYW1ldGVycy5mcmFtZUlE LnRvVUludDY0KCksIG1fdHJhY2tpbmdQYXJhbWV0ZXJzLnJlc291cmNlSUQpOwogICAgICAgICB9 OwogICAgIH0KIApAQCAtMTUzLDcgKzE1Myw3IEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkZXI6OmRp ZFJlY2VpdmVSZXNwb25zZShjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSwgYm9vCiAg ICAgICAgIG1faW50ZXJjZXB0Q29udHJvbGxlci5iZWdpbkludGVyY2VwdGluZ1Jlc3BvbnNlKGlu dGVyY2VwdGVkUmVxdWVzdElkZW50aWZpZXIpOwogICAgICAgICBJbnNwZWN0b3JJbnN0cnVtZW50 YXRpb25XZWJLaXQ6OmludGVyY2VwdFJlc3BvbnNlKG1fY29yZUxvYWRlci0+ZnJhbWUoKSwgcmVz cG9uc2UsIGludGVyY2VwdGVkUmVxdWVzdElkZW50aWZpZXIsIFt0aGlzLCBwcm90ZWN0ZWRUaGlz ID0gbWFrZVJlZigqdGhpcyksIGludGVyY2VwdGVkUmVxdWVzdElkZW50aWZpZXIsIHBvbGljeURl Y2lzaW9uQ29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKHBvbGljeURlY2lzaW9uQ29tcGxldGlv bkhhbmRsZXIpXShjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiBpbnNwZWN0b3JSZXNwb25zZSwgUmVm UHRyPFNoYXJlZEJ1ZmZlcj4gb3ZlcnJpZGVEYXRhKSBtdXRhYmxlIHsKICAgICAgICAgICAgIGlm ICghbV9jb3JlTG9hZGVyIHx8ICFtX2NvcmVMb2FkZXItPmlkZW50aWZpZXIoKSkgewotICAgICAg ICAgICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoImRpZFJlY2VpdmVSZXNwb25zZTogbm90 IGNvbnRpbnVpbmcgaW50ZXJjZXB0IGxvYWQgYmVjYXVzZSBubyBjb3JlTG9hZGVyIG9yIG5vIElE IChwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCByZXNvdXJjZUlE ID0gJSIgUFJJdTY0ICIpIiwgbV90cmFja2luZ1BhcmFtZXRlcnMucGFnZUlELnRvVUludDY0KCks IG1fdHJhY2tpbmdQYXJhbWV0ZXJzLmZyYW1lSUQudG9VSW50NjQoKSwgbV90cmFja2luZ1BhcmFt ZXRlcnMucmVzb3VyY2VJRCk7CisgICAgICAgICAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dF RCgiZGlkUmVjZWl2ZVJlc3BvbnNlOiBub3QgY29udGludWluZyBpbnRlcmNlcHQgbG9hZCBiZWNh dXNlIG5vIGNvcmVMb2FkZXIgb3Igbm8gSUQgKHdlYlBhZ2VJRD0lIiBQUkl1NjQgIiwgZnJhbWVJ RD0lIiBQUkl1NjQgIiwgcmVzb3VyY2VJRD0lIiBQUkl1NjQgIikiLCBtX3RyYWNraW5nUGFyYW1l dGVycy5wYWdlSUQudG9VSW50NjQoKSwgbV90cmFja2luZ1BhcmFtZXRlcnMuZnJhbWVJRC50b1VJ bnQ2NCgpLCBtX3RyYWNraW5nUGFyYW1ldGVycy5yZXNvdXJjZUlEKTsKICAgICAgICAgICAgICAg ICBtX2ludGVyY2VwdENvbnRyb2xsZXIuY29udGludWVSZXNwb25zZShpbnRlcmNlcHRlZFJlcXVl c3RJZGVudGlmaWVyKTsKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9CkBA IC0yMDEsNyArMjAxLDcgQEAgdm9pZCBXZWJSZXNvdXJjZUxvYWRlcjo6ZGlkUmVjZWl2ZURhdGEo Y29uc3QgSVBDOjpEYXRhUmVmZXJlbmNlJiBkYXRhLCBpbnQ2NF90IGUKICAgICB9CiAKICAgICBp ZiAoIW1fbnVtQnl0ZXNSZWNlaXZlZCkgewotICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VE KCJkaWRSZWNlaXZlRGF0YTogU3RhcnRlZCByZWNlaXZpbmcgZGF0YSAocGFnZUlEID0gJSIgUFJJ dTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgcmVzb3VyY2VJRCA9ICUiIFBSSXU2NCAiKSIs IG1fdHJhY2tpbmdQYXJhbWV0ZXJzLnBhZ2VJRC50b1VJbnQ2NCgpLCBtX3RyYWNraW5nUGFyYW1l dGVycy5mcmFtZUlELnRvVUludDY0KCksIG1fdHJhY2tpbmdQYXJhbWV0ZXJzLnJlc291cmNlSUQp OworICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJkaWRSZWNlaXZlRGF0YTogU3RhcnRl ZCByZWNlaXZpbmcgZGF0YSAod2ViUGFnZUlEPSUiIFBSSXU2NCAiLCBmcmFtZUlEPSUiIFBSSXU2 NCAiLCByZXNvdXJjZUlEPSUiIFBSSXU2NCAiKSIsIG1fdHJhY2tpbmdQYXJhbWV0ZXJzLnBhZ2VJ RC50b1VJbnQ2NCgpLCBtX3RyYWNraW5nUGFyYW1ldGVycy5mcmFtZUlELnRvVUludDY0KCksIG1f dHJhY2tpbmdQYXJhbWV0ZXJzLnJlc291cmNlSUQpOwogICAgIH0KICAgICBtX251bUJ5dGVzUmVj ZWl2ZWQgKz0gZGF0YS5zaXplKCk7CiAKQEAgLTIxMSw3ICsyMTEsNyBAQCB2b2lkIFdlYlJlc291 cmNlTG9hZGVyOjpkaWRSZWNlaXZlRGF0YShjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmIGRhdGEs IGludDY0X3QgZQogdm9pZCBXZWJSZXNvdXJjZUxvYWRlcjo6ZGlkRmluaXNoUmVzb3VyY2VMb2Fk KGNvbnN0IE5ldHdvcmtMb2FkTWV0cmljcyYgbmV0d29ya0xvYWRNZXRyaWNzKQogewogICAgIExP RyhOZXR3b3JrLCAiKFdlYlByb2Nlc3MpIFdlYlJlc291cmNlTG9hZGVyOjpkaWRGaW5pc2hSZXNv dXJjZUxvYWQgZm9yICclcyciLCBtX2NvcmVMb2FkZXItPnVybCgpLnN0cmluZygpLmxhdGluMSgp LmRhdGEoKSk7Ci0gICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgiZGlkRmluaXNoUmVzb3VyY2VM b2FkOiAocGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgcmVzb3Vy Y2VJRCA9ICUiIFBSSXU2NCAiLCBsZW5ndGggPSAlemQpIiwgbV90cmFja2luZ1BhcmFtZXRlcnMu cGFnZUlELnRvVUludDY0KCksIG1fdHJhY2tpbmdQYXJhbWV0ZXJzLmZyYW1lSUQudG9VSW50NjQo KSwgbV90cmFja2luZ1BhcmFtZXRlcnMucmVzb3VyY2VJRCwgbV9udW1CeXRlc1JlY2VpdmVkKTsK KyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJkaWRGaW5pc2hSZXNvdXJjZUxvYWQ6ICh3ZWJQ YWdlSUQ9JSIgUFJJdTY0ICIsIGZyYW1lSUQ9JSIgUFJJdTY0ICIsIHJlc291cmNlSUQ9JSIgUFJJ dTY0ICIsIGxlbmd0aD0lemQpIiwgbV90cmFja2luZ1BhcmFtZXRlcnMucGFnZUlELnRvVUludDY0 KCksIG1fdHJhY2tpbmdQYXJhbWV0ZXJzLmZyYW1lSUQudG9VSW50NjQoKSwgbV90cmFja2luZ1Bh cmFtZXRlcnMucmVzb3VyY2VJRCwgbV9udW1CeXRlc1JlY2VpdmVkKTsKIAogICAgIGlmIChVTkxJ S0VMWShtX2ludGVyY2VwdENvbnRyb2xsZXIuaXNJbnRlcmNlcHRpbmcobV9jb3JlTG9hZGVyLT5p ZGVudGlmaWVyKCkpKSkgewogICAgICAgICBtX2ludGVyY2VwdENvbnRyb2xsZXIuZGVmZXIobV9j b3JlTG9hZGVyLT5pZGVudGlmaWVyKCksIFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigq dGhpcyksIG5ldHdvcmtMb2FkTWV0cmljc10oKSBtdXRhYmxlIHsKQEAgLTI0MCw3ICsyNDAsNyBA QCB2b2lkIFdlYlJlc291cmNlTG9hZGVyOjpkaWRGYWlsU2VydmljZVdvcmtlckxvYWQoY29uc3Qg UmVzb3VyY2VFcnJvciYgZXJyb3IpCiB2b2lkIFdlYlJlc291cmNlTG9hZGVyOjpzZXJ2aWNlV29y a2VyRGlkTm90SGFuZGxlKCkKIHsKICNpZiBFTkFCTEUoU0VSVklDRV9XT1JLRVIpCi0gICAgUkVM RUFTRV9MT0dfSUZfQUxMT1dFRCgic2VydmljZVdvcmtlckRpZE5vdEhhbmRsZTogKHBhZ2VJRCA9 ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0ICIsIHJlc291cmNlSUQgPSAlIiBQUkl1 NjQgIikiLCBtX3RyYWNraW5nUGFyYW1ldGVycy5wYWdlSUQudG9VSW50NjQoKSwgbV90cmFja2lu Z1BhcmFtZXRlcnMuZnJhbWVJRC50b1VJbnQ2NCgpLCBtX3RyYWNraW5nUGFyYW1ldGVycy5yZXNv dXJjZUlEKTsKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJzZXJ2aWNlV29ya2VyRGlkTm90 SGFuZGxlOiAod2ViUGFnZUlEPSUiIFBSSXU2NCAiLCBmcmFtZUlEPSUiIFBSSXU2NCAiLCByZXNv dXJjZUlEPSUiIFBSSXU2NCAiKSIsIG1fdHJhY2tpbmdQYXJhbWV0ZXJzLnBhZ2VJRC50b1VJbnQ2 NCgpLCBtX3RyYWNraW5nUGFyYW1ldGVycy5mcmFtZUlELnRvVUludDY0KCksIG1fdHJhY2tpbmdQ YXJhbWV0ZXJzLnJlc291cmNlSUQpOwogCiAgICAgQVNTRVJUKG1fY29yZUxvYWRlci0+b3B0aW9u cygpLnNlcnZpY2VXb3JrZXJzTW9kZSA9PSBTZXJ2aWNlV29ya2Vyc01vZGU6Ok9ubHkpOwogICAg IGF1dG8gZXJyb3IgPSBpbnRlcm5hbEVycm9yKG1fY29yZUxvYWRlci0+cmVxdWVzdCgpLnVybCgp KTsKQEAgLTI1NCw3ICsyNTQsNyBAQCB2b2lkIFdlYlJlc291cmNlTG9hZGVyOjpzZXJ2aWNlV29y a2VyRGlkTm90SGFuZGxlKCkKIHZvaWQgV2ViUmVzb3VyY2VMb2FkZXI6OmRpZEZhaWxSZXNvdXJj ZUxvYWQoY29uc3QgUmVzb3VyY2VFcnJvciYgZXJyb3IpCiB7CiAgICAgTE9HKE5ldHdvcmssICIo V2ViUHJvY2VzcykgV2ViUmVzb3VyY2VMb2FkZXI6OmRpZEZhaWxSZXNvdXJjZUxvYWQgZm9yICcl cyciLCBtX2NvcmVMb2FkZXItPnVybCgpLnN0cmluZygpLmxhdGluMSgpLmRhdGEoKSk7Ci0gICAg UkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgiZGlkRmFpbFJlc291cmNlTG9hZDogKHBhZ2VJRCA9ICUi IFBSSXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0ICIsIHJlc291cmNlSUQgPSAlIiBQUkl1NjQg IikiLCBtX3RyYWNraW5nUGFyYW1ldGVycy5wYWdlSUQudG9VSW50NjQoKSwgbV90cmFja2luZ1Bh cmFtZXRlcnMuZnJhbWVJRC50b1VJbnQ2NCgpLCBtX3RyYWNraW5nUGFyYW1ldGVycy5yZXNvdXJj ZUlEKTsKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJkaWRGYWlsUmVzb3VyY2VMb2FkOiAo d2ViUGFnZUlEPSUiIFBSSXU2NCAiLCBmcmFtZUlEPSUiIFBSSXU2NCAiLCByZXNvdXJjZUlEPSUi IFBSSXU2NCAiKSIsIG1fdHJhY2tpbmdQYXJhbWV0ZXJzLnBhZ2VJRC50b1VJbnQ2NCgpLCBtX3Ry YWNraW5nUGFyYW1ldGVycy5mcmFtZUlELnRvVUludDY0KCksIG1fdHJhY2tpbmdQYXJhbWV0ZXJz LnJlc291cmNlSUQpOwogCiAgICAgaWYgKFVOTElLRUxZKG1faW50ZXJjZXB0Q29udHJvbGxlci5p c0ludGVyY2VwdGluZyhtX2NvcmVMb2FkZXItPmlkZW50aWZpZXIoKSkpKSB7CiAgICAgICAgIG1f aW50ZXJjZXB0Q29udHJvbGxlci5kZWZlcihtX2NvcmVMb2FkZXItPmlkZW50aWZpZXIoKSwgW3Ro aXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgZXJyb3JdKCkgbXV0YWJsZSB7CkBA IC0yNzQsNyArMjc0LDcgQEAgdm9pZCBXZWJSZXNvdXJjZUxvYWRlcjo6ZGlkRmFpbFJlc291cmNl TG9hZChjb25zdCBSZXNvdXJjZUVycm9yJiBlcnJvcikKIHZvaWQgV2ViUmVzb3VyY2VMb2FkZXI6 OmRpZEJsb2NrQXV0aGVudGljYXRpb25DaGFsbGVuZ2UoKQogewogICAgIExPRyhOZXR3b3JrLCAi KFdlYlByb2Nlc3MpIFdlYlJlc291cmNlTG9hZGVyOjpkaWRCbG9ja0F1dGhlbnRpY2F0aW9uQ2hh bGxlbmdlIGZvciAnJXMnIiwgbV9jb3JlTG9hZGVyLT51cmwoKS5zdHJpbmcoKS5sYXRpbjEoKS5k YXRhKCkpOwotICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoImRpZEJsb2NrQXV0aGVudGljYXRp b25DaGFsbGVuZ2U6IChwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAi LCByZXNvdXJjZUlEID0gJSIgUFJJdTY0ICIpIiwgbV90cmFja2luZ1BhcmFtZXRlcnMucGFnZUlE LnRvVUludDY0KCksIG1fdHJhY2tpbmdQYXJhbWV0ZXJzLmZyYW1lSUQudG9VSW50NjQoKSwgbV90 cmFja2luZ1BhcmFtZXRlcnMucmVzb3VyY2VJRCk7CisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dF RCgiZGlkQmxvY2tBdXRoZW50aWNhdGlvbkNoYWxsZW5nZTogKHdlYlBhZ2VJRD0lIiBQUkl1NjQg IiwgZnJhbWVJRD0lIiBQUkl1NjQgIiwgcmVzb3VyY2VJRD0lIiBQUkl1NjQgIikiLCBtX3RyYWNr aW5nUGFyYW1ldGVycy5wYWdlSUQudG9VSW50NjQoKSwgbV90cmFja2luZ1BhcmFtZXRlcnMuZnJh bWVJRC50b1VJbnQ2NCgpLCBtX3RyYWNraW5nUGFyYW1ldGVycy5yZXNvdXJjZUlEKTsKIAogICAg IG1fY29yZUxvYWRlci0+ZGlkQmxvY2tBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSgpOwogfQpAQCAt MjgyLDcgKzI4Miw3IEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkZXI6OmRpZEJsb2NrQXV0aGVudGlj YXRpb25DaGFsbGVuZ2UoKQogdm9pZCBXZWJSZXNvdXJjZUxvYWRlcjo6c3RvcExvYWRpbmdBZnRl clhGcmFtZU9wdGlvbnNPckNvbnRlbnRTZWN1cml0eVBvbGljeURlbmllZChjb25zdCBSZXNvdXJj ZVJlc3BvbnNlJiByZXNwb25zZSkKIHsKICAgICBMT0coTmV0d29yaywgIihXZWJQcm9jZXNzKSBX ZWJSZXNvdXJjZUxvYWRlcjo6c3RvcExvYWRpbmdBZnRlclhGcmFtZU9wdGlvbnNPckNvbnRlbnRT ZWN1cml0eVBvbGljeURlbmllZCBmb3IgJyVzJyIsIG1fY29yZUxvYWRlci0+dXJsKCkuc3RyaW5n KCkubGF0aW4xKCkuZGF0YSgpKTsKLSAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJzdG9wTG9h ZGluZ0FmdGVyWEZyYW1lT3B0aW9uc09yQ29udGVudFNlY3VyaXR5UG9saWN5RGVuaWVkOiAocGFn ZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgcmVzb3VyY2VJRCA9ICUi IFBSSXU2NCAiKSIsIG1fdHJhY2tpbmdQYXJhbWV0ZXJzLnBhZ2VJRC50b1VJbnQ2NCgpLCBtX3Ry YWNraW5nUGFyYW1ldGVycy5mcmFtZUlELnRvVUludDY0KCksIG1fdHJhY2tpbmdQYXJhbWV0ZXJz LnJlc291cmNlSUQpOworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoInN0b3BMb2FkaW5nQWZ0 ZXJYRnJhbWVPcHRpb25zT3JDb250ZW50U2VjdXJpdHlQb2xpY3lEZW5pZWQ6ICh3ZWJQYWdlSUQ9 JSIgUFJJdTY0ICIsIGZyYW1lSUQ9JSIgUFJJdTY0ICIsIHJlc291cmNlSUQ9JSIgUFJJdTY0ICIp IiwgbV90cmFja2luZ1BhcmFtZXRlcnMucGFnZUlELnRvVUludDY0KCksIG1fdHJhY2tpbmdQYXJh bWV0ZXJzLmZyYW1lSUQudG9VSW50NjQoKSwgbV90cmFja2luZ1BhcmFtZXRlcnMucmVzb3VyY2VJ RCk7CiAKICAgICBtX2NvcmVMb2FkZXItPmRvY3VtZW50TG9hZGVyKCktPnN0b3BMb2FkaW5nQWZ0 ZXJYRnJhbWVPcHRpb25zT3JDb250ZW50U2VjdXJpdHlQb2xpY3lEZW5pZWQobV9jb3JlTG9hZGVy LT5pZGVudGlmaWVyKCksIHJlc3BvbnNlKTsKIH0KQEAgLTI5MSwxMyArMjkxLDEzIEBAIHZvaWQg V2ViUmVzb3VyY2VMb2FkZXI6OnN0b3BMb2FkaW5nQWZ0ZXJYRnJhbWVPcHRpb25zT3JDb250ZW50 U2VjdXJpdHlQb2xpY3lEZW5pCiB2b2lkIFdlYlJlc291cmNlTG9hZGVyOjpkaWRSZWNlaXZlUmVz b3VyY2UoY29uc3QgU2hhcmVhYmxlUmVzb3VyY2U6OkhhbmRsZSYgaGFuZGxlKQogewogICAgIExP RyhOZXR3b3JrLCAiKFdlYlByb2Nlc3MpIFdlYlJlc291cmNlTG9hZGVyOjpkaWRSZWNlaXZlUmVz b3VyY2UgZm9yICclcyciLCBtX2NvcmVMb2FkZXItPnVybCgpLnN0cmluZygpLmxhdGluMSgpLmRh dGEoKSk7Ci0gICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgiZGlkUmVjZWl2ZVJlc291cmNlOiAo cGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgcmVzb3VyY2VJRCA9 ICUiIFBSSXU2NCAiKSIsIG1fdHJhY2tpbmdQYXJhbWV0ZXJzLnBhZ2VJRC50b1VJbnQ2NCgpLCBt X3RyYWNraW5nUGFyYW1ldGVycy5mcmFtZUlELnRvVUludDY0KCksIG1fdHJhY2tpbmdQYXJhbWV0 ZXJzLnJlc291cmNlSUQpOworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoImRpZFJlY2VpdmVS ZXNvdXJjZTogKHdlYlBhZ2VJRD0lIiBQUkl1NjQgIiwgZnJhbWVJRD0lIiBQUkl1NjQgIiwgcmVz b3VyY2VJRD0lIiBQUkl1NjQgIikiLCBtX3RyYWNraW5nUGFyYW1ldGVycy5wYWdlSUQudG9VSW50 NjQoKSwgbV90cmFja2luZ1BhcmFtZXRlcnMuZnJhbWVJRC50b1VJbnQ2NCgpLCBtX3RyYWNraW5n UGFyYW1ldGVycy5yZXNvdXJjZUlEKTsKIAogICAgIFJlZlB0cjxTaGFyZWRCdWZmZXI+IGJ1ZmZl ciA9IGhhbmRsZS50cnlXcmFwSW5TaGFyZWRCdWZmZXIoKTsKIAogICAgIGlmICghYnVmZmVyKSB7 CiAgICAgICAgIExPR19FUlJPUigiVW5hYmxlIHRvIGNyZWF0ZSBidWZmZXIgZnJvbSBTaGFyZWFi bGVSZXNvdXJjZSBzZW50IGZyb20gdGhlIG5ldHdvcmsgcHJvY2Vzcy4iKTsKLSAgICAgICAgUkVM RUFTRV9MT0dfSUZfQUxMT1dFRCgiZGlkUmVjZWl2ZVJlc291cmNlOiBVbmFibGUgdG8gY3JlYXRl IFNoYXJlZEJ1ZmZlciAocGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQg IiwgcmVzb3VyY2VJRCA9ICUiIFBSSXU2NCAiKSIsIG1fdHJhY2tpbmdQYXJhbWV0ZXJzLnBhZ2VJ RC50b1VJbnQ2NCgpLCBtX3RyYWNraW5nUGFyYW1ldGVycy5mcmFtZUlELnRvVUludDY0KCksIG1f dHJhY2tpbmdQYXJhbWV0ZXJzLnJlc291cmNlSUQpOworICAgICAgICBSRUxFQVNFX0xPR19JRl9B TExPV0VEKCJkaWRSZWNlaXZlUmVzb3VyY2U6IFVuYWJsZSB0byBjcmVhdGUgU2hhcmVkQnVmZmVy ICh3ZWJQYWdlSUQ9JSIgUFJJdTY0ICIsIGZyYW1lSUQ9JSIgUFJJdTY0ICIsIHJlc291cmNlSUQ9 JSIgUFJJdTY0ICIpIiwgbV90cmFja2luZ1BhcmFtZXRlcnMucGFnZUlELnRvVUludDY0KCksIG1f dHJhY2tpbmdQYXJhbWV0ZXJzLmZyYW1lSUQudG9VSW50NjQoKSwgbV90cmFja2luZ1BhcmFtZXRl cnMucmVzb3VyY2VJRCk7CiAgICAgICAgIGlmIChhdXRvKiBmcmFtZSA9IG1fY29yZUxvYWRlci0+ ZnJhbWUoKSkgewogICAgICAgICAgICAgaWYgKGF1dG8qIHBhZ2UgPSBmcmFtZS0+cGFnZSgpKQog ICAgICAgICAgICAgICAgIHBhZ2UtPmRpYWdub3N0aWNMb2dnaW5nQ2xpZW50KCkubG9nRGlhZ25v c3RpY01lc3NhZ2UoV2ViQ29yZTo6RGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjppbnRlcm5hbEVycm9y S2V5KCksIFdlYkNvcmU6OkRpYWdub3N0aWNMb2dnaW5nS2V5czo6Y3JlYXRlU2hhcmVkQnVmZmVy RmFpbGVkS2V5KCksIFdlYkNvcmU6OlNob3VsZFNhbXBsZTo6Tm8pOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50 LmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxv YWRlckNsaWVudC5jcHAKaW5kZXggNzhkYTQ3Y2E5ZTE5Y2ZlN2ZkNmVjNzFjZmFkZTc5NmVlNWQ5 NTZhZS4uN2YyZGQzZWUwOWU5NTY1MDg0OGEyYmFmNDQ3MDQ0ZDFhY2NiMDA2ZSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVy Q2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQv V2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCkBAIC01NjAsNyArNTYwLDcgQEAgdm9pZCBXZWJGcmFt ZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRGYWlsUHJvdmlzaW9uYWxMb2FkKGNvbnN0IFJlc291 cmNlRXJyb3ImIGUKICAgICBpZiAoIXdlYlBhZ2UpCiAgICAgICAgIHJldHVybjsKIAotICAgIFJF TEVBU0VfTE9HKE5ldHdvcmssICIlcCAtIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERp ZEZhaWxQcm92aXNpb25hbExvYWQ6IChwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUi IFBSSXU2NCAiKSIsIHRoaXMsIHdlYlBhZ2UtPmlkZW50aWZpZXIoKS50b1VJbnQ2NCgpLCBtX2Zy YW1lLT5mcmFtZUlEKCkudG9VSW50NjQoKSk7CisgICAgUkVMRUFTRV9MT0coTmV0d29yaywgIiVw IC0gV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkRmFpbFByb3Zpc2lvbmFsTG9hZDog KHdlYlBhZ2VJRD0lIiBQUkl1NjQgIiwgZnJhbWVJRD0lIiBQUkl1NjQgIikiLCB0aGlzLCB3ZWJQ YWdlLT5pZGVudGlmaWVyKCkudG9VSW50NjQoKSwgbV9mcmFtZS0+ZnJhbWVJRCgpLnRvVUludDY0 KCkpOwogCiAgICAgUmVmUHRyPEFQSTo6T2JqZWN0PiB1c2VyRGF0YTsKIApAQCAtNTk2LDcgKzU5 Niw3IEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkRmFpbExvYWQoY29u c3QgUmVzb3VyY2VFcnJvciYgZXJyb3IpCiAgICAgaWYgKCF3ZWJQYWdlKQogICAgICAgICByZXR1 cm47CiAKLSAgICBSRUxFQVNFX0xPRyhOZXR3b3JrLCAiJXAgLSBXZWJGcmFtZUxvYWRlckNsaWVu dDo6ZGlzcGF0Y2hEaWRGYWlsTG9hZDogKHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0g JSIgUFJJdTY0ICIpIiwgdGhpcywgd2ViUGFnZS0+aWRlbnRpZmllcigpLnRvVUludDY0KCksIG1f ZnJhbWUtPmZyYW1lSUQoKS50b1VJbnQ2NCgpKTsKKyAgICBSRUxFQVNFX0xPRyhOZXR3b3JrLCAi JXAgLSBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRGYWlsTG9hZDogKHdlYlBhZ2VJ RD0lIiBQUkl1NjQgIiwgZnJhbWVJRD0lIiBQUkl1NjQgIikiLCB0aGlzLCB3ZWJQYWdlLT5pZGVu dGlmaWVyKCkudG9VSW50NjQoKSwgbV9mcmFtZS0+ZnJhbWVJRCgpLnRvVUludDY0KCkpOwogCiAg ICAgUmVmUHRyPEFQSTo6T2JqZWN0PiB1c2VyRGF0YTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAppbmRleCBkN2Q4MGI2MzU1NmQxZGI2YjBlNmM1ZWVh OWMwYWY0N2IzMzBkMGVlLi5jYjlkNjhlMDk2Y2ZlYzI1ZDUyZDNmOGY3MzY2ZDYwOWQ1N2U3MzRm IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAt MjUwNCw3ICsyNTA0LDcgQEAgdm9pZCBXZWJQYWdlOjpmcmVlemVMYXllclRyZWUoTGF5ZXJUcmVl RnJlZXplUmVhc29uIHJlYXNvbikKICAgICBhdXRvIG9sZFJlYXNvbnMgPSBtX2xheWVyVHJlZUZy ZWV6ZVJlYXNvbnMudG9SYXcoKTsKICAgICBVTlVTRURfUEFSQU0ob2xkUmVhc29ucyk7CiAgICAg bV9sYXllclRyZWVGcmVlemVSZWFzb25zLmFkZChyZWFzb24pOwotICAgIFJFTEVBU0VfTE9HKFBy b2Nlc3NTdXNwZW5zaW9uLCAiJXAgLSBXZWJQYWdlIChQYWdlSUQ9JWxsdSkgLSBBZGRpbmcgYSBy ZWFzb24gJWQgdG8gZnJlZXplIGxheWVyIHRyZWUgKG5vdyAlZCk7IG9sZCByZWFzb25zIHdlcmUg JWQiLCB0aGlzLCBtX2lkZW50aWZpZXIudG9VSW50NjQoKSwgc3RhdGljX2Nhc3Q8dW5zaWduZWQ+ KHJlYXNvbiksIG1fbGF5ZXJUcmVlRnJlZXplUmVhc29ucy50b1JhdygpLCBvbGRSZWFzb25zKTsK KyAgICBSRUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwgIiVwIC0gV2ViUGFnZSAod2ViUGFn ZUlEPSVsbHUpIC0gQWRkaW5nIGEgcmVhc29uICVkIHRvIGZyZWV6ZSBsYXllciB0cmVlIChub3cg JWQpOyBvbGQgcmVhc29ucyB3ZXJlICVkIiwgdGhpcywgbV9pZGVudGlmaWVyLnRvVUludDY0KCks IHN0YXRpY19jYXN0PHVuc2lnbmVkPihyZWFzb24pLCBtX2xheWVyVHJlZUZyZWV6ZVJlYXNvbnMu dG9SYXcoKSwgb2xkUmVhc29ucyk7CiAgICAgdXBkYXRlRHJhd2luZ0FyZWFMYXllclRyZWVGcmVl emVTdGF0ZSgpOwogfQogCkBAIC0yNTEzLDcgKzI1MTMsNyBAQCB2b2lkIFdlYlBhZ2U6OnVuZnJl ZXplTGF5ZXJUcmVlKExheWVyVHJlZUZyZWV6ZVJlYXNvbiByZWFzb24pCiAgICAgYXV0byBvbGRS ZWFzb25zID0gbV9sYXllclRyZWVGcmVlemVSZWFzb25zLnRvUmF3KCk7CiAgICAgVU5VU0VEX1BB UkFNKG9sZFJlYXNvbnMpOwogICAgIG1fbGF5ZXJUcmVlRnJlZXplUmVhc29ucy5yZW1vdmUocmVh c29uKTsKLSAgICBSRUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwgIiVwIC0gV2ViUGFnZSAo UGFnZUlEPSVsbHUpIC0gUmVtb3ZpbmcgYSByZWFzb24gJWQgdG8gZnJlZXplIGxheWVyIHRyZWUg KG5vdyAlZCk7IG9sZCByZWFzb25zIHdlcmUgJWQiLCB0aGlzLCBtX2lkZW50aWZpZXIudG9VSW50 NjQoKSwgc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KHJlYXNvbiksIG1fbGF5ZXJUcmVlRnJlZXplUmVh c29ucy50b1JhdygpLCBvbGRSZWFzb25zKTsKKyAgICBSRUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVu c2lvbiwgIiVwIC0gV2ViUGFnZSAod2ViUGFnZUlEPSVsbHUpIC0gUmVtb3ZpbmcgYSByZWFzb24g JWQgdG8gZnJlZXplIGxheWVyIHRyZWUgKG5vdyAlZCk7IG9sZCByZWFzb25zIHdlcmUgJWQiLCB0 aGlzLCBtX2lkZW50aWZpZXIudG9VSW50NjQoKSwgc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KHJlYXNv biksIG1fbGF5ZXJUcmVlRnJlZXplUmVhc29ucy50b1JhdygpLCBvbGRSZWFzb25zKTsKICAgICB1 cGRhdGVEcmF3aW5nQXJlYUxheWVyVHJlZUZyZWV6ZVN0YXRlKCk7CiB9CiAK