197995 2019-05-17 13:08:51 -0700 Avoid races in taking networking assertions for downloads by having both Networking and UIProcess do it 2019-05-17 14:37:15 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 beidson beidson achristensen cdumez commit-queue oldest_to_newest 1537207 0 beidson 2019-05-17 13:08:51 -0700 Avoid races in taking networking assertions for downloads by having both Networking and UIProcess do it <rdar://problem/50564630> 1537209 1 370138 beidson 2019-05-17 13:12:31 -0700 Created attachment 370138 Patch 1537213 2 370140 beidson 2019-05-17 13:26:01 -0700 Created attachment 370140 Patch 1537225 3 370140 cdumez 2019-05-17 13:40:09 -0700 Comment on attachment 370140 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=370140&action=review > Source/WebKit/NetworkProcess/Downloads/DownloadMap.cpp:64 > + RELEASE_LOG(Loading, "Took 'WebKit downloads' assertion in NetworkProcess"); We normally use ProcessSuspension channel for such logging. > Source/WebKit/NetworkProcess/Downloads/DownloadMap.cpp:78 > + RELEASE_LOG(Loading, "Dropped 'WebKit downloads' assertion in NetworkProcess"); We normally use ProcessSuspension channel for such logging. > Source/WebKit/UIProcess/Downloads/DownloadProxyMap.cpp:97 > + RELEASE_LOG(Loading, "UIProcess took 'WebKit downloads' assertions for UIProcess and NetworkProcess"); We normally use ProcessSuspension channel for such logging. > Source/WebKit/UIProcess/Downloads/DownloadProxyMap.cpp:125 > + RELEASE_LOG(Loading, "UIProcess released 'WebKit downloads' assertions for UIProcess and NetworkProcess"); We normally use ProcessSuspension channel for such logging. > Source/WebKit/UIProcess/Downloads/DownloadProxyMap.cpp:141 > + RELEASE_LOG(Loading, "UIProcess DownloadProxyMap invalidated - Released 'WebKit downloads' assertions for UIProcess and NetworkProcess"); We normally use ProcessSuspension channel for such logging. 1537234 4 370146 beidson 2019-05-17 13:50:13 -0700 Created attachment 370146 Patch 1537261 5 370146 commit-queue 2019-05-17 14:37:13 -0700 Comment on attachment 370146 Patch Clearing flags on attachment: 370146 Committed r245480: <https://trac.webkit.org/changeset/245480> 1537262 6 commit-queue 2019-05-17 14:37:15 -0700 All reviewed patches have been landed. Closing bug. 370138 2019-05-17 13:12:31 -0700 2019-05-17 13:26:00 -0700 Patch bug-197995-20190517131231.patch text/plain 8301 beidson U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ1NDc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDY5NWRlOTA0ZTAwNmQyOTNm YTlmYzAwY2M4ZTBhZmIxMDNkMTVlNDAuLjE4ZTUwZDU2YjU3NWY1MjM3YzI2YjZmMWViZWE2NjBl NDdmMzkzZTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMgQEAKKzIwMTktMDUtMTcgIEJyYWR5IEVp ZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAgICAgIEF2b2lkIHJhY2VzIGluIHRha2lu ZyBuZXR3b3JraW5nIGFzc2VydGlvbnMgZm9yIGRvd25sb2FkcyBieSBoYXZpbmcgYm90aCBOZXR3 b3JraW5nIGFuZCBVSVByb2Nlc3MgZG8gaXQuCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81MDU2 NDYzMD4gYW5kIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTc5OTUK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGVyZSdz IGEgZmFpcmx5IGluZGV0ZXJtaW5hbnQgdGltZSBnYXAgYmV0d2VlbiB3aGVuIHRoZSBVSVByb2Nl c3MgZGVjaWRlcyBhIGxvYWQgYmVjb21lcyBhIGRvd25sb2FkCisgICAgICAgIGFuZCB3aGVuIHRo ZSBOZXR3b3JrUHJvY2VzcyBEb3dubG9hZCBvYmplY3QgaXMgY3JlYXRlZCwgYW5kIHRoZXJlZm9y ZSB0aGUgZG93bmxvYWQgYXNzZXJ0aW9uIHRvIGJlIHRha2VuLgorCisgICAgICAgIFRoZSB0aW1l IGdhcCBjYW4gYmUgbG9uZyBlbm91Z2ggZm9yIHRoZSBOZXR3b3JraW5nIHByb2Nlc3MgdG8gc3Vz cGVuZCBiZWZvcmUgdGhlIGRvd25sb2FkIGFjdHVhbGx5IHN0YXJ0cy4KKworICAgICAgICBUaGVy ZSdzIHRoZSByZXZlcnNlIHJhY2Ugd2hlbiB0aGUgVUlQcm9jZXNzIHRlbGxzIGEgZG93bmxvYWQg dG8gc3RvcCwgYXMgd2VsbC4KKworICAgICAgICBCeSBoYXZpbmcgYm90aCB0aGUgVUlQcm9jZXNz IGFuZCBOZXR3b3JrUHJvY2VzcyB0YWtlIGFuIGFzc2VydGlvbiBvbiBiZWhhbGYgb2YgdGhlIE5l dHdvcmtQcm9jZXNzIHdlCisgICAgICAgIGF2b2lkIHRoZSByYWNlLgorCisgICAgICAgICogTmV0 d29ya1Byb2Nlc3MvRG93bmxvYWRzL0Rvd25sb2FkTWFwLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 RG93bmxvYWRNYXA6OmFkZCk6CisgICAgICAgIChXZWJLaXQ6OkRvd25sb2FkTWFwOjpyZW1vdmUp OgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcDoK KyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZGVyOjpjb252ZXJ0VG9Eb3dubG9h ZCk6CisKKyAgICAgICAgKiBVSVByb2Nlc3MvRG93bmxvYWRzL0Rvd25sb2FkUHJveHlNYXAuY3Bw OgorICAgICAgICAoV2ViS2l0OjpEb3dubG9hZFByb3h5TWFwOjpjcmVhdGVEb3dubG9hZFByb3h5 KToKKyAgICAgICAgKFdlYktpdDo6RG93bmxvYWRQcm94eU1hcDo6ZG93bmxvYWRGaW5pc2hlZCk6 CisgICAgICAgIChXZWJLaXQ6OkRvd25sb2FkUHJveHlNYXA6OmludmFsaWRhdGUpOgorICAgICAg ICAqIFVJUHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxvYWRQcm94eU1hcC5oOgorCiAyMDE5LTA1LTE3 ICBLZWl0aCBSb2xsaW4gIDxrcm9sbGluQGFwcGxlLmNvbT4KIAogICAgICAgICBSZS1lbmFibGUg Z2VuZXJhdGUteGNmaWxlbGlzdHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvRG93bmxvYWRzL0Rvd25sb2FkTWFwLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvRG93bmxvYWRzL0Rvd25sb2FkTWFwLmNwcAppbmRleCAzMjk5MjUzMDQ4ZjQyY2UzOTZj MzVjM2RhMDVkYTUwYTE1MzFiOTJhLi44M2NiMGFhODVhMzg2NTAzYTU1NjBhNjUzZTk2MWU1ODEw YWNmZTM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0Rvd25sb2Fk cy9Eb3dubG9hZE1hcC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9Eb3du bG9hZHMvRG93bmxvYWRNYXAuY3BwCkBAIC01NSwxMCArNTUsMTMgQEAgYm9vbCBEb3dubG9hZE1h cDo6Y29udGFpbnMoRG93bmxvYWRJRCBkb3dubG9hZElEKSBjb25zdAogCiBEb3dubG9hZE1hcDo6 RG93bmxvYWRNYXBUeXBlOjpBZGRSZXN1bHQgRG93bmxvYWRNYXA6OmFkZChEb3dubG9hZElEIGRv d25sb2FkSUQsIHN0ZDo6dW5pcXVlX3B0cjxEb3dubG9hZD4mJiBkb3dubG9hZCkKIHsKKyAgICBS RUxFQVNFX0xPRyhMb2FkaW5nLCAiQWRkaW5nIGRvd25sb2FkICUiIFBSSXU2NCAiIHRvIE5ldHdv cmtQcm9jZXNzIERvd25sb2FkTWFwIiwgZG93bmxvYWRJRC5kb3dubG9hZElEKCkpOworCiAgICAg YXV0byByZXN1bHQgPSBtX2Rvd25sb2Fkcy5hZGQoZG93bmxvYWRJRCwgV1RGTW92ZShkb3dubG9h ZCkpOwogICAgIGlmIChtX2Rvd25sb2Fkcy5zaXplKCkgPT0gMSkgewogICAgICAgICBBU1NFUlQo IW1fZG93bmxvYWRBc3NlcnRpb24pOwogICAgICAgICBtX2Rvd25sb2FkQXNzZXJ0aW9uID0gc3Rk OjptYWtlX3VuaXF1ZTxQcm9jZXNzQXNzZXJ0aW9uPihnZXRwaWQoKSwgIldlYktpdCBkb3dubG9h ZHMiX3MsIEFzc2VydGlvblN0YXRlOjpVbmJvdW5kZWROZXR3b3JraW5nKTsKKyAgICAgICAgUkVM RUFTRV9MT0coTG9hZGluZywgIlRvb2sgJ1dlYktpdCBkb3dubG9hZHMnIGFzc2VydGlvbiBpbiBO ZXR3b3JrUHJvY2VzcyIpOwogICAgIH0KIAogICAgIHJldHVybiByZXN1bHQ7CkBAIC02NiwxMCAr NjksMTMgQEAgRG93bmxvYWRNYXA6OkRvd25sb2FkTWFwVHlwZTo6QWRkUmVzdWx0IERvd25sb2Fk TWFwOjphZGQoRG93bmxvYWRJRCBkb3dubG9hZElELAogCiBib29sIERvd25sb2FkTWFwOjpyZW1v dmUoRG93bmxvYWRJRCBkb3dubG9hZElEKQogeworICAgIFJFTEVBU0VfTE9HKExvYWRpbmcsICJS ZW1vdmluZyBkb3dubG9hZCAlIiBQUkl1NjQgIiBmcm9tIE5ldHdvcmtQcm9jZXNzIERvd25sb2Fk TWFwIiwgZG93bmxvYWRJRC5kb3dubG9hZElEKCkpOworCiAgICAgYXV0byByZXN1bHQgPSBtX2Rv d25sb2Fkcy5yZW1vdmUoZG93bmxvYWRJRCk7CiAgICAgaWYgKG1fZG93bmxvYWRzLmlzRW1wdHko KSkgewogICAgICAgICBBU1NFUlQobV9kb3dubG9hZEFzc2VydGlvbik7CiAgICAgICAgIG1fZG93 bmxvYWRBc3NlcnRpb24gPSBudWxscHRyOworICAgICAgICBSRUxFQVNFX0xPRyhMb2FkaW5nLCAi RHJvcHBlZCAnV2ViS2l0IGRvd25sb2FkcycgYXNzZXJ0aW9uIGluIE5ldHdvcmtQcm9jZXNzIik7 CiAgICAgfQogICAgIAogICAgIHJldHVybiByZXN1bHQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2Vi S2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAKaW5kZXggNDUxMGU5 MjY4YTIyYzIwNWM4YzZiMDM1YTdiMGZjZmU0NzhlMDZlMi4uZmUyNjUzNmYyMWMzZWU5YTcwMTg5 OGNhMDU5MzJkNTVkMTVkMzRiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcApAQCAtMzIyLDYgKzMyMiw4IEBAIHZv aWQgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpjbGVhbnVwKExvYWRSZXN1bHQgcmVzdWx0KQogCiB2 b2lkIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6Y29udmVydFRvRG93bmxvYWQoRG93bmxvYWRJRCBk b3dubG9hZElELCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIGNvbnN0IFJlc291cmNl UmVzcG9uc2UmIHJlc3BvbnNlKQogeworICAgIFJFTEVBU0VfTE9HKExvYWRpbmcsICJDb252ZXJ0 aW5nIE5ldHdvcmtSZXNvdXJjZUxvYWRlciAlcCB0byBkb3dubG9hZCAlIiBQUkl1NjQgIiAocGFn ZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgcmVzb3VyY2VJRCA9ICUi IFBSSXU2NCAiKSIsIHRoaXMsIGRvd25sb2FkSUQuZG93bmxvYWRJRCgpLCBtX3BhcmFtZXRlcnMu d2ViUGFnZUlELCBtX3BhcmFtZXRlcnMud2ViRnJhbWVJRCwgbV9wYXJhbWV0ZXJzLmlkZW50aWZp ZXIpOworICAgIAogICAgIC8vIFRoaXMgY2FuIGhhcHBlbiBpZiB0aGUgcmVzb3VyY2UgY2FtZSBm cm9tIHRoZSBkaXNrIGNhY2hlLgogICAgIGlmICghbV9uZXR3b3JrTG9hZCkgewogICAgICAgICBt X2Nvbm5lY3Rpb24tPm5ldHdvcmtQcm9jZXNzKCkuZG93bmxvYWRNYW5hZ2VyKCkuc3RhcnREb3du bG9hZChtX3BhcmFtZXRlcnMuc2Vzc2lvbklELCBkb3dubG9hZElELCByZXF1ZXN0KTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0Rvd25sb2Fkcy9Eb3dubG9hZFByb3h5TWFw LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0Rvd25sb2Fkcy9Eb3dubG9hZFByb3h5TWFw LmNwcAppbmRleCBmMzk5YzVhOGU5OGFjYjI3NWUzZWRiZjQ2NzFkMzI1NGVkMDFkYmM3Li4zYWJj NDE3NWJhODcyNTliNTU5ODgzZDRiZTg1ZjUyNGVjNmI4YzZlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxvYWRQcm94eU1hcC5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvRG93bmxvYWRzL0Rvd25sb2FkUHJveHlNYXAuY3BwCkBAIC04 NCw5ICs4NCwxOCBAQCBEb3dubG9hZFByb3h5JiBEb3dubG9hZFByb3h5TWFwOjpjcmVhdGVEb3du bG9hZFByb3h5KFdlYlByb2Nlc3NQb29sJiBwcm9jZXNzUG9vbAogICAgIGF1dG8gZG93bmxvYWRQ cm94eSA9IERvd25sb2FkUHJveHk6OmNyZWF0ZSgqdGhpcywgcHJvY2Vzc1Bvb2wsIHJlc291cmNl UmVxdWVzdCk7CiAgICAgbV9kb3dubG9hZHMuc2V0KGRvd25sb2FkUHJveHktPmRvd25sb2FkSUQo KSwgZG93bmxvYWRQcm94eS5jb3B5UmVmKCkpOwogCisgICAgUkVMRUFTRV9MT0coTG9hZGluZywg IkFkZGluZyBkb3dubG9hZCAlIiBQUkl1NjQgIiB0byBVSVByb2Nlc3MgRG93bmxvYWRQcm94eU1h cCIsIGRvd25sb2FkUHJveHktPmRvd25sb2FkSUQoKS5kb3dubG9hZElEKCkpOworCiAgICAgaWYg KG1fZG93bmxvYWRzLnNpemUoKSA9PSAxICYmIG1fc2hvdWxkVGFrZUFzc2VydGlvbikgewotICAg ICAgICBBU1NFUlQoIW1fZG93bmxvYWRBc3NlcnRpb24pOwotICAgICAgICBtX2Rvd25sb2FkQXNz ZXJ0aW9uID0gc3RkOjptYWtlX3VuaXF1ZTxQcm9jZXNzQXNzZXJ0aW9uPihnZXRDdXJyZW50UHJv Y2Vzc0lEKCksICJXZWJLaXQgZG93bmxvYWRzIl9zLCBBc3NlcnRpb25TdGF0ZTo6VW5ib3VuZGVk TmV0d29ya2luZyk7CisgICAgICAgIEFTU0VSVCghbV9kb3dubG9hZFVJQXNzZXJ0aW9uKTsKKyAg ICAgICAgbV9kb3dubG9hZFVJQXNzZXJ0aW9uID0gc3RkOjptYWtlX3VuaXF1ZTxQcm9jZXNzQXNz ZXJ0aW9uPihnZXRDdXJyZW50UHJvY2Vzc0lEKCksICJXZWJLaXQgZG93bmxvYWRzIl9zLCBBc3Nl cnRpb25TdGF0ZTo6VW5ib3VuZGVkTmV0d29ya2luZyk7CisKKyAgICAgICAgQVNTRVJUKCFtX2Rv d25sb2FkTmV0d29ya2luZ0Fzc2VydGlvbik7CisgICAgICAgIFJFTEVBU0VfQVNTRVJUKG1fcHJv Y2Vzcyk7CisgICAgICAgIFJFTEVBU0VfQVNTRVJUKG1fcHJvY2Vzcy0+Y29ubmVjdGlvbigpKTsK KyAgICAgICAgbV9kb3dubG9hZE5ldHdvcmtpbmdBc3NlcnRpb24gPSBzdGQ6Om1ha2VfdW5pcXVl PFByb2Nlc3NBc3NlcnRpb24+KG1fcHJvY2Vzcy0+Y29ubmVjdGlvbigpLT5yZW1vdGVQcm9jZXNz SUQoKSwgIldlYktpdCBkb3dubG9hZHMiX3MsIEFzc2VydGlvblN0YXRlOjpVbmJvdW5kZWROZXR3 b3JraW5nKTsKKworICAgICAgICBSRUxFQVNFX0xPRyhMb2FkaW5nLCAiVUlQcm9jZXNzIHRvb2sg J1dlYktpdCBkb3dubG9hZHMnIGFzc2VydGlvbnMgZm9yIFVJUHJvY2VzcyBhbmQgTmV0d29ya1By b2Nlc3MiKTsKICAgICB9CiAKICAgICBtX3Byb2Nlc3MtPmFkZE1lc3NhZ2VSZWNlaXZlcihNZXNz YWdlczo6RG93bmxvYWRQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBkb3dubG9hZFByb3h5 LT5kb3dubG9hZElEKCkuZG93bmxvYWRJRCgpLCBkb3dubG9hZFByb3h5LmdldCgpKTsKQEAgLTk4 LDYgKzEwNyw4IEBAIHZvaWQgRG93bmxvYWRQcm94eU1hcDo6ZG93bmxvYWRGaW5pc2hlZChEb3du bG9hZFByb3h5JiBkb3dubG9hZFByb3h5KQogewogICAgIGF1dG8gZG93bmxvYWRJRCA9IGRvd25s b2FkUHJveHkuZG93bmxvYWRJRCgpOwogCisgICAgUkVMRUFTRV9MT0coTG9hZGluZywgIlJlbW92 aW5nIGRvd25sb2FkICUiIFBSSXU2NCAiIGZyb20gVUlQcm9jZXNzIERvd25sb2FkUHJveHlNYXAi LCBkb3dubG9hZElELmRvd25sb2FkSUQoKSk7CisKICAgICAvLyBUaGUgRG93bmxvYWRQcm94eSBt YXkgYmUgaG9sZGluZyB0aGUgbGFzdCByZWZlcmVuY2UgdG8gdGhlIHByb2Nlc3MgcG9vbC4KICAg ICBhdXRvIHByb3RlY3RlZFByb2Nlc3NQb29sID0gbWFrZVJlZlB0cihtX3Byb2Nlc3MtPnByb2Nl c3NQb29sKCkpOwogCkBAIC0xMDgsOCArMTE5LDExIEBAIHZvaWQgRG93bmxvYWRQcm94eU1hcDo6 ZG93bmxvYWRGaW5pc2hlZChEb3dubG9hZFByb3h5JiBkb3dubG9hZFByb3h5KQogICAgIG1fZG93 bmxvYWRzLnJlbW92ZShkb3dubG9hZElEKTsKIAogICAgIGlmIChtX2Rvd25sb2Fkcy5pc0VtcHR5 KCkgJiYgbV9zaG91bGRUYWtlQXNzZXJ0aW9uKSB7Ci0gICAgICAgIEFTU0VSVChtX2Rvd25sb2Fk QXNzZXJ0aW9uKTsKLSAgICAgICAgbV9kb3dubG9hZEFzc2VydGlvbiA9IG51bGxwdHI7CisgICAg ICAgIEFTU0VSVChtX2Rvd25sb2FkVUlBc3NlcnRpb24pOworICAgICAgICBBU1NFUlQobV9kb3du bG9hZE5ldHdvcmtpbmdBc3NlcnRpb24pOworICAgICAgICBtX2Rvd25sb2FkVUlBc3NlcnRpb24g PSBudWxscHRyOworICAgICAgICBtX2Rvd25sb2FkTmV0d29ya2luZ0Fzc2VydGlvbiA9IG51bGxw dHI7CisgICAgICAgIFJFTEVBU0VfTE9HKExvYWRpbmcsICJVSVByb2Nlc3MgcmVsZWFzZWQgJ1dl YktpdCBkb3dubG9hZHMnIGFzc2VydGlvbnMgZm9yIFVJUHJvY2VzcyBhbmQgTmV0d29ya1Byb2Nl c3MiKTsKICAgICB9CiB9CiAKQEAgLTEyMyw3ICsxMzcsMTAgQEAgdm9pZCBEb3dubG9hZFByb3h5 TWFwOjppbnZhbGlkYXRlKCkKICAgICB9CiAKICAgICBtX2Rvd25sb2Fkcy5jbGVhcigpOwotICAg IG1fZG93bmxvYWRBc3NlcnRpb24gPSBudWxscHRyOworICAgIG1fZG93bmxvYWRVSUFzc2VydGlv biA9IG51bGxwdHI7CisgICAgbV9kb3dubG9hZE5ldHdvcmtpbmdBc3NlcnRpb24gPSBudWxscHRy OworICAgIFJFTEVBU0VfTE9HKExvYWRpbmcsICJVSVByb2Nlc3MgRG93bmxvYWRQcm94eU1hcCBp bnZhbGlkYXRlZCAtIFJlbGVhc2VkICdXZWJLaXQgZG93bmxvYWRzJyBhc3NlcnRpb25zIGZvciBV SVByb2Nlc3MgYW5kIE5ldHdvcmtQcm9jZXNzIik7CisKICAgICBtX3Byb2Nlc3MgPSBudWxscHRy OwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Eb3dubG9hZHMvRG93 bmxvYWRQcm94eU1hcC5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvRG93bmxvYWRzL0Rvd25s b2FkUHJveHlNYXAuaAppbmRleCBiZTM4Y2NiODJmYjU1OTM5ZjQ0MmU4MTJhOGY1MzBkMzQwMGY1 MDU3Li44NTRkY2M3OTBhMDg5Mjc3NmYzODU0NWM1ZGY5NTAwMjIxM2ZiZmMyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxvYWRQcm94eU1hcC5oCisr KyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0Rvd25sb2Fkcy9Eb3dubG9hZFByb3h5TWFwLmgK QEAgLTcyLDcgKzcyLDkgQEAgcHJpdmF0ZToKICAgICBIYXNoTWFwPERvd25sb2FkSUQsIFJlZlB0 cjxEb3dubG9hZFByb3h5Pj4gbV9kb3dubG9hZHM7CiAKICAgICBib29sIG1fc2hvdWxkVGFrZUFz c2VydGlvbiB7IGZhbHNlIH07Ci0gICAgc3RkOjp1bmlxdWVfcHRyPFByb2Nlc3NBc3NlcnRpb24+ IG1fZG93bmxvYWRBc3NlcnRpb247CisgICAgc3RkOjp1bmlxdWVfcHRyPFByb2Nlc3NBc3NlcnRp b24+IG1fZG93bmxvYWRVSUFzc2VydGlvbjsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8UHJvY2Vzc0Fz c2VydGlvbj4gbV9kb3dubG9hZE5ldHdvcmtpbmdBc3NlcnRpb247CisKICNpZiBQTEFURk9STShJ T1NfRkFNSUxZKQogICAgIFJldGFpblB0cjxpZD4gbV9iYWNrZ3JvdW5kT2JzZXJ2ZXI7CiAgICAg UmV0YWluUHRyPGlkPiBtX2ZvcmVncm91bmRPYnNlcnZlcjsK 370140 2019-05-17 13:26:01 -0700 2019-05-17 13:50:12 -0700 Patch bug-197995-20190517132600.patch text/plain 8239 beidson U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ1NDc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDY5NWRlOTA0ZTAwNmQyOTNm YTlmYzAwY2M4ZTBhZmIxMDNkMTVlNDAuLjE4ZTUwZDU2YjU3NWY1MjM3YzI2YjZmMWViZWE2NjBl NDdmMzkzZTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMgQEAKKzIwMTktMDUtMTcgIEJyYWR5IEVp ZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAgICAgIEF2b2lkIHJhY2VzIGluIHRha2lu ZyBuZXR3b3JraW5nIGFzc2VydGlvbnMgZm9yIGRvd25sb2FkcyBieSBoYXZpbmcgYm90aCBOZXR3 b3JraW5nIGFuZCBVSVByb2Nlc3MgZG8gaXQuCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81MDU2 NDYzMD4gYW5kIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTc5OTUK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGVyZSdz IGEgZmFpcmx5IGluZGV0ZXJtaW5hbnQgdGltZSBnYXAgYmV0d2VlbiB3aGVuIHRoZSBVSVByb2Nl c3MgZGVjaWRlcyBhIGxvYWQgYmVjb21lcyBhIGRvd25sb2FkCisgICAgICAgIGFuZCB3aGVuIHRo ZSBOZXR3b3JrUHJvY2VzcyBEb3dubG9hZCBvYmplY3QgaXMgY3JlYXRlZCwgYW5kIHRoZXJlZm9y ZSB0aGUgZG93bmxvYWQgYXNzZXJ0aW9uIHRvIGJlIHRha2VuLgorCisgICAgICAgIFRoZSB0aW1l IGdhcCBjYW4gYmUgbG9uZyBlbm91Z2ggZm9yIHRoZSBOZXR3b3JraW5nIHByb2Nlc3MgdG8gc3Vz cGVuZCBiZWZvcmUgdGhlIGRvd25sb2FkIGFjdHVhbGx5IHN0YXJ0cy4KKworICAgICAgICBUaGVy ZSdzIHRoZSByZXZlcnNlIHJhY2Ugd2hlbiB0aGUgVUlQcm9jZXNzIHRlbGxzIGEgZG93bmxvYWQg dG8gc3RvcCwgYXMgd2VsbC4KKworICAgICAgICBCeSBoYXZpbmcgYm90aCB0aGUgVUlQcm9jZXNz IGFuZCBOZXR3b3JrUHJvY2VzcyB0YWtlIGFuIGFzc2VydGlvbiBvbiBiZWhhbGYgb2YgdGhlIE5l dHdvcmtQcm9jZXNzIHdlCisgICAgICAgIGF2b2lkIHRoZSByYWNlLgorCisgICAgICAgICogTmV0 d29ya1Byb2Nlc3MvRG93bmxvYWRzL0Rvd25sb2FkTWFwLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 RG93bmxvYWRNYXA6OmFkZCk6CisgICAgICAgIChXZWJLaXQ6OkRvd25sb2FkTWFwOjpyZW1vdmUp OgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcDoK KyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZGVyOjpjb252ZXJ0VG9Eb3dubG9h ZCk6CisKKyAgICAgICAgKiBVSVByb2Nlc3MvRG93bmxvYWRzL0Rvd25sb2FkUHJveHlNYXAuY3Bw OgorICAgICAgICAoV2ViS2l0OjpEb3dubG9hZFByb3h5TWFwOjpjcmVhdGVEb3dubG9hZFByb3h5 KToKKyAgICAgICAgKFdlYktpdDo6RG93bmxvYWRQcm94eU1hcDo6ZG93bmxvYWRGaW5pc2hlZCk6 CisgICAgICAgIChXZWJLaXQ6OkRvd25sb2FkUHJveHlNYXA6OmludmFsaWRhdGUpOgorICAgICAg ICAqIFVJUHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxvYWRQcm94eU1hcC5oOgorCiAyMDE5LTA1LTE3 ICBLZWl0aCBSb2xsaW4gIDxrcm9sbGluQGFwcGxlLmNvbT4KIAogICAgICAgICBSZS1lbmFibGUg Z2VuZXJhdGUteGNmaWxlbGlzdHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvRG93bmxvYWRzL0Rvd25sb2FkTWFwLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvRG93bmxvYWRzL0Rvd25sb2FkTWFwLmNwcAppbmRleCAzMjk5MjUzMDQ4ZjQyY2UzOTZj MzVjM2RhMDVkYTUwYTE1MzFiOTJhLi44M2NiMGFhODVhMzg2NTAzYTU1NjBhNjUzZTk2MWU1ODEw YWNmZTM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0Rvd25sb2Fk cy9Eb3dubG9hZE1hcC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9Eb3du bG9hZHMvRG93bmxvYWRNYXAuY3BwCkBAIC01NSwxMCArNTUsMTMgQEAgYm9vbCBEb3dubG9hZE1h cDo6Y29udGFpbnMoRG93bmxvYWRJRCBkb3dubG9hZElEKSBjb25zdAogCiBEb3dubG9hZE1hcDo6 RG93bmxvYWRNYXBUeXBlOjpBZGRSZXN1bHQgRG93bmxvYWRNYXA6OmFkZChEb3dubG9hZElEIGRv d25sb2FkSUQsIHN0ZDo6dW5pcXVlX3B0cjxEb3dubG9hZD4mJiBkb3dubG9hZCkKIHsKKyAgICBS RUxFQVNFX0xPRyhMb2FkaW5nLCAiQWRkaW5nIGRvd25sb2FkICUiIFBSSXU2NCAiIHRvIE5ldHdv cmtQcm9jZXNzIERvd25sb2FkTWFwIiwgZG93bmxvYWRJRC5kb3dubG9hZElEKCkpOworCiAgICAg YXV0byByZXN1bHQgPSBtX2Rvd25sb2Fkcy5hZGQoZG93bmxvYWRJRCwgV1RGTW92ZShkb3dubG9h ZCkpOwogICAgIGlmIChtX2Rvd25sb2Fkcy5zaXplKCkgPT0gMSkgewogICAgICAgICBBU1NFUlQo IW1fZG93bmxvYWRBc3NlcnRpb24pOwogICAgICAgICBtX2Rvd25sb2FkQXNzZXJ0aW9uID0gc3Rk OjptYWtlX3VuaXF1ZTxQcm9jZXNzQXNzZXJ0aW9uPihnZXRwaWQoKSwgIldlYktpdCBkb3dubG9h ZHMiX3MsIEFzc2VydGlvblN0YXRlOjpVbmJvdW5kZWROZXR3b3JraW5nKTsKKyAgICAgICAgUkVM RUFTRV9MT0coTG9hZGluZywgIlRvb2sgJ1dlYktpdCBkb3dubG9hZHMnIGFzc2VydGlvbiBpbiBO ZXR3b3JrUHJvY2VzcyIpOwogICAgIH0KIAogICAgIHJldHVybiByZXN1bHQ7CkBAIC02NiwxMCAr NjksMTMgQEAgRG93bmxvYWRNYXA6OkRvd25sb2FkTWFwVHlwZTo6QWRkUmVzdWx0IERvd25sb2Fk TWFwOjphZGQoRG93bmxvYWRJRCBkb3dubG9hZElELAogCiBib29sIERvd25sb2FkTWFwOjpyZW1v dmUoRG93bmxvYWRJRCBkb3dubG9hZElEKQogeworICAgIFJFTEVBU0VfTE9HKExvYWRpbmcsICJS ZW1vdmluZyBkb3dubG9hZCAlIiBQUkl1NjQgIiBmcm9tIE5ldHdvcmtQcm9jZXNzIERvd25sb2Fk TWFwIiwgZG93bmxvYWRJRC5kb3dubG9hZElEKCkpOworCiAgICAgYXV0byByZXN1bHQgPSBtX2Rv d25sb2Fkcy5yZW1vdmUoZG93bmxvYWRJRCk7CiAgICAgaWYgKG1fZG93bmxvYWRzLmlzRW1wdHko KSkgewogICAgICAgICBBU1NFUlQobV9kb3dubG9hZEFzc2VydGlvbik7CiAgICAgICAgIG1fZG93 bmxvYWRBc3NlcnRpb24gPSBudWxscHRyOworICAgICAgICBSRUxFQVNFX0xPRyhMb2FkaW5nLCAi RHJvcHBlZCAnV2ViS2l0IGRvd25sb2FkcycgYXNzZXJ0aW9uIGluIE5ldHdvcmtQcm9jZXNzIik7 CiAgICAgfQogICAgIAogICAgIHJldHVybiByZXN1bHQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2Vi S2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAKaW5kZXggNDUxMGU5 MjY4YTIyYzIwNWM4YzZiMDM1YTdiMGZjZmU0NzhlMDZlMi4uZmUyNjUzNmYyMWMzZWU5YTcwMTg5 OGNhMDU5MzJkNTVkMTVkMzRiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcApAQCAtMzIyLDYgKzMyMiw4IEBAIHZv aWQgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpjbGVhbnVwKExvYWRSZXN1bHQgcmVzdWx0KQogCiB2 b2lkIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6Y29udmVydFRvRG93bmxvYWQoRG93bmxvYWRJRCBk b3dubG9hZElELCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIGNvbnN0IFJlc291cmNl UmVzcG9uc2UmIHJlc3BvbnNlKQogeworICAgIFJFTEVBU0VfTE9HKExvYWRpbmcsICJDb252ZXJ0 aW5nIE5ldHdvcmtSZXNvdXJjZUxvYWRlciAlcCB0byBkb3dubG9hZCAlIiBQUkl1NjQgIiAocGFn ZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgcmVzb3VyY2VJRCA9ICUi IFBSSXU2NCAiKSIsIHRoaXMsIGRvd25sb2FkSUQuZG93bmxvYWRJRCgpLCBtX3BhcmFtZXRlcnMu d2ViUGFnZUlELCBtX3BhcmFtZXRlcnMud2ViRnJhbWVJRCwgbV9wYXJhbWV0ZXJzLmlkZW50aWZp ZXIpOworICAgIAogICAgIC8vIFRoaXMgY2FuIGhhcHBlbiBpZiB0aGUgcmVzb3VyY2UgY2FtZSBm cm9tIHRoZSBkaXNrIGNhY2hlLgogICAgIGlmICghbV9uZXR3b3JrTG9hZCkgewogICAgICAgICBt X2Nvbm5lY3Rpb24tPm5ldHdvcmtQcm9jZXNzKCkuZG93bmxvYWRNYW5hZ2VyKCkuc3RhcnREb3du bG9hZChtX3BhcmFtZXRlcnMuc2Vzc2lvbklELCBkb3dubG9hZElELCByZXF1ZXN0KTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0Rvd25sb2Fkcy9Eb3dubG9hZFByb3h5TWFw LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0Rvd25sb2Fkcy9Eb3dubG9hZFByb3h5TWFw LmNwcAppbmRleCBmMzk5YzVhOGU5OGFjYjI3NWUzZWRiZjQ2NzFkMzI1NGVkMDFkYmM3Li4zNmRm NjZlNGI0YTE0M2Q2MmIyOWE4MjBkYTA2NDgzNzU0MjJlZjAzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxvYWRQcm94eU1hcC5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvRG93bmxvYWRzL0Rvd25sb2FkUHJveHlNYXAuY3BwCkBAIC04 NCw5ICs4NCwxNyBAQCBEb3dubG9hZFByb3h5JiBEb3dubG9hZFByb3h5TWFwOjpjcmVhdGVEb3du bG9hZFByb3h5KFdlYlByb2Nlc3NQb29sJiBwcm9jZXNzUG9vbAogICAgIGF1dG8gZG93bmxvYWRQ cm94eSA9IERvd25sb2FkUHJveHk6OmNyZWF0ZSgqdGhpcywgcHJvY2Vzc1Bvb2wsIHJlc291cmNl UmVxdWVzdCk7CiAgICAgbV9kb3dubG9hZHMuc2V0KGRvd25sb2FkUHJveHktPmRvd25sb2FkSUQo KSwgZG93bmxvYWRQcm94eS5jb3B5UmVmKCkpOwogCisgICAgUkVMRUFTRV9MT0coTG9hZGluZywg IkFkZGluZyBkb3dubG9hZCAlIiBQUkl1NjQgIiB0byBVSVByb2Nlc3MgRG93bmxvYWRQcm94eU1h cCIsIGRvd25sb2FkUHJveHktPmRvd25sb2FkSUQoKS5kb3dubG9hZElEKCkpOworCiAgICAgaWYg KG1fZG93bmxvYWRzLnNpemUoKSA9PSAxICYmIG1fc2hvdWxkVGFrZUFzc2VydGlvbikgewotICAg ICAgICBBU1NFUlQoIW1fZG93bmxvYWRBc3NlcnRpb24pOwotICAgICAgICBtX2Rvd25sb2FkQXNz ZXJ0aW9uID0gc3RkOjptYWtlX3VuaXF1ZTxQcm9jZXNzQXNzZXJ0aW9uPihnZXRDdXJyZW50UHJv Y2Vzc0lEKCksICJXZWJLaXQgZG93bmxvYWRzIl9zLCBBc3NlcnRpb25TdGF0ZTo6VW5ib3VuZGVk TmV0d29ya2luZyk7CisgICAgICAgIEFTU0VSVCghbV9kb3dubG9hZFVJQXNzZXJ0aW9uKTsKKyAg ICAgICAgbV9kb3dubG9hZFVJQXNzZXJ0aW9uID0gc3RkOjptYWtlX3VuaXF1ZTxQcm9jZXNzQXNz ZXJ0aW9uPihnZXRDdXJyZW50UHJvY2Vzc0lEKCksICJXZWJLaXQgZG93bmxvYWRzIl9zLCBBc3Nl cnRpb25TdGF0ZTo6VW5ib3VuZGVkTmV0d29ya2luZyk7CisKKyAgICAgICAgQVNTRVJUKCFtX2Rv d25sb2FkTmV0d29ya2luZ0Fzc2VydGlvbik7CisgICAgICAgIFJFTEVBU0VfQVNTRVJUKG1fcHJv Y2Vzcyk7CisgICAgICAgIG1fZG93bmxvYWROZXR3b3JraW5nQXNzZXJ0aW9uID0gc3RkOjptYWtl X3VuaXF1ZTxQcm9jZXNzQXNzZXJ0aW9uPihtX3Byb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCks ICJXZWJLaXQgZG93bmxvYWRzIl9zLCBBc3NlcnRpb25TdGF0ZTo6VW5ib3VuZGVkTmV0d29ya2lu Zyk7CisKKyAgICAgICAgUkVMRUFTRV9MT0coTG9hZGluZywgIlVJUHJvY2VzcyB0b29rICdXZWJL aXQgZG93bmxvYWRzJyBhc3NlcnRpb25zIGZvciBVSVByb2Nlc3MgYW5kIE5ldHdvcmtQcm9jZXNz Iik7CiAgICAgfQogCiAgICAgbV9wcm9jZXNzLT5hZGRNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6 OkRvd25sb2FkUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgZG93bmxvYWRQcm94eS0+ZG93 bmxvYWRJRCgpLmRvd25sb2FkSUQoKSwgZG93bmxvYWRQcm94eS5nZXQoKSk7CkBAIC05OCw2ICsx MDYsOCBAQCB2b2lkIERvd25sb2FkUHJveHlNYXA6OmRvd25sb2FkRmluaXNoZWQoRG93bmxvYWRQ cm94eSYgZG93bmxvYWRQcm94eSkKIHsKICAgICBhdXRvIGRvd25sb2FkSUQgPSBkb3dubG9hZFBy b3h5LmRvd25sb2FkSUQoKTsKIAorICAgIFJFTEVBU0VfTE9HKExvYWRpbmcsICJSZW1vdmluZyBk b3dubG9hZCAlIiBQUkl1NjQgIiBmcm9tIFVJUHJvY2VzcyBEb3dubG9hZFByb3h5TWFwIiwgZG93 bmxvYWRJRC5kb3dubG9hZElEKCkpOworCiAgICAgLy8gVGhlIERvd25sb2FkUHJveHkgbWF5IGJl IGhvbGRpbmcgdGhlIGxhc3QgcmVmZXJlbmNlIHRvIHRoZSBwcm9jZXNzIHBvb2wuCiAgICAgYXV0 byBwcm90ZWN0ZWRQcm9jZXNzUG9vbCA9IG1ha2VSZWZQdHIobV9wcm9jZXNzLT5wcm9jZXNzUG9v bCgpKTsKIApAQCAtMTA4LDggKzExOCwxMSBAQCB2b2lkIERvd25sb2FkUHJveHlNYXA6OmRvd25s b2FkRmluaXNoZWQoRG93bmxvYWRQcm94eSYgZG93bmxvYWRQcm94eSkKICAgICBtX2Rvd25sb2Fk cy5yZW1vdmUoZG93bmxvYWRJRCk7CiAKICAgICBpZiAobV9kb3dubG9hZHMuaXNFbXB0eSgpICYm IG1fc2hvdWxkVGFrZUFzc2VydGlvbikgewotICAgICAgICBBU1NFUlQobV9kb3dubG9hZEFzc2Vy dGlvbik7Ci0gICAgICAgIG1fZG93bmxvYWRBc3NlcnRpb24gPSBudWxscHRyOworICAgICAgICBB U1NFUlQobV9kb3dubG9hZFVJQXNzZXJ0aW9uKTsKKyAgICAgICAgQVNTRVJUKG1fZG93bmxvYWRO ZXR3b3JraW5nQXNzZXJ0aW9uKTsKKyAgICAgICAgbV9kb3dubG9hZFVJQXNzZXJ0aW9uID0gbnVs bHB0cjsKKyAgICAgICAgbV9kb3dubG9hZE5ldHdvcmtpbmdBc3NlcnRpb24gPSBudWxscHRyOwor ICAgICAgICBSRUxFQVNFX0xPRyhMb2FkaW5nLCAiVUlQcm9jZXNzIHJlbGVhc2VkICdXZWJLaXQg ZG93bmxvYWRzJyBhc3NlcnRpb25zIGZvciBVSVByb2Nlc3MgYW5kIE5ldHdvcmtQcm9jZXNzIik7 CiAgICAgfQogfQogCkBAIC0xMjMsNyArMTM2LDEwIEBAIHZvaWQgRG93bmxvYWRQcm94eU1hcDo6 aW52YWxpZGF0ZSgpCiAgICAgfQogCiAgICAgbV9kb3dubG9hZHMuY2xlYXIoKTsKLSAgICBtX2Rv d25sb2FkQXNzZXJ0aW9uID0gbnVsbHB0cjsKKyAgICBtX2Rvd25sb2FkVUlBc3NlcnRpb24gPSBu dWxscHRyOworICAgIG1fZG93bmxvYWROZXR3b3JraW5nQXNzZXJ0aW9uID0gbnVsbHB0cjsKKyAg ICBSRUxFQVNFX0xPRyhMb2FkaW5nLCAiVUlQcm9jZXNzIERvd25sb2FkUHJveHlNYXAgaW52YWxp ZGF0ZWQgLSBSZWxlYXNlZCAnV2ViS2l0IGRvd25sb2FkcycgYXNzZXJ0aW9ucyBmb3IgVUlQcm9j ZXNzIGFuZCBOZXR3b3JrUHJvY2VzcyIpOworCiAgICAgbV9wcm9jZXNzID0gbnVsbHB0cjsKIH0K IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvRG93bmxvYWRzL0Rvd25sb2Fk UHJveHlNYXAuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0Rvd25sb2Fkcy9Eb3dubG9hZFBy b3h5TWFwLmgKaW5kZXggYmUzOGNjYjgyZmI1NTkzOWY0NDJlODEyYThmNTMwZDM0MDBmNTA1Ny4u ODU0ZGNjNzkwYTA4OTI3NzZmMzg1NDVjNWRmOTUwMDIyMTNmYmZjMiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvRG93bmxvYWRzL0Rvd25sb2FkUHJveHlNYXAuaAorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxvYWRQcm94eU1hcC5oCkBAIC03 Miw3ICs3Miw5IEBAIHByaXZhdGU6CiAgICAgSGFzaE1hcDxEb3dubG9hZElELCBSZWZQdHI8RG93 bmxvYWRQcm94eT4+IG1fZG93bmxvYWRzOwogCiAgICAgYm9vbCBtX3Nob3VsZFRha2VBc3NlcnRp b24geyBmYWxzZSB9OwotICAgIHN0ZDo6dW5pcXVlX3B0cjxQcm9jZXNzQXNzZXJ0aW9uPiBtX2Rv d25sb2FkQXNzZXJ0aW9uOworICAgIHN0ZDo6dW5pcXVlX3B0cjxQcm9jZXNzQXNzZXJ0aW9uPiBt X2Rvd25sb2FkVUlBc3NlcnRpb247CisgICAgc3RkOjp1bmlxdWVfcHRyPFByb2Nlc3NBc3NlcnRp b24+IG1fZG93bmxvYWROZXR3b3JraW5nQXNzZXJ0aW9uOworCiAjaWYgUExBVEZPUk0oSU9TX0ZB TUlMWSkKICAgICBSZXRhaW5QdHI8aWQ+IG1fYmFja2dyb3VuZE9ic2VydmVyOwogICAgIFJldGFp blB0cjxpZD4gbV9mb3JlZ3JvdW5kT2JzZXJ2ZXI7Cg== 370146 2019-05-17 13:50:13 -0700 2019-05-17 14:37:13 -0700 Patch bug-197995-20190517135013.patch text/plain 8286 beidson U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ1NDc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDY5NWRlOTA0ZTAwNmQyOTNm YTlmYzAwY2M4ZTBhZmIxMDNkMTVlNDAuLjFmODMyMDJkMjFkM2M5Mjk5NjJlYjE0OTQwMDU5Yjgy ZGJmZTQ1MTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMgQEAKKzIwMTktMDUtMTcgIEJyYWR5IEVp ZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAgICAgIEF2b2lkIHJhY2VzIGluIHRha2lu ZyBuZXR3b3JraW5nIGFzc2VydGlvbnMgZm9yIGRvd25sb2FkcyBieSBoYXZpbmcgYm90aCBOZXR3 b3JraW5nIGFuZCBVSVByb2Nlc3MgZG8gaXQuCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81MDU2 NDYzMD4gYW5kIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTc5OTUK KworICAgICAgICBSZXZpZXdlZCBieSBDaHJpcyBEdW1lei4KKworICAgICAgICBUaGVyZSdzIGEg ZmFpcmx5IGluZGV0ZXJtaW5hbnQgdGltZSBnYXAgYmV0d2VlbiB3aGVuIHRoZSBVSVByb2Nlc3Mg ZGVjaWRlcyBhIGxvYWQgYmVjb21lcyBhIGRvd25sb2FkCisgICAgICAgIGFuZCB3aGVuIHRoZSBO ZXR3b3JrUHJvY2VzcyBEb3dubG9hZCBvYmplY3QgaXMgY3JlYXRlZCwgYW5kIHRoZXJlZm9yZSB0 aGUgZG93bmxvYWQgYXNzZXJ0aW9uIHRvIGJlIHRha2VuLgorCisgICAgICAgIFRoZSB0aW1lIGdh cCBjYW4gYmUgbG9uZyBlbm91Z2ggZm9yIHRoZSBOZXR3b3JraW5nIHByb2Nlc3MgdG8gc3VzcGVu ZCBiZWZvcmUgdGhlIGRvd25sb2FkIGFjdHVhbGx5IHN0YXJ0cy4KKworICAgICAgICBUaGVyZSdz IHRoZSByZXZlcnNlIHJhY2Ugd2hlbiB0aGUgVUlQcm9jZXNzIHRlbGxzIGEgZG93bmxvYWQgdG8g c3RvcCwgYXMgd2VsbC4KKworICAgICAgICBCeSBoYXZpbmcgYm90aCB0aGUgVUlQcm9jZXNzIGFu ZCBOZXR3b3JrUHJvY2VzcyB0YWtlIGFuIGFzc2VydGlvbiBvbiBiZWhhbGYgb2YgdGhlIE5ldHdv cmtQcm9jZXNzIHdlCisgICAgICAgIGF2b2lkIHRoZSByYWNlLgorCisgICAgICAgICogTmV0d29y a1Byb2Nlc3MvRG93bmxvYWRzL0Rvd25sb2FkTWFwLmNwcDoKKyAgICAgICAgKFdlYktpdDo6RG93 bmxvYWRNYXA6OmFkZCk6CisgICAgICAgIChXZWJLaXQ6OkRvd25sb2FkTWFwOjpyZW1vdmUpOgor CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZGVyOjpjb252ZXJ0VG9Eb3dubG9hZCk6 CisKKyAgICAgICAgKiBVSVByb2Nlc3MvRG93bmxvYWRzL0Rvd25sb2FkUHJveHlNYXAuY3BwOgor ICAgICAgICAoV2ViS2l0OjpEb3dubG9hZFByb3h5TWFwOjpjcmVhdGVEb3dubG9hZFByb3h5KToK KyAgICAgICAgKFdlYktpdDo6RG93bmxvYWRQcm94eU1hcDo6ZG93bmxvYWRGaW5pc2hlZCk6Cisg ICAgICAgIChXZWJLaXQ6OkRvd25sb2FkUHJveHlNYXA6OmludmFsaWRhdGUpOgorICAgICAgICAq IFVJUHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxvYWRQcm94eU1hcC5oOgorCiAyMDE5LTA1LTE3ICBL ZWl0aCBSb2xsaW4gIDxrcm9sbGluQGFwcGxlLmNvbT4KIAogICAgICAgICBSZS1lbmFibGUgZ2Vu ZXJhdGUteGNmaWxlbGlzdHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvRG93bmxvYWRzL0Rvd25sb2FkTWFwLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvRG93bmxvYWRzL0Rvd25sb2FkTWFwLmNwcAppbmRleCAzMjk5MjUzMDQ4ZjQyY2UzOTZjMzVj M2RhMDVkYTUwYTE1MzFiOTJhLi5lMmUxMjg1NDgwOWZiOTY4ZWU4MDJiMTYwYTEwMDcwMDdmZTU0 MDExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0Rvd25sb2Fkcy9E b3dubG9hZE1hcC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9Eb3dubG9h ZHMvRG93bmxvYWRNYXAuY3BwCkBAIC01NSwxMCArNTUsMTMgQEAgYm9vbCBEb3dubG9hZE1hcDo6 Y29udGFpbnMoRG93bmxvYWRJRCBkb3dubG9hZElEKSBjb25zdAogCiBEb3dubG9hZE1hcDo6RG93 bmxvYWRNYXBUeXBlOjpBZGRSZXN1bHQgRG93bmxvYWRNYXA6OmFkZChEb3dubG9hZElEIGRvd25s b2FkSUQsIHN0ZDo6dW5pcXVlX3B0cjxEb3dubG9hZD4mJiBkb3dubG9hZCkKIHsKKyAgICBSRUxF QVNFX0xPRyhMb2FkaW5nLCAiQWRkaW5nIGRvd25sb2FkICUiIFBSSXU2NCAiIHRvIE5ldHdvcmtQ cm9jZXNzIERvd25sb2FkTWFwIiwgZG93bmxvYWRJRC5kb3dubG9hZElEKCkpOworCiAgICAgYXV0 byByZXN1bHQgPSBtX2Rvd25sb2Fkcy5hZGQoZG93bmxvYWRJRCwgV1RGTW92ZShkb3dubG9hZCkp OwogICAgIGlmIChtX2Rvd25sb2Fkcy5zaXplKCkgPT0gMSkgewogICAgICAgICBBU1NFUlQoIW1f ZG93bmxvYWRBc3NlcnRpb24pOwogICAgICAgICBtX2Rvd25sb2FkQXNzZXJ0aW9uID0gc3RkOjpt YWtlX3VuaXF1ZTxQcm9jZXNzQXNzZXJ0aW9uPihnZXRwaWQoKSwgIldlYktpdCBkb3dubG9hZHMi X3MsIEFzc2VydGlvblN0YXRlOjpVbmJvdW5kZWROZXR3b3JraW5nKTsKKyAgICAgICAgUkVMRUFT RV9MT0coUHJvY2Vzc1N1c3BlbnNpb24sICJUb29rICdXZWJLaXQgZG93bmxvYWRzJyBhc3NlcnRp b24gaW4gTmV0d29ya1Byb2Nlc3MiKTsKICAgICB9CiAKICAgICByZXR1cm4gcmVzdWx0OwpAQCAt NjYsMTAgKzY5LDEzIEBAIERvd25sb2FkTWFwOjpEb3dubG9hZE1hcFR5cGU6OkFkZFJlc3VsdCBE b3dubG9hZE1hcDo6YWRkKERvd25sb2FkSUQgZG93bmxvYWRJRCwKIAogYm9vbCBEb3dubG9hZE1h cDo6cmVtb3ZlKERvd25sb2FkSUQgZG93bmxvYWRJRCkKIHsKKyAgICBSRUxFQVNFX0xPRyhMb2Fk aW5nLCAiUmVtb3ZpbmcgZG93bmxvYWQgJSIgUFJJdTY0ICIgZnJvbSBOZXR3b3JrUHJvY2VzcyBE b3dubG9hZE1hcCIsIGRvd25sb2FkSUQuZG93bmxvYWRJRCgpKTsKKwogICAgIGF1dG8gcmVzdWx0 ID0gbV9kb3dubG9hZHMucmVtb3ZlKGRvd25sb2FkSUQpOwogICAgIGlmIChtX2Rvd25sb2Fkcy5p c0VtcHR5KCkpIHsKICAgICAgICAgQVNTRVJUKG1fZG93bmxvYWRBc3NlcnRpb24pOwogICAgICAg ICBtX2Rvd25sb2FkQXNzZXJ0aW9uID0gbnVsbHB0cjsKKyAgICAgICAgUkVMRUFTRV9MT0coUHJv Y2Vzc1N1c3BlbnNpb24sICJEcm9wcGVkICdXZWJLaXQgZG93bmxvYWRzJyBhc3NlcnRpb24gaW4g TmV0d29ya1Byb2Nlc3MiKTsKICAgICB9CiAgICAgCiAgICAgcmV0dXJuIHJlc3VsdDsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVy LmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVy LmNwcAppbmRleCA0NTEwZTkyNjhhMjJjMjA1YzhjNmIwMzVhN2IwZmNmZTQ3OGUwNmUyLi5mZTI2 NTM2ZjIxYzNlZTlhNzAxODk4Y2EwNTkzMmQ1NWQxNWQzNGIwIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwCkBAIC0z MjIsNiArMzIyLDggQEAgdm9pZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OmNsZWFudXAoTG9hZFJl c3VsdCByZXN1bHQpCiAKIHZvaWQgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpjb252ZXJ0VG9Eb3du bG9hZChEb3dubG9hZElEIGRvd25sb2FkSUQsIGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVz dCwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UpCiB7CisgICAgUkVMRUFTRV9MT0co TG9hZGluZywgIkNvbnZlcnRpbmcgTmV0d29ya1Jlc291cmNlTG9hZGVyICVwIHRvIGRvd25sb2Fk ICUiIFBSSXU2NCAiIChwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAi LCByZXNvdXJjZUlEID0gJSIgUFJJdTY0ICIpIiwgdGhpcywgZG93bmxvYWRJRC5kb3dubG9hZElE KCksIG1fcGFyYW1ldGVycy53ZWJQYWdlSUQsIG1fcGFyYW1ldGVycy53ZWJGcmFtZUlELCBtX3Bh cmFtZXRlcnMuaWRlbnRpZmllcik7CisgICAgCiAgICAgLy8gVGhpcyBjYW4gaGFwcGVuIGlmIHRo ZSByZXNvdXJjZSBjYW1lIGZyb20gdGhlIGRpc2sgY2FjaGUuCiAgICAgaWYgKCFtX25ldHdvcmtM b2FkKSB7CiAgICAgICAgIG1fY29ubmVjdGlvbi0+bmV0d29ya1Byb2Nlc3MoKS5kb3dubG9hZE1h bmFnZXIoKS5zdGFydERvd25sb2FkKG1fcGFyYW1ldGVycy5zZXNzaW9uSUQsIGRvd25sb2FkSUQs IHJlcXVlc3QpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvRG93bmxvYWRz L0Rvd25sb2FkUHJveHlNYXAuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvRG93bmxvYWRz L0Rvd25sb2FkUHJveHlNYXAuY3BwCmluZGV4IGYzOTljNWE4ZTk4YWNiMjc1ZTNlZGJmNDY3MWQz MjU0ZWQwMWRiYzcuLjYzYTQ5YjU2N2RiOGRhNTNmNTc5OWE1MDM0NGYzMTI1MWY1ZTk2ODQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0Rvd25sb2Fkcy9Eb3dubG9hZFByb3h5 TWFwLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxvYWRQ cm94eU1hcC5jcHAKQEAgLTg0LDkgKzg0LDE3IEBAIERvd25sb2FkUHJveHkmIERvd25sb2FkUHJv eHlNYXA6OmNyZWF0ZURvd25sb2FkUHJveHkoV2ViUHJvY2Vzc1Bvb2wmIHByb2Nlc3NQb29sCiAg ICAgYXV0byBkb3dubG9hZFByb3h5ID0gRG93bmxvYWRQcm94eTo6Y3JlYXRlKCp0aGlzLCBwcm9j ZXNzUG9vbCwgcmVzb3VyY2VSZXF1ZXN0KTsKICAgICBtX2Rvd25sb2Fkcy5zZXQoZG93bmxvYWRQ cm94eS0+ZG93bmxvYWRJRCgpLCBkb3dubG9hZFByb3h5LmNvcHlSZWYoKSk7CiAKKyAgICBSRUxF QVNFX0xPRyhMb2FkaW5nLCAiQWRkaW5nIGRvd25sb2FkICUiIFBSSXU2NCAiIHRvIFVJUHJvY2Vz cyBEb3dubG9hZFByb3h5TWFwIiwgZG93bmxvYWRQcm94eS0+ZG93bmxvYWRJRCgpLmRvd25sb2Fk SUQoKSk7CisKICAgICBpZiAobV9kb3dubG9hZHMuc2l6ZSgpID09IDEgJiYgbV9zaG91bGRUYWtl QXNzZXJ0aW9uKSB7Ci0gICAgICAgIEFTU0VSVCghbV9kb3dubG9hZEFzc2VydGlvbik7Ci0gICAg ICAgIG1fZG93bmxvYWRBc3NlcnRpb24gPSBzdGQ6Om1ha2VfdW5pcXVlPFByb2Nlc3NBc3NlcnRp b24+KGdldEN1cnJlbnRQcm9jZXNzSUQoKSwgIldlYktpdCBkb3dubG9hZHMiX3MsIEFzc2VydGlv blN0YXRlOjpVbmJvdW5kZWROZXR3b3JraW5nKTsKKyAgICAgICAgQVNTRVJUKCFtX2Rvd25sb2Fk VUlBc3NlcnRpb24pOworICAgICAgICBtX2Rvd25sb2FkVUlBc3NlcnRpb24gPSBzdGQ6Om1ha2Vf dW5pcXVlPFByb2Nlc3NBc3NlcnRpb24+KGdldEN1cnJlbnRQcm9jZXNzSUQoKSwgIldlYktpdCBk b3dubG9hZHMiX3MsIEFzc2VydGlvblN0YXRlOjpVbmJvdW5kZWROZXR3b3JraW5nKTsKKworICAg ICAgICBBU1NFUlQoIW1fZG93bmxvYWROZXR3b3JraW5nQXNzZXJ0aW9uKTsKKyAgICAgICAgUkVM RUFTRV9BU1NFUlQobV9wcm9jZXNzKTsKKyAgICAgICAgbV9kb3dubG9hZE5ldHdvcmtpbmdBc3Nl cnRpb24gPSBzdGQ6Om1ha2VfdW5pcXVlPFByb2Nlc3NBc3NlcnRpb24+KG1fcHJvY2Vzcy0+cHJv Y2Vzc0lkZW50aWZpZXIoKSwgIldlYktpdCBkb3dubG9hZHMiX3MsIEFzc2VydGlvblN0YXRlOjpV bmJvdW5kZWROZXR3b3JraW5nKTsKKworICAgICAgICBSRUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVu c2lvbiwgIlVJUHJvY2VzcyB0b29rICdXZWJLaXQgZG93bmxvYWRzJyBhc3NlcnRpb25zIGZvciBV SVByb2Nlc3MgYW5kIE5ldHdvcmtQcm9jZXNzIik7CiAgICAgfQogCiAgICAgbV9wcm9jZXNzLT5h ZGRNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OkRvd25sb2FkUHJveHk6Om1lc3NhZ2VSZWNlaXZl ck5hbWUoKSwgZG93bmxvYWRQcm94eS0+ZG93bmxvYWRJRCgpLmRvd25sb2FkSUQoKSwgZG93bmxv YWRQcm94eS5nZXQoKSk7CkBAIC05OCw2ICsxMDYsOCBAQCB2b2lkIERvd25sb2FkUHJveHlNYXA6 OmRvd25sb2FkRmluaXNoZWQoRG93bmxvYWRQcm94eSYgZG93bmxvYWRQcm94eSkKIHsKICAgICBh dXRvIGRvd25sb2FkSUQgPSBkb3dubG9hZFByb3h5LmRvd25sb2FkSUQoKTsKIAorICAgIFJFTEVB U0VfTE9HKExvYWRpbmcsICJSZW1vdmluZyBkb3dubG9hZCAlIiBQUkl1NjQgIiBmcm9tIFVJUHJv Y2VzcyBEb3dubG9hZFByb3h5TWFwIiwgZG93bmxvYWRJRC5kb3dubG9hZElEKCkpOworCiAgICAg Ly8gVGhlIERvd25sb2FkUHJveHkgbWF5IGJlIGhvbGRpbmcgdGhlIGxhc3QgcmVmZXJlbmNlIHRv IHRoZSBwcm9jZXNzIHBvb2wuCiAgICAgYXV0byBwcm90ZWN0ZWRQcm9jZXNzUG9vbCA9IG1ha2VS ZWZQdHIobV9wcm9jZXNzLT5wcm9jZXNzUG9vbCgpKTsKIApAQCAtMTA4LDggKzExOCwxMSBAQCB2 b2lkIERvd25sb2FkUHJveHlNYXA6OmRvd25sb2FkRmluaXNoZWQoRG93bmxvYWRQcm94eSYgZG93 bmxvYWRQcm94eSkKICAgICBtX2Rvd25sb2Fkcy5yZW1vdmUoZG93bmxvYWRJRCk7CiAKICAgICBp ZiAobV9kb3dubG9hZHMuaXNFbXB0eSgpICYmIG1fc2hvdWxkVGFrZUFzc2VydGlvbikgewotICAg ICAgICBBU1NFUlQobV9kb3dubG9hZEFzc2VydGlvbik7Ci0gICAgICAgIG1fZG93bmxvYWRBc3Nl cnRpb24gPSBudWxscHRyOworICAgICAgICBBU1NFUlQobV9kb3dubG9hZFVJQXNzZXJ0aW9uKTsK KyAgICAgICAgQVNTRVJUKG1fZG93bmxvYWROZXR3b3JraW5nQXNzZXJ0aW9uKTsKKyAgICAgICAg bV9kb3dubG9hZFVJQXNzZXJ0aW9uID0gbnVsbHB0cjsKKyAgICAgICAgbV9kb3dubG9hZE5ldHdv cmtpbmdBc3NlcnRpb24gPSBudWxscHRyOworICAgICAgICBSRUxFQVNFX0xPRyhQcm9jZXNzU3Vz cGVuc2lvbiwgIlVJUHJvY2VzcyByZWxlYXNlZCAnV2ViS2l0IGRvd25sb2FkcycgYXNzZXJ0aW9u cyBmb3IgVUlQcm9jZXNzIGFuZCBOZXR3b3JrUHJvY2VzcyIpOwogICAgIH0KIH0KIApAQCAtMTIz LDcgKzEzNiwxMCBAQCB2b2lkIERvd25sb2FkUHJveHlNYXA6OmludmFsaWRhdGUoKQogICAgIH0K IAogICAgIG1fZG93bmxvYWRzLmNsZWFyKCk7Ci0gICAgbV9kb3dubG9hZEFzc2VydGlvbiA9IG51 bGxwdHI7CisgICAgbV9kb3dubG9hZFVJQXNzZXJ0aW9uID0gbnVsbHB0cjsKKyAgICBtX2Rvd25s b2FkTmV0d29ya2luZ0Fzc2VydGlvbiA9IG51bGxwdHI7CisgICAgUkVMRUFTRV9MT0coUHJvY2Vz c1N1c3BlbnNpb24sICJVSVByb2Nlc3MgRG93bmxvYWRQcm94eU1hcCBpbnZhbGlkYXRlZCAtIFJl bGVhc2VkICdXZWJLaXQgZG93bmxvYWRzJyBhc3NlcnRpb25zIGZvciBVSVByb2Nlc3MgYW5kIE5l dHdvcmtQcm9jZXNzIik7CisKICAgICBtX3Byb2Nlc3MgPSBudWxscHRyOwogfQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxvYWRQcm94eU1hcC5o IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvRG93bmxvYWRzL0Rvd25sb2FkUHJveHlNYXAuaApp bmRleCBiZTM4Y2NiODJmYjU1OTM5ZjQ0MmU4MTJhOGY1MzBkMzQwMGY1MDU3Li44NTRkY2M3OTBh MDg5Mjc3NmYzODU0NWM1ZGY5NTAwMjIxM2ZiZmMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxvYWRQcm94eU1hcC5oCisrKyBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0Rvd25sb2Fkcy9Eb3dubG9hZFByb3h5TWFwLmgKQEAgLTcyLDcgKzcyLDkg QEAgcHJpdmF0ZToKICAgICBIYXNoTWFwPERvd25sb2FkSUQsIFJlZlB0cjxEb3dubG9hZFByb3h5 Pj4gbV9kb3dubG9hZHM7CiAKICAgICBib29sIG1fc2hvdWxkVGFrZUFzc2VydGlvbiB7IGZhbHNl IH07Ci0gICAgc3RkOjp1bmlxdWVfcHRyPFByb2Nlc3NBc3NlcnRpb24+IG1fZG93bmxvYWRBc3Nl cnRpb247CisgICAgc3RkOjp1bmlxdWVfcHRyPFByb2Nlc3NBc3NlcnRpb24+IG1fZG93bmxvYWRV SUFzc2VydGlvbjsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8UHJvY2Vzc0Fzc2VydGlvbj4gbV9kb3du bG9hZE5ldHdvcmtpbmdBc3NlcnRpb247CisKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQogICAg IFJldGFpblB0cjxpZD4gbV9iYWNrZ3JvdW5kT2JzZXJ2ZXI7CiAgICAgUmV0YWluUHRyPGlkPiBt X2ZvcmVncm91bmRPYnNlcnZlcjsK