213548 2020-06-24 02:28:05 -0700 Send WebRTC packets received from network process to web process from a background thread 2020-06-29 11:28:26 -0700 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf achristensen eric.carlson ews-watchlist webkit-bug-importer youennf oldest_to_newest 1665678 0 youennf 2020-06-24 02:28:05 -0700 Send WebRTC packets received from network process to web process from a background thread 1665680 1 402630 youennf 2020-06-24 02:29:58 -0700 Created attachment 402630 Patch 1665704 2 402639 youennf 2020-06-24 05:33:27 -0700 Created attachment 402639 Patch 1665707 3 402641 youennf 2020-06-24 05:44:59 -0700 Created attachment 402641 Patch 1667102 4 403062 youennf 2020-06-29 08:29:19 -0700 Created attachment 403062 Rebasing 1667203 5 ews-feeder 2020-06-29 11:27:58 -0700 Committed r263670: <https://trac.webkit.org/changeset/263670> All reviewed patches have been landed. Closing bug and clearing flags on attachment 403062. 1667204 6 webkit-bug-importer 2020-06-29 11:28:26 -0700 <rdar://problem/64899618> 402630 2020-06-24 02:29:58 -0700 2020-06-24 05:33:22 -0700 Patch bug-213548-20200624112957.patch text/plain 13731 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMjE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM1MDk0M2FmMzlhMzUyZDBl ZWM5NzhhZjNmZmE1MDg5MjlmYjVlMmMuLmZhOTdlMmJkMzA0ZTY0Yjk3ZTUzM2YxNTBjZGQ0MmJh NzE4YmY3MzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMjAtMDYtMjQgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIFNlbmQgV2ViUlRDIHBhY2tldHMg cmVjZWl2ZWQgZnJvbSBuZXR3b3JrIHByb2Nlc3MgdG8gd2ViIHByb2Nlc3MgZnJvbSBhIGJhY2tn cm91bmQgdGhyZWFkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMTM1NDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBNYWtlIExpYldlYlJUQ1NvY2tldENsaWVudCB0YWtlIGEgcmVmIHRvIGFuIElQQyBjb25u ZWN0aW9uIGF0IGNyZWF0aW9uIHRpbWUuCisgICAgICAgIFVzZSB0aGlzIGNvbm5lY3Rpb24gZnJv bSB0aGUgUlRDIG5ldHdvcmsgdGhyZWFkIHRvIHNlbmQgcmVjZWl2ZWQgcGFja2V0cyB0byBpbXBy b3ZlIHBlcmZvcm1hbmNlcy4KKyAgICAgICAgQ292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKwor ICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL3dlYnJ0Yy9MaWJXZWJSVENTb2NrZXRDbGllbnQuY3Bw OgorICAgICAgICAoV2ViS2l0OjpMaWJXZWJSVENTb2NrZXRDbGllbnQ6OkxpYldlYlJUQ1NvY2tl dENsaWVudCk6CisgICAgICAgIChXZWJLaXQ6OkxpYldlYlJUQ1NvY2tldENsaWVudDo6c2lnbmFs UmVhZFBhY2tldCk6CisgICAgICAgIChXZWJLaXQ6OkxpYldlYlJUQ1NvY2tldENsaWVudDo6c2ln bmFsU2VudFBhY2tldCk6CisgICAgICAgIChXZWJLaXQ6OkxpYldlYlJUQ1NvY2tldENsaWVudDo6 c2lnbmFsQWRkcmVzc1JlYWR5KToKKyAgICAgICAgKFdlYktpdDo6TGliV2ViUlRDU29ja2V0Q2xp ZW50OjpzaWduYWxDb25uZWN0KToKKyAgICAgICAgKFdlYktpdDo6TGliV2ViUlRDU29ja2V0Q2xp ZW50OjpzaWduYWxDbG9zZSk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3Mvd2VicnRjL0xpYldl YlJUQ1NvY2tldENsaWVudC5oOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL3dlYnJ0Yy9OZXR3 b3JrUlRDUHJvdmlkZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUlRDUHJvdmlkZXI6 OmNyZWF0ZVNvY2tldCk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSVENQcm92aWRlcjo6Y3Jl YXRlVURQU29ja2V0KToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1JUQ1Byb3ZpZGVyOjpjcmVh dGVTZXJ2ZXJUQ1BTb2NrZXQpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUlRDUHJvdmlkZXI6 OmNyZWF0ZUNsaWVudFRDUFNvY2tldCk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSVENQcm92 aWRlcjo6d3JhcE5ld1RDUENvbm5lY3Rpb24pOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL3dl YnJ0Yy9OZXR3b3JrUlRDUHJvdmlkZXIuaDoKKwogMjAyMC0wNi0xOCAgRGF2aWQgS2lsemVyICA8 ZGRraWx6ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFtJUEMgaGFyZGVuaW5nXSBPcHRpb25TZXQ8 PiB2YWx1ZXMgc2hvdWxkIGJlIHZhbGlkYXRlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy93ZWJydGMvTGliV2ViUlRDU29ja2V0Q2xpZW50LmNwcCBiL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3Mvd2VicnRjL0xpYldlYlJUQ1NvY2tldENsaWVudC5jcHAKaW5k ZXggMzUyZmZkNGYwZjU5ZDgzMWI3NGYyYzcyYWFlNzUzYTNkMmUyMjkxNS4uZTk3ZmY0MjNiZGM5 ZmU4MjU3ZDk2NTVkYzdjZjg5NWRkOWVkNTc3YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy93ZWJydGMvTGliV2ViUlRDU29ja2V0Q2xpZW50LmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3dlYnJ0Yy9MaWJXZWJSVENTb2NrZXRDbGllbnQuY3Bw CkBAIC0zOCwxMSArMzgsMTIgQEAKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLUxpYldlYlJUQ1Nv Y2tldENsaWVudDo6TGliV2ViUlRDU29ja2V0Q2xpZW50KFdlYkNvcmU6OkxpYldlYlJUQ1NvY2tl dElkZW50aWZpZXIgaWRlbnRpZmllciwgTmV0d29ya1JUQ1Byb3ZpZGVyJiBydGNQcm92aWRlciwg c3RkOjp1bmlxdWVfcHRyPHJ0Yzo6QXN5bmNQYWNrZXRTb2NrZXQ+JiYgc29ja2V0LCBUeXBlIHR5 cGUpCitMaWJXZWJSVENTb2NrZXRDbGllbnQ6OkxpYldlYlJUQ1NvY2tldENsaWVudChXZWJDb3Jl OjpMaWJXZWJSVENTb2NrZXRJZGVudGlmaWVyIGlkZW50aWZpZXIsIE5ldHdvcmtSVENQcm92aWRl ciYgcnRjUHJvdmlkZXIsIHN0ZDo6dW5pcXVlX3B0cjxydGM6OkFzeW5jUGFja2V0U29ja2V0PiYm IHNvY2tldCwgVHlwZSB0eXBlLCBSZWY8SVBDOjpDb25uZWN0aW9uPiYmIGNvbm5lY3Rpb24pCiAg ICAgOiBtX2lkZW50aWZpZXIoaWRlbnRpZmllcikKICAgICAsIG1fdHlwZSh0eXBlKQogICAgICwg bV9ydGNQcm92aWRlcihydGNQcm92aWRlcikKICAgICAsIG1fc29ja2V0KFdURk1vdmUoc29ja2V0 KSkKKyAgICAsIG1fY29ubmVjdGlvbihXVEZNb3ZlKGNvbm5lY3Rpb24pKQogewogICAgIEFTU0VS VChtX3NvY2tldCk7CiAKQEAgLTk3LDE5ICs5OCwxNCBAQCB2b2lkIExpYldlYlJUQ1NvY2tldENs aWVudDo6c2V0T3B0aW9uKGludCBvcHRpb24sIGludCB2YWx1ZSkKIHZvaWQgTGliV2ViUlRDU29j a2V0Q2xpZW50OjpzaWduYWxSZWFkUGFja2V0KHJ0Yzo6QXN5bmNQYWNrZXRTb2NrZXQqIHNvY2tl dCwgY29uc3QgY2hhciogdmFsdWUsIHNpemVfdCBsZW5ndGgsIGNvbnN0IHJ0Yzo6U29ja2V0QWRk cmVzcyYgYWRkcmVzcywgY29uc3QgcnRjOjpQYWNrZXRUaW1lJiBwYWNrZXRUaW1lKQogewogICAg IEFTU0VSVF9VTlVTRUQoc29ja2V0LCBtX3NvY2tldC5nZXQoKSA9PSBzb2NrZXQpOwotICAgIGF1 dG8gYnVmZmVyID0gV2ViQ29yZTo6U2hhcmVkQnVmZmVyOjpjcmVhdGUodmFsdWUsIGxlbmd0aCk7 Ci0gICAgbV9ydGNQcm92aWRlci5zZW5kRnJvbU1haW5UaHJlYWQoW2lkZW50aWZpZXIgPSBtX2lk ZW50aWZpZXIsIGJ1ZmZlciA9IFdURk1vdmUoYnVmZmVyKSwgYWRkcmVzcyA9IFJUQ05ldHdvcms6 Omlzb2xhdGVkQ29weShhZGRyZXNzKSwgcGFja2V0VGltZV0oSVBDOjpDb25uZWN0aW9uJiBjb25u ZWN0aW9uKSB7Ci0gICAgICAgIElQQzo6RGF0YVJlZmVyZW5jZSBkYXRhKHJlaW50ZXJwcmV0X2Nh c3Q8Y29uc3QgdWludDhfdCo+KGJ1ZmZlci0+ZGF0YSgpKSwgYnVmZmVyLT5zaXplKCkpOwotICAg ICAgICBjb25uZWN0aW9uLnNlbmQoTWVzc2FnZXM6OkxpYldlYlJUQ05ldHdvcms6OlNpZ25hbFJl YWRQYWNrZXQoaWRlbnRpZmllciwgZGF0YSwgUlRDTmV0d29yazo6SVBBZGRyZXNzKGFkZHJlc3Mu aXBhZGRyKCkpLCBhZGRyZXNzLnBvcnQoKSwgcGFja2V0VGltZSksIDApOwotICAgIH0pOworICAg IElQQzo6RGF0YVJlZmVyZW5jZSBkYXRhKHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgdWludDhfdCo+ KHZhbHVlKSwgbGVuZ3RoKTsKKyAgICBtX2Nvbm5lY3Rpb24tPnNlbmQoTWVzc2FnZXM6OkxpYldl YlJUQ05ldHdvcms6OlNpZ25hbFJlYWRQYWNrZXQobV9pZGVudGlmaWVyLCBkYXRhLCBSVENOZXR3 b3JrOjpJUEFkZHJlc3MoYWRkcmVzcy5pcGFkZHIoKSksIGFkZHJlc3MucG9ydCgpLCBwYWNrZXRU aW1lKSwgMCk7CiB9CiAKIHZvaWQgTGliV2ViUlRDU29ja2V0Q2xpZW50OjpzaWduYWxTZW50UGFj a2V0KHJ0Yzo6QXN5bmNQYWNrZXRTb2NrZXQqIHNvY2tldCwgY29uc3QgcnRjOjpTZW50UGFja2V0 JiBzZW50UGFja2V0KQogewogICAgIEFTU0VSVF9VTlVTRUQoc29ja2V0LCBtX3NvY2tldC5nZXQo KSA9PSBzb2NrZXQpOwotICAgIG1fcnRjUHJvdmlkZXIuc2VuZEZyb21NYWluVGhyZWFkKFtpZGVu dGlmaWVyID0gbV9pZGVudGlmaWVyLCBzZW50UGFja2V0XShJUEM6OkNvbm5lY3Rpb24mIGNvbm5l Y3Rpb24pIHsKLSAgICAgICAgY29ubmVjdGlvbi5zZW5kKE1lc3NhZ2VzOjpMaWJXZWJSVENOZXR3 b3JrOjpTaWduYWxTZW50UGFja2V0KGlkZW50aWZpZXIsIHNlbnRQYWNrZXQucGFja2V0X2lkLCBz ZW50UGFja2V0LnNlbmRfdGltZV9tcyksIDApOwotICAgIH0pOworICAgIG1fY29ubmVjdGlvbi0+ c2VuZChNZXNzYWdlczo6TGliV2ViUlRDTmV0d29yazo6U2lnbmFsU2VudFBhY2tldChtX2lkZW50 aWZpZXIsIHNlbnRQYWNrZXQucGFja2V0X2lkLCBzZW50UGFja2V0LnNlbmRfdGltZV9tcyksIDAp OwogfQogCiB2b2lkIExpYldlYlJUQ1NvY2tldENsaWVudDo6c2lnbmFsTmV3Q29ubmVjdGlvbihy dGM6OkFzeW5jUGFja2V0U29ja2V0KiBzb2NrZXQsIHJ0Yzo6QXN5bmNQYWNrZXRTb2NrZXQqIG5l d1NvY2tldCkKQEAgLTEyMSw5ICsxMTcsNyBAQCB2b2lkIExpYldlYlJUQ1NvY2tldENsaWVudDo6 c2lnbmFsTmV3Q29ubmVjdGlvbihydGM6OkFzeW5jUGFja2V0U29ja2V0KiBzb2NrZXQsCiB2b2lk IExpYldlYlJUQ1NvY2tldENsaWVudDo6c2lnbmFsQWRkcmVzc1JlYWR5KHJ0Yzo6QXN5bmNQYWNr ZXRTb2NrZXQqIHNvY2tldCwgY29uc3QgcnRjOjpTb2NrZXRBZGRyZXNzJiBhZGRyZXNzKQogewog ICAgIEFTU0VSVF9VTlVTRUQoc29ja2V0LCBtX3NvY2tldC5nZXQoKSA9PSBzb2NrZXQpOwotICAg IG1fcnRjUHJvdmlkZXIuc2VuZEZyb21NYWluVGhyZWFkKFtpZGVudGlmaWVyID0gbV9pZGVudGlm aWVyLCBhZGRyZXNzID0gUlRDTmV0d29yazo6aXNvbGF0ZWRDb3B5KGFkZHJlc3MpXShJUEM6OkNv bm5lY3Rpb24mIGNvbm5lY3Rpb24pIHsKLSAgICAgICAgY29ubmVjdGlvbi5zZW5kKE1lc3NhZ2Vz OjpMaWJXZWJSVENOZXR3b3JrOjpTaWduYWxBZGRyZXNzUmVhZHkoaWRlbnRpZmllciwgUlRDTmV0 d29yazo6U29ja2V0QWRkcmVzcyhhZGRyZXNzKSksIDApOwotICAgIH0pOworICAgIG1fY29ubmVj dGlvbi0+c2VuZChNZXNzYWdlczo6TGliV2ViUlRDTmV0d29yazo6U2lnbmFsQWRkcmVzc1JlYWR5 KG1faWRlbnRpZmllciwgUlRDTmV0d29yazo6U29ja2V0QWRkcmVzcyhhZGRyZXNzKSksIDApOwog fQogCiB2b2lkIExpYldlYlJUQ1NvY2tldENsaWVudDo6c2lnbmFsQWRkcmVzc1JlYWR5KCkKQEAg LTEzNCwxNyArMTI4LDE0IEBAIHZvaWQgTGliV2ViUlRDU29ja2V0Q2xpZW50OjpzaWduYWxBZGRy ZXNzUmVhZHkoKQogdm9pZCBMaWJXZWJSVENTb2NrZXRDbGllbnQ6OnNpZ25hbENvbm5lY3QocnRj OjpBc3luY1BhY2tldFNvY2tldCogc29ja2V0KQogewogICAgIEFTU0VSVF9VTlVTRUQoc29ja2V0 LCBtX3NvY2tldC5nZXQoKSA9PSBzb2NrZXQpOwotICAgIG1fcnRjUHJvdmlkZXIuc2VuZEZyb21N YWluVGhyZWFkKFtpZGVudGlmaWVyID0gbV9pZGVudGlmaWVyXShJUEM6OkNvbm5lY3Rpb24mIGNv bm5lY3Rpb24pIHsKLSAgICAgICAgY29ubmVjdGlvbi5zZW5kKE1lc3NhZ2VzOjpMaWJXZWJSVENO ZXR3b3JrOjpTaWduYWxDb25uZWN0KGlkZW50aWZpZXIpLCAwKTsKLSAgICB9KTsKKyAgICBtX2Nv bm5lY3Rpb24tPnNlbmQoTWVzc2FnZXM6OkxpYldlYlJUQ05ldHdvcms6OlNpZ25hbENvbm5lY3Qo bV9pZGVudGlmaWVyKSwgMCk7CiB9CiAKIHZvaWQgTGliV2ViUlRDU29ja2V0Q2xpZW50OjpzaWdu YWxDbG9zZShydGM6OkFzeW5jUGFja2V0U29ja2V0KiBzb2NrZXQsIGludCBlcnJvcikKIHsKICAg ICBBU1NFUlRfVU5VU0VEKHNvY2tldCwgbV9zb2NrZXQuZ2V0KCkgPT0gc29ja2V0KTsKLSAgICBt X3J0Y1Byb3ZpZGVyLnNlbmRGcm9tTWFpblRocmVhZChbaWRlbnRpZmllciA9IG1faWRlbnRpZmll ciwgZXJyb3JdKElQQzo6Q29ubmVjdGlvbiYgY29ubmVjdGlvbikgewotICAgICAgICBjb25uZWN0 aW9uLnNlbmQoTWVzc2FnZXM6OkxpYldlYlJUQ05ldHdvcms6OlNpZ25hbENsb3NlKGlkZW50aWZp ZXIsIGVycm9yKSwgMCk7Ci0gICAgfSk7CisgICAgbV9jb25uZWN0aW9uLT5zZW5kKE1lc3NhZ2Vz OjpMaWJXZWJSVENOZXR3b3JrOjpTaWduYWxDbG9zZShtX2lkZW50aWZpZXIsIGVycm9yKSwgMCk7 CisKICAgICAvLyBXZSB3YW50IHRvIHJlbW92ZSAndGhpcycgZnJvbSB0aGUgc29ja2V0IG1hcCBu b3cgYnV0IHdlIHdpbGwgZGVzdHJveSBpdCBhc3luY2hyb25vdXNseQogICAgIC8vIHNvIHRoYXQg dGhlIHNvY2tldCBwYXJhbWV0ZXIgb2Ygc2lnbmFsQ2xvc2UgcmVtYWlucyBhbGl2ZSBhcyB0aGUg Y2FsbGVyIG9mIHNpZ25hbENsb3NlIG1heSBhY3R1YWxseSBiZWluZyB1c2luZyBpdCBhZnRlcndh cmRzLgogICAgIG1fcnRjUHJvdmlkZXIuY2FsbE9uUlRDTmV0d29ya1RocmVhZChbc29ja2V0ID0g bV9ydGNQcm92aWRlci50YWtlU29ja2V0KG1faWRlbnRpZmllcildIHsgfSk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3dlYnJ0Yy9MaWJXZWJSVENTb2NrZXRDbGll bnQuaCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvd2VicnRjL0xpYldlYlJUQ1NvY2tl dENsaWVudC5oCmluZGV4IDdiMTE3ZjlhOGI1NThhMzhhNDhlYThmMDVmNmY1ZGJhNzcyY2U1Mjgu LmFmOWJlYjdhZWZhNWVhNTExZjk3ZmJlOTI1NTRhMGY5ZDdjOWRmYmMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvd2VicnRjL0xpYldlYlJUQ1NvY2tldENsaWVudC5o CisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvd2VicnRjL0xpYldlYlJUQ1NvY2tl dENsaWVudC5oCkBAIC00MSw3ICs0MSw3IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogY2xhc3MgTGli V2ViUlRDU29ja2V0Q2xpZW50IGZpbmFsIDogcHVibGljIE5ldHdvcmtSVENQcm92aWRlcjo6U29j a2V0LCBwdWJsaWMgc2lnc2xvdDo6aGFzX3Nsb3RzPD4gewogICAgIFdURl9NQUtFX0ZBU1RfQUxM T0NBVEVEOwogcHVibGljOgotICAgIExpYldlYlJUQ1NvY2tldENsaWVudChXZWJDb3JlOjpMaWJX ZWJSVENTb2NrZXRJZGVudGlmaWVyLCBOZXR3b3JrUlRDUHJvdmlkZXImLCBzdGQ6OnVuaXF1ZV9w dHI8cnRjOjpBc3luY1BhY2tldFNvY2tldD4mJiwgVHlwZSk7CisgICAgTGliV2ViUlRDU29ja2V0 Q2xpZW50KFdlYkNvcmU6OkxpYldlYlJUQ1NvY2tldElkZW50aWZpZXIsIE5ldHdvcmtSVENQcm92 aWRlciYsIHN0ZDo6dW5pcXVlX3B0cjxydGM6OkFzeW5jUGFja2V0U29ja2V0PiYmLCBUeXBlLCBS ZWY8SVBDOjpDb25uZWN0aW9uPiYmKTsKIAogcHJpdmF0ZToKICAgICBXZWJDb3JlOjpMaWJXZWJS VENTb2NrZXRJZGVudGlmaWVyIGlkZW50aWZpZXIoKSBjb25zdCBmaW5hbCB7IHJldHVybiBtX2lk ZW50aWZpZXI7IH0KQEAgLTY0LDYgKzY0LDcgQEAgcHJpdmF0ZToKICAgICBUeXBlIG1fdHlwZTsK ICAgICBOZXR3b3JrUlRDUHJvdmlkZXImIG1fcnRjUHJvdmlkZXI7CiAgICAgc3RkOjp1bmlxdWVf cHRyPHJ0Yzo6QXN5bmNQYWNrZXRTb2NrZXQ+IG1fc29ja2V0OworICAgIFJlZjxJUEM6OkNvbm5l Y3Rpb24+JiYgbV9jb25uZWN0aW9uOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3dlYnJ0Yy9OZXR3b3JrUlRDUHJv dmlkZXIuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy93ZWJydGMvTmV0d29ya1JU Q1Byb3ZpZGVyLmNwcAppbmRleCAyYTAwNWFmMDdjZjE3NzMxYmNjMzJhODkxYWQ2OTc3NjgyMGNk ZjJhLi45NzljYzUzNWI0NjQ5MzFhZTQ0MTY5YWI2Y2M1ZDlhOTJkNzI5YTEwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3dlYnJ0Yy9OZXR3b3JrUlRDUHJvdmlkZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvd2VicnRjL05ldHdvcmtSVENQ cm92aWRlci5jcHAKQEAgLTExMywyMyArMTEzLDIxIEBAIHZvaWQgTmV0d29ya1JUQ1Byb3ZpZGVy OjpjbG9zZSgpCiAgICAgfSk7CiB9CiAKLXZvaWQgTmV0d29ya1JUQ1Byb3ZpZGVyOjpjcmVhdGVT b2NrZXQoTGliV2ViUlRDU29ja2V0SWRlbnRpZmllciBpZGVudGlmaWVyLCBzdGQ6OnVuaXF1ZV9w dHI8cnRjOjpBc3luY1BhY2tldFNvY2tldD4mJiBzb2NrZXQsIFNvY2tldDo6VHlwZSB0eXBlKQor dm9pZCBOZXR3b3JrUlRDUHJvdmlkZXI6OmNyZWF0ZVNvY2tldChMaWJXZWJSVENTb2NrZXRJZGVu dGlmaWVyIGlkZW50aWZpZXIsIHN0ZDo6dW5pcXVlX3B0cjxydGM6OkFzeW5jUGFja2V0U29ja2V0 PiYmIHNvY2tldCwgU29ja2V0OjpUeXBlIHR5cGUsIFJlZjxJUEM6OkNvbm5lY3Rpb24+JiYgY29u bmVjdGlvbikKIHsKICAgICBpZiAoIXNvY2tldCkgewotICAgICAgICBzZW5kRnJvbU1haW5UaHJl YWQoW3RoaXMsIGlkZW50aWZpZXIsIHNpemUgPSBtX3NvY2tldHMuc2l6ZSgpXShJUEM6OkNvbm5l Y3Rpb24mIGNvbm5lY3Rpb24pIHsKLSAgICAgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SX0lGX0FM TE9XRUQoImNyZWF0ZVNvY2tldCB3aXRoICV1IHNvY2tldHMgaXMgdW5hYmxlIHRvIGNyZWF0ZSBh IG5ldyBzb2NrZXQiLCBzaXplKTsKLSAgICAgICAgICAgIGNvbm5lY3Rpb24uc2VuZChNZXNzYWdl czo6TGliV2ViUlRDTmV0d29yazo6U2lnbmFsQ2xvc2UoaWRlbnRpZmllciwgMSksIDApOwotICAg ICAgICB9KTsKKyAgICAgICAgUkVMRUFTRV9MT0dfRVJST1JfSUZfQUxMT1dFRCgiY3JlYXRlU29j a2V0IHdpdGggJXUgc29ja2V0cyBpcyB1bmFibGUgdG8gY3JlYXRlIGEgbmV3IHNvY2tldCIsIG1f c29ja2V0cy5zaXplKCkpOworICAgICAgICBjb25uZWN0aW9uLT5zZW5kKE1lc3NhZ2VzOjpMaWJX ZWJSVENOZXR3b3JrOjpTaWduYWxDbG9zZShpZGVudGlmaWVyLCAxKSwgMCk7CiAgICAgICAgIHJl dHVybjsKICAgICB9Ci0gICAgYWRkU29ja2V0KGlkZW50aWZpZXIsIG1ha2VVbmlxdWU8TGliV2Vi UlRDU29ja2V0Q2xpZW50PihpZGVudGlmaWVyLCAqdGhpcywgV1RGTW92ZShzb2NrZXQpLCB0eXBl KSk7CisgICAgYWRkU29ja2V0KGlkZW50aWZpZXIsIG1ha2VVbmlxdWU8TGliV2ViUlRDU29ja2V0 Q2xpZW50PihpZGVudGlmaWVyLCAqdGhpcywgV1RGTW92ZShzb2NrZXQpLCB0eXBlLCBXVEZNb3Zl KGNvbm5lY3Rpb24pKSk7CiB9CiAKIHZvaWQgTmV0d29ya1JUQ1Byb3ZpZGVyOjpjcmVhdGVVRFBT b2NrZXQoTGliV2ViUlRDU29ja2V0SWRlbnRpZmllciBpZGVudGlmaWVyLCBjb25zdCBSVENOZXR3 b3JrOjpTb2NrZXRBZGRyZXNzJiBhZGRyZXNzLCB1aW50MTZfdCBtaW5Qb3J0LCB1aW50MTZfdCBt YXhQb3J0KQogewotICAgIGNhbGxPblJUQ05ldHdvcmtUaHJlYWQoW3RoaXMsIGlkZW50aWZpZXIs IGFkZHJlc3MgPSBSVENOZXR3b3JrOjppc29sYXRlZENvcHkoYWRkcmVzcy52YWx1ZSksIG1pblBv cnQsIG1heFBvcnRdKCkgeworICAgIGNhbGxPblJUQ05ldHdvcmtUaHJlYWQoW3RoaXMsIGlkZW50 aWZpZXIsIGFkZHJlc3MgPSBSVENOZXR3b3JrOjppc29sYXRlZENvcHkoYWRkcmVzcy52YWx1ZSks IG1pblBvcnQsIG1heFBvcnQsIGNvbm5lY3Rpb24gPSBtYWtlUmVmKG1fY29ubmVjdGlvbi0+Y29u bmVjdGlvbigpKV0oKSBtdXRhYmxlIHsKICAgICAgICAgc3RkOjp1bmlxdWVfcHRyPHJ0Yzo6QXN5 bmNQYWNrZXRTb2NrZXQ+IHNvY2tldChtX3BhY2tldFNvY2tldEZhY3RvcnktPkNyZWF0ZVVkcFNv Y2tldChhZGRyZXNzLCBtaW5Qb3J0LCBtYXhQb3J0KSk7Ci0gICAgICAgIGNyZWF0ZVNvY2tldChp ZGVudGlmaWVyLCBXVEZNb3ZlKHNvY2tldCksIFNvY2tldDo6VHlwZTo6VURQKTsKKyAgICAgICAg Y3JlYXRlU29ja2V0KGlkZW50aWZpZXIsIFdURk1vdmUoc29ja2V0KSwgU29ja2V0OjpUeXBlOjpV RFAsIFdURk1vdmUoY29ubmVjdGlvbikpOwogICAgIH0pOwogfQogCkBAIC0xNDEsOSArMTM5LDkg QEAgdm9pZCBOZXR3b3JrUlRDUHJvdmlkZXI6OmNyZWF0ZVNlcnZlclRDUFNvY2tldChMaWJXZWJS VENTb2NrZXRJZGVudGlmaWVyIGlkZW50aWYKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAg IGNhbGxPblJUQ05ldHdvcmtUaHJlYWQoW3RoaXMsIGlkZW50aWZpZXIsIGFkZHJlc3MgPSBSVENO ZXR3b3JrOjppc29sYXRlZENvcHkoYWRkcmVzcy52YWx1ZSksIG1pblBvcnQsIG1heFBvcnQsIG9w dGlvbnNdKCkgeworICAgIGNhbGxPblJUQ05ldHdvcmtUaHJlYWQoW3RoaXMsIGlkZW50aWZpZXIs IGFkZHJlc3MgPSBSVENOZXR3b3JrOjppc29sYXRlZENvcHkoYWRkcmVzcy52YWx1ZSksIG1pblBv cnQsIG1heFBvcnQsIG9wdGlvbnMsIGNvbm5lY3Rpb24gPSBtYWtlUmVmKG1fY29ubmVjdGlvbi0+ Y29ubmVjdGlvbigpKV0oKSBtdXRhYmxlIHsKICAgICAgICAgc3RkOjp1bmlxdWVfcHRyPHJ0Yzo6 QXN5bmNQYWNrZXRTb2NrZXQ+IHNvY2tldChtX3BhY2tldFNvY2tldEZhY3RvcnktPkNyZWF0ZVNl cnZlclRjcFNvY2tldChhZGRyZXNzLCBtaW5Qb3J0LCBtYXhQb3J0LCBvcHRpb25zKSk7Ci0gICAg ICAgIGNyZWF0ZVNvY2tldChpZGVudGlmaWVyLCBXVEZNb3ZlKHNvY2tldCksIFNvY2tldDo6VHlw ZTo6U2VydmVyVENQKTsKKyAgICAgICAgY3JlYXRlU29ja2V0KGlkZW50aWZpZXIsIFdURk1vdmUo c29ja2V0KSwgU29ja2V0OjpUeXBlOjpTZXJ2ZXJUQ1AsIFdURk1vdmUoY29ubmVjdGlvbikpOwog ICAgIH0pOwogfQogCkBAIC0xNjEsMjEgKzE1OSwyMSBAQCB2b2lkIE5ldHdvcmtSVENQcm92aWRl cjo6Y3JlYXRlQ2xpZW50VENQU29ja2V0KExpYldlYlJUQ1NvY2tldElkZW50aWZpZXIgaWRlbnRp ZgogICAgICAgICBtX2Nvbm5lY3Rpb24tPmNvbm5lY3Rpb24oKS5zZW5kKE1lc3NhZ2VzOjpMaWJX ZWJSVENOZXR3b3JrOjpTaWduYWxDbG9zZShpZGVudGlmaWVyLCAxKSwgMCk7CiAgICAgICAgIHJl dHVybjsKICAgICB9Ci0gICAgY2FsbE9uUlRDTmV0d29ya1RocmVhZChbdGhpcywgaWRlbnRpZmll ciwgbG9jYWxBZGRyZXNzID0gUlRDTmV0d29yazo6aXNvbGF0ZWRDb3B5KGxvY2FsQWRkcmVzcy52 YWx1ZSksIHJlbW90ZUFkZHJlc3MgPSBSVENOZXR3b3JrOjppc29sYXRlZENvcHkocmVtb3RlQWRk cmVzcy52YWx1ZSksIHByb3h5SW5mbyA9IHByb3h5SW5mb0Zyb21TZXNzaW9uKHJlbW90ZUFkZHJl c3MsICpzZXNzaW9uKSwgdXNlckFnZW50ID0gV1RGTW92ZSh1c2VyQWdlbnQpLmlzb2xhdGVkQ29w eSgpLCBvcHRpb25zXSgpIHsKKyAgICBjYWxsT25SVENOZXR3b3JrVGhyZWFkKFt0aGlzLCBpZGVu dGlmaWVyLCBsb2NhbEFkZHJlc3MgPSBSVENOZXR3b3JrOjppc29sYXRlZENvcHkobG9jYWxBZGRy ZXNzLnZhbHVlKSwgcmVtb3RlQWRkcmVzcyA9IFJUQ05ldHdvcms6Omlzb2xhdGVkQ29weShyZW1v dGVBZGRyZXNzLnZhbHVlKSwgcHJveHlJbmZvID0gcHJveHlJbmZvRnJvbVNlc3Npb24ocmVtb3Rl QWRkcmVzcywgKnNlc3Npb24pLCB1c2VyQWdlbnQgPSBXVEZNb3ZlKHVzZXJBZ2VudCkuaXNvbGF0 ZWRDb3B5KCksIG9wdGlvbnMsIGNvbm5lY3Rpb24gPSBtYWtlUmVmKG1fY29ubmVjdGlvbi0+Y29u bmVjdGlvbigpKV0oKSBtdXRhYmxlIHsKICAgICAgICAgcnRjOjpQYWNrZXRTb2NrZXRUY3BPcHRp b25zIHRjcE9wdGlvbnM7CiAgICAgICAgIHRjcE9wdGlvbnMub3B0cyA9IG9wdGlvbnM7CiAgICAg ICAgIHN0ZDo6dW5pcXVlX3B0cjxydGM6OkFzeW5jUGFja2V0U29ja2V0PiBzb2NrZXQobV9wYWNr ZXRTb2NrZXRGYWN0b3J5LT5DcmVhdGVDbGllbnRUY3BTb2NrZXQobG9jYWxBZGRyZXNzLCByZW1v dGVBZGRyZXNzLCBwcm94eUluZm8sIHVzZXJBZ2VudC51dGY4KCkuZGF0YSgpLCB0Y3BPcHRpb25z KSk7Ci0gICAgICAgIGNyZWF0ZVNvY2tldChpZGVudGlmaWVyLCBXVEZNb3ZlKHNvY2tldCksIFNv Y2tldDo6VHlwZTo6Q2xpZW50VENQKTsKKyAgICAgICAgY3JlYXRlU29ja2V0KGlkZW50aWZpZXIs IFdURk1vdmUoc29ja2V0KSwgU29ja2V0OjpUeXBlOjpDbGllbnRUQ1AsIFdURk1vdmUoY29ubmVj dGlvbikpOwogICAgIH0pOwogfQogCiB2b2lkIE5ldHdvcmtSVENQcm92aWRlcjo6d3JhcE5ld1RD UENvbm5lY3Rpb24oTGliV2ViUlRDU29ja2V0SWRlbnRpZmllciBpZGVudGlmaWVyLCBMaWJXZWJS VENTb2NrZXRJZGVudGlmaWVyIG5ld0Nvbm5lY3Rpb25Tb2NrZXRJZGVudGlmaWVyKQogewotICAg IGNhbGxPblJUQ05ldHdvcmtUaHJlYWQoW3RoaXMsIGlkZW50aWZpZXIsIG5ld0Nvbm5lY3Rpb25T b2NrZXRJZGVudGlmaWVyXSgpIHsKKyAgICBjYWxsT25SVENOZXR3b3JrVGhyZWFkKFt0aGlzLCBp ZGVudGlmaWVyLCBuZXdDb25uZWN0aW9uU29ja2V0SWRlbnRpZmllciwgY29ubmVjdGlvbiA9IG1h a2VSZWYobV9jb25uZWN0aW9uLT5jb25uZWN0aW9uKCkpXSgpIG11dGFibGUgewogICAgICAgICBh dXRvIHNvY2tldCA9IG1fcGVuZGluZ0luY29taW5nU29ja2V0cy50YWtlKG5ld0Nvbm5lY3Rpb25T b2NrZXRJZGVudGlmaWVyKTsKICAgICAgICAgUkVMRUFTRV9MT0dfSUYoIXNvY2tldCwgV2ViUlRD LCAiTmV0d29ya1JUQ1Byb3ZpZGVyOjp3cmFwTmV3VENQQ29ubmVjdGlvbiByZWNlaXZlZCBhbiBp bnZhbGlkIHNvY2tldCBpZGVudGlmaWVyIik7CiAgICAgICAgIGlmIChzb2NrZXQpCi0gICAgICAg ICAgICBhZGRTb2NrZXQoaWRlbnRpZmllciwgbWFrZVVuaXF1ZTxMaWJXZWJSVENTb2NrZXRDbGll bnQ+KGlkZW50aWZpZXIsICp0aGlzLCBXVEZNb3ZlKHNvY2tldCksIFNvY2tldDo6VHlwZTo6U2Vy dmVyQ29ubmVjdGlvblRDUCkpOworICAgICAgICAgICAgYWRkU29ja2V0KGlkZW50aWZpZXIsIG1h a2VVbmlxdWU8TGliV2ViUlRDU29ja2V0Q2xpZW50PihpZGVudGlmaWVyLCAqdGhpcywgV1RGTW92 ZShzb2NrZXQpLCBTb2NrZXQ6OlR5cGU6OlNlcnZlckNvbm5lY3Rpb25UQ1AsIFdURk1vdmUoY29u bmVjdGlvbikpKTsKICAgICB9KTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy93ZWJydGMvTmV0d29ya1JUQ1Byb3ZpZGVyLmggYi9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL3dlYnJ0Yy9OZXR3b3JrUlRDUHJvdmlkZXIuaAppbmRleCBjOGQ3Y2Y0YjM3 MGZlM2M1N2Q1MzExMzFjNTk2ODg0YmFiMjc0MzI0Li4yZWMyMGQxMzBkYmE4NWI1YzMzMzFkNzJk ZTY4YWFhZjZkZDljMTk0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L3dlYnJ0Yy9OZXR3b3JrUlRDUHJvdmlkZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL3dlYnJ0Yy9OZXR3b3JrUlRDUHJvdmlkZXIuaApAQCAtMTEwLDcgKzExMCw3IEBAIHBy aXZhdGU6CiAKICAgICB2b2lkIGFkZFNvY2tldChXZWJDb3JlOjpMaWJXZWJSVENTb2NrZXRJZGVu dGlmaWVyLCBzdGQ6OnVuaXF1ZV9wdHI8U29ja2V0PiYmKTsKIAotICAgIHZvaWQgY3JlYXRlU29j a2V0KFdlYkNvcmU6OkxpYldlYlJUQ1NvY2tldElkZW50aWZpZXIsIHN0ZDo6dW5pcXVlX3B0cjxy dGM6OkFzeW5jUGFja2V0U29ja2V0PiYmLCBTb2NrZXQ6OlR5cGUpOworICAgIHZvaWQgY3JlYXRl U29ja2V0KFdlYkNvcmU6OkxpYldlYlJUQ1NvY2tldElkZW50aWZpZXIsIHN0ZDo6dW5pcXVlX3B0 cjxydGM6OkFzeW5jUGFja2V0U29ja2V0PiYmLCBTb2NrZXQ6OlR5cGUsIFJlZjxJUEM6OkNvbm5l Y3Rpb24+JiYpOwogCiAgICAgdm9pZCBPbk1lc3NhZ2UocnRjOjpNZXNzYWdlKik7CiAK 402639 2020-06-24 05:33:27 -0700 2020-06-24 05:44:55 -0700 Patch bug-213548-20200624143325.patch text/plain 13753 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzNDUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDlmZTEzYTE2NzUyNmZlNjA5 ZTFiZDU3MWNjYTQwMTkyZjk5OTY0ZjEuLjY4NWNmZWFjMjI0YjMyYjkyOGRkODBkY2RjZDAwNTA1 ZDZjZTJmY2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMjAtMDYtMjQgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIFNlbmQgV2ViUlRDIHBhY2tldHMg cmVjZWl2ZWQgZnJvbSBuZXR3b3JrIHByb2Nlc3MgdG8gd2ViIHByb2Nlc3MgZnJvbSBhIGJhY2tn cm91bmQgdGhyZWFkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMTM1NDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBNYWtlIExpYldlYlJUQ1NvY2tldENsaWVudCB0YWtlIGEgcmVmIHRvIGFuIElQQyBjb25u ZWN0aW9uIGF0IGNyZWF0aW9uIHRpbWUuCisgICAgICAgIFVzZSB0aGlzIGNvbm5lY3Rpb24gZnJv bSB0aGUgUlRDIG5ldHdvcmsgdGhyZWFkIHRvIHNlbmQgcmVjZWl2ZWQgcGFja2V0cyB0byBpbXBy b3ZlIHBlcmZvcm1hbmNlcy4KKyAgICAgICAgQ292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKwor ICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL3dlYnJ0Yy9MaWJXZWJSVENTb2NrZXRDbGllbnQuY3Bw OgorICAgICAgICAoV2ViS2l0OjpMaWJXZWJSVENTb2NrZXRDbGllbnQ6OkxpYldlYlJUQ1NvY2tl dENsaWVudCk6CisgICAgICAgIChXZWJLaXQ6OkxpYldlYlJUQ1NvY2tldENsaWVudDo6c2lnbmFs UmVhZFBhY2tldCk6CisgICAgICAgIChXZWJLaXQ6OkxpYldlYlJUQ1NvY2tldENsaWVudDo6c2ln bmFsU2VudFBhY2tldCk6CisgICAgICAgIChXZWJLaXQ6OkxpYldlYlJUQ1NvY2tldENsaWVudDo6 c2lnbmFsQWRkcmVzc1JlYWR5KToKKyAgICAgICAgKFdlYktpdDo6TGliV2ViUlRDU29ja2V0Q2xp ZW50OjpzaWduYWxDb25uZWN0KToKKyAgICAgICAgKFdlYktpdDo6TGliV2ViUlRDU29ja2V0Q2xp ZW50OjpzaWduYWxDbG9zZSk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3Mvd2VicnRjL0xpYldl YlJUQ1NvY2tldENsaWVudC5oOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL3dlYnJ0Yy9OZXR3 b3JrUlRDUHJvdmlkZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUlRDUHJvdmlkZXI6 OmNyZWF0ZVNvY2tldCk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSVENQcm92aWRlcjo6Y3Jl YXRlVURQU29ja2V0KToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1JUQ1Byb3ZpZGVyOjpjcmVh dGVTZXJ2ZXJUQ1BTb2NrZXQpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUlRDUHJvdmlkZXI6 OmNyZWF0ZUNsaWVudFRDUFNvY2tldCk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSVENQcm92 aWRlcjo6d3JhcE5ld1RDUENvbm5lY3Rpb24pOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL3dl YnJ0Yy9OZXR3b3JrUlRDUHJvdmlkZXIuaDoKKwogMjAyMC0wNi0yNCAgQ2FybG9zIEdhcmNpYSBD YW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gVXBkYXRl IE9wdGlvbnNHVEsuY21ha2UgYW5kIE5FV1MgZm9yIDIuMjkuMiByZWxlYXNlCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3dlYnJ0Yy9MaWJXZWJSVENTb2NrZXRDbGll bnQuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy93ZWJydGMvTGliV2ViUlRDU29j a2V0Q2xpZW50LmNwcAppbmRleCA1MTVlODdiOGM3ZTY3YTg1NGRmODhmNDM2ZTdkZDk2N2NmNGI3 Yzc1Li40ZTY0YzExYTQzN2I1MDBiZGI1OTExNjllMzIyYjkwMTIwNWI0MzFmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3dlYnJ0Yy9MaWJXZWJSVENTb2NrZXRDbGll bnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvd2VicnRjL0xpYldlYlJU Q1NvY2tldENsaWVudC5jcHAKQEAgLTM4LDExICszOCwxMiBAQAogCiBuYW1lc3BhY2UgV2ViS2l0 IHsKIAotTGliV2ViUlRDU29ja2V0Q2xpZW50OjpMaWJXZWJSVENTb2NrZXRDbGllbnQoV2ViQ29y ZTo6TGliV2ViUlRDU29ja2V0SWRlbnRpZmllciBpZGVudGlmaWVyLCBOZXR3b3JrUlRDUHJvdmlk ZXImIHJ0Y1Byb3ZpZGVyLCBzdGQ6OnVuaXF1ZV9wdHI8cnRjOjpBc3luY1BhY2tldFNvY2tldD4m JiBzb2NrZXQsIFR5cGUgdHlwZSkKK0xpYldlYlJUQ1NvY2tldENsaWVudDo6TGliV2ViUlRDU29j a2V0Q2xpZW50KFdlYkNvcmU6OkxpYldlYlJUQ1NvY2tldElkZW50aWZpZXIgaWRlbnRpZmllciwg TmV0d29ya1JUQ1Byb3ZpZGVyJiBydGNQcm92aWRlciwgc3RkOjp1bmlxdWVfcHRyPHJ0Yzo6QXN5 bmNQYWNrZXRTb2NrZXQ+JiYgc29ja2V0LCBUeXBlIHR5cGUsIFJlZjxJUEM6OkNvbm5lY3Rpb24+ JiYgY29ubmVjdGlvbikKICAgICA6IG1faWRlbnRpZmllcihpZGVudGlmaWVyKQogICAgICwgbV90 eXBlKHR5cGUpCiAgICAgLCBtX3J0Y1Byb3ZpZGVyKHJ0Y1Byb3ZpZGVyKQogICAgICwgbV9zb2Nr ZXQoV1RGTW92ZShzb2NrZXQpKQorICAgICwgbV9jb25uZWN0aW9uKFdURk1vdmUoY29ubmVjdGlv bikpCiB7CiAgICAgQVNTRVJUKG1fc29ja2V0KTsKIApAQCAtOTcsMTkgKzk4LDE0IEBAIHZvaWQg TGliV2ViUlRDU29ja2V0Q2xpZW50OjpzZXRPcHRpb24oaW50IG9wdGlvbiwgaW50IHZhbHVlKQog dm9pZCBMaWJXZWJSVENTb2NrZXRDbGllbnQ6OnNpZ25hbFJlYWRQYWNrZXQocnRjOjpBc3luY1Bh Y2tldFNvY2tldCogc29ja2V0LCBjb25zdCBjaGFyKiB2YWx1ZSwgc2l6ZV90IGxlbmd0aCwgY29u c3QgcnRjOjpTb2NrZXRBZGRyZXNzJiBhZGRyZXNzLCBjb25zdCBydGM6OlBhY2tldFRpbWUmIHBh Y2tldFRpbWUpCiB7CiAgICAgQVNTRVJUX1VOVVNFRChzb2NrZXQsIG1fc29ja2V0LmdldCgpID09 IHNvY2tldCk7Ci0gICAgYXV0byBidWZmZXIgPSBXZWJDb3JlOjpTaGFyZWRCdWZmZXI6OmNyZWF0 ZSh2YWx1ZSwgbGVuZ3RoKTsKLSAgICBtX3J0Y1Byb3ZpZGVyLnNlbmRGcm9tTWFpblRocmVhZChb aWRlbnRpZmllciA9IG1faWRlbnRpZmllciwgYnVmZmVyID0gV1RGTW92ZShidWZmZXIpLCBhZGRy ZXNzID0gUlRDTmV0d29yazo6aXNvbGF0ZWRDb3B5KGFkZHJlc3MpLCBwYWNrZXRUaW1lXShJUEM6 OkNvbm5lY3Rpb24mIGNvbm5lY3Rpb24pIHsKLSAgICAgICAgSVBDOjpEYXRhUmVmZXJlbmNlIGRh dGEocmVpbnRlcnByZXRfY2FzdDxjb25zdCB1aW50OF90Kj4oYnVmZmVyLT5kYXRhKCkpLCBidWZm ZXItPnNpemUoKSk7Ci0gICAgICAgIGNvbm5lY3Rpb24uc2VuZChNZXNzYWdlczo6TGliV2ViUlRD TmV0d29yazo6U2lnbmFsUmVhZFBhY2tldChpZGVudGlmaWVyLCBkYXRhLCBSVENOZXR3b3JrOjpJ UEFkZHJlc3MoYWRkcmVzcy5pcGFkZHIoKSksIGFkZHJlc3MucG9ydCgpLCBwYWNrZXRUaW1lKSwg MCk7Ci0gICAgfSk7CisgICAgSVBDOjpEYXRhUmVmZXJlbmNlIGRhdGEocmVpbnRlcnByZXRfY2Fz dDxjb25zdCB1aW50OF90Kj4odmFsdWUpLCBsZW5ndGgpOworICAgIG1fY29ubmVjdGlvbi0+c2Vu ZChNZXNzYWdlczo6TGliV2ViUlRDTmV0d29yazo6U2lnbmFsUmVhZFBhY2tldChtX2lkZW50aWZp ZXIsIGRhdGEsIFJUQ05ldHdvcms6OklQQWRkcmVzcyhhZGRyZXNzLmlwYWRkcigpKSwgYWRkcmVz cy5wb3J0KCksIHBhY2tldFRpbWUpLCAwKTsKIH0KIAogdm9pZCBMaWJXZWJSVENTb2NrZXRDbGll bnQ6OnNpZ25hbFNlbnRQYWNrZXQocnRjOjpBc3luY1BhY2tldFNvY2tldCogc29ja2V0LCBjb25z dCBydGM6OlNlbnRQYWNrZXQmIHNlbnRQYWNrZXQpCiB7CiAgICAgQVNTRVJUX1VOVVNFRChzb2Nr ZXQsIG1fc29ja2V0LmdldCgpID09IHNvY2tldCk7Ci0gICAgbV9ydGNQcm92aWRlci5zZW5kRnJv bU1haW5UaHJlYWQoW2lkZW50aWZpZXIgPSBtX2lkZW50aWZpZXIsIHNlbnRQYWNrZXRdKElQQzo6 Q29ubmVjdGlvbiYgY29ubmVjdGlvbikgewotICAgICAgICBjb25uZWN0aW9uLnNlbmQoTWVzc2Fn ZXM6OkxpYldlYlJUQ05ldHdvcms6OlNpZ25hbFNlbnRQYWNrZXQoaWRlbnRpZmllciwgc2VudFBh Y2tldC5wYWNrZXRfaWQsIHNlbnRQYWNrZXQuc2VuZF90aW1lX21zKSwgMCk7Ci0gICAgfSk7Cisg ICAgbV9jb25uZWN0aW9uLT5zZW5kKE1lc3NhZ2VzOjpMaWJXZWJSVENOZXR3b3JrOjpTaWduYWxT ZW50UGFja2V0KG1faWRlbnRpZmllciwgc2VudFBhY2tldC5wYWNrZXRfaWQsIHNlbnRQYWNrZXQu c2VuZF90aW1lX21zKSwgMCk7CiB9CiAKIHZvaWQgTGliV2ViUlRDU29ja2V0Q2xpZW50OjpzaWdu YWxOZXdDb25uZWN0aW9uKHJ0Yzo6QXN5bmNQYWNrZXRTb2NrZXQqIHNvY2tldCwgcnRjOjpBc3lu Y1BhY2tldFNvY2tldCogbmV3U29ja2V0KQpAQCAtMTIxLDkgKzExNyw3IEBAIHZvaWQgTGliV2Vi UlRDU29ja2V0Q2xpZW50OjpzaWduYWxOZXdDb25uZWN0aW9uKHJ0Yzo6QXN5bmNQYWNrZXRTb2Nr ZXQqIHNvY2tldCwKIHZvaWQgTGliV2ViUlRDU29ja2V0Q2xpZW50OjpzaWduYWxBZGRyZXNzUmVh ZHkocnRjOjpBc3luY1BhY2tldFNvY2tldCogc29ja2V0LCBjb25zdCBydGM6OlNvY2tldEFkZHJl c3MmIGFkZHJlc3MpCiB7CiAgICAgQVNTRVJUX1VOVVNFRChzb2NrZXQsIG1fc29ja2V0LmdldCgp ID09IHNvY2tldCk7Ci0gICAgbV9ydGNQcm92aWRlci5zZW5kRnJvbU1haW5UaHJlYWQoW2lkZW50 aWZpZXIgPSBtX2lkZW50aWZpZXIsIGFkZHJlc3MgPSBSVENOZXR3b3JrOjppc29sYXRlZENvcHko YWRkcmVzcyldKElQQzo6Q29ubmVjdGlvbiYgY29ubmVjdGlvbikgewotICAgICAgICBjb25uZWN0 aW9uLnNlbmQoTWVzc2FnZXM6OkxpYldlYlJUQ05ldHdvcms6OlNpZ25hbEFkZHJlc3NSZWFkeShp ZGVudGlmaWVyLCBSVENOZXR3b3JrOjpTb2NrZXRBZGRyZXNzKGFkZHJlc3MpKSwgMCk7Ci0gICAg fSk7CisgICAgbV9jb25uZWN0aW9uLT5zZW5kKE1lc3NhZ2VzOjpMaWJXZWJSVENOZXR3b3JrOjpT aWduYWxBZGRyZXNzUmVhZHkobV9pZGVudGlmaWVyLCBSVENOZXR3b3JrOjpTb2NrZXRBZGRyZXNz KGFkZHJlc3MpKSwgMCk7CiB9CiAKIHZvaWQgTGliV2ViUlRDU29ja2V0Q2xpZW50OjpzaWduYWxB ZGRyZXNzUmVhZHkoKQpAQCAtMTM0LDE3ICsxMjgsMTQgQEAgdm9pZCBMaWJXZWJSVENTb2NrZXRD bGllbnQ6OnNpZ25hbEFkZHJlc3NSZWFkeSgpCiB2b2lkIExpYldlYlJUQ1NvY2tldENsaWVudDo6 c2lnbmFsQ29ubmVjdChydGM6OkFzeW5jUGFja2V0U29ja2V0KiBzb2NrZXQpCiB7CiAgICAgQVNT RVJUX1VOVVNFRChzb2NrZXQsIG1fc29ja2V0LmdldCgpID09IHNvY2tldCk7Ci0gICAgbV9ydGNQ cm92aWRlci5zZW5kRnJvbU1haW5UaHJlYWQoW2lkZW50aWZpZXIgPSBtX2lkZW50aWZpZXJdKElQ Qzo6Q29ubmVjdGlvbiYgY29ubmVjdGlvbikgewotICAgICAgICBjb25uZWN0aW9uLnNlbmQoTWVz c2FnZXM6OkxpYldlYlJUQ05ldHdvcms6OlNpZ25hbENvbm5lY3QoaWRlbnRpZmllciksIDApOwot ICAgIH0pOworICAgIG1fY29ubmVjdGlvbi0+c2VuZChNZXNzYWdlczo6TGliV2ViUlRDTmV0d29y azo6U2lnbmFsQ29ubmVjdChtX2lkZW50aWZpZXIpLCAwKTsKIH0KIAogdm9pZCBMaWJXZWJSVENT b2NrZXRDbGllbnQ6OnNpZ25hbENsb3NlKHJ0Yzo6QXN5bmNQYWNrZXRTb2NrZXQqIHNvY2tldCwg aW50IGVycm9yKQogewogICAgIEFTU0VSVF9VTlVTRUQoc29ja2V0LCBtX3NvY2tldC5nZXQoKSA9 PSBzb2NrZXQpOwotICAgIG1fcnRjUHJvdmlkZXIuc2VuZEZyb21NYWluVGhyZWFkKFtpZGVudGlm aWVyID0gbV9pZGVudGlmaWVyLCBlcnJvcl0oSVBDOjpDb25uZWN0aW9uJiBjb25uZWN0aW9uKSB7 Ci0gICAgICAgIGNvbm5lY3Rpb24uc2VuZChNZXNzYWdlczo6TGliV2ViUlRDTmV0d29yazo6U2ln bmFsQ2xvc2UoaWRlbnRpZmllciwgZXJyb3IpLCAwKTsKLSAgICB9KTsKKyAgICBtX2Nvbm5lY3Rp b24tPnNlbmQoTWVzc2FnZXM6OkxpYldlYlJUQ05ldHdvcms6OlNpZ25hbENsb3NlKG1faWRlbnRp ZmllciwgZXJyb3IpLCAwKTsKKwogICAgIC8vIFdlIHdhbnQgdG8gcmVtb3ZlICd0aGlzJyBmcm9t IHRoZSBzb2NrZXQgbWFwIG5vdyBidXQgd2Ugd2lsbCBkZXN0cm95IGl0IGFzeW5jaHJvbm91c2x5 CiAgICAgLy8gc28gdGhhdCB0aGUgc29ja2V0IHBhcmFtZXRlciBvZiBzaWduYWxDbG9zZSByZW1h aW5zIGFsaXZlIGFzIHRoZSBjYWxsZXIgb2Ygc2lnbmFsQ2xvc2UgbWF5IGFjdHVhbGx5IGJlaW5n IHVzaW5nIGl0IGFmdGVyd2FyZHMuCiAgICAgbV9ydGNQcm92aWRlci5jYWxsT25SVENOZXR3b3Jr VGhyZWFkKFtzb2NrZXQgPSBtX3J0Y1Byb3ZpZGVyLnRha2VTb2NrZXQobV9pZGVudGlmaWVyKV0g eyB9KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvd2VicnRjL0xp YldlYlJUQ1NvY2tldENsaWVudC5oIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy93ZWJy dGMvTGliV2ViUlRDU29ja2V0Q2xpZW50LmgKaW5kZXggNWI3Y2M1MGQzZTg1NjYwZDU5M2VmN2Fk ZTBmYzZhZTFhZGZjMjYwOC4uYWM5YWI2MjBjNzdhMDNiNDg4NWU1ODMyNTFmMGExMWRjNzVmZGJk OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy93ZWJydGMvTGliV2Vi UlRDU29ja2V0Q2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy93ZWJy dGMvTGliV2ViUlRDU29ja2V0Q2xpZW50LmgKQEAgLTQxLDcgKzQxLDcgQEAgbmFtZXNwYWNlIFdl YktpdCB7CiBjbGFzcyBMaWJXZWJSVENTb2NrZXRDbGllbnQgZmluYWwgOiBwdWJsaWMgTmV0d29y a1JUQ1Byb3ZpZGVyOjpTb2NrZXQsIHB1YmxpYyBzaWdzbG90OjpoYXNfc2xvdHM8PiB7CiAgICAg V1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiBwdWJsaWM6Ci0gICAgTGliV2ViUlRDU29ja2V0Q2xp ZW50KFdlYkNvcmU6OkxpYldlYlJUQ1NvY2tldElkZW50aWZpZXIsIE5ldHdvcmtSVENQcm92aWRl ciYsIHN0ZDo6dW5pcXVlX3B0cjxydGM6OkFzeW5jUGFja2V0U29ja2V0PiYmLCBUeXBlKTsKKyAg ICBMaWJXZWJSVENTb2NrZXRDbGllbnQoV2ViQ29yZTo6TGliV2ViUlRDU29ja2V0SWRlbnRpZmll ciwgTmV0d29ya1JUQ1Byb3ZpZGVyJiwgc3RkOjp1bmlxdWVfcHRyPHJ0Yzo6QXN5bmNQYWNrZXRT b2NrZXQ+JiYsIFR5cGUsIFJlZjxJUEM6OkNvbm5lY3Rpb24+JiYpOwogCiBwcml2YXRlOgogICAg IFdlYkNvcmU6OkxpYldlYlJUQ1NvY2tldElkZW50aWZpZXIgaWRlbnRpZmllcigpIGNvbnN0IGZp bmFsIHsgcmV0dXJuIG1faWRlbnRpZmllcjsgfQpAQCAtNjQsNiArNjQsNyBAQCBwcml2YXRlOgog ICAgIFR5cGUgbV90eXBlOwogICAgIE5ldHdvcmtSVENQcm92aWRlciYgbV9ydGNQcm92aWRlcjsK ICAgICBzdGQ6OnVuaXF1ZV9wdHI8cnRjOjpBc3luY1BhY2tldFNvY2tldD4gbV9zb2NrZXQ7Cisg ICAgUmVmPElQQzo6Q29ubmVjdGlvbj4mJiBtX2Nvbm5lY3Rpb247CiAgICAgaW50IG1fc2VuZEVy cm9yIHsgMCB9OwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy93ZWJydGMvTmV0d29ya1JUQ1Byb3ZpZGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3Mvd2VicnRjL05ldHdvcmtSVENQcm92aWRlci5jcHAKaW5kZXggMmEwMDVhZjA3Y2YxNzcz MWJjYzMyYTg5MWFkNjk3NzY4MjBjZGYyYS4uOTc5Y2M1MzViNDY0OTMxYWU0NDE2OWFiNmNjNWQ5 YTkyZDcyOWExMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy93ZWJy dGMvTmV0d29ya1JUQ1Byb3ZpZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL3dlYnJ0Yy9OZXR3b3JrUlRDUHJvdmlkZXIuY3BwCkBAIC0xMTMsMjMgKzExMywyMSBAQCB2 b2lkIE5ldHdvcmtSVENQcm92aWRlcjo6Y2xvc2UoKQogICAgIH0pOwogfQogCi12b2lkIE5ldHdv cmtSVENQcm92aWRlcjo6Y3JlYXRlU29ja2V0KExpYldlYlJUQ1NvY2tldElkZW50aWZpZXIgaWRl bnRpZmllciwgc3RkOjp1bmlxdWVfcHRyPHJ0Yzo6QXN5bmNQYWNrZXRTb2NrZXQ+JiYgc29ja2V0 LCBTb2NrZXQ6OlR5cGUgdHlwZSkKK3ZvaWQgTmV0d29ya1JUQ1Byb3ZpZGVyOjpjcmVhdGVTb2Nr ZXQoTGliV2ViUlRDU29ja2V0SWRlbnRpZmllciBpZGVudGlmaWVyLCBzdGQ6OnVuaXF1ZV9wdHI8 cnRjOjpBc3luY1BhY2tldFNvY2tldD4mJiBzb2NrZXQsIFNvY2tldDo6VHlwZSB0eXBlLCBSZWY8 SVBDOjpDb25uZWN0aW9uPiYmIGNvbm5lY3Rpb24pCiB7CiAgICAgaWYgKCFzb2NrZXQpIHsKLSAg ICAgICAgc2VuZEZyb21NYWluVGhyZWFkKFt0aGlzLCBpZGVudGlmaWVyLCBzaXplID0gbV9zb2Nr ZXRzLnNpemUoKV0oSVBDOjpDb25uZWN0aW9uJiBjb25uZWN0aW9uKSB7Ci0gICAgICAgICAgICBS RUxFQVNFX0xPR19FUlJPUl9JRl9BTExPV0VEKCJjcmVhdGVTb2NrZXQgd2l0aCAldSBzb2NrZXRz IGlzIHVuYWJsZSB0byBjcmVhdGUgYSBuZXcgc29ja2V0Iiwgc2l6ZSk7Ci0gICAgICAgICAgICBj b25uZWN0aW9uLnNlbmQoTWVzc2FnZXM6OkxpYldlYlJUQ05ldHdvcms6OlNpZ25hbENsb3NlKGlk ZW50aWZpZXIsIDEpLCAwKTsKLSAgICAgICAgfSk7CisgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9S X0lGX0FMTE9XRUQoImNyZWF0ZVNvY2tldCB3aXRoICV1IHNvY2tldHMgaXMgdW5hYmxlIHRvIGNy ZWF0ZSBhIG5ldyBzb2NrZXQiLCBtX3NvY2tldHMuc2l6ZSgpKTsKKyAgICAgICAgY29ubmVjdGlv bi0+c2VuZChNZXNzYWdlczo6TGliV2ViUlRDTmV0d29yazo6U2lnbmFsQ2xvc2UoaWRlbnRpZmll ciwgMSksIDApOwogICAgICAgICByZXR1cm47CiAgICAgfQotICAgIGFkZFNvY2tldChpZGVudGlm aWVyLCBtYWtlVW5pcXVlPExpYldlYlJUQ1NvY2tldENsaWVudD4oaWRlbnRpZmllciwgKnRoaXMs IFdURk1vdmUoc29ja2V0KSwgdHlwZSkpOworICAgIGFkZFNvY2tldChpZGVudGlmaWVyLCBtYWtl VW5pcXVlPExpYldlYlJUQ1NvY2tldENsaWVudD4oaWRlbnRpZmllciwgKnRoaXMsIFdURk1vdmUo c29ja2V0KSwgdHlwZSwgV1RGTW92ZShjb25uZWN0aW9uKSkpOwogfQogCiB2b2lkIE5ldHdvcmtS VENQcm92aWRlcjo6Y3JlYXRlVURQU29ja2V0KExpYldlYlJUQ1NvY2tldElkZW50aWZpZXIgaWRl bnRpZmllciwgY29uc3QgUlRDTmV0d29yazo6U29ja2V0QWRkcmVzcyYgYWRkcmVzcywgdWludDE2 X3QgbWluUG9ydCwgdWludDE2X3QgbWF4UG9ydCkKIHsKLSAgICBjYWxsT25SVENOZXR3b3JrVGhy ZWFkKFt0aGlzLCBpZGVudGlmaWVyLCBhZGRyZXNzID0gUlRDTmV0d29yazo6aXNvbGF0ZWRDb3B5 KGFkZHJlc3MudmFsdWUpLCBtaW5Qb3J0LCBtYXhQb3J0XSgpIHsKKyAgICBjYWxsT25SVENOZXR3 b3JrVGhyZWFkKFt0aGlzLCBpZGVudGlmaWVyLCBhZGRyZXNzID0gUlRDTmV0d29yazo6aXNvbGF0 ZWRDb3B5KGFkZHJlc3MudmFsdWUpLCBtaW5Qb3J0LCBtYXhQb3J0LCBjb25uZWN0aW9uID0gbWFr ZVJlZihtX2Nvbm5lY3Rpb24tPmNvbm5lY3Rpb24oKSldKCkgbXV0YWJsZSB7CiAgICAgICAgIHN0 ZDo6dW5pcXVlX3B0cjxydGM6OkFzeW5jUGFja2V0U29ja2V0PiBzb2NrZXQobV9wYWNrZXRTb2Nr ZXRGYWN0b3J5LT5DcmVhdGVVZHBTb2NrZXQoYWRkcmVzcywgbWluUG9ydCwgbWF4UG9ydCkpOwot ICAgICAgICBjcmVhdGVTb2NrZXQoaWRlbnRpZmllciwgV1RGTW92ZShzb2NrZXQpLCBTb2NrZXQ6 OlR5cGU6OlVEUCk7CisgICAgICAgIGNyZWF0ZVNvY2tldChpZGVudGlmaWVyLCBXVEZNb3ZlKHNv Y2tldCksIFNvY2tldDo6VHlwZTo6VURQLCBXVEZNb3ZlKGNvbm5lY3Rpb24pKTsKICAgICB9KTsK IH0KIApAQCAtMTQxLDkgKzEzOSw5IEBAIHZvaWQgTmV0d29ya1JUQ1Byb3ZpZGVyOjpjcmVhdGVT ZXJ2ZXJUQ1BTb2NrZXQoTGliV2ViUlRDU29ja2V0SWRlbnRpZmllciBpZGVudGlmCiAgICAgICAg IHJldHVybjsKICAgICB9CiAKLSAgICBjYWxsT25SVENOZXR3b3JrVGhyZWFkKFt0aGlzLCBpZGVu dGlmaWVyLCBhZGRyZXNzID0gUlRDTmV0d29yazo6aXNvbGF0ZWRDb3B5KGFkZHJlc3MudmFsdWUp LCBtaW5Qb3J0LCBtYXhQb3J0LCBvcHRpb25zXSgpIHsKKyAgICBjYWxsT25SVENOZXR3b3JrVGhy ZWFkKFt0aGlzLCBpZGVudGlmaWVyLCBhZGRyZXNzID0gUlRDTmV0d29yazo6aXNvbGF0ZWRDb3B5 KGFkZHJlc3MudmFsdWUpLCBtaW5Qb3J0LCBtYXhQb3J0LCBvcHRpb25zLCBjb25uZWN0aW9uID0g bWFrZVJlZihtX2Nvbm5lY3Rpb24tPmNvbm5lY3Rpb24oKSldKCkgbXV0YWJsZSB7CiAgICAgICAg IHN0ZDo6dW5pcXVlX3B0cjxydGM6OkFzeW5jUGFja2V0U29ja2V0PiBzb2NrZXQobV9wYWNrZXRT b2NrZXRGYWN0b3J5LT5DcmVhdGVTZXJ2ZXJUY3BTb2NrZXQoYWRkcmVzcywgbWluUG9ydCwgbWF4 UG9ydCwgb3B0aW9ucykpOwotICAgICAgICBjcmVhdGVTb2NrZXQoaWRlbnRpZmllciwgV1RGTW92 ZShzb2NrZXQpLCBTb2NrZXQ6OlR5cGU6OlNlcnZlclRDUCk7CisgICAgICAgIGNyZWF0ZVNvY2tl dChpZGVudGlmaWVyLCBXVEZNb3ZlKHNvY2tldCksIFNvY2tldDo6VHlwZTo6U2VydmVyVENQLCBX VEZNb3ZlKGNvbm5lY3Rpb24pKTsKICAgICB9KTsKIH0KIApAQCAtMTYxLDIxICsxNTksMjEgQEAg dm9pZCBOZXR3b3JrUlRDUHJvdmlkZXI6OmNyZWF0ZUNsaWVudFRDUFNvY2tldChMaWJXZWJSVENT b2NrZXRJZGVudGlmaWVyIGlkZW50aWYKICAgICAgICAgbV9jb25uZWN0aW9uLT5jb25uZWN0aW9u KCkuc2VuZChNZXNzYWdlczo6TGliV2ViUlRDTmV0d29yazo6U2lnbmFsQ2xvc2UoaWRlbnRpZmll ciwgMSksIDApOwogICAgICAgICByZXR1cm47CiAgICAgfQotICAgIGNhbGxPblJUQ05ldHdvcmtU aHJlYWQoW3RoaXMsIGlkZW50aWZpZXIsIGxvY2FsQWRkcmVzcyA9IFJUQ05ldHdvcms6Omlzb2xh dGVkQ29weShsb2NhbEFkZHJlc3MudmFsdWUpLCByZW1vdGVBZGRyZXNzID0gUlRDTmV0d29yazo6 aXNvbGF0ZWRDb3B5KHJlbW90ZUFkZHJlc3MudmFsdWUpLCBwcm94eUluZm8gPSBwcm94eUluZm9G cm9tU2Vzc2lvbihyZW1vdGVBZGRyZXNzLCAqc2Vzc2lvbiksIHVzZXJBZ2VudCA9IFdURk1vdmUo dXNlckFnZW50KS5pc29sYXRlZENvcHkoKSwgb3B0aW9uc10oKSB7CisgICAgY2FsbE9uUlRDTmV0 d29ya1RocmVhZChbdGhpcywgaWRlbnRpZmllciwgbG9jYWxBZGRyZXNzID0gUlRDTmV0d29yazo6 aXNvbGF0ZWRDb3B5KGxvY2FsQWRkcmVzcy52YWx1ZSksIHJlbW90ZUFkZHJlc3MgPSBSVENOZXR3 b3JrOjppc29sYXRlZENvcHkocmVtb3RlQWRkcmVzcy52YWx1ZSksIHByb3h5SW5mbyA9IHByb3h5 SW5mb0Zyb21TZXNzaW9uKHJlbW90ZUFkZHJlc3MsICpzZXNzaW9uKSwgdXNlckFnZW50ID0gV1RG TW92ZSh1c2VyQWdlbnQpLmlzb2xhdGVkQ29weSgpLCBvcHRpb25zLCBjb25uZWN0aW9uID0gbWFr ZVJlZihtX2Nvbm5lY3Rpb24tPmNvbm5lY3Rpb24oKSldKCkgbXV0YWJsZSB7CiAgICAgICAgIHJ0 Yzo6UGFja2V0U29ja2V0VGNwT3B0aW9ucyB0Y3BPcHRpb25zOwogICAgICAgICB0Y3BPcHRpb25z Lm9wdHMgPSBvcHRpb25zOwogICAgICAgICBzdGQ6OnVuaXF1ZV9wdHI8cnRjOjpBc3luY1BhY2tl dFNvY2tldD4gc29ja2V0KG1fcGFja2V0U29ja2V0RmFjdG9yeS0+Q3JlYXRlQ2xpZW50VGNwU29j a2V0KGxvY2FsQWRkcmVzcywgcmVtb3RlQWRkcmVzcywgcHJveHlJbmZvLCB1c2VyQWdlbnQudXRm OCgpLmRhdGEoKSwgdGNwT3B0aW9ucykpOwotICAgICAgICBjcmVhdGVTb2NrZXQoaWRlbnRpZmll ciwgV1RGTW92ZShzb2NrZXQpLCBTb2NrZXQ6OlR5cGU6OkNsaWVudFRDUCk7CisgICAgICAgIGNy ZWF0ZVNvY2tldChpZGVudGlmaWVyLCBXVEZNb3ZlKHNvY2tldCksIFNvY2tldDo6VHlwZTo6Q2xp ZW50VENQLCBXVEZNb3ZlKGNvbm5lY3Rpb24pKTsKICAgICB9KTsKIH0KIAogdm9pZCBOZXR3b3Jr UlRDUHJvdmlkZXI6OndyYXBOZXdUQ1BDb25uZWN0aW9uKExpYldlYlJUQ1NvY2tldElkZW50aWZp ZXIgaWRlbnRpZmllciwgTGliV2ViUlRDU29ja2V0SWRlbnRpZmllciBuZXdDb25uZWN0aW9uU29j a2V0SWRlbnRpZmllcikKIHsKLSAgICBjYWxsT25SVENOZXR3b3JrVGhyZWFkKFt0aGlzLCBpZGVu dGlmaWVyLCBuZXdDb25uZWN0aW9uU29ja2V0SWRlbnRpZmllcl0oKSB7CisgICAgY2FsbE9uUlRD TmV0d29ya1RocmVhZChbdGhpcywgaWRlbnRpZmllciwgbmV3Q29ubmVjdGlvblNvY2tldElkZW50 aWZpZXIsIGNvbm5lY3Rpb24gPSBtYWtlUmVmKG1fY29ubmVjdGlvbi0+Y29ubmVjdGlvbigpKV0o KSBtdXRhYmxlIHsKICAgICAgICAgYXV0byBzb2NrZXQgPSBtX3BlbmRpbmdJbmNvbWluZ1NvY2tl dHMudGFrZShuZXdDb25uZWN0aW9uU29ja2V0SWRlbnRpZmllcik7CiAgICAgICAgIFJFTEVBU0Vf TE9HX0lGKCFzb2NrZXQsIFdlYlJUQywgIk5ldHdvcmtSVENQcm92aWRlcjo6d3JhcE5ld1RDUENv bm5lY3Rpb24gcmVjZWl2ZWQgYW4gaW52YWxpZCBzb2NrZXQgaWRlbnRpZmllciIpOwogICAgICAg ICBpZiAoc29ja2V0KQotICAgICAgICAgICAgYWRkU29ja2V0KGlkZW50aWZpZXIsIG1ha2VVbmlx dWU8TGliV2ViUlRDU29ja2V0Q2xpZW50PihpZGVudGlmaWVyLCAqdGhpcywgV1RGTW92ZShzb2Nr ZXQpLCBTb2NrZXQ6OlR5cGU6OlNlcnZlckNvbm5lY3Rpb25UQ1ApKTsKKyAgICAgICAgICAgIGFk ZFNvY2tldChpZGVudGlmaWVyLCBtYWtlVW5pcXVlPExpYldlYlJUQ1NvY2tldENsaWVudD4oaWRl bnRpZmllciwgKnRoaXMsIFdURk1vdmUoc29ja2V0KSwgU29ja2V0OjpUeXBlOjpTZXJ2ZXJDb25u ZWN0aW9uVENQLCBXVEZNb3ZlKGNvbm5lY3Rpb24pKSk7CiAgICAgfSk7CiB9CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvd2VicnRjL05ldHdvcmtSVENQcm92aWRl ci5oIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy93ZWJydGMvTmV0d29ya1JUQ1Byb3Zp ZGVyLmgKaW5kZXggYzhkN2NmNGIzNzBmZTNjNTdkNTMxMTMxYzU5Njg4NGJhYjI3NDMyNC4uMmVj MjBkMTMwZGJhODViNWMzMzMxZDcyZGU2OGFhYWY2ZGQ5YzE5NCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy93ZWJydGMvTmV0d29ya1JUQ1Byb3ZpZGVyLmgKKysrIGIv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy93ZWJydGMvTmV0d29ya1JUQ1Byb3ZpZGVyLmgK QEAgLTExMCw3ICsxMTAsNyBAQCBwcml2YXRlOgogCiAgICAgdm9pZCBhZGRTb2NrZXQoV2ViQ29y ZTo6TGliV2ViUlRDU29ja2V0SWRlbnRpZmllciwgc3RkOjp1bmlxdWVfcHRyPFNvY2tldD4mJik7 CiAKLSAgICB2b2lkIGNyZWF0ZVNvY2tldChXZWJDb3JlOjpMaWJXZWJSVENTb2NrZXRJZGVudGlm aWVyLCBzdGQ6OnVuaXF1ZV9wdHI8cnRjOjpBc3luY1BhY2tldFNvY2tldD4mJiwgU29ja2V0OjpU eXBlKTsKKyAgICB2b2lkIGNyZWF0ZVNvY2tldChXZWJDb3JlOjpMaWJXZWJSVENTb2NrZXRJZGVu dGlmaWVyLCBzdGQ6OnVuaXF1ZV9wdHI8cnRjOjpBc3luY1BhY2tldFNvY2tldD4mJiwgU29ja2V0 OjpUeXBlLCBSZWY8SVBDOjpDb25uZWN0aW9uPiYmKTsKIAogICAgIHZvaWQgT25NZXNzYWdlKHJ0 Yzo6TWVzc2FnZSopOwogCg== 402641 2020-06-24 05:44:59 -0700 2020-06-29 08:29:15 -0700 Patch bug-213548-20200624144457.patch text/plain 13751 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzNDUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDlmZTEzYTE2NzUyNmZlNjA5 ZTFiZDU3MWNjYTQwMTkyZjk5OTY0ZjEuLjY4NWNmZWFjMjI0YjMyYjkyOGRkODBkY2RjZDAwNTA1 ZDZjZTJmY2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMjAtMDYtMjQgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIFNlbmQgV2ViUlRDIHBhY2tldHMg cmVjZWl2ZWQgZnJvbSBuZXR3b3JrIHByb2Nlc3MgdG8gd2ViIHByb2Nlc3MgZnJvbSBhIGJhY2tn cm91bmQgdGhyZWFkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMTM1NDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBNYWtlIExpYldlYlJUQ1NvY2tldENsaWVudCB0YWtlIGEgcmVmIHRvIGFuIElQQyBjb25u ZWN0aW9uIGF0IGNyZWF0aW9uIHRpbWUuCisgICAgICAgIFVzZSB0aGlzIGNvbm5lY3Rpb24gZnJv bSB0aGUgUlRDIG5ldHdvcmsgdGhyZWFkIHRvIHNlbmQgcmVjZWl2ZWQgcGFja2V0cyB0byBpbXBy b3ZlIHBlcmZvcm1hbmNlcy4KKyAgICAgICAgQ292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKwor ICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL3dlYnJ0Yy9MaWJXZWJSVENTb2NrZXRDbGllbnQuY3Bw OgorICAgICAgICAoV2ViS2l0OjpMaWJXZWJSVENTb2NrZXRDbGllbnQ6OkxpYldlYlJUQ1NvY2tl dENsaWVudCk6CisgICAgICAgIChXZWJLaXQ6OkxpYldlYlJUQ1NvY2tldENsaWVudDo6c2lnbmFs UmVhZFBhY2tldCk6CisgICAgICAgIChXZWJLaXQ6OkxpYldlYlJUQ1NvY2tldENsaWVudDo6c2ln bmFsU2VudFBhY2tldCk6CisgICAgICAgIChXZWJLaXQ6OkxpYldlYlJUQ1NvY2tldENsaWVudDo6 c2lnbmFsQWRkcmVzc1JlYWR5KToKKyAgICAgICAgKFdlYktpdDo6TGliV2ViUlRDU29ja2V0Q2xp ZW50OjpzaWduYWxDb25uZWN0KToKKyAgICAgICAgKFdlYktpdDo6TGliV2ViUlRDU29ja2V0Q2xp ZW50OjpzaWduYWxDbG9zZSk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3Mvd2VicnRjL0xpYldl YlJUQ1NvY2tldENsaWVudC5oOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL3dlYnJ0Yy9OZXR3 b3JrUlRDUHJvdmlkZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUlRDUHJvdmlkZXI6 OmNyZWF0ZVNvY2tldCk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSVENQcm92aWRlcjo6Y3Jl YXRlVURQU29ja2V0KToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1JUQ1Byb3ZpZGVyOjpjcmVh dGVTZXJ2ZXJUQ1BTb2NrZXQpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUlRDUHJvdmlkZXI6 OmNyZWF0ZUNsaWVudFRDUFNvY2tldCk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSVENQcm92 aWRlcjo6d3JhcE5ld1RDUENvbm5lY3Rpb24pOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL3dl YnJ0Yy9OZXR3b3JrUlRDUHJvdmlkZXIuaDoKKwogMjAyMC0wNi0yNCAgQ2FybG9zIEdhcmNpYSBD YW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gVXBkYXRl IE9wdGlvbnNHVEsuY21ha2UgYW5kIE5FV1MgZm9yIDIuMjkuMiByZWxlYXNlCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3dlYnJ0Yy9MaWJXZWJSVENTb2NrZXRDbGll bnQuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy93ZWJydGMvTGliV2ViUlRDU29j a2V0Q2xpZW50LmNwcAppbmRleCA1MTVlODdiOGM3ZTY3YTg1NGRmODhmNDM2ZTdkZDk2N2NmNGI3 Yzc1Li40ZTY0YzExYTQzN2I1MDBiZGI1OTExNjllMzIyYjkwMTIwNWI0MzFmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3dlYnJ0Yy9MaWJXZWJSVENTb2NrZXRDbGll bnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvd2VicnRjL0xpYldlYlJU Q1NvY2tldENsaWVudC5jcHAKQEAgLTM4LDExICszOCwxMiBAQAogCiBuYW1lc3BhY2UgV2ViS2l0 IHsKIAotTGliV2ViUlRDU29ja2V0Q2xpZW50OjpMaWJXZWJSVENTb2NrZXRDbGllbnQoV2ViQ29y ZTo6TGliV2ViUlRDU29ja2V0SWRlbnRpZmllciBpZGVudGlmaWVyLCBOZXR3b3JrUlRDUHJvdmlk ZXImIHJ0Y1Byb3ZpZGVyLCBzdGQ6OnVuaXF1ZV9wdHI8cnRjOjpBc3luY1BhY2tldFNvY2tldD4m JiBzb2NrZXQsIFR5cGUgdHlwZSkKK0xpYldlYlJUQ1NvY2tldENsaWVudDo6TGliV2ViUlRDU29j a2V0Q2xpZW50KFdlYkNvcmU6OkxpYldlYlJUQ1NvY2tldElkZW50aWZpZXIgaWRlbnRpZmllciwg TmV0d29ya1JUQ1Byb3ZpZGVyJiBydGNQcm92aWRlciwgc3RkOjp1bmlxdWVfcHRyPHJ0Yzo6QXN5 bmNQYWNrZXRTb2NrZXQ+JiYgc29ja2V0LCBUeXBlIHR5cGUsIFJlZjxJUEM6OkNvbm5lY3Rpb24+ JiYgY29ubmVjdGlvbikKICAgICA6IG1faWRlbnRpZmllcihpZGVudGlmaWVyKQogICAgICwgbV90 eXBlKHR5cGUpCiAgICAgLCBtX3J0Y1Byb3ZpZGVyKHJ0Y1Byb3ZpZGVyKQogICAgICwgbV9zb2Nr ZXQoV1RGTW92ZShzb2NrZXQpKQorICAgICwgbV9jb25uZWN0aW9uKFdURk1vdmUoY29ubmVjdGlv bikpCiB7CiAgICAgQVNTRVJUKG1fc29ja2V0KTsKIApAQCAtOTcsMTkgKzk4LDE0IEBAIHZvaWQg TGliV2ViUlRDU29ja2V0Q2xpZW50OjpzZXRPcHRpb24oaW50IG9wdGlvbiwgaW50IHZhbHVlKQog dm9pZCBMaWJXZWJSVENTb2NrZXRDbGllbnQ6OnNpZ25hbFJlYWRQYWNrZXQocnRjOjpBc3luY1Bh Y2tldFNvY2tldCogc29ja2V0LCBjb25zdCBjaGFyKiB2YWx1ZSwgc2l6ZV90IGxlbmd0aCwgY29u c3QgcnRjOjpTb2NrZXRBZGRyZXNzJiBhZGRyZXNzLCBjb25zdCBydGM6OlBhY2tldFRpbWUmIHBh Y2tldFRpbWUpCiB7CiAgICAgQVNTRVJUX1VOVVNFRChzb2NrZXQsIG1fc29ja2V0LmdldCgpID09 IHNvY2tldCk7Ci0gICAgYXV0byBidWZmZXIgPSBXZWJDb3JlOjpTaGFyZWRCdWZmZXI6OmNyZWF0 ZSh2YWx1ZSwgbGVuZ3RoKTsKLSAgICBtX3J0Y1Byb3ZpZGVyLnNlbmRGcm9tTWFpblRocmVhZChb aWRlbnRpZmllciA9IG1faWRlbnRpZmllciwgYnVmZmVyID0gV1RGTW92ZShidWZmZXIpLCBhZGRy ZXNzID0gUlRDTmV0d29yazo6aXNvbGF0ZWRDb3B5KGFkZHJlc3MpLCBwYWNrZXRUaW1lXShJUEM6 OkNvbm5lY3Rpb24mIGNvbm5lY3Rpb24pIHsKLSAgICAgICAgSVBDOjpEYXRhUmVmZXJlbmNlIGRh dGEocmVpbnRlcnByZXRfY2FzdDxjb25zdCB1aW50OF90Kj4oYnVmZmVyLT5kYXRhKCkpLCBidWZm ZXItPnNpemUoKSk7Ci0gICAgICAgIGNvbm5lY3Rpb24uc2VuZChNZXNzYWdlczo6TGliV2ViUlRD TmV0d29yazo6U2lnbmFsUmVhZFBhY2tldChpZGVudGlmaWVyLCBkYXRhLCBSVENOZXR3b3JrOjpJ UEFkZHJlc3MoYWRkcmVzcy5pcGFkZHIoKSksIGFkZHJlc3MucG9ydCgpLCBwYWNrZXRUaW1lKSwg MCk7Ci0gICAgfSk7CisgICAgSVBDOjpEYXRhUmVmZXJlbmNlIGRhdGEocmVpbnRlcnByZXRfY2Fz dDxjb25zdCB1aW50OF90Kj4odmFsdWUpLCBsZW5ndGgpOworICAgIG1fY29ubmVjdGlvbi0+c2Vu ZChNZXNzYWdlczo6TGliV2ViUlRDTmV0d29yazo6U2lnbmFsUmVhZFBhY2tldChtX2lkZW50aWZp ZXIsIGRhdGEsIFJUQ05ldHdvcms6OklQQWRkcmVzcyhhZGRyZXNzLmlwYWRkcigpKSwgYWRkcmVz cy5wb3J0KCksIHBhY2tldFRpbWUpLCAwKTsKIH0KIAogdm9pZCBMaWJXZWJSVENTb2NrZXRDbGll bnQ6OnNpZ25hbFNlbnRQYWNrZXQocnRjOjpBc3luY1BhY2tldFNvY2tldCogc29ja2V0LCBjb25z dCBydGM6OlNlbnRQYWNrZXQmIHNlbnRQYWNrZXQpCiB7CiAgICAgQVNTRVJUX1VOVVNFRChzb2Nr ZXQsIG1fc29ja2V0LmdldCgpID09IHNvY2tldCk7Ci0gICAgbV9ydGNQcm92aWRlci5zZW5kRnJv bU1haW5UaHJlYWQoW2lkZW50aWZpZXIgPSBtX2lkZW50aWZpZXIsIHNlbnRQYWNrZXRdKElQQzo6 Q29ubmVjdGlvbiYgY29ubmVjdGlvbikgewotICAgICAgICBjb25uZWN0aW9uLnNlbmQoTWVzc2Fn ZXM6OkxpYldlYlJUQ05ldHdvcms6OlNpZ25hbFNlbnRQYWNrZXQoaWRlbnRpZmllciwgc2VudFBh Y2tldC5wYWNrZXRfaWQsIHNlbnRQYWNrZXQuc2VuZF90aW1lX21zKSwgMCk7Ci0gICAgfSk7Cisg ICAgbV9jb25uZWN0aW9uLT5zZW5kKE1lc3NhZ2VzOjpMaWJXZWJSVENOZXR3b3JrOjpTaWduYWxT ZW50UGFja2V0KG1faWRlbnRpZmllciwgc2VudFBhY2tldC5wYWNrZXRfaWQsIHNlbnRQYWNrZXQu c2VuZF90aW1lX21zKSwgMCk7CiB9CiAKIHZvaWQgTGliV2ViUlRDU29ja2V0Q2xpZW50OjpzaWdu YWxOZXdDb25uZWN0aW9uKHJ0Yzo6QXN5bmNQYWNrZXRTb2NrZXQqIHNvY2tldCwgcnRjOjpBc3lu Y1BhY2tldFNvY2tldCogbmV3U29ja2V0KQpAQCAtMTIxLDkgKzExNyw3IEBAIHZvaWQgTGliV2Vi UlRDU29ja2V0Q2xpZW50OjpzaWduYWxOZXdDb25uZWN0aW9uKHJ0Yzo6QXN5bmNQYWNrZXRTb2Nr ZXQqIHNvY2tldCwKIHZvaWQgTGliV2ViUlRDU29ja2V0Q2xpZW50OjpzaWduYWxBZGRyZXNzUmVh ZHkocnRjOjpBc3luY1BhY2tldFNvY2tldCogc29ja2V0LCBjb25zdCBydGM6OlNvY2tldEFkZHJl c3MmIGFkZHJlc3MpCiB7CiAgICAgQVNTRVJUX1VOVVNFRChzb2NrZXQsIG1fc29ja2V0LmdldCgp ID09IHNvY2tldCk7Ci0gICAgbV9ydGNQcm92aWRlci5zZW5kRnJvbU1haW5UaHJlYWQoW2lkZW50 aWZpZXIgPSBtX2lkZW50aWZpZXIsIGFkZHJlc3MgPSBSVENOZXR3b3JrOjppc29sYXRlZENvcHko YWRkcmVzcyldKElQQzo6Q29ubmVjdGlvbiYgY29ubmVjdGlvbikgewotICAgICAgICBjb25uZWN0 aW9uLnNlbmQoTWVzc2FnZXM6OkxpYldlYlJUQ05ldHdvcms6OlNpZ25hbEFkZHJlc3NSZWFkeShp ZGVudGlmaWVyLCBSVENOZXR3b3JrOjpTb2NrZXRBZGRyZXNzKGFkZHJlc3MpKSwgMCk7Ci0gICAg fSk7CisgICAgbV9jb25uZWN0aW9uLT5zZW5kKE1lc3NhZ2VzOjpMaWJXZWJSVENOZXR3b3JrOjpT aWduYWxBZGRyZXNzUmVhZHkobV9pZGVudGlmaWVyLCBSVENOZXR3b3JrOjpTb2NrZXRBZGRyZXNz KGFkZHJlc3MpKSwgMCk7CiB9CiAKIHZvaWQgTGliV2ViUlRDU29ja2V0Q2xpZW50OjpzaWduYWxB ZGRyZXNzUmVhZHkoKQpAQCAtMTM0LDE3ICsxMjgsMTQgQEAgdm9pZCBMaWJXZWJSVENTb2NrZXRD bGllbnQ6OnNpZ25hbEFkZHJlc3NSZWFkeSgpCiB2b2lkIExpYldlYlJUQ1NvY2tldENsaWVudDo6 c2lnbmFsQ29ubmVjdChydGM6OkFzeW5jUGFja2V0U29ja2V0KiBzb2NrZXQpCiB7CiAgICAgQVNT RVJUX1VOVVNFRChzb2NrZXQsIG1fc29ja2V0LmdldCgpID09IHNvY2tldCk7Ci0gICAgbV9ydGNQ cm92aWRlci5zZW5kRnJvbU1haW5UaHJlYWQoW2lkZW50aWZpZXIgPSBtX2lkZW50aWZpZXJdKElQ Qzo6Q29ubmVjdGlvbiYgY29ubmVjdGlvbikgewotICAgICAgICBjb25uZWN0aW9uLnNlbmQoTWVz c2FnZXM6OkxpYldlYlJUQ05ldHdvcms6OlNpZ25hbENvbm5lY3QoaWRlbnRpZmllciksIDApOwot ICAgIH0pOworICAgIG1fY29ubmVjdGlvbi0+c2VuZChNZXNzYWdlczo6TGliV2ViUlRDTmV0d29y azo6U2lnbmFsQ29ubmVjdChtX2lkZW50aWZpZXIpLCAwKTsKIH0KIAogdm9pZCBMaWJXZWJSVENT b2NrZXRDbGllbnQ6OnNpZ25hbENsb3NlKHJ0Yzo6QXN5bmNQYWNrZXRTb2NrZXQqIHNvY2tldCwg aW50IGVycm9yKQogewogICAgIEFTU0VSVF9VTlVTRUQoc29ja2V0LCBtX3NvY2tldC5nZXQoKSA9 PSBzb2NrZXQpOwotICAgIG1fcnRjUHJvdmlkZXIuc2VuZEZyb21NYWluVGhyZWFkKFtpZGVudGlm aWVyID0gbV9pZGVudGlmaWVyLCBlcnJvcl0oSVBDOjpDb25uZWN0aW9uJiBjb25uZWN0aW9uKSB7 Ci0gICAgICAgIGNvbm5lY3Rpb24uc2VuZChNZXNzYWdlczo6TGliV2ViUlRDTmV0d29yazo6U2ln bmFsQ2xvc2UoaWRlbnRpZmllciwgZXJyb3IpLCAwKTsKLSAgICB9KTsKKyAgICBtX2Nvbm5lY3Rp b24tPnNlbmQoTWVzc2FnZXM6OkxpYldlYlJUQ05ldHdvcms6OlNpZ25hbENsb3NlKG1faWRlbnRp ZmllciwgZXJyb3IpLCAwKTsKKwogICAgIC8vIFdlIHdhbnQgdG8gcmVtb3ZlICd0aGlzJyBmcm9t IHRoZSBzb2NrZXQgbWFwIG5vdyBidXQgd2Ugd2lsbCBkZXN0cm95IGl0IGFzeW5jaHJvbm91c2x5 CiAgICAgLy8gc28gdGhhdCB0aGUgc29ja2V0IHBhcmFtZXRlciBvZiBzaWduYWxDbG9zZSByZW1h aW5zIGFsaXZlIGFzIHRoZSBjYWxsZXIgb2Ygc2lnbmFsQ2xvc2UgbWF5IGFjdHVhbGx5IGJlaW5n IHVzaW5nIGl0IGFmdGVyd2FyZHMuCiAgICAgbV9ydGNQcm92aWRlci5jYWxsT25SVENOZXR3b3Jr VGhyZWFkKFtzb2NrZXQgPSBtX3J0Y1Byb3ZpZGVyLnRha2VTb2NrZXQobV9pZGVudGlmaWVyKV0g eyB9KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvd2VicnRjL0xp YldlYlJUQ1NvY2tldENsaWVudC5oIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy93ZWJy dGMvTGliV2ViUlRDU29ja2V0Q2xpZW50LmgKaW5kZXggNWI3Y2M1MGQzZTg1NjYwZDU5M2VmN2Fk ZTBmYzZhZTFhZGZjMjYwOC4uOGUzZjQ4MDY1YmYwMDk5Y2E5M2M2ZTRkYzE0ZWZiNTMyZTU4ZjZh NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy93ZWJydGMvTGliV2Vi UlRDU29ja2V0Q2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy93ZWJy dGMvTGliV2ViUlRDU29ja2V0Q2xpZW50LmgKQEAgLTQxLDcgKzQxLDcgQEAgbmFtZXNwYWNlIFdl YktpdCB7CiBjbGFzcyBMaWJXZWJSVENTb2NrZXRDbGllbnQgZmluYWwgOiBwdWJsaWMgTmV0d29y a1JUQ1Byb3ZpZGVyOjpTb2NrZXQsIHB1YmxpYyBzaWdzbG90OjpoYXNfc2xvdHM8PiB7CiAgICAg V1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiBwdWJsaWM6Ci0gICAgTGliV2ViUlRDU29ja2V0Q2xp ZW50KFdlYkNvcmU6OkxpYldlYlJUQ1NvY2tldElkZW50aWZpZXIsIE5ldHdvcmtSVENQcm92aWRl ciYsIHN0ZDo6dW5pcXVlX3B0cjxydGM6OkFzeW5jUGFja2V0U29ja2V0PiYmLCBUeXBlKTsKKyAg ICBMaWJXZWJSVENTb2NrZXRDbGllbnQoV2ViQ29yZTo6TGliV2ViUlRDU29ja2V0SWRlbnRpZmll ciwgTmV0d29ya1JUQ1Byb3ZpZGVyJiwgc3RkOjp1bmlxdWVfcHRyPHJ0Yzo6QXN5bmNQYWNrZXRT b2NrZXQ+JiYsIFR5cGUsIFJlZjxJUEM6OkNvbm5lY3Rpb24+JiYpOwogCiBwcml2YXRlOgogICAg IFdlYkNvcmU6OkxpYldlYlJUQ1NvY2tldElkZW50aWZpZXIgaWRlbnRpZmllcigpIGNvbnN0IGZp bmFsIHsgcmV0dXJuIG1faWRlbnRpZmllcjsgfQpAQCAtNjQsNiArNjQsNyBAQCBwcml2YXRlOgog ICAgIFR5cGUgbV90eXBlOwogICAgIE5ldHdvcmtSVENQcm92aWRlciYgbV9ydGNQcm92aWRlcjsK ICAgICBzdGQ6OnVuaXF1ZV9wdHI8cnRjOjpBc3luY1BhY2tldFNvY2tldD4gbV9zb2NrZXQ7Cisg ICAgUmVmPElQQzo6Q29ubmVjdGlvbj4gbV9jb25uZWN0aW9uOwogICAgIGludCBtX3NlbmRFcnJv ciB7IDAgfTsKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv d2VicnRjL05ldHdvcmtSVENQcm92aWRlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL3dlYnJ0Yy9OZXR3b3JrUlRDUHJvdmlkZXIuY3BwCmluZGV4IDJhMDA1YWYwN2NmMTc3MzFi Y2MzMmE4OTFhZDY5Nzc2ODIwY2RmMmEuLjk3OWNjNTM1YjQ2NDkzMWFlNDQxNjlhYjZjYzVkOWE5 MmQ3MjlhMTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvd2VicnRj L05ldHdvcmtSVENQcm92aWRlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy93ZWJydGMvTmV0d29ya1JUQ1Byb3ZpZGVyLmNwcApAQCAtMTEzLDIzICsxMTMsMjEgQEAgdm9p ZCBOZXR3b3JrUlRDUHJvdmlkZXI6OmNsb3NlKCkKICAgICB9KTsKIH0KIAotdm9pZCBOZXR3b3Jr UlRDUHJvdmlkZXI6OmNyZWF0ZVNvY2tldChMaWJXZWJSVENTb2NrZXRJZGVudGlmaWVyIGlkZW50 aWZpZXIsIHN0ZDo6dW5pcXVlX3B0cjxydGM6OkFzeW5jUGFja2V0U29ja2V0PiYmIHNvY2tldCwg U29ja2V0OjpUeXBlIHR5cGUpCit2b2lkIE5ldHdvcmtSVENQcm92aWRlcjo6Y3JlYXRlU29ja2V0 KExpYldlYlJUQ1NvY2tldElkZW50aWZpZXIgaWRlbnRpZmllciwgc3RkOjp1bmlxdWVfcHRyPHJ0 Yzo6QXN5bmNQYWNrZXRTb2NrZXQ+JiYgc29ja2V0LCBTb2NrZXQ6OlR5cGUgdHlwZSwgUmVmPElQ Qzo6Q29ubmVjdGlvbj4mJiBjb25uZWN0aW9uKQogewogICAgIGlmICghc29ja2V0KSB7Ci0gICAg ICAgIHNlbmRGcm9tTWFpblRocmVhZChbdGhpcywgaWRlbnRpZmllciwgc2l6ZSA9IG1fc29ja2V0 cy5zaXplKCldKElQQzo6Q29ubmVjdGlvbiYgY29ubmVjdGlvbikgewotICAgICAgICAgICAgUkVM RUFTRV9MT0dfRVJST1JfSUZfQUxMT1dFRCgiY3JlYXRlU29ja2V0IHdpdGggJXUgc29ja2V0cyBp cyB1bmFibGUgdG8gY3JlYXRlIGEgbmV3IHNvY2tldCIsIHNpemUpOwotICAgICAgICAgICAgY29u bmVjdGlvbi5zZW5kKE1lc3NhZ2VzOjpMaWJXZWJSVENOZXR3b3JrOjpTaWduYWxDbG9zZShpZGVu dGlmaWVyLCAxKSwgMCk7Ci0gICAgICAgIH0pOworICAgICAgICBSRUxFQVNFX0xPR19FUlJPUl9J Rl9BTExPV0VEKCJjcmVhdGVTb2NrZXQgd2l0aCAldSBzb2NrZXRzIGlzIHVuYWJsZSB0byBjcmVh dGUgYSBuZXcgc29ja2V0IiwgbV9zb2NrZXRzLnNpemUoKSk7CisgICAgICAgIGNvbm5lY3Rpb24t PnNlbmQoTWVzc2FnZXM6OkxpYldlYlJUQ05ldHdvcms6OlNpZ25hbENsb3NlKGlkZW50aWZpZXIs IDEpLCAwKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KLSAgICBhZGRTb2NrZXQoaWRlbnRpZmll ciwgbWFrZVVuaXF1ZTxMaWJXZWJSVENTb2NrZXRDbGllbnQ+KGlkZW50aWZpZXIsICp0aGlzLCBX VEZNb3ZlKHNvY2tldCksIHR5cGUpKTsKKyAgICBhZGRTb2NrZXQoaWRlbnRpZmllciwgbWFrZVVu aXF1ZTxMaWJXZWJSVENTb2NrZXRDbGllbnQ+KGlkZW50aWZpZXIsICp0aGlzLCBXVEZNb3ZlKHNv Y2tldCksIHR5cGUsIFdURk1vdmUoY29ubmVjdGlvbikpKTsKIH0KIAogdm9pZCBOZXR3b3JrUlRD UHJvdmlkZXI6OmNyZWF0ZVVEUFNvY2tldChMaWJXZWJSVENTb2NrZXRJZGVudGlmaWVyIGlkZW50 aWZpZXIsIGNvbnN0IFJUQ05ldHdvcms6OlNvY2tldEFkZHJlc3MmIGFkZHJlc3MsIHVpbnQxNl90 IG1pblBvcnQsIHVpbnQxNl90IG1heFBvcnQpCiB7Ci0gICAgY2FsbE9uUlRDTmV0d29ya1RocmVh ZChbdGhpcywgaWRlbnRpZmllciwgYWRkcmVzcyA9IFJUQ05ldHdvcms6Omlzb2xhdGVkQ29weShh ZGRyZXNzLnZhbHVlKSwgbWluUG9ydCwgbWF4UG9ydF0oKSB7CisgICAgY2FsbE9uUlRDTmV0d29y a1RocmVhZChbdGhpcywgaWRlbnRpZmllciwgYWRkcmVzcyA9IFJUQ05ldHdvcms6Omlzb2xhdGVk Q29weShhZGRyZXNzLnZhbHVlKSwgbWluUG9ydCwgbWF4UG9ydCwgY29ubmVjdGlvbiA9IG1ha2VS ZWYobV9jb25uZWN0aW9uLT5jb25uZWN0aW9uKCkpXSgpIG11dGFibGUgewogICAgICAgICBzdGQ6 OnVuaXF1ZV9wdHI8cnRjOjpBc3luY1BhY2tldFNvY2tldD4gc29ja2V0KG1fcGFja2V0U29ja2V0 RmFjdG9yeS0+Q3JlYXRlVWRwU29ja2V0KGFkZHJlc3MsIG1pblBvcnQsIG1heFBvcnQpKTsKLSAg ICAgICAgY3JlYXRlU29ja2V0KGlkZW50aWZpZXIsIFdURk1vdmUoc29ja2V0KSwgU29ja2V0OjpU eXBlOjpVRFApOworICAgICAgICBjcmVhdGVTb2NrZXQoaWRlbnRpZmllciwgV1RGTW92ZShzb2Nr ZXQpLCBTb2NrZXQ6OlR5cGU6OlVEUCwgV1RGTW92ZShjb25uZWN0aW9uKSk7CiAgICAgfSk7CiB9 CiAKQEAgLTE0MSw5ICsxMzksOSBAQCB2b2lkIE5ldHdvcmtSVENQcm92aWRlcjo6Y3JlYXRlU2Vy dmVyVENQU29ja2V0KExpYldlYlJUQ1NvY2tldElkZW50aWZpZXIgaWRlbnRpZgogICAgICAgICBy ZXR1cm47CiAgICAgfQogCi0gICAgY2FsbE9uUlRDTmV0d29ya1RocmVhZChbdGhpcywgaWRlbnRp ZmllciwgYWRkcmVzcyA9IFJUQ05ldHdvcms6Omlzb2xhdGVkQ29weShhZGRyZXNzLnZhbHVlKSwg bWluUG9ydCwgbWF4UG9ydCwgb3B0aW9uc10oKSB7CisgICAgY2FsbE9uUlRDTmV0d29ya1RocmVh ZChbdGhpcywgaWRlbnRpZmllciwgYWRkcmVzcyA9IFJUQ05ldHdvcms6Omlzb2xhdGVkQ29weShh ZGRyZXNzLnZhbHVlKSwgbWluUG9ydCwgbWF4UG9ydCwgb3B0aW9ucywgY29ubmVjdGlvbiA9IG1h a2VSZWYobV9jb25uZWN0aW9uLT5jb25uZWN0aW9uKCkpXSgpIG11dGFibGUgewogICAgICAgICBz dGQ6OnVuaXF1ZV9wdHI8cnRjOjpBc3luY1BhY2tldFNvY2tldD4gc29ja2V0KG1fcGFja2V0U29j a2V0RmFjdG9yeS0+Q3JlYXRlU2VydmVyVGNwU29ja2V0KGFkZHJlc3MsIG1pblBvcnQsIG1heFBv cnQsIG9wdGlvbnMpKTsKLSAgICAgICAgY3JlYXRlU29ja2V0KGlkZW50aWZpZXIsIFdURk1vdmUo c29ja2V0KSwgU29ja2V0OjpUeXBlOjpTZXJ2ZXJUQ1ApOworICAgICAgICBjcmVhdGVTb2NrZXQo aWRlbnRpZmllciwgV1RGTW92ZShzb2NrZXQpLCBTb2NrZXQ6OlR5cGU6OlNlcnZlclRDUCwgV1RG TW92ZShjb25uZWN0aW9uKSk7CiAgICAgfSk7CiB9CiAKQEAgLTE2MSwyMSArMTU5LDIxIEBAIHZv aWQgTmV0d29ya1JUQ1Byb3ZpZGVyOjpjcmVhdGVDbGllbnRUQ1BTb2NrZXQoTGliV2ViUlRDU29j a2V0SWRlbnRpZmllciBpZGVudGlmCiAgICAgICAgIG1fY29ubmVjdGlvbi0+Y29ubmVjdGlvbigp LnNlbmQoTWVzc2FnZXM6OkxpYldlYlJUQ05ldHdvcms6OlNpZ25hbENsb3NlKGlkZW50aWZpZXIs IDEpLCAwKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KLSAgICBjYWxsT25SVENOZXR3b3JrVGhy ZWFkKFt0aGlzLCBpZGVudGlmaWVyLCBsb2NhbEFkZHJlc3MgPSBSVENOZXR3b3JrOjppc29sYXRl ZENvcHkobG9jYWxBZGRyZXNzLnZhbHVlKSwgcmVtb3RlQWRkcmVzcyA9IFJUQ05ldHdvcms6Omlz b2xhdGVkQ29weShyZW1vdGVBZGRyZXNzLnZhbHVlKSwgcHJveHlJbmZvID0gcHJveHlJbmZvRnJv bVNlc3Npb24ocmVtb3RlQWRkcmVzcywgKnNlc3Npb24pLCB1c2VyQWdlbnQgPSBXVEZNb3ZlKHVz ZXJBZ2VudCkuaXNvbGF0ZWRDb3B5KCksIG9wdGlvbnNdKCkgeworICAgIGNhbGxPblJUQ05ldHdv cmtUaHJlYWQoW3RoaXMsIGlkZW50aWZpZXIsIGxvY2FsQWRkcmVzcyA9IFJUQ05ldHdvcms6Omlz b2xhdGVkQ29weShsb2NhbEFkZHJlc3MudmFsdWUpLCByZW1vdGVBZGRyZXNzID0gUlRDTmV0d29y azo6aXNvbGF0ZWRDb3B5KHJlbW90ZUFkZHJlc3MudmFsdWUpLCBwcm94eUluZm8gPSBwcm94eUlu Zm9Gcm9tU2Vzc2lvbihyZW1vdGVBZGRyZXNzLCAqc2Vzc2lvbiksIHVzZXJBZ2VudCA9IFdURk1v dmUodXNlckFnZW50KS5pc29sYXRlZENvcHkoKSwgb3B0aW9ucywgY29ubmVjdGlvbiA9IG1ha2VS ZWYobV9jb25uZWN0aW9uLT5jb25uZWN0aW9uKCkpXSgpIG11dGFibGUgewogICAgICAgICBydGM6 OlBhY2tldFNvY2tldFRjcE9wdGlvbnMgdGNwT3B0aW9uczsKICAgICAgICAgdGNwT3B0aW9ucy5v cHRzID0gb3B0aW9uczsKICAgICAgICAgc3RkOjp1bmlxdWVfcHRyPHJ0Yzo6QXN5bmNQYWNrZXRT b2NrZXQ+IHNvY2tldChtX3BhY2tldFNvY2tldEZhY3RvcnktPkNyZWF0ZUNsaWVudFRjcFNvY2tl dChsb2NhbEFkZHJlc3MsIHJlbW90ZUFkZHJlc3MsIHByb3h5SW5mbywgdXNlckFnZW50LnV0Zjgo KS5kYXRhKCksIHRjcE9wdGlvbnMpKTsKLSAgICAgICAgY3JlYXRlU29ja2V0KGlkZW50aWZpZXIs IFdURk1vdmUoc29ja2V0KSwgU29ja2V0OjpUeXBlOjpDbGllbnRUQ1ApOworICAgICAgICBjcmVh dGVTb2NrZXQoaWRlbnRpZmllciwgV1RGTW92ZShzb2NrZXQpLCBTb2NrZXQ6OlR5cGU6OkNsaWVu dFRDUCwgV1RGTW92ZShjb25uZWN0aW9uKSk7CiAgICAgfSk7CiB9CiAKIHZvaWQgTmV0d29ya1JU Q1Byb3ZpZGVyOjp3cmFwTmV3VENQQ29ubmVjdGlvbihMaWJXZWJSVENTb2NrZXRJZGVudGlmaWVy IGlkZW50aWZpZXIsIExpYldlYlJUQ1NvY2tldElkZW50aWZpZXIgbmV3Q29ubmVjdGlvblNvY2tl dElkZW50aWZpZXIpCiB7Ci0gICAgY2FsbE9uUlRDTmV0d29ya1RocmVhZChbdGhpcywgaWRlbnRp ZmllciwgbmV3Q29ubmVjdGlvblNvY2tldElkZW50aWZpZXJdKCkgeworICAgIGNhbGxPblJUQ05l dHdvcmtUaHJlYWQoW3RoaXMsIGlkZW50aWZpZXIsIG5ld0Nvbm5lY3Rpb25Tb2NrZXRJZGVudGlm aWVyLCBjb25uZWN0aW9uID0gbWFrZVJlZihtX2Nvbm5lY3Rpb24tPmNvbm5lY3Rpb24oKSldKCkg bXV0YWJsZSB7CiAgICAgICAgIGF1dG8gc29ja2V0ID0gbV9wZW5kaW5nSW5jb21pbmdTb2NrZXRz LnRha2UobmV3Q29ubmVjdGlvblNvY2tldElkZW50aWZpZXIpOwogICAgICAgICBSRUxFQVNFX0xP R19JRighc29ja2V0LCBXZWJSVEMsICJOZXR3b3JrUlRDUHJvdmlkZXI6OndyYXBOZXdUQ1BDb25u ZWN0aW9uIHJlY2VpdmVkIGFuIGludmFsaWQgc29ja2V0IGlkZW50aWZpZXIiKTsKICAgICAgICAg aWYgKHNvY2tldCkKLSAgICAgICAgICAgIGFkZFNvY2tldChpZGVudGlmaWVyLCBtYWtlVW5pcXVl PExpYldlYlJUQ1NvY2tldENsaWVudD4oaWRlbnRpZmllciwgKnRoaXMsIFdURk1vdmUoc29ja2V0 KSwgU29ja2V0OjpUeXBlOjpTZXJ2ZXJDb25uZWN0aW9uVENQKSk7CisgICAgICAgICAgICBhZGRT b2NrZXQoaWRlbnRpZmllciwgbWFrZVVuaXF1ZTxMaWJXZWJSVENTb2NrZXRDbGllbnQ+KGlkZW50 aWZpZXIsICp0aGlzLCBXVEZNb3ZlKHNvY2tldCksIFNvY2tldDo6VHlwZTo6U2VydmVyQ29ubmVj dGlvblRDUCwgV1RGTW92ZShjb25uZWN0aW9uKSkpOwogICAgIH0pOwogfQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3dlYnJ0Yy9OZXR3b3JrUlRDUHJvdmlkZXIu aCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvd2VicnRjL05ldHdvcmtSVENQcm92aWRl ci5oCmluZGV4IGM4ZDdjZjRiMzcwZmUzYzU3ZDUzMTEzMWM1OTY4ODRiYWIyNzQzMjQuLjJlYzIw ZDEzMGRiYTg1YjVjMzMzMWQ3MmRlNjhhYWFmNmRkOWMxOTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3Mvd2VicnRjL05ldHdvcmtSVENQcm92aWRlci5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvd2VicnRjL05ldHdvcmtSVENQcm92aWRlci5oCkBA IC0xMTAsNyArMTEwLDcgQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgYWRkU29ja2V0KFdlYkNvcmU6 OkxpYldlYlJUQ1NvY2tldElkZW50aWZpZXIsIHN0ZDo6dW5pcXVlX3B0cjxTb2NrZXQ+JiYpOwog Ci0gICAgdm9pZCBjcmVhdGVTb2NrZXQoV2ViQ29yZTo6TGliV2ViUlRDU29ja2V0SWRlbnRpZmll ciwgc3RkOjp1bmlxdWVfcHRyPHJ0Yzo6QXN5bmNQYWNrZXRTb2NrZXQ+JiYsIFNvY2tldDo6VHlw ZSk7CisgICAgdm9pZCBjcmVhdGVTb2NrZXQoV2ViQ29yZTo6TGliV2ViUlRDU29ja2V0SWRlbnRp Zmllciwgc3RkOjp1bmlxdWVfcHRyPHJ0Yzo6QXN5bmNQYWNrZXRTb2NrZXQ+JiYsIFNvY2tldDo6 VHlwZSwgUmVmPElQQzo6Q29ubmVjdGlvbj4mJik7CiAKICAgICB2b2lkIE9uTWVzc2FnZShydGM6 Ok1lc3NhZ2UqKTsKIAo= 403062 2020-06-29 08:29:19 -0700 2020-06-29 11:27:58 -0700 Rebasing bug-213548-20200629172917.patch text/plain 13710 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzNjQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGI4M2EwZGMyZWMzMWEwMGRl OWQyNGZmODg0Zjk3NGJiZGI2OTA3YWMuLjA4NjNiOTE5MTRhOTRkOTk2NTg4YzAzODYzZDY5YjE0 ZDczOGZmZWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMjAtMDYtMjkgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIFNlbmQgV2ViUlRDIHBhY2tldHMg cmVjZWl2ZWQgZnJvbSBuZXR3b3JrIHByb2Nlc3MgdG8gd2ViIHByb2Nlc3MgZnJvbSBhIGJhY2tn cm91bmQgdGhyZWFkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMTM1NDgKKworICAgICAgICBSZXZpZXdlZCBieSBFcmljIENhcmxzb24uCisKKyAgICAg ICAgTWFrZSBMaWJXZWJSVENTb2NrZXRDbGllbnQgdGFrZSBhIHJlZiB0byBhbiBJUEMgY29ubmVj dGlvbiBhdCBjcmVhdGlvbiB0aW1lLgorICAgICAgICBVc2UgdGhpcyBjb25uZWN0aW9uIGZyb20g dGhlIFJUQyBuZXR3b3JrIHRocmVhZCB0byBzZW5kIHJlY2VpdmVkIHBhY2tldHMgdG8gaW1wcm92 ZSBwZXJmb3JtYW5jZXMuCisgICAgICAgIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAg ICAgICAgKiBOZXR3b3JrUHJvY2Vzcy93ZWJydGMvTGliV2ViUlRDU29ja2V0Q2xpZW50LmNwcDoK KyAgICAgICAgKFdlYktpdDo6TGliV2ViUlRDU29ja2V0Q2xpZW50OjpMaWJXZWJSVENTb2NrZXRD bGllbnQpOgorICAgICAgICAoV2ViS2l0OjpMaWJXZWJSVENTb2NrZXRDbGllbnQ6OnNpZ25hbFJl YWRQYWNrZXQpOgorICAgICAgICAoV2ViS2l0OjpMaWJXZWJSVENTb2NrZXRDbGllbnQ6OnNpZ25h bFNlbnRQYWNrZXQpOgorICAgICAgICAoV2ViS2l0OjpMaWJXZWJSVENTb2NrZXRDbGllbnQ6OnNp Z25hbEFkZHJlc3NSZWFkeSk6CisgICAgICAgIChXZWJLaXQ6OkxpYldlYlJUQ1NvY2tldENsaWVu dDo6c2lnbmFsQ29ubmVjdCk6CisgICAgICAgIChXZWJLaXQ6OkxpYldlYlJUQ1NvY2tldENsaWVu dDo6c2lnbmFsQ2xvc2UpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL3dlYnJ0Yy9MaWJXZWJS VENTb2NrZXRDbGllbnQuaDoKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy93ZWJydGMvTmV0d29y a1JUQ1Byb3ZpZGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1JUQ1Byb3ZpZGVyOjpj cmVhdGVTb2NrZXQpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUlRDUHJvdmlkZXI6OmNyZWF0 ZVVEUFNvY2tldCk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSVENQcm92aWRlcjo6Y3JlYXRl U2VydmVyVENQU29ja2V0KToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1JUQ1Byb3ZpZGVyOjpj cmVhdGVDbGllbnRUQ1BTb2NrZXQpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUlRDUHJvdmlk ZXI6OndyYXBOZXdUQ1BDb25uZWN0aW9uKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy93ZWJy dGMvTmV0d29ya1JUQ1Byb3ZpZGVyLmg6CisKIDIwMjAtMDYtMjkgIFlvdWVubiBGYWJsZXQgIDx5 b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBWUDkgV2ViUlRDIGNvZGVjIHJ1bnRpbWUg ZmxhZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy93ZWJydGMvTGli V2ViUlRDU29ja2V0Q2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvd2Vi cnRjL0xpYldlYlJUQ1NvY2tldENsaWVudC5jcHAKaW5kZXggNTE1ZTg3YjhjN2U2N2E4NTRkZjg4 ZjQzNmU3ZGQ5NjdjZjRiN2M3NS4uNGU2NGMxMWE0MzdiNTAwYmRiNTkxMTY5ZTMyMmI5MDEyMDVi NDMxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy93ZWJydGMvTGli V2ViUlRDU29ja2V0Q2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L3dlYnJ0Yy9MaWJXZWJSVENTb2NrZXRDbGllbnQuY3BwCkBAIC0zOCwxMSArMzgsMTIgQEAKIAog bmFtZXNwYWNlIFdlYktpdCB7CiAKLUxpYldlYlJUQ1NvY2tldENsaWVudDo6TGliV2ViUlRDU29j a2V0Q2xpZW50KFdlYkNvcmU6OkxpYldlYlJUQ1NvY2tldElkZW50aWZpZXIgaWRlbnRpZmllciwg TmV0d29ya1JUQ1Byb3ZpZGVyJiBydGNQcm92aWRlciwgc3RkOjp1bmlxdWVfcHRyPHJ0Yzo6QXN5 bmNQYWNrZXRTb2NrZXQ+JiYgc29ja2V0LCBUeXBlIHR5cGUpCitMaWJXZWJSVENTb2NrZXRDbGll bnQ6OkxpYldlYlJUQ1NvY2tldENsaWVudChXZWJDb3JlOjpMaWJXZWJSVENTb2NrZXRJZGVudGlm aWVyIGlkZW50aWZpZXIsIE5ldHdvcmtSVENQcm92aWRlciYgcnRjUHJvdmlkZXIsIHN0ZDo6dW5p cXVlX3B0cjxydGM6OkFzeW5jUGFja2V0U29ja2V0PiYmIHNvY2tldCwgVHlwZSB0eXBlLCBSZWY8 SVBDOjpDb25uZWN0aW9uPiYmIGNvbm5lY3Rpb24pCiAgICAgOiBtX2lkZW50aWZpZXIoaWRlbnRp ZmllcikKICAgICAsIG1fdHlwZSh0eXBlKQogICAgICwgbV9ydGNQcm92aWRlcihydGNQcm92aWRl cikKICAgICAsIG1fc29ja2V0KFdURk1vdmUoc29ja2V0KSkKKyAgICAsIG1fY29ubmVjdGlvbihX VEZNb3ZlKGNvbm5lY3Rpb24pKQogewogICAgIEFTU0VSVChtX3NvY2tldCk7CiAKQEAgLTk3LDE5 ICs5OCwxNCBAQCB2b2lkIExpYldlYlJUQ1NvY2tldENsaWVudDo6c2V0T3B0aW9uKGludCBvcHRp b24sIGludCB2YWx1ZSkKIHZvaWQgTGliV2ViUlRDU29ja2V0Q2xpZW50OjpzaWduYWxSZWFkUGFj a2V0KHJ0Yzo6QXN5bmNQYWNrZXRTb2NrZXQqIHNvY2tldCwgY29uc3QgY2hhciogdmFsdWUsIHNp emVfdCBsZW5ndGgsIGNvbnN0IHJ0Yzo6U29ja2V0QWRkcmVzcyYgYWRkcmVzcywgY29uc3QgcnRj OjpQYWNrZXRUaW1lJiBwYWNrZXRUaW1lKQogewogICAgIEFTU0VSVF9VTlVTRUQoc29ja2V0LCBt X3NvY2tldC5nZXQoKSA9PSBzb2NrZXQpOwotICAgIGF1dG8gYnVmZmVyID0gV2ViQ29yZTo6U2hh cmVkQnVmZmVyOjpjcmVhdGUodmFsdWUsIGxlbmd0aCk7Ci0gICAgbV9ydGNQcm92aWRlci5zZW5k RnJvbU1haW5UaHJlYWQoW2lkZW50aWZpZXIgPSBtX2lkZW50aWZpZXIsIGJ1ZmZlciA9IFdURk1v dmUoYnVmZmVyKSwgYWRkcmVzcyA9IFJUQ05ldHdvcms6Omlzb2xhdGVkQ29weShhZGRyZXNzKSwg cGFja2V0VGltZV0oSVBDOjpDb25uZWN0aW9uJiBjb25uZWN0aW9uKSB7Ci0gICAgICAgIElQQzo6 RGF0YVJlZmVyZW5jZSBkYXRhKHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgdWludDhfdCo+KGJ1ZmZl ci0+ZGF0YSgpKSwgYnVmZmVyLT5zaXplKCkpOwotICAgICAgICBjb25uZWN0aW9uLnNlbmQoTWVz c2FnZXM6OkxpYldlYlJUQ05ldHdvcms6OlNpZ25hbFJlYWRQYWNrZXQoaWRlbnRpZmllciwgZGF0 YSwgUlRDTmV0d29yazo6SVBBZGRyZXNzKGFkZHJlc3MuaXBhZGRyKCkpLCBhZGRyZXNzLnBvcnQo KSwgcGFja2V0VGltZSksIDApOwotICAgIH0pOworICAgIElQQzo6RGF0YVJlZmVyZW5jZSBkYXRh KHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgdWludDhfdCo+KHZhbHVlKSwgbGVuZ3RoKTsKKyAgICBt X2Nvbm5lY3Rpb24tPnNlbmQoTWVzc2FnZXM6OkxpYldlYlJUQ05ldHdvcms6OlNpZ25hbFJlYWRQ YWNrZXQobV9pZGVudGlmaWVyLCBkYXRhLCBSVENOZXR3b3JrOjpJUEFkZHJlc3MoYWRkcmVzcy5p cGFkZHIoKSksIGFkZHJlc3MucG9ydCgpLCBwYWNrZXRUaW1lKSwgMCk7CiB9CiAKIHZvaWQgTGli V2ViUlRDU29ja2V0Q2xpZW50OjpzaWduYWxTZW50UGFja2V0KHJ0Yzo6QXN5bmNQYWNrZXRTb2Nr ZXQqIHNvY2tldCwgY29uc3QgcnRjOjpTZW50UGFja2V0JiBzZW50UGFja2V0KQogewogICAgIEFT U0VSVF9VTlVTRUQoc29ja2V0LCBtX3NvY2tldC5nZXQoKSA9PSBzb2NrZXQpOwotICAgIG1fcnRj UHJvdmlkZXIuc2VuZEZyb21NYWluVGhyZWFkKFtpZGVudGlmaWVyID0gbV9pZGVudGlmaWVyLCBz ZW50UGFja2V0XShJUEM6OkNvbm5lY3Rpb24mIGNvbm5lY3Rpb24pIHsKLSAgICAgICAgY29ubmVj dGlvbi5zZW5kKE1lc3NhZ2VzOjpMaWJXZWJSVENOZXR3b3JrOjpTaWduYWxTZW50UGFja2V0KGlk ZW50aWZpZXIsIHNlbnRQYWNrZXQucGFja2V0X2lkLCBzZW50UGFja2V0LnNlbmRfdGltZV9tcyks IDApOwotICAgIH0pOworICAgIG1fY29ubmVjdGlvbi0+c2VuZChNZXNzYWdlczo6TGliV2ViUlRD TmV0d29yazo6U2lnbmFsU2VudFBhY2tldChtX2lkZW50aWZpZXIsIHNlbnRQYWNrZXQucGFja2V0 X2lkLCBzZW50UGFja2V0LnNlbmRfdGltZV9tcyksIDApOwogfQogCiB2b2lkIExpYldlYlJUQ1Nv Y2tldENsaWVudDo6c2lnbmFsTmV3Q29ubmVjdGlvbihydGM6OkFzeW5jUGFja2V0U29ja2V0KiBz b2NrZXQsIHJ0Yzo6QXN5bmNQYWNrZXRTb2NrZXQqIG5ld1NvY2tldCkKQEAgLTEyMSw5ICsxMTcs NyBAQCB2b2lkIExpYldlYlJUQ1NvY2tldENsaWVudDo6c2lnbmFsTmV3Q29ubmVjdGlvbihydGM6 OkFzeW5jUGFja2V0U29ja2V0KiBzb2NrZXQsCiB2b2lkIExpYldlYlJUQ1NvY2tldENsaWVudDo6 c2lnbmFsQWRkcmVzc1JlYWR5KHJ0Yzo6QXN5bmNQYWNrZXRTb2NrZXQqIHNvY2tldCwgY29uc3Qg cnRjOjpTb2NrZXRBZGRyZXNzJiBhZGRyZXNzKQogewogICAgIEFTU0VSVF9VTlVTRUQoc29ja2V0 LCBtX3NvY2tldC5nZXQoKSA9PSBzb2NrZXQpOwotICAgIG1fcnRjUHJvdmlkZXIuc2VuZEZyb21N YWluVGhyZWFkKFtpZGVudGlmaWVyID0gbV9pZGVudGlmaWVyLCBhZGRyZXNzID0gUlRDTmV0d29y azo6aXNvbGF0ZWRDb3B5KGFkZHJlc3MpXShJUEM6OkNvbm5lY3Rpb24mIGNvbm5lY3Rpb24pIHsK LSAgICAgICAgY29ubmVjdGlvbi5zZW5kKE1lc3NhZ2VzOjpMaWJXZWJSVENOZXR3b3JrOjpTaWdu YWxBZGRyZXNzUmVhZHkoaWRlbnRpZmllciwgUlRDTmV0d29yazo6U29ja2V0QWRkcmVzcyhhZGRy ZXNzKSksIDApOwotICAgIH0pOworICAgIG1fY29ubmVjdGlvbi0+c2VuZChNZXNzYWdlczo6TGli V2ViUlRDTmV0d29yazo6U2lnbmFsQWRkcmVzc1JlYWR5KG1faWRlbnRpZmllciwgUlRDTmV0d29y azo6U29ja2V0QWRkcmVzcyhhZGRyZXNzKSksIDApOwogfQogCiB2b2lkIExpYldlYlJUQ1NvY2tl dENsaWVudDo6c2lnbmFsQWRkcmVzc1JlYWR5KCkKQEAgLTEzNCwxNyArMTI4LDE0IEBAIHZvaWQg TGliV2ViUlRDU29ja2V0Q2xpZW50OjpzaWduYWxBZGRyZXNzUmVhZHkoKQogdm9pZCBMaWJXZWJS VENTb2NrZXRDbGllbnQ6OnNpZ25hbENvbm5lY3QocnRjOjpBc3luY1BhY2tldFNvY2tldCogc29j a2V0KQogewogICAgIEFTU0VSVF9VTlVTRUQoc29ja2V0LCBtX3NvY2tldC5nZXQoKSA9PSBzb2Nr ZXQpOwotICAgIG1fcnRjUHJvdmlkZXIuc2VuZEZyb21NYWluVGhyZWFkKFtpZGVudGlmaWVyID0g bV9pZGVudGlmaWVyXShJUEM6OkNvbm5lY3Rpb24mIGNvbm5lY3Rpb24pIHsKLSAgICAgICAgY29u bmVjdGlvbi5zZW5kKE1lc3NhZ2VzOjpMaWJXZWJSVENOZXR3b3JrOjpTaWduYWxDb25uZWN0KGlk ZW50aWZpZXIpLCAwKTsKLSAgICB9KTsKKyAgICBtX2Nvbm5lY3Rpb24tPnNlbmQoTWVzc2FnZXM6 OkxpYldlYlJUQ05ldHdvcms6OlNpZ25hbENvbm5lY3QobV9pZGVudGlmaWVyKSwgMCk7CiB9CiAK IHZvaWQgTGliV2ViUlRDU29ja2V0Q2xpZW50OjpzaWduYWxDbG9zZShydGM6OkFzeW5jUGFja2V0 U29ja2V0KiBzb2NrZXQsIGludCBlcnJvcikKIHsKICAgICBBU1NFUlRfVU5VU0VEKHNvY2tldCwg bV9zb2NrZXQuZ2V0KCkgPT0gc29ja2V0KTsKLSAgICBtX3J0Y1Byb3ZpZGVyLnNlbmRGcm9tTWFp blRocmVhZChbaWRlbnRpZmllciA9IG1faWRlbnRpZmllciwgZXJyb3JdKElQQzo6Q29ubmVjdGlv biYgY29ubmVjdGlvbikgewotICAgICAgICBjb25uZWN0aW9uLnNlbmQoTWVzc2FnZXM6OkxpYldl YlJUQ05ldHdvcms6OlNpZ25hbENsb3NlKGlkZW50aWZpZXIsIGVycm9yKSwgMCk7Ci0gICAgfSk7 CisgICAgbV9jb25uZWN0aW9uLT5zZW5kKE1lc3NhZ2VzOjpMaWJXZWJSVENOZXR3b3JrOjpTaWdu YWxDbG9zZShtX2lkZW50aWZpZXIsIGVycm9yKSwgMCk7CisKICAgICAvLyBXZSB3YW50IHRvIHJl bW92ZSAndGhpcycgZnJvbSB0aGUgc29ja2V0IG1hcCBub3cgYnV0IHdlIHdpbGwgZGVzdHJveSBp dCBhc3luY2hyb25vdXNseQogICAgIC8vIHNvIHRoYXQgdGhlIHNvY2tldCBwYXJhbWV0ZXIgb2Yg c2lnbmFsQ2xvc2UgcmVtYWlucyBhbGl2ZSBhcyB0aGUgY2FsbGVyIG9mIHNpZ25hbENsb3NlIG1h eSBhY3R1YWxseSBiZWluZyB1c2luZyBpdCBhZnRlcndhcmRzLgogICAgIG1fcnRjUHJvdmlkZXIu Y2FsbE9uUlRDTmV0d29ya1RocmVhZChbc29ja2V0ID0gbV9ydGNQcm92aWRlci50YWtlU29ja2V0 KG1faWRlbnRpZmllcildIHsgfSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL3dlYnJ0Yy9MaWJXZWJSVENTb2NrZXRDbGllbnQuaCBiL1NvdXJjZS9XZWJLaXQvTmV0 d29ya1Byb2Nlc3Mvd2VicnRjL0xpYldlYlJUQ1NvY2tldENsaWVudC5oCmluZGV4IDViN2NjNTBk M2U4NTY2MGQ1OTNlZjdhZGUwZmM2YWUxYWRmYzI2MDguLjhlM2Y0ODA2NWJmMDA5OWNhOTNjNmU0 ZGMxNGVmYjUzMmU1OGY2YTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3Mvd2VicnRjL0xpYldlYlJUQ1NvY2tldENsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0 d29ya1Byb2Nlc3Mvd2VicnRjL0xpYldlYlJUQ1NvY2tldENsaWVudC5oCkBAIC00MSw3ICs0MSw3 IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogY2xhc3MgTGliV2ViUlRDU29ja2V0Q2xpZW50IGZpbmFs IDogcHVibGljIE5ldHdvcmtSVENQcm92aWRlcjo6U29ja2V0LCBwdWJsaWMgc2lnc2xvdDo6aGFz X3Nsb3RzPD4gewogICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwogcHVibGljOgotICAgIExp YldlYlJUQ1NvY2tldENsaWVudChXZWJDb3JlOjpMaWJXZWJSVENTb2NrZXRJZGVudGlmaWVyLCBO ZXR3b3JrUlRDUHJvdmlkZXImLCBzdGQ6OnVuaXF1ZV9wdHI8cnRjOjpBc3luY1BhY2tldFNvY2tl dD4mJiwgVHlwZSk7CisgICAgTGliV2ViUlRDU29ja2V0Q2xpZW50KFdlYkNvcmU6OkxpYldlYlJU Q1NvY2tldElkZW50aWZpZXIsIE5ldHdvcmtSVENQcm92aWRlciYsIHN0ZDo6dW5pcXVlX3B0cjxy dGM6OkFzeW5jUGFja2V0U29ja2V0PiYmLCBUeXBlLCBSZWY8SVBDOjpDb25uZWN0aW9uPiYmKTsK IAogcHJpdmF0ZToKICAgICBXZWJDb3JlOjpMaWJXZWJSVENTb2NrZXRJZGVudGlmaWVyIGlkZW50 aWZpZXIoKSBjb25zdCBmaW5hbCB7IHJldHVybiBtX2lkZW50aWZpZXI7IH0KQEAgLTY0LDYgKzY0 LDcgQEAgcHJpdmF0ZToKICAgICBUeXBlIG1fdHlwZTsKICAgICBOZXR3b3JrUlRDUHJvdmlkZXIm IG1fcnRjUHJvdmlkZXI7CiAgICAgc3RkOjp1bmlxdWVfcHRyPHJ0Yzo6QXN5bmNQYWNrZXRTb2Nr ZXQ+IG1fc29ja2V0OworICAgIFJlZjxJUEM6OkNvbm5lY3Rpb24+IG1fY29ubmVjdGlvbjsKICAg ICBpbnQgbV9zZW5kRXJyb3IgeyAwIH07CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L05ldHdvcmtQcm9jZXNzL3dlYnJ0Yy9OZXR3b3JrUlRDUHJvdmlkZXIuY3BwIGIvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy93ZWJydGMvTmV0d29ya1JUQ1Byb3ZpZGVyLmNwcAppbmRleCAy YTAwNWFmMDdjZjE3NzMxYmNjMzJhODkxYWQ2OTc3NjgyMGNkZjJhLi45NzljYzUzNWI0NjQ5MzFh ZTQ0MTY5YWI2Y2M1ZDlhOTJkNzI5YTEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdv cmtQcm9jZXNzL3dlYnJ0Yy9OZXR3b3JrUlRDUHJvdmlkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvTmV0d29ya1Byb2Nlc3Mvd2VicnRjL05ldHdvcmtSVENQcm92aWRlci5jcHAKQEAgLTExMywy MyArMTEzLDIxIEBAIHZvaWQgTmV0d29ya1JUQ1Byb3ZpZGVyOjpjbG9zZSgpCiAgICAgfSk7CiB9 CiAKLXZvaWQgTmV0d29ya1JUQ1Byb3ZpZGVyOjpjcmVhdGVTb2NrZXQoTGliV2ViUlRDU29ja2V0 SWRlbnRpZmllciBpZGVudGlmaWVyLCBzdGQ6OnVuaXF1ZV9wdHI8cnRjOjpBc3luY1BhY2tldFNv Y2tldD4mJiBzb2NrZXQsIFNvY2tldDo6VHlwZSB0eXBlKQordm9pZCBOZXR3b3JrUlRDUHJvdmlk ZXI6OmNyZWF0ZVNvY2tldChMaWJXZWJSVENTb2NrZXRJZGVudGlmaWVyIGlkZW50aWZpZXIsIHN0 ZDo6dW5pcXVlX3B0cjxydGM6OkFzeW5jUGFja2V0U29ja2V0PiYmIHNvY2tldCwgU29ja2V0OjpU eXBlIHR5cGUsIFJlZjxJUEM6OkNvbm5lY3Rpb24+JiYgY29ubmVjdGlvbikKIHsKICAgICBpZiAo IXNvY2tldCkgewotICAgICAgICBzZW5kRnJvbU1haW5UaHJlYWQoW3RoaXMsIGlkZW50aWZpZXIs IHNpemUgPSBtX3NvY2tldHMuc2l6ZSgpXShJUEM6OkNvbm5lY3Rpb24mIGNvbm5lY3Rpb24pIHsK LSAgICAgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SX0lGX0FMTE9XRUQoImNyZWF0ZVNvY2tldCB3 aXRoICV1IHNvY2tldHMgaXMgdW5hYmxlIHRvIGNyZWF0ZSBhIG5ldyBzb2NrZXQiLCBzaXplKTsK LSAgICAgICAgICAgIGNvbm5lY3Rpb24uc2VuZChNZXNzYWdlczo6TGliV2ViUlRDTmV0d29yazo6 U2lnbmFsQ2xvc2UoaWRlbnRpZmllciwgMSksIDApOwotICAgICAgICB9KTsKKyAgICAgICAgUkVM RUFTRV9MT0dfRVJST1JfSUZfQUxMT1dFRCgiY3JlYXRlU29ja2V0IHdpdGggJXUgc29ja2V0cyBp cyB1bmFibGUgdG8gY3JlYXRlIGEgbmV3IHNvY2tldCIsIG1fc29ja2V0cy5zaXplKCkpOworICAg ICAgICBjb25uZWN0aW9uLT5zZW5kKE1lc3NhZ2VzOjpMaWJXZWJSVENOZXR3b3JrOjpTaWduYWxD bG9zZShpZGVudGlmaWVyLCAxKSwgMCk7CiAgICAgICAgIHJldHVybjsKICAgICB9Ci0gICAgYWRk U29ja2V0KGlkZW50aWZpZXIsIG1ha2VVbmlxdWU8TGliV2ViUlRDU29ja2V0Q2xpZW50PihpZGVu dGlmaWVyLCAqdGhpcywgV1RGTW92ZShzb2NrZXQpLCB0eXBlKSk7CisgICAgYWRkU29ja2V0KGlk ZW50aWZpZXIsIG1ha2VVbmlxdWU8TGliV2ViUlRDU29ja2V0Q2xpZW50PihpZGVudGlmaWVyLCAq dGhpcywgV1RGTW92ZShzb2NrZXQpLCB0eXBlLCBXVEZNb3ZlKGNvbm5lY3Rpb24pKSk7CiB9CiAK IHZvaWQgTmV0d29ya1JUQ1Byb3ZpZGVyOjpjcmVhdGVVRFBTb2NrZXQoTGliV2ViUlRDU29ja2V0 SWRlbnRpZmllciBpZGVudGlmaWVyLCBjb25zdCBSVENOZXR3b3JrOjpTb2NrZXRBZGRyZXNzJiBh ZGRyZXNzLCB1aW50MTZfdCBtaW5Qb3J0LCB1aW50MTZfdCBtYXhQb3J0KQogewotICAgIGNhbGxP blJUQ05ldHdvcmtUaHJlYWQoW3RoaXMsIGlkZW50aWZpZXIsIGFkZHJlc3MgPSBSVENOZXR3b3Jr Ojppc29sYXRlZENvcHkoYWRkcmVzcy52YWx1ZSksIG1pblBvcnQsIG1heFBvcnRdKCkgeworICAg IGNhbGxPblJUQ05ldHdvcmtUaHJlYWQoW3RoaXMsIGlkZW50aWZpZXIsIGFkZHJlc3MgPSBSVENO ZXR3b3JrOjppc29sYXRlZENvcHkoYWRkcmVzcy52YWx1ZSksIG1pblBvcnQsIG1heFBvcnQsIGNv bm5lY3Rpb24gPSBtYWtlUmVmKG1fY29ubmVjdGlvbi0+Y29ubmVjdGlvbigpKV0oKSBtdXRhYmxl IHsKICAgICAgICAgc3RkOjp1bmlxdWVfcHRyPHJ0Yzo6QXN5bmNQYWNrZXRTb2NrZXQ+IHNvY2tl dChtX3BhY2tldFNvY2tldEZhY3RvcnktPkNyZWF0ZVVkcFNvY2tldChhZGRyZXNzLCBtaW5Qb3J0 LCBtYXhQb3J0KSk7Ci0gICAgICAgIGNyZWF0ZVNvY2tldChpZGVudGlmaWVyLCBXVEZNb3ZlKHNv Y2tldCksIFNvY2tldDo6VHlwZTo6VURQKTsKKyAgICAgICAgY3JlYXRlU29ja2V0KGlkZW50aWZp ZXIsIFdURk1vdmUoc29ja2V0KSwgU29ja2V0OjpUeXBlOjpVRFAsIFdURk1vdmUoY29ubmVjdGlv bikpOwogICAgIH0pOwogfQogCkBAIC0xNDEsOSArMTM5LDkgQEAgdm9pZCBOZXR3b3JrUlRDUHJv dmlkZXI6OmNyZWF0ZVNlcnZlclRDUFNvY2tldChMaWJXZWJSVENTb2NrZXRJZGVudGlmaWVyIGlk ZW50aWYKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIGNhbGxPblJUQ05ldHdvcmtUaHJl YWQoW3RoaXMsIGlkZW50aWZpZXIsIGFkZHJlc3MgPSBSVENOZXR3b3JrOjppc29sYXRlZENvcHko YWRkcmVzcy52YWx1ZSksIG1pblBvcnQsIG1heFBvcnQsIG9wdGlvbnNdKCkgeworICAgIGNhbGxP blJUQ05ldHdvcmtUaHJlYWQoW3RoaXMsIGlkZW50aWZpZXIsIGFkZHJlc3MgPSBSVENOZXR3b3Jr Ojppc29sYXRlZENvcHkoYWRkcmVzcy52YWx1ZSksIG1pblBvcnQsIG1heFBvcnQsIG9wdGlvbnMs IGNvbm5lY3Rpb24gPSBtYWtlUmVmKG1fY29ubmVjdGlvbi0+Y29ubmVjdGlvbigpKV0oKSBtdXRh YmxlIHsKICAgICAgICAgc3RkOjp1bmlxdWVfcHRyPHJ0Yzo6QXN5bmNQYWNrZXRTb2NrZXQ+IHNv Y2tldChtX3BhY2tldFNvY2tldEZhY3RvcnktPkNyZWF0ZVNlcnZlclRjcFNvY2tldChhZGRyZXNz LCBtaW5Qb3J0LCBtYXhQb3J0LCBvcHRpb25zKSk7Ci0gICAgICAgIGNyZWF0ZVNvY2tldChpZGVu dGlmaWVyLCBXVEZNb3ZlKHNvY2tldCksIFNvY2tldDo6VHlwZTo6U2VydmVyVENQKTsKKyAgICAg ICAgY3JlYXRlU29ja2V0KGlkZW50aWZpZXIsIFdURk1vdmUoc29ja2V0KSwgU29ja2V0OjpUeXBl OjpTZXJ2ZXJUQ1AsIFdURk1vdmUoY29ubmVjdGlvbikpOwogICAgIH0pOwogfQogCkBAIC0xNjEs MjEgKzE1OSwyMSBAQCB2b2lkIE5ldHdvcmtSVENQcm92aWRlcjo6Y3JlYXRlQ2xpZW50VENQU29j a2V0KExpYldlYlJUQ1NvY2tldElkZW50aWZpZXIgaWRlbnRpZgogICAgICAgICBtX2Nvbm5lY3Rp b24tPmNvbm5lY3Rpb24oKS5zZW5kKE1lc3NhZ2VzOjpMaWJXZWJSVENOZXR3b3JrOjpTaWduYWxD bG9zZShpZGVudGlmaWVyLCAxKSwgMCk7CiAgICAgICAgIHJldHVybjsKICAgICB9Ci0gICAgY2Fs bE9uUlRDTmV0d29ya1RocmVhZChbdGhpcywgaWRlbnRpZmllciwgbG9jYWxBZGRyZXNzID0gUlRD TmV0d29yazo6aXNvbGF0ZWRDb3B5KGxvY2FsQWRkcmVzcy52YWx1ZSksIHJlbW90ZUFkZHJlc3Mg PSBSVENOZXR3b3JrOjppc29sYXRlZENvcHkocmVtb3RlQWRkcmVzcy52YWx1ZSksIHByb3h5SW5m byA9IHByb3h5SW5mb0Zyb21TZXNzaW9uKHJlbW90ZUFkZHJlc3MsICpzZXNzaW9uKSwgdXNlckFn ZW50ID0gV1RGTW92ZSh1c2VyQWdlbnQpLmlzb2xhdGVkQ29weSgpLCBvcHRpb25zXSgpIHsKKyAg ICBjYWxsT25SVENOZXR3b3JrVGhyZWFkKFt0aGlzLCBpZGVudGlmaWVyLCBsb2NhbEFkZHJlc3Mg PSBSVENOZXR3b3JrOjppc29sYXRlZENvcHkobG9jYWxBZGRyZXNzLnZhbHVlKSwgcmVtb3RlQWRk cmVzcyA9IFJUQ05ldHdvcms6Omlzb2xhdGVkQ29weShyZW1vdGVBZGRyZXNzLnZhbHVlKSwgcHJv eHlJbmZvID0gcHJveHlJbmZvRnJvbVNlc3Npb24ocmVtb3RlQWRkcmVzcywgKnNlc3Npb24pLCB1 c2VyQWdlbnQgPSBXVEZNb3ZlKHVzZXJBZ2VudCkuaXNvbGF0ZWRDb3B5KCksIG9wdGlvbnMsIGNv bm5lY3Rpb24gPSBtYWtlUmVmKG1fY29ubmVjdGlvbi0+Y29ubmVjdGlvbigpKV0oKSBtdXRhYmxl IHsKICAgICAgICAgcnRjOjpQYWNrZXRTb2NrZXRUY3BPcHRpb25zIHRjcE9wdGlvbnM7CiAgICAg ICAgIHRjcE9wdGlvbnMub3B0cyA9IG9wdGlvbnM7CiAgICAgICAgIHN0ZDo6dW5pcXVlX3B0cjxy dGM6OkFzeW5jUGFja2V0U29ja2V0PiBzb2NrZXQobV9wYWNrZXRTb2NrZXRGYWN0b3J5LT5DcmVh dGVDbGllbnRUY3BTb2NrZXQobG9jYWxBZGRyZXNzLCByZW1vdGVBZGRyZXNzLCBwcm94eUluZm8s IHVzZXJBZ2VudC51dGY4KCkuZGF0YSgpLCB0Y3BPcHRpb25zKSk7Ci0gICAgICAgIGNyZWF0ZVNv Y2tldChpZGVudGlmaWVyLCBXVEZNb3ZlKHNvY2tldCksIFNvY2tldDo6VHlwZTo6Q2xpZW50VENQ KTsKKyAgICAgICAgY3JlYXRlU29ja2V0KGlkZW50aWZpZXIsIFdURk1vdmUoc29ja2V0KSwgU29j a2V0OjpUeXBlOjpDbGllbnRUQ1AsIFdURk1vdmUoY29ubmVjdGlvbikpOwogICAgIH0pOwogfQog CiB2b2lkIE5ldHdvcmtSVENQcm92aWRlcjo6d3JhcE5ld1RDUENvbm5lY3Rpb24oTGliV2ViUlRD U29ja2V0SWRlbnRpZmllciBpZGVudGlmaWVyLCBMaWJXZWJSVENTb2NrZXRJZGVudGlmaWVyIG5l d0Nvbm5lY3Rpb25Tb2NrZXRJZGVudGlmaWVyKQogewotICAgIGNhbGxPblJUQ05ldHdvcmtUaHJl YWQoW3RoaXMsIGlkZW50aWZpZXIsIG5ld0Nvbm5lY3Rpb25Tb2NrZXRJZGVudGlmaWVyXSgpIHsK KyAgICBjYWxsT25SVENOZXR3b3JrVGhyZWFkKFt0aGlzLCBpZGVudGlmaWVyLCBuZXdDb25uZWN0 aW9uU29ja2V0SWRlbnRpZmllciwgY29ubmVjdGlvbiA9IG1ha2VSZWYobV9jb25uZWN0aW9uLT5j b25uZWN0aW9uKCkpXSgpIG11dGFibGUgewogICAgICAgICBhdXRvIHNvY2tldCA9IG1fcGVuZGlu Z0luY29taW5nU29ja2V0cy50YWtlKG5ld0Nvbm5lY3Rpb25Tb2NrZXRJZGVudGlmaWVyKTsKICAg ICAgICAgUkVMRUFTRV9MT0dfSUYoIXNvY2tldCwgV2ViUlRDLCAiTmV0d29ya1JUQ1Byb3ZpZGVy Ojp3cmFwTmV3VENQQ29ubmVjdGlvbiByZWNlaXZlZCBhbiBpbnZhbGlkIHNvY2tldCBpZGVudGlm aWVyIik7CiAgICAgICAgIGlmIChzb2NrZXQpCi0gICAgICAgICAgICBhZGRTb2NrZXQoaWRlbnRp ZmllciwgbWFrZVVuaXF1ZTxMaWJXZWJSVENTb2NrZXRDbGllbnQ+KGlkZW50aWZpZXIsICp0aGlz LCBXVEZNb3ZlKHNvY2tldCksIFNvY2tldDo6VHlwZTo6U2VydmVyQ29ubmVjdGlvblRDUCkpOwor ICAgICAgICAgICAgYWRkU29ja2V0KGlkZW50aWZpZXIsIG1ha2VVbmlxdWU8TGliV2ViUlRDU29j a2V0Q2xpZW50PihpZGVudGlmaWVyLCAqdGhpcywgV1RGTW92ZShzb2NrZXQpLCBTb2NrZXQ6OlR5 cGU6OlNlcnZlckNvbm5lY3Rpb25UQ1AsIFdURk1vdmUoY29ubmVjdGlvbikpKTsKICAgICB9KTsK IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy93ZWJydGMvTmV0 d29ya1JUQ1Byb3ZpZGVyLmggYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3dlYnJ0Yy9O ZXR3b3JrUlRDUHJvdmlkZXIuaAppbmRleCBjOGQ3Y2Y0YjM3MGZlM2M1N2Q1MzExMzFjNTk2ODg0 YmFiMjc0MzI0Li4yZWMyMGQxMzBkYmE4NWI1YzMzMzFkNzJkZTY4YWFhZjZkZDljMTk0IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3dlYnJ0Yy9OZXR3b3JrUlRDUHJv dmlkZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3dlYnJ0Yy9OZXR3b3Jr UlRDUHJvdmlkZXIuaApAQCAtMTEwLDcgKzExMCw3IEBAIHByaXZhdGU6CiAKICAgICB2b2lkIGFk ZFNvY2tldChXZWJDb3JlOjpMaWJXZWJSVENTb2NrZXRJZGVudGlmaWVyLCBzdGQ6OnVuaXF1ZV9w dHI8U29ja2V0PiYmKTsKIAotICAgIHZvaWQgY3JlYXRlU29ja2V0KFdlYkNvcmU6OkxpYldlYlJU Q1NvY2tldElkZW50aWZpZXIsIHN0ZDo6dW5pcXVlX3B0cjxydGM6OkFzeW5jUGFja2V0U29ja2V0 PiYmLCBTb2NrZXQ6OlR5cGUpOworICAgIHZvaWQgY3JlYXRlU29ja2V0KFdlYkNvcmU6OkxpYldl YlJUQ1NvY2tldElkZW50aWZpZXIsIHN0ZDo6dW5pcXVlX3B0cjxydGM6OkFzeW5jUGFja2V0U29j a2V0PiYmLCBTb2NrZXQ6OlR5cGUsIFJlZjxJUEM6OkNvbm5lY3Rpb24+JiYpOwogCiAgICAgdm9p ZCBPbk1lc3NhZ2UocnRjOjpNZXNzYWdlKik7CiAK