189281 2018-09-04 16:23:04 -0700 Move replaceTrack logic to LibWebRTCPeerConnectionBackend 2018-09-05 11:56:21 -0700 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf alex commit-queue eric.carlson webkit-bug-importer youennf oldest_to_newest 1456504 0 youennf 2018-09-04 16:23:04 -0700 Right now it is split between RTCPeerConnection and LibWebRTCPeerConnectionBackend. This makes it difficult to reason about. 1456507 1 348866 youennf 2018-09-04 16:26:20 -0700 Created attachment 348866 Patch 1456718 2 348926 youennf 2018-09-05 08:49:03 -0700 Created attachment 348926 Patch 1456750 3 348926 eric.carlson 2018-09-05 09:58:59 -0700 Comment on attachment 348926 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=348926&action=review > Source/WebCore/ChangeLog:9 > + This allows maing the logic easier to understand. Nit: "This allows maing the logic" -> "This makes the logic" > Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.cpp:412 > +static inline bool tryUpdatingTrackSource(MediaStreamTrack& currentTrack, MediaStreamTrack* newTrack, const Vector<Source>& sources) It doesn't look like newTrack can be NULL, can you make it a MediaStreamTrack& ? 1456770 4 348938 youennf 2018-09-05 10:39:13 -0700 Created attachment 348938 Patch for landing 1456810 5 348938 commit-queue 2018-09-05 11:55:01 -0700 Comment on attachment 348938 Patch for landing Clearing flags on attachment: 348938 Committed r235682: <https://trac.webkit.org/changeset/235682> 1456811 6 commit-queue 2018-09-05 11:55:03 -0700 All reviewed patches have been landed. Closing bug. 1456813 7 webkit-bug-importer 2018-09-05 11:56:21 -0700 <rdar://problem/44148039> 348866 2018-09-04 16:26:20 -0700 2018-09-04 16:32:29 -0700 Patch bug-189281-20180904162619.patch text/plain 10066 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1NjEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2ZiYjBhMTk5NDFmZGNj MGMwODZlN2ZiNzdkZWY0NmM3NGJhZmM4MC4uNTUwMzk0ZWI4NjM5NzZkMjQ3MTVkZmEzYzc2MjVl Y2IxNjdhYTAwMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE4LTA5LTA0ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIHJlcGxhY2VUcmFj ayBsb2dpYyB0byBMaWJXZWJSVENQZWVyQ29ubmVjdGlvbkJhY2tlbmQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4OTI4MQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmUgcmVwbGFjZVRyYWNrIGhhbmRs aW5nIGNvZGUgZnJvbSBSVENQZWVyQ29ubmVjdGlvbiB0byBMaWJXZWJSVENQZWVyQ29ubmVjdGlv bkJhY2tlbmQuCisgICAgICAgIFRoaXMgYWxsb3dzIG1haW5nIHRoZSBsb2dpYyBlYXNpZXIgdG8g dW5kZXJzdGFuZC4KKyAgICAgICAgRnV0dXJlIHJlZmFjdG9yaW5nIHdpbGwgZnVydGhlciB0cnkg dG8gcHV0IG1vcmUgaGFuZGxpbmcgaW4gUlRDUnRwU2VuZGVyQmFja2VuZC4KKyAgICAgICAgTm8g Y2hhbmdlIG9mIGJlaGF2aW9yLgorCisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENQ ZWVyQ29ubmVjdGlvbi5jcHA6CisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENQZWVy Q29ubmVjdGlvbi5oOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xp YldlYlJUQ1BlZXJDb25uZWN0aW9uQmFja2VuZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjp0cnlV cGRhdGluZ1RyYWNrU291cmNlKToKKyAgICAgICAgKFdlYkNvcmU6OkxpYldlYlJUQ1BlZXJDb25u ZWN0aW9uQmFja2VuZDo6cmVwbGFjZVRyYWNrKToKKyAgICAgICAgKFdlYkNvcmU6OkxpYldlYlJU Q1BlZXJDb25uZWN0aW9uQmFja2VuZDo6ZW5xdWV1ZVJlcGxhY2VUcmFja1Rhc2spOgorICAgICAg ICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ1BlZXJDb25uZWN0aW9u QmFja2VuZC5oOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldl YlJUQ1J0cFNlbmRlckJhY2tlbmQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGliV2ViUlRDUnRw U2VuZGVyQmFja2VuZDo6cmVwbGFjZVRyYWNrKToKKwogMjAxOC0wOS0wNCAgWW91ZW5uIEZhYmxl dCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgTWFrZSBMaWJXZWJSVENSdHBTZW5kZXJC YWNrZW5kIG93biBpdHMgbGlid2VicnRjIFJUUCBzZW5kZXIgYmFja2VuZApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLmNw cAppbmRleCAyYTVhMTNlMGEwODg2ODhiZGIyZWNkM2E0ZDgwMmI2OTcxODAwZTUxLi40YWQ0Zjdj YmY2YTc3NDljZWJkZjcyZTc0MWEwNDExNTJiZWVjMmVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLmNwcApAQCAt NTMwLDI2ICs1MzAsNiBAQCB2b2lkIFJUQ1BlZXJDb25uZWN0aW9uOjpmaXJlRXZlbnQoRXZlbnQm IGV2ZW50KQogICAgIGRpc3BhdGNoRXZlbnQoZXZlbnQpOwogfQogCi12b2lkIFJUQ1BlZXJDb25u ZWN0aW9uOjplbnF1ZXVlUmVwbGFjZVRyYWNrVGFzayhSVENSdHBTZW5kZXImIHNlbmRlciwgUmVm UHRyPE1lZGlhU3RyZWFtVHJhY2s+JiYgd2l0aFRyYWNrLCBET01Qcm9taXNlRGVmZXJyZWQ8dm9p ZD4mJiBwcm9taXNlKQotewotICAgIHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKS0+cG9zdFRhc2so W3Byb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgcHJvdGVjdGVkU2VuZGVyID0gbWFrZVJl ZihzZW5kZXIpLCBwcm9taXNlID0gV1RGTW92ZShwcm9taXNlKSwgd2l0aFRyYWNrID0gV1RGTW92 ZSh3aXRoVHJhY2spXShTY3JpcHRFeGVjdXRpb25Db250ZXh0JikgbXV0YWJsZSB7Ci0gICAgICAg IGlmIChwcm90ZWN0ZWRUaGlzLT5pc0Nsb3NlZCgpKQotICAgICAgICAgICAgcmV0dXJuOwotCi0g ICAgICAgIGlmICghd2l0aFRyYWNrKSB7Ci0gICAgICAgICAgICBwcm90ZWN0ZWRTZW5kZXItPnNl dFRyYWNrVG9OdWxsKCk7Ci0gICAgICAgICAgICBwcm9taXNlLnJlc29sdmUoKTsKLSAgICAgICAg ICAgIHJldHVybjsKLSAgICAgICAgfQotCi0gICAgICAgIGJvb2wgaGFzVHJhY2sgPSBwcm90ZWN0 ZWRTZW5kZXItPnRyYWNrKCk7Ci0gICAgICAgIHByb3RlY3RlZFNlbmRlci0+c2V0VHJhY2sod2l0 aFRyYWNrLnJlbGVhc2VOb25OdWxsKCkpOwotICAgICAgICBpZiAoIWhhc1RyYWNrKQotICAgICAg ICAgICAgcHJvdGVjdGVkVGhpcy0+bV9iYWNrZW5kLT5hZGRUcmFjayhwcm90ZWN0ZWRTZW5kZXIu cHRyKCksICpwcm90ZWN0ZWRTZW5kZXItPnRyYWNrKCksIHsgfSk7Ci0gICAgICAgIHByb21pc2Uu cmVzb2x2ZSgpOwotICAgIH0pOwotfQotCiB2b2lkIFJUQ1BlZXJDb25uZWN0aW9uOjpkaXNwYXRj aEV2ZW50KEV2ZW50JiBldmVudCkKIHsKICAgICBERUJVR19MT0coTE9HSURFTlRJRklFUiwgImRp c3BhdGNoaW5nICciLCBldmVudC50eXBlKCksICInIik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLmggYi9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLmgKaW5kZXggODRlYjli YzlhNTVhNWE3MTc0YzdlMGZiMWU3ZTk0ZTdkMzE1ZDJkNi4uMzVjMWVkZjBkNjI1MDA5MzI3YzM3 NWVhY2FkNjY2ZWVhNTRkMTBkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9t ZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24uaApAQCAtMTUwLDggKzE1MCw2IEBAIHB1 YmxpYzoKICAgICB2b2lkIGRpc2FibGVJQ0VDYW5kaWRhdGVGaWx0ZXJpbmcoKSB7IG1fYmFja2Vu ZC0+ZGlzYWJsZUlDRUNhbmRpZGF0ZUZpbHRlcmluZygpOyB9CiAgICAgdm9pZCBlbmFibGVJQ0VD YW5kaWRhdGVGaWx0ZXJpbmcoKSB7IG1fYmFja2VuZC0+ZW5hYmxlSUNFQ2FuZGlkYXRlRmlsdGVy aW5nKCk7IH0KIAotICAgIHZvaWQgZW5xdWV1ZVJlcGxhY2VUcmFja1Rhc2soUlRDUnRwU2VuZGVy JiwgUmVmUHRyPE1lZGlhU3RyZWFtVHJhY2s+JiYsIERPTVByb21pc2VEZWZlcnJlZDx2b2lkPiYm KTsKLQogICAgIHZvaWQgY2xlYXJDb250cm9sbGVyKCkgeyBtX2NvbnRyb2xsZXIgPSBudWxscHRy OyB9CiAKICAgICAvLyBBY3RpdmVET01PYmplY3QuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENQZWVyQ29ubmVjdGlvbkJh Y2tlbmQuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMv TGliV2ViUlRDUGVlckNvbm5lY3Rpb25CYWNrZW5kLmNwcAppbmRleCA0NjFlYjVhZDJiNDZmMzg3 YzM4YzgxZDE4ZTI0MDQ5ODlhNTM1Zjc4Li42MjA1YTAyYzQyNTRiZGViYmRhOWZhM2IxOTg1ZTI5 NDZmZWZkYTQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFt L2xpYndlYnJ0Yy9MaWJXZWJSVENQZWVyQ29ubmVjdGlvbkJhY2tlbmQuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ1BlZXJDb25u ZWN0aW9uQmFja2VuZC5jcHAKQEAgLTQwOCw0NyArNDA4LDY5IEBAIHN0YXRpYyBpbmxpbmUgYm9v bCB1cGRhdGVUcmFja1NvdXJjZShTb3VyY2UmIHNvdXJjZSwgTWVkaWFTdHJlYW1UcmFjayogdHJh Y2spCiAgICAgcmV0dXJuIHNvdXJjZS0+c2V0U291cmNlKHRyYWNrLT5wcml2YXRlVHJhY2soKSk7 CiB9CiAKLXZvaWQgTGliV2ViUlRDUGVlckNvbm5lY3Rpb25CYWNrZW5kOjpyZXBsYWNlVHJhY2so UlRDUnRwU2VuZGVyJiBzZW5kZXIsIFJlZlB0cjxNZWRpYVN0cmVhbVRyYWNrPiYmIHRyYWNrLCBE T01Qcm9taXNlRGVmZXJyZWQ8dm9pZD4mJiBwcm9taXNlKQordGVtcGxhdGU8dHlwZW5hbWUgU291 cmNlPgorc3RhdGljIGlubGluZSBib29sIHRyeVVwZGF0aW5nVHJhY2tTb3VyY2UoTWVkaWFTdHJl YW1UcmFjayYgY3VycmVudFRyYWNrLCBNZWRpYVN0cmVhbVRyYWNrKiBuZXdUcmFjaywgY29uc3Qg VmVjdG9yPFNvdXJjZT4mIHNvdXJjZXMpCiB7Ci0gICAgQVNTRVJUKHNlbmRlci50cmFjaygpKTsK KyAgICBmb3IgKGF1dG8mIHNvdXJjZSA6IHNvdXJjZXMpIHsKKyAgICAgICAgaWYgKCZzb3VyY2Ut PnNvdXJjZSgpID09ICZjdXJyZW50VHJhY2sucHJpdmF0ZVRyYWNrKCkpIHsKKyAgICAgICAgICAg IGlmICghdXBkYXRlVHJhY2tTb3VyY2Uoc291cmNlLCBuZXdUcmFjaykpCisgICAgICAgICAgICAg ICAgcmV0dXJuIGZhbHNlOworICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIH0KKyAg ICB9CisgICAgcmV0dXJuIGZhbHNlOworfQogCit2b2lkIExpYldlYlJUQ1BlZXJDb25uZWN0aW9u QmFja2VuZDo6cmVwbGFjZVRyYWNrKFJUQ1J0cFNlbmRlciYgc2VuZGVyLCBSZWZQdHI8TWVkaWFT dHJlYW1UcmFjaz4mJiB0cmFjaywgRE9NUHJvbWlzZURlZmVycmVkPHZvaWQ+JiYgcHJvbWlzZSkK K3sKICAgICBhdXRvKiBjdXJyZW50VHJhY2sgPSBzZW5kZXIudHJhY2soKTsKIAotICAgIEFTU0VS VCghdHJhY2sgfHwgY3VycmVudFRyYWNrLT5zb3VyY2UoKS50eXBlKCkgPT0gdHJhY2stPnNvdXJj ZSgpLnR5cGUoKSk7Ci0gICAgc3dpdGNoIChjdXJyZW50VHJhY2stPnNvdXJjZSgpLnR5cGUoKSkg ewotICAgIGNhc2UgUmVhbHRpbWVNZWRpYVNvdXJjZTo6VHlwZTo6Tm9uZToKLSAgICAgICAgQVNT RVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgICAgIHByb21pc2UucmVqZWN0KEludmFsaWRNb2RpZmlj YXRpb25FcnJvcik7Ci0gICAgICAgIGJyZWFrOwotICAgIGNhc2UgUmVhbHRpbWVNZWRpYVNvdXJj ZTo6VHlwZTo6QXVkaW86IHsKLSAgICAgICAgZm9yIChhdXRvJiBhdWRpb1NvdXJjZSA6IG1fYXVk aW9Tb3VyY2VzKSB7Ci0gICAgICAgICAgICBpZiAoJmF1ZGlvU291cmNlLT5zb3VyY2UoKSA9PSAm Y3VycmVudFRyYWNrLT5wcml2YXRlVHJhY2soKSkgewotICAgICAgICAgICAgICAgIGlmICghdXBk YXRlVHJhY2tTb3VyY2UoYXVkaW9Tb3VyY2UsIHRyYWNrLmdldCgpKSkgewotICAgICAgICAgICAg ICAgICAgICBwcm9taXNlLnJlamVjdChJbnZhbGlkTW9kaWZpY2F0aW9uRXJyb3IpOwotICAgICAg ICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAg IGNvbm5lY3Rpb24oKS5lbnF1ZXVlUmVwbGFjZVRyYWNrVGFzayhzZW5kZXIsIFdURk1vdmUodHJh Y2spLCBXVEZNb3ZlKHByb21pc2UpKTsKKyAgICBBU1NFUlQoIXRyYWNrIHx8ICFjdXJyZW50VHJh Y2sgfHwgY3VycmVudFRyYWNrLT5zb3VyY2UoKS50eXBlKCkgPT0gdHJhY2stPnNvdXJjZSgpLnR5 cGUoKSk7CisgICAgaWYgKGN1cnJlbnRUcmFjaykgeworICAgICAgICBzd2l0Y2ggKGN1cnJlbnRU cmFjay0+c291cmNlKCkudHlwZSgpKSB7CisgICAgICAgIGNhc2UgUmVhbHRpbWVNZWRpYVNvdXJj ZTo6VHlwZTo6Tm9uZToKKyAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAg ICAgICAgcHJvbWlzZS5yZWplY3QoSW52YWxpZE1vZGlmaWNhdGlvbkVycm9yKTsKKyAgICAgICAg ICAgIGJyZWFrOworICAgICAgICBjYXNlIFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5cGU6OkF1ZGlv OgorICAgICAgICAgICAgaWYgKCF0cnlVcGRhdGluZ1RyYWNrU291cmNlKCpjdXJyZW50VHJhY2ss IHRyYWNrLmdldCgpLCBtX2F1ZGlvU291cmNlcykpIHsKKyAgICAgICAgICAgICAgICBwcm9taXNl LnJlamVjdChJbnZhbGlkTW9kaWZpY2F0aW9uRXJyb3IpOwogICAgICAgICAgICAgICAgIHJldHVy bjsKICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIFJlYWx0 aW1lTWVkaWFTb3VyY2U6OlR5cGU6OlZpZGVvOgorICAgICAgICAgICAgaWYgKCF0cnlVcGRhdGlu Z1RyYWNrU291cmNlKCpjdXJyZW50VHJhY2ssIHRyYWNrLmdldCgpLCBtX3ZpZGVvU291cmNlcykp IHsKKyAgICAgICAgICAgICAgICBwcm9taXNlLnJlamVjdChJbnZhbGlkTW9kaWZpY2F0aW9uRXJy b3IpOworICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAg IGJyZWFrOwogICAgICAgICB9Ci0gICAgICAgIHByb21pc2UucmVqZWN0KEludmFsaWRNb2RpZmlj YXRpb25FcnJvcik7Ci0gICAgICAgIGJyZWFrOwogICAgIH0KLSAgICBjYXNlIFJlYWx0aW1lTWVk aWFTb3VyY2U6OlR5cGU6OlZpZGVvOiB7Ci0gICAgICAgIGZvciAoYXV0byYgdmlkZW9Tb3VyY2Ug OiBtX3ZpZGVvU291cmNlcykgewotICAgICAgICAgICAgaWYgKCZ2aWRlb1NvdXJjZS0+c291cmNl KCkgPT0gJmN1cnJlbnRUcmFjay0+cHJpdmF0ZVRyYWNrKCkpIHsKLSAgICAgICAgICAgICAgICBp ZiAoIXVwZGF0ZVRyYWNrU291cmNlKHZpZGVvU291cmNlLCB0cmFjay5nZXQoKSkpIHsKLSAgICAg ICAgICAgICAgICAgICAgcHJvbWlzZS5yZWplY3QoSW52YWxpZE1vZGlmaWNhdGlvbkVycm9yKTsK LSAgICAgICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICAgICAgICAgIH0KLSAgICAgICAg ICAgICAgICBjb25uZWN0aW9uKCkuZW5xdWV1ZVJlcGxhY2VUcmFja1Rhc2soc2VuZGVyLCBXVEZN b3ZlKHRyYWNrKSwgV1RGTW92ZShwcm9taXNlKSk7CisgICAgZW5xdWV1ZVJlcGxhY2VUcmFja1Rh c2soc2VuZGVyLCBXVEZNb3ZlKHRyYWNrKSwgV1RGTW92ZShwcm9taXNlKSk7Cit9CisKK3ZvaWQg TGliV2ViUlRDUGVlckNvbm5lY3Rpb25CYWNrZW5kOjplbnF1ZXVlUmVwbGFjZVRyYWNrVGFzayhS VENSdHBTZW5kZXImIHNlbmRlciwgUmVmUHRyPE1lZGlhU3RyZWFtVHJhY2s+JiYgd2l0aFRyYWNr LCBET01Qcm9taXNlRGVmZXJyZWQ8dm9pZD4mJiBwcm9taXNlKQoreworICAgIG1fcGVlckNvbm5l Y3Rpb24uc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLT5wb3N0VGFzayhbcHJvdGVjdGVkQ29ubmVj dGlvbiA9IG1ha2VSZWYobV9wZWVyQ29ubmVjdGlvbiksIHByb3RlY3RlZFNlbmRlciA9IG1ha2VS ZWYoc2VuZGVyKSwgcHJvbWlzZSA9IFdURk1vdmUocHJvbWlzZSksIHdpdGhUcmFjayA9IFdURk1v dmUod2l0aFRyYWNrKSwgdGhpc10oU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYpIG11dGFibGUgewor ICAgICAgICBpZiAocHJvdGVjdGVkQ29ubmVjdGlvbi0+aXNDbG9zZWQoKSkKKyAgICAgICAgICAg IHJldHVybjsKKworICAgICAgICBpZiAoIXdpdGhUcmFjaykgeworICAgICAgICAgICAgcHJvdGVj dGVkU2VuZGVyLT5zZXRUcmFja1RvTnVsbCgpOworICAgICAgICAgICAgcHJvbWlzZS5yZXNvbHZl KCk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKworICAgICAgICBib29sIGhhc1Ry YWNrID0gcHJvdGVjdGVkU2VuZGVyLT50cmFjaygpOworICAgICAgICBwcm90ZWN0ZWRTZW5kZXIt PnNldFRyYWNrKHdpdGhUcmFjay5yZWxlYXNlTm9uTnVsbCgpKTsKKyAgICAgICAgaWYgKCFoYXNU cmFjaykgeworICAgICAgICAgICAgaWYgKCFtX2VuZHBvaW50LT5hZGRUcmFjayhiYWNrZW5kRnJv bVJUUFNlbmRlcihwcm90ZWN0ZWRTZW5kZXIpLCAqcHJvdGVjdGVkU2VuZGVyLT50cmFjaygpLCB7 IH0pKSB7CisgICAgICAgICAgICAgICAgcHJvbWlzZS5yZWplY3QoRXhjZXB0aW9uIHsgVHlwZUVy cm9yLCAiVW5hYmxlIHRvIGFkZCB0cmFjayJfcyB9KTsKICAgICAgICAgICAgICAgICByZXR1cm47 CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KLSAgICAgICAgcHJvbWlzZS5yZWplY3QoSW52YWxp ZE1vZGlmaWNhdGlvbkVycm9yKTsKLSAgICAgICAgYnJlYWs7Ci0gICAgfQotICAgIH0KKyAgICAg ICAgcHJvbWlzZS5yZXNvbHZlKCk7CisgICAgfSk7CiB9CiAKIHZvaWQgTGliV2ViUlRDUGVlckNv bm5lY3Rpb25CYWNrZW5kOjphcHBseVJvdGF0aW9uRm9yT3V0Z29pbmdWaWRlb1NvdXJjZXMoKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMv TGliV2ViUlRDUGVlckNvbm5lY3Rpb25CYWNrZW5kLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENQZWVyQ29ubmVjdGlvbkJhY2tlbmQuaApp bmRleCBiNTVmMGNmMmQ0OWI4NTU4MTFlODdmNjg5M2QxYzU5Y2ZkMTUwNWY3Li42NGU2MDljMjYw NTA0ZjAyZjc5MDM2NmJlMGEwNDNiOGExYjAyYzA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENQZWVyQ29ubmVjdGlvbkJh Y2tlbmQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0 Yy9MaWJXZWJSVENQZWVyQ29ubmVjdGlvbkJhY2tlbmQuaApAQCAtMTEyLDYgKzExMiw4IEBAIHBy aXZhdGU6CiAKICAgICBSZWY8UlRDUnRwVHJhbnNjZWl2ZXI+IGNvbXBsZXRlQWRkVHJhbnNjZWl2 ZXIoUmVmPFJUQ1J0cFNlbmRlcj4mJiwgY29uc3QgUlRDUnRwVHJhbnNjZWl2ZXJJbml0JiwgY29u c3QgU3RyaW5nJiB0cmFja0lkLCBjb25zdCBTdHJpbmcmIHRyYWNrS2luZCk7CiAKKyAgICB2b2lk IGVucXVldWVSZXBsYWNlVHJhY2tUYXNrKFJUQ1J0cFNlbmRlciYsIFJlZlB0cjxNZWRpYVN0cmVh bVRyYWNrPiYmLCBET01Qcm9taXNlRGVmZXJyZWQ8dm9pZD4mJik7CisKICAgICBSZWY8TGliV2Vi UlRDTWVkaWFFbmRwb2ludD4gbV9lbmRwb2ludDsKICAgICBib29sIG1faXNMb2NhbERlc2NyaXB0 aW9uU2V0IHsgZmFsc2UgfTsKICAgICBib29sIG1faXNSZW1vdGVEZXNjcmlwdGlvblNldCB7IGZh bHNlIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xp YndlYnJ0Yy9MaWJXZWJSVENSdHBTZW5kZXJCYWNrZW5kLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ1J0cFNlbmRlckJhY2tlbmQuY3Bw CmluZGV4IDJiMjczNWMyNzRiNjUyYjRiODgyOTU5ZmU3ZDFhMmRhMDc0YmEwZDEuLjUxYTc4YWUz MWRiYWZmNWJiNWY5ZWM1YjExMjViN2FmOWQwMTJjMzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ1J0cFNlbmRlckJhY2tl bmQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRj L0xpYldlYlJUQ1J0cFNlbmRlckJhY2tlbmQuY3BwCkBAIC00MSwxMSArNDEsNiBAQCB2b2lkIExp YldlYlJUQ1J0cFNlbmRlckJhY2tlbmQ6OnJlcGxhY2VUcmFjayhSVENSdHBTZW5kZXImIHNlbmRl ciwgUmVmUHRyPE1lZGlhUwogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgaWYgKCFzZW5k ZXIudHJhY2soKSAmJiB0cmFjaykgewotICAgICAgICBtX3BlZXJDb25uZWN0aW9uQmFja2VuZC0+ Y29ubmVjdGlvbigpLmVucXVldWVSZXBsYWNlVHJhY2tUYXNrKHNlbmRlciwgdHJhY2sucmVsZWFz ZU5vbk51bGwoKSwgV1RGTW92ZShwcm9taXNlKSk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0K ICAgICBtX3BlZXJDb25uZWN0aW9uQmFja2VuZC0+cmVwbGFjZVRyYWNrKHNlbmRlciwgV1RGTW92 ZSh0cmFjayksIFdURk1vdmUocHJvbWlzZSkpOwogfQogCg== 348926 2018-09-05 08:49:03 -0700 2018-09-05 10:39:12 -0700 Patch bug-189281-20180905084902.patch text/plain 10071 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1NjY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWU3MTA3YmJhNWI4ZGM0 ZDkxMjVjNzM4MzMzNzg3MTdjODMzOWYzNi4uNDc2ZGI3MDcyMjU4MDhmMDczMmQ5YWMyZWNiZjgy OWYzODA5NjkwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE4LTA5LTA1ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIHJlcGxhY2VUcmFj ayBsb2dpYyB0byBMaWJXZWJSVENQZWVyQ29ubmVjdGlvbkJhY2tlbmQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4OTI4MQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmUgcmVwbGFjZVRyYWNrIGhhbmRs aW5nIGNvZGUgZnJvbSBSVENQZWVyQ29ubmVjdGlvbiB0byBMaWJXZWJSVENQZWVyQ29ubmVjdGlv bkJhY2tlbmQuCisgICAgICAgIFRoaXMgYWxsb3dzIG1haW5nIHRoZSBsb2dpYyBlYXNpZXIgdG8g dW5kZXJzdGFuZC4KKyAgICAgICAgRnV0dXJlIHJlZmFjdG9yaW5nIHdpbGwgZnVydGhlciB0cnkg dG8gcHV0IG1vcmUgaGFuZGxpbmcgaW4gUlRDUnRwU2VuZGVyQmFja2VuZC4KKyAgICAgICAgTm8g Y2hhbmdlIG9mIGJlaGF2aW9yLgorCisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENQ ZWVyQ29ubmVjdGlvbi5jcHA6CisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENQZWVy Q29ubmVjdGlvbi5oOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xp YldlYlJUQ1BlZXJDb25uZWN0aW9uQmFja2VuZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjp0cnlV cGRhdGluZ1RyYWNrU291cmNlKToKKyAgICAgICAgKFdlYkNvcmU6OkxpYldlYlJUQ1BlZXJDb25u ZWN0aW9uQmFja2VuZDo6cmVwbGFjZVRyYWNrKToKKyAgICAgICAgKFdlYkNvcmU6OkxpYldlYlJU Q1BlZXJDb25uZWN0aW9uQmFja2VuZDo6ZW5xdWV1ZVJlcGxhY2VUcmFja1Rhc2spOgorICAgICAg ICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ1BlZXJDb25uZWN0aW9u QmFja2VuZC5oOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldl YlJUQ1J0cFNlbmRlckJhY2tlbmQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGliV2ViUlRDUnRw U2VuZGVyQmFja2VuZDo6cmVwbGFjZVRyYWNrKToKKwogMjAxOC0wOS0wNSAgWmFsYW4gQnVqdGFz IDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bQkZDXSBNb3ZlIE1hcmdpbkNvbGxh cHNlIGNsYXNzIHVuZGVyIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9u LmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rp b24uY3BwCmluZGV4IDJhNWExM2UwYTA4ODY4OGJkYjJlY2QzYTRkODAyYjY5NzE4MDBlNTEuLjRh ZDRmN2NiZjZhNzc0OWNlYmRmNzJlNzQxYTA0MTE1MmJlZWMyZWQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24uY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24uY3Bw CkBAIC01MzAsMjYgKzUzMCw2IEBAIHZvaWQgUlRDUGVlckNvbm5lY3Rpb246OmZpcmVFdmVudChF dmVudCYgZXZlbnQpCiAgICAgZGlzcGF0Y2hFdmVudChldmVudCk7CiB9CiAKLXZvaWQgUlRDUGVl ckNvbm5lY3Rpb246OmVucXVldWVSZXBsYWNlVHJhY2tUYXNrKFJUQ1J0cFNlbmRlciYgc2VuZGVy LCBSZWZQdHI8TWVkaWFTdHJlYW1UcmFjaz4mJiB3aXRoVHJhY2ssIERPTVByb21pc2VEZWZlcnJl ZDx2b2lkPiYmIHByb21pc2UpCi17Ci0gICAgc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLT5wb3N0 VGFzayhbcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBwcm90ZWN0ZWRTZW5kZXIgPSBt YWtlUmVmKHNlbmRlciksIHByb21pc2UgPSBXVEZNb3ZlKHByb21pc2UpLCB3aXRoVHJhY2sgPSBX VEZNb3ZlKHdpdGhUcmFjayldKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmKSBtdXRhYmxlIHsKLSAg ICAgICAgaWYgKHByb3RlY3RlZFRoaXMtPmlzQ2xvc2VkKCkpCi0gICAgICAgICAgICByZXR1cm47 Ci0KLSAgICAgICAgaWYgKCF3aXRoVHJhY2spIHsKLSAgICAgICAgICAgIHByb3RlY3RlZFNlbmRl ci0+c2V0VHJhY2tUb051bGwoKTsKLSAgICAgICAgICAgIHByb21pc2UucmVzb2x2ZSgpOwotICAg ICAgICAgICAgcmV0dXJuOwotICAgICAgICB9Ci0KLSAgICAgICAgYm9vbCBoYXNUcmFjayA9IHBy b3RlY3RlZFNlbmRlci0+dHJhY2soKTsKLSAgICAgICAgcHJvdGVjdGVkU2VuZGVyLT5zZXRUcmFj ayh3aXRoVHJhY2sucmVsZWFzZU5vbk51bGwoKSk7Ci0gICAgICAgIGlmICghaGFzVHJhY2spCi0g ICAgICAgICAgICBwcm90ZWN0ZWRUaGlzLT5tX2JhY2tlbmQtPmFkZFRyYWNrKHByb3RlY3RlZFNl bmRlci5wdHIoKSwgKnByb3RlY3RlZFNlbmRlci0+dHJhY2soKSwgeyB9KTsKLSAgICAgICAgcHJv bWlzZS5yZXNvbHZlKCk7Ci0gICAgfSk7Ci19Ci0KIHZvaWQgUlRDUGVlckNvbm5lY3Rpb246OmRp c3BhdGNoRXZlbnQoRXZlbnQmIGV2ZW50KQogewogICAgIERFQlVHX0xPRyhMT0dJREVOVElGSUVS LCAiZGlzcGF0Y2hpbmcgJyIsIGV2ZW50LnR5cGUoKSwgIiciKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24uaCBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24uaAppbmRleCA4 NGViOWJjOWE1NWE1YTcxNzRjN2UwZmIxZTdlOTRlN2QzMTVkMmQ2Li4zNWMxZWRmMGQ2MjUwMDkz MjdjMzc1ZWFjYWQ2NjZlZWE1NGQxMGQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi5oCkBAIC0xNTAsOCArMTUwLDYg QEAgcHVibGljOgogICAgIHZvaWQgZGlzYWJsZUlDRUNhbmRpZGF0ZUZpbHRlcmluZygpIHsgbV9i YWNrZW5kLT5kaXNhYmxlSUNFQ2FuZGlkYXRlRmlsdGVyaW5nKCk7IH0KICAgICB2b2lkIGVuYWJs ZUlDRUNhbmRpZGF0ZUZpbHRlcmluZygpIHsgbV9iYWNrZW5kLT5lbmFibGVJQ0VDYW5kaWRhdGVG aWx0ZXJpbmcoKTsgfQogCi0gICAgdm9pZCBlbnF1ZXVlUmVwbGFjZVRyYWNrVGFzayhSVENSdHBT ZW5kZXImLCBSZWZQdHI8TWVkaWFTdHJlYW1UcmFjaz4mJiwgRE9NUHJvbWlzZURlZmVycmVkPHZv aWQ+JiYpOwotCiAgICAgdm9pZCBjbGVhckNvbnRyb2xsZXIoKSB7IG1fY29udHJvbGxlciA9IG51 bGxwdHI7IH0KIAogICAgIC8vIEFjdGl2ZURPTU9iamVjdC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ1BlZXJDb25uZWN0 aW9uQmFja2VuZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndl YnJ0Yy9MaWJXZWJSVENQZWVyQ29ubmVjdGlvbkJhY2tlbmQuY3BwCmluZGV4IDQ2MWViNWFkMmI0 NmYzODdjMzhjODFkMThlMjQwNDk4OWE1MzVmNzguLjYyMDVhMDJjNDI1NGJkZWJiZGE5ZmEzYjE5 ODVlMjk0NmZlZmRhNDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFz dHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ1BlZXJDb25uZWN0aW9uQmFja2VuZC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDUGVl ckNvbm5lY3Rpb25CYWNrZW5kLmNwcApAQCAtNDA4LDQ3ICs0MDgsNjkgQEAgc3RhdGljIGlubGlu ZSBib29sIHVwZGF0ZVRyYWNrU291cmNlKFNvdXJjZSYgc291cmNlLCBNZWRpYVN0cmVhbVRyYWNr KiB0cmFjaykKICAgICByZXR1cm4gc291cmNlLT5zZXRTb3VyY2UodHJhY2stPnByaXZhdGVUcmFj aygpKTsKIH0KIAotdm9pZCBMaWJXZWJSVENQZWVyQ29ubmVjdGlvbkJhY2tlbmQ6OnJlcGxhY2VU cmFjayhSVENSdHBTZW5kZXImIHNlbmRlciwgUmVmUHRyPE1lZGlhU3RyZWFtVHJhY2s+JiYgdHJh Y2ssIERPTVByb21pc2VEZWZlcnJlZDx2b2lkPiYmIHByb21pc2UpCit0ZW1wbGF0ZTx0eXBlbmFt ZSBTb3VyY2U+CitzdGF0aWMgaW5saW5lIGJvb2wgdHJ5VXBkYXRpbmdUcmFja1NvdXJjZShNZWRp YVN0cmVhbVRyYWNrJiBjdXJyZW50VHJhY2ssIE1lZGlhU3RyZWFtVHJhY2sqIG5ld1RyYWNrLCBj b25zdCBWZWN0b3I8U291cmNlPiYgc291cmNlcykKIHsKLSAgICBBU1NFUlQoc2VuZGVyLnRyYWNr KCkpOworICAgIGZvciAoYXV0byYgc291cmNlIDogc291cmNlcykgeworICAgICAgICBpZiAoJnNv dXJjZS0+c291cmNlKCkgPT0gJmN1cnJlbnRUcmFjay5wcml2YXRlVHJhY2soKSkgeworICAgICAg ICAgICAgaWYgKCF1cGRhdGVUcmFja1NvdXJjZShzb3VyY2UsIG5ld1RyYWNrKSkKKyAgICAgICAg ICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAg fQorICAgIH0KKyAgICByZXR1cm4gZmFsc2U7Cit9CiAKK3ZvaWQgTGliV2ViUlRDUGVlckNvbm5l Y3Rpb25CYWNrZW5kOjpyZXBsYWNlVHJhY2soUlRDUnRwU2VuZGVyJiBzZW5kZXIsIFJlZlB0cjxN ZWRpYVN0cmVhbVRyYWNrPiYmIHRyYWNrLCBET01Qcm9taXNlRGVmZXJyZWQ8dm9pZD4mJiBwcm9t aXNlKQorewogICAgIGF1dG8qIGN1cnJlbnRUcmFjayA9IHNlbmRlci50cmFjaygpOwogCi0gICAg QVNTRVJUKCF0cmFjayB8fCBjdXJyZW50VHJhY2stPnNvdXJjZSgpLnR5cGUoKSA9PSB0cmFjay0+ c291cmNlKCkudHlwZSgpKTsKLSAgICBzd2l0Y2ggKGN1cnJlbnRUcmFjay0+c291cmNlKCkudHlw ZSgpKSB7Ci0gICAgY2FzZSBSZWFsdGltZU1lZGlhU291cmNlOjpUeXBlOjpOb25lOgotICAgICAg ICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICAgICAgcHJvbWlzZS5yZWplY3QoSW52YWxpZE1v ZGlmaWNhdGlvbkVycm9yKTsKLSAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBSZWFsdGltZU1lZGlh U291cmNlOjpUeXBlOjpBdWRpbzogewotICAgICAgICBmb3IgKGF1dG8mIGF1ZGlvU291cmNlIDog bV9hdWRpb1NvdXJjZXMpIHsKLSAgICAgICAgICAgIGlmICgmYXVkaW9Tb3VyY2UtPnNvdXJjZSgp ID09ICZjdXJyZW50VHJhY2stPnByaXZhdGVUcmFjaygpKSB7Ci0gICAgICAgICAgICAgICAgaWYg KCF1cGRhdGVUcmFja1NvdXJjZShhdWRpb1NvdXJjZSwgdHJhY2suZ2V0KCkpKSB7Ci0gICAgICAg ICAgICAgICAgICAgIHByb21pc2UucmVqZWN0KEludmFsaWRNb2RpZmljYXRpb25FcnJvcik7Ci0g ICAgICAgICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAg ICAgICAgY29ubmVjdGlvbigpLmVucXVldWVSZXBsYWNlVHJhY2tUYXNrKHNlbmRlciwgV1RGTW92 ZSh0cmFjayksIFdURk1vdmUocHJvbWlzZSkpOworICAgIEFTU0VSVCghdHJhY2sgfHwgIWN1cnJl bnRUcmFjayB8fCBjdXJyZW50VHJhY2stPnNvdXJjZSgpLnR5cGUoKSA9PSB0cmFjay0+c291cmNl KCkudHlwZSgpKTsKKyAgICBpZiAoY3VycmVudFRyYWNrKSB7CisgICAgICAgIHN3aXRjaCAoY3Vy cmVudFRyYWNrLT5zb3VyY2UoKS50eXBlKCkpIHsKKyAgICAgICAgY2FzZSBSZWFsdGltZU1lZGlh U291cmNlOjpUeXBlOjpOb25lOgorICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Cisg ICAgICAgICAgICBwcm9taXNlLnJlamVjdChJbnZhbGlkTW9kaWZpY2F0aW9uRXJyb3IpOworICAg ICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgUmVhbHRpbWVNZWRpYVNvdXJjZTo6VHlwZTo6 QXVkaW86CisgICAgICAgICAgICBpZiAoIXRyeVVwZGF0aW5nVHJhY2tTb3VyY2UoKmN1cnJlbnRU cmFjaywgdHJhY2suZ2V0KCksIG1fYXVkaW9Tb3VyY2VzKSkgeworICAgICAgICAgICAgICAgIHBy b21pc2UucmVqZWN0KEludmFsaWRNb2RpZmljYXRpb25FcnJvcik7CiAgICAgICAgICAgICAgICAg cmV0dXJuOwogICAgICAgICAgICAgfQorICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2Ug UmVhbHRpbWVNZWRpYVNvdXJjZTo6VHlwZTo6VmlkZW86CisgICAgICAgICAgICBpZiAoIXRyeVVw ZGF0aW5nVHJhY2tTb3VyY2UoKmN1cnJlbnRUcmFjaywgdHJhY2suZ2V0KCksIG1fdmlkZW9Tb3Vy Y2VzKSkgeworICAgICAgICAgICAgICAgIHByb21pc2UucmVqZWN0KEludmFsaWRNb2RpZmljYXRp b25FcnJvcik7CisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgfQorICAgICAg ICAgICAgYnJlYWs7CiAgICAgICAgIH0KLSAgICAgICAgcHJvbWlzZS5yZWplY3QoSW52YWxpZE1v ZGlmaWNhdGlvbkVycm9yKTsKLSAgICAgICAgYnJlYWs7CiAgICAgfQotICAgIGNhc2UgUmVhbHRp bWVNZWRpYVNvdXJjZTo6VHlwZTo6VmlkZW86IHsKLSAgICAgICAgZm9yIChhdXRvJiB2aWRlb1Nv dXJjZSA6IG1fdmlkZW9Tb3VyY2VzKSB7Ci0gICAgICAgICAgICBpZiAoJnZpZGVvU291cmNlLT5z b3VyY2UoKSA9PSAmY3VycmVudFRyYWNrLT5wcml2YXRlVHJhY2soKSkgewotICAgICAgICAgICAg ICAgIGlmICghdXBkYXRlVHJhY2tTb3VyY2UodmlkZW9Tb3VyY2UsIHRyYWNrLmdldCgpKSkgewot ICAgICAgICAgICAgICAgICAgICBwcm9taXNlLnJlamVjdChJbnZhbGlkTW9kaWZpY2F0aW9uRXJy b3IpOwotICAgICAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICAgICAgfQotICAg ICAgICAgICAgICAgIGNvbm5lY3Rpb24oKS5lbnF1ZXVlUmVwbGFjZVRyYWNrVGFzayhzZW5kZXIs IFdURk1vdmUodHJhY2spLCBXVEZNb3ZlKHByb21pc2UpKTsKKyAgICBlbnF1ZXVlUmVwbGFjZVRy YWNrVGFzayhzZW5kZXIsIFdURk1vdmUodHJhY2spLCBXVEZNb3ZlKHByb21pc2UpKTsKK30KKwor dm9pZCBMaWJXZWJSVENQZWVyQ29ubmVjdGlvbkJhY2tlbmQ6OmVucXVldWVSZXBsYWNlVHJhY2tU YXNrKFJUQ1J0cFNlbmRlciYgc2VuZGVyLCBSZWZQdHI8TWVkaWFTdHJlYW1UcmFjaz4mJiB3aXRo VHJhY2ssIERPTVByb21pc2VEZWZlcnJlZDx2b2lkPiYmIHByb21pc2UpCit7CisgICAgbV9wZWVy Q29ubmVjdGlvbi5zY3JpcHRFeGVjdXRpb25Db250ZXh0KCktPnBvc3RUYXNrKFtwcm90ZWN0ZWRD b25uZWN0aW9uID0gbWFrZVJlZihtX3BlZXJDb25uZWN0aW9uKSwgcHJvdGVjdGVkU2VuZGVyID0g bWFrZVJlZihzZW5kZXIpLCBwcm9taXNlID0gV1RGTW92ZShwcm9taXNlKSwgd2l0aFRyYWNrID0g V1RGTW92ZSh3aXRoVHJhY2spLCB0aGlzXShTY3JpcHRFeGVjdXRpb25Db250ZXh0JikgbXV0YWJs ZSB7CisgICAgICAgIGlmIChwcm90ZWN0ZWRDb25uZWN0aW9uLT5pc0Nsb3NlZCgpKQorICAgICAg ICAgICAgcmV0dXJuOworCisgICAgICAgIGlmICghd2l0aFRyYWNrKSB7CisgICAgICAgICAgICBw cm90ZWN0ZWRTZW5kZXItPnNldFRyYWNrVG9OdWxsKCk7CisgICAgICAgICAgICBwcm9taXNlLnJl c29sdmUoKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCisgICAgICAgIGJvb2wg aGFzVHJhY2sgPSBwcm90ZWN0ZWRTZW5kZXItPnRyYWNrKCk7CisgICAgICAgIHByb3RlY3RlZFNl bmRlci0+c2V0VHJhY2sod2l0aFRyYWNrLnJlbGVhc2VOb25OdWxsKCkpOworICAgICAgICBpZiAo IWhhc1RyYWNrKSB7CisgICAgICAgICAgICBpZiAoIW1fZW5kcG9pbnQtPmFkZFRyYWNrKGJhY2tl bmRGcm9tUlRQU2VuZGVyKHByb3RlY3RlZFNlbmRlciksICpwcm90ZWN0ZWRTZW5kZXItPnRyYWNr KCksIHsgfSkpIHsKKyAgICAgICAgICAgICAgICBwcm9taXNlLnJlamVjdChFeGNlcHRpb24geyBU eXBlRXJyb3IsICJVbmFibGUgdG8gYWRkIHRyYWNrIl9zIH0pOwogICAgICAgICAgICAgICAgIHJl dHVybjsKICAgICAgICAgICAgIH0KICAgICAgICAgfQotICAgICAgICBwcm9taXNlLnJlamVjdChJ bnZhbGlkTW9kaWZpY2F0aW9uRXJyb3IpOwotICAgICAgICBicmVhazsKLSAgICB9Ci0gICAgfQor ICAgICAgICBwcm9taXNlLnJlc29sdmUoKTsKKyAgICB9KTsKIH0KIAogdm9pZCBMaWJXZWJSVENQ ZWVyQ29ubmVjdGlvbkJhY2tlbmQ6OmFwcGx5Um90YXRpb25Gb3JPdXRnb2luZ1ZpZGVvU291cmNl cygpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndl YnJ0Yy9MaWJXZWJSVENQZWVyQ29ubmVjdGlvbkJhY2tlbmQuaCBiL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ1BlZXJDb25uZWN0aW9uQmFja2Vu ZC5oCmluZGV4IGI1NWYwY2YyZDQ5Yjg1NTgxMWU4N2Y2ODkzZDFjNTljZmQxNTA1ZjcuLjY0ZTYw OWMyNjA1MDRmMDJmNzkwMzY2YmUwYTA0M2I4YTFiMDJjMDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ1BlZXJDb25uZWN0 aW9uQmFja2VuZC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGli d2VicnRjL0xpYldlYlJUQ1BlZXJDb25uZWN0aW9uQmFja2VuZC5oCkBAIC0xMTIsNiArMTEyLDgg QEAgcHJpdmF0ZToKIAogICAgIFJlZjxSVENSdHBUcmFuc2NlaXZlcj4gY29tcGxldGVBZGRUcmFu c2NlaXZlcihSZWY8UlRDUnRwU2VuZGVyPiYmLCBjb25zdCBSVENSdHBUcmFuc2NlaXZlckluaXQm LCBjb25zdCBTdHJpbmcmIHRyYWNrSWQsIGNvbnN0IFN0cmluZyYgdHJhY2tLaW5kKTsKIAorICAg IHZvaWQgZW5xdWV1ZVJlcGxhY2VUcmFja1Rhc2soUlRDUnRwU2VuZGVyJiwgUmVmUHRyPE1lZGlh U3RyZWFtVHJhY2s+JiYsIERPTVByb21pc2VEZWZlcnJlZDx2b2lkPiYmKTsKKwogICAgIFJlZjxM aWJXZWJSVENNZWRpYUVuZHBvaW50PiBtX2VuZHBvaW50OwogICAgIGJvb2wgbV9pc0xvY2FsRGVz Y3JpcHRpb25TZXQgeyBmYWxzZSB9OwogICAgIGJvb2wgbV9pc1JlbW90ZURlc2NyaXB0aW9uU2V0 IHsgZmFsc2UgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJl YW0vbGlid2VicnRjL0xpYldlYlJUQ1J0cFNlbmRlckJhY2tlbmQuY3BwIGIvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDUnRwU2VuZGVyQmFja2Vu ZC5jcHAKaW5kZXggMmIyNzM1YzI3NGI2NTJiNGI4ODI5NTlmZTdkMWEyZGEwNzRiYTBkMS4uNTFh NzhhZTMxZGJhZmY1YmI1ZjllYzViMTEyNWI3YWY5ZDAxMmMzNyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDUnRwU2VuZGVy QmFja2VuZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3 ZWJydGMvTGliV2ViUlRDUnRwU2VuZGVyQmFja2VuZC5jcHAKQEAgLTQxLDExICs0MSw2IEBAIHZv aWQgTGliV2ViUlRDUnRwU2VuZGVyQmFja2VuZDo6cmVwbGFjZVRyYWNrKFJUQ1J0cFNlbmRlciYg c2VuZGVyLCBSZWZQdHI8TWVkaWFTCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBpZiAo IXNlbmRlci50cmFjaygpICYmIHRyYWNrKSB7Ci0gICAgICAgIG1fcGVlckNvbm5lY3Rpb25CYWNr ZW5kLT5jb25uZWN0aW9uKCkuZW5xdWV1ZVJlcGxhY2VUcmFja1Rhc2soc2VuZGVyLCB0cmFjay5y ZWxlYXNlTm9uTnVsbCgpLCBXVEZNb3ZlKHByb21pc2UpKTsKLSAgICAgICAgcmV0dXJuOwotICAg IH0KLQogICAgIG1fcGVlckNvbm5lY3Rpb25CYWNrZW5kLT5yZXBsYWNlVHJhY2soc2VuZGVyLCBX VEZNb3ZlKHRyYWNrKSwgV1RGTW92ZShwcm9taXNlKSk7CiB9CiAK 348938 2018-09-05 10:39:13 -0700 2018-09-05 11:55:01 -0700 Patch for landing bug-189281-20180905103912.patch text/plain 10867 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1NjcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTRjMmU1ZjZkYjNhZTAy OGUzY2NiYjgwOGNmY2JjMmEzMTQ3YzA3YS4uZjliZGE5NjllMGRjMDY4OWRhOGNkZWI4ZjlhNDY4 NzEyZWIxMTYzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE4LTA5LTA1ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIHJlcGxhY2VUcmFj ayBsb2dpYyB0byBMaWJXZWJSVENQZWVyQ29ubmVjdGlvbkJhY2tlbmQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4OTI4MQorCisgICAgICAgIFJldmll d2VkIGJ5IEVyaWMgQ2FybHNvbi4KKworICAgICAgICBNb3ZlIHJlcGxhY2VUcmFjayBoYW5kbGlu ZyBjb2RlIGZyb20gUlRDUGVlckNvbm5lY3Rpb24gdG8gTGliV2ViUlRDUGVlckNvbm5lY3Rpb25C YWNrZW5kLgorICAgICAgICBUaGlzIG1ha2VzIHRoZSBsb2dpYyBlYXNpZXIgdG8gdW5kZXJzdGFu ZC4KKyAgICAgICAgRnV0dXJlIHJlZmFjdG9yaW5nIHdpbGwgZnVydGhlciB0cnkgdG8gcHV0IG1v cmUgaGFuZGxpbmcgaW4gUlRDUnRwU2VuZGVyQmFja2VuZC4KKyAgICAgICAgTm8gY2hhbmdlIG9m IGJlaGF2aW9yLgorCisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVj dGlvbi5jcHA6CisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlv bi5oOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ1Bl ZXJDb25uZWN0aW9uQmFja2VuZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjp0cnlVcGRhdGluZ1Ry YWNrU291cmNlKToKKyAgICAgICAgKFdlYkNvcmU6OkxpYldlYlJUQ1BlZXJDb25uZWN0aW9uQmFj a2VuZDo6cmVwbGFjZVRyYWNrKToKKyAgICAgICAgKFdlYkNvcmU6OkxpYldlYlJUQ1BlZXJDb25u ZWN0aW9uQmFja2VuZDo6ZW5xdWV1ZVJlcGxhY2VUcmFja1Rhc2spOgorICAgICAgICAqIE1vZHVs ZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ1BlZXJDb25uZWN0aW9uQmFja2VuZC5o OgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ1J0cFNl bmRlckJhY2tlbmQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGliV2ViUlRDUnRwU2VuZGVyQmFj a2VuZDo6cmVwbGFjZVRyYWNrKToKKwogMjAxOC0wOS0wNSAgWW91ZW5uIEZhYmxldCAgPHlvdWVu bkBhcHBsZS5jb20+CiAKICAgICAgICAgQWN0aXZlRE9NT2JqZWN0cyBzaG91bGQgYmUgR0MgY29s bGVjdGFibGUgYXMgc29vbiBhcyB0aGVpciBkb2N1bWVudCBpcyBiZWluZyBzdG9wcGVkCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0 aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5l Y3Rpb24uY3BwCmluZGV4IDJhNWExM2UwYTA4ODY4OGJkYjJlY2QzYTRkODAyYjY5NzE4MDBlNTEu LjRhZDRmN2NiZjZhNzc0OWNlYmRmNzJlNzQxYTA0MTE1MmJlZWMyZWQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24uY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24u Y3BwCkBAIC01MzAsMjYgKzUzMCw2IEBAIHZvaWQgUlRDUGVlckNvbm5lY3Rpb246OmZpcmVFdmVu dChFdmVudCYgZXZlbnQpCiAgICAgZGlzcGF0Y2hFdmVudChldmVudCk7CiB9CiAKLXZvaWQgUlRD UGVlckNvbm5lY3Rpb246OmVucXVldWVSZXBsYWNlVHJhY2tUYXNrKFJUQ1J0cFNlbmRlciYgc2Vu ZGVyLCBSZWZQdHI8TWVkaWFTdHJlYW1UcmFjaz4mJiB3aXRoVHJhY2ssIERPTVByb21pc2VEZWZl cnJlZDx2b2lkPiYmIHByb21pc2UpCi17Ci0gICAgc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLT5w b3N0VGFzayhbcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBwcm90ZWN0ZWRTZW5kZXIg PSBtYWtlUmVmKHNlbmRlciksIHByb21pc2UgPSBXVEZNb3ZlKHByb21pc2UpLCB3aXRoVHJhY2sg PSBXVEZNb3ZlKHdpdGhUcmFjayldKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmKSBtdXRhYmxlIHsK LSAgICAgICAgaWYgKHByb3RlY3RlZFRoaXMtPmlzQ2xvc2VkKCkpCi0gICAgICAgICAgICByZXR1 cm47Ci0KLSAgICAgICAgaWYgKCF3aXRoVHJhY2spIHsKLSAgICAgICAgICAgIHByb3RlY3RlZFNl bmRlci0+c2V0VHJhY2tUb051bGwoKTsKLSAgICAgICAgICAgIHByb21pc2UucmVzb2x2ZSgpOwot ICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9Ci0KLSAgICAgICAgYm9vbCBoYXNUcmFjayA9 IHByb3RlY3RlZFNlbmRlci0+dHJhY2soKTsKLSAgICAgICAgcHJvdGVjdGVkU2VuZGVyLT5zZXRU cmFjayh3aXRoVHJhY2sucmVsZWFzZU5vbk51bGwoKSk7Ci0gICAgICAgIGlmICghaGFzVHJhY2sp Ci0gICAgICAgICAgICBwcm90ZWN0ZWRUaGlzLT5tX2JhY2tlbmQtPmFkZFRyYWNrKHByb3RlY3Rl ZFNlbmRlci5wdHIoKSwgKnByb3RlY3RlZFNlbmRlci0+dHJhY2soKSwgeyB9KTsKLSAgICAgICAg cHJvbWlzZS5yZXNvbHZlKCk7Ci0gICAgfSk7Ci19Ci0KIHZvaWQgUlRDUGVlckNvbm5lY3Rpb246 OmRpc3BhdGNoRXZlbnQoRXZlbnQmIGV2ZW50KQogewogICAgIERFQlVHX0xPRyhMT0dJREVOVElG SUVSLCAiZGlzcGF0Y2hpbmcgJyIsIGV2ZW50LnR5cGUoKSwgIiciKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24uaCBiL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24uaAppbmRl eCA4NGViOWJjOWE1NWE1YTcxNzRjN2UwZmIxZTdlOTRlN2QzMTVkMmQ2Li4zNWMxZWRmMGQ2MjUw MDkzMjdjMzc1ZWFjYWQ2NjZlZWE1NGQxMGQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLmgKKysrIGIvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi5oCkBAIC0xNTAsOCArMTUw LDYgQEAgcHVibGljOgogICAgIHZvaWQgZGlzYWJsZUlDRUNhbmRpZGF0ZUZpbHRlcmluZygpIHsg bV9iYWNrZW5kLT5kaXNhYmxlSUNFQ2FuZGlkYXRlRmlsdGVyaW5nKCk7IH0KICAgICB2b2lkIGVu YWJsZUlDRUNhbmRpZGF0ZUZpbHRlcmluZygpIHsgbV9iYWNrZW5kLT5lbmFibGVJQ0VDYW5kaWRh dGVGaWx0ZXJpbmcoKTsgfQogCi0gICAgdm9pZCBlbnF1ZXVlUmVwbGFjZVRyYWNrVGFzayhSVENS dHBTZW5kZXImLCBSZWZQdHI8TWVkaWFTdHJlYW1UcmFjaz4mJiwgRE9NUHJvbWlzZURlZmVycmVk PHZvaWQ+JiYpOwotCiAgICAgdm9pZCBjbGVhckNvbnRyb2xsZXIoKSB7IG1fY29udHJvbGxlciA9 IG51bGxwdHI7IH0KIAogICAgIC8vIEFjdGl2ZURPTU9iamVjdC4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ1BlZXJDb25u ZWN0aW9uQmFja2VuZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xp YndlYnJ0Yy9MaWJXZWJSVENQZWVyQ29ubmVjdGlvbkJhY2tlbmQuY3BwCmluZGV4IDQ2MWViNWFk MmI0NmYzODdjMzhjODFkMThlMjQwNDk4OWE1MzVmNzguLjYyMDVhMDJjNDI1NGJkZWJiZGE5ZmEz YjE5ODVlMjk0NmZlZmRhNDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVk aWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ1BlZXJDb25uZWN0aW9uQmFja2VuZC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRD UGVlckNvbm5lY3Rpb25CYWNrZW5kLmNwcApAQCAtNDA4LDQ3ICs0MDgsNjkgQEAgc3RhdGljIGlu bGluZSBib29sIHVwZGF0ZVRyYWNrU291cmNlKFNvdXJjZSYgc291cmNlLCBNZWRpYVN0cmVhbVRy YWNrKiB0cmFjaykKICAgICByZXR1cm4gc291cmNlLT5zZXRTb3VyY2UodHJhY2stPnByaXZhdGVU cmFjaygpKTsKIH0KIAotdm9pZCBMaWJXZWJSVENQZWVyQ29ubmVjdGlvbkJhY2tlbmQ6OnJlcGxh Y2VUcmFjayhSVENSdHBTZW5kZXImIHNlbmRlciwgUmVmUHRyPE1lZGlhU3RyZWFtVHJhY2s+JiYg dHJhY2ssIERPTVByb21pc2VEZWZlcnJlZDx2b2lkPiYmIHByb21pc2UpCit0ZW1wbGF0ZTx0eXBl bmFtZSBTb3VyY2U+CitzdGF0aWMgaW5saW5lIGJvb2wgdHJ5VXBkYXRpbmdUcmFja1NvdXJjZShN ZWRpYVN0cmVhbVRyYWNrJiBjdXJyZW50VHJhY2ssIE1lZGlhU3RyZWFtVHJhY2sqIG5ld1RyYWNr LCBjb25zdCBWZWN0b3I8U291cmNlPiYgc291cmNlcykKIHsKLSAgICBBU1NFUlQoc2VuZGVyLnRy YWNrKCkpOworICAgIGZvciAoYXV0byYgc291cmNlIDogc291cmNlcykgeworICAgICAgICBpZiAo JnNvdXJjZS0+c291cmNlKCkgPT0gJmN1cnJlbnRUcmFjay5wcml2YXRlVHJhY2soKSkgeworICAg ICAgICAgICAgaWYgKCF1cGRhdGVUcmFja1NvdXJjZShzb3VyY2UsIG5ld1RyYWNrKSkKKyAgICAg ICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAg ICAgfQorICAgIH0KKyAgICByZXR1cm4gZmFsc2U7Cit9CiAKK3ZvaWQgTGliV2ViUlRDUGVlckNv bm5lY3Rpb25CYWNrZW5kOjpyZXBsYWNlVHJhY2soUlRDUnRwU2VuZGVyJiBzZW5kZXIsIFJlZlB0 cjxNZWRpYVN0cmVhbVRyYWNrPiYmIHRyYWNrLCBET01Qcm9taXNlRGVmZXJyZWQ8dm9pZD4mJiBw cm9taXNlKQorewogICAgIGF1dG8qIGN1cnJlbnRUcmFjayA9IHNlbmRlci50cmFjaygpOwogCi0g ICAgQVNTRVJUKCF0cmFjayB8fCBjdXJyZW50VHJhY2stPnNvdXJjZSgpLnR5cGUoKSA9PSB0cmFj ay0+c291cmNlKCkudHlwZSgpKTsKLSAgICBzd2l0Y2ggKGN1cnJlbnRUcmFjay0+c291cmNlKCku dHlwZSgpKSB7Ci0gICAgY2FzZSBSZWFsdGltZU1lZGlhU291cmNlOjpUeXBlOjpOb25lOgotICAg ICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICAgICAgcHJvbWlzZS5yZWplY3QoSW52YWxp ZE1vZGlmaWNhdGlvbkVycm9yKTsKLSAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBSZWFsdGltZU1l ZGlhU291cmNlOjpUeXBlOjpBdWRpbzogewotICAgICAgICBmb3IgKGF1dG8mIGF1ZGlvU291cmNl IDogbV9hdWRpb1NvdXJjZXMpIHsKLSAgICAgICAgICAgIGlmICgmYXVkaW9Tb3VyY2UtPnNvdXJj ZSgpID09ICZjdXJyZW50VHJhY2stPnByaXZhdGVUcmFjaygpKSB7Ci0gICAgICAgICAgICAgICAg aWYgKCF1cGRhdGVUcmFja1NvdXJjZShhdWRpb1NvdXJjZSwgdHJhY2suZ2V0KCkpKSB7Ci0gICAg ICAgICAgICAgICAgICAgIHByb21pc2UucmVqZWN0KEludmFsaWRNb2RpZmljYXRpb25FcnJvcik7 Ci0gICAgICAgICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAg ICAgICAgICAgY29ubmVjdGlvbigpLmVucXVldWVSZXBsYWNlVHJhY2tUYXNrKHNlbmRlciwgV1RG TW92ZSh0cmFjayksIFdURk1vdmUocHJvbWlzZSkpOworICAgIEFTU0VSVCghdHJhY2sgfHwgIWN1 cnJlbnRUcmFjayB8fCBjdXJyZW50VHJhY2stPnNvdXJjZSgpLnR5cGUoKSA9PSB0cmFjay0+c291 cmNlKCkudHlwZSgpKTsKKyAgICBpZiAoY3VycmVudFRyYWNrKSB7CisgICAgICAgIHN3aXRjaCAo Y3VycmVudFRyYWNrLT5zb3VyY2UoKS50eXBlKCkpIHsKKyAgICAgICAgY2FzZSBSZWFsdGltZU1l ZGlhU291cmNlOjpUeXBlOjpOb25lOgorICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7 CisgICAgICAgICAgICBwcm9taXNlLnJlamVjdChJbnZhbGlkTW9kaWZpY2F0aW9uRXJyb3IpOwor ICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgUmVhbHRpbWVNZWRpYVNvdXJjZTo6VHlw ZTo6QXVkaW86CisgICAgICAgICAgICBpZiAoIXRyeVVwZGF0aW5nVHJhY2tTb3VyY2UoKmN1cnJl bnRUcmFjaywgdHJhY2suZ2V0KCksIG1fYXVkaW9Tb3VyY2VzKSkgeworICAgICAgICAgICAgICAg IHByb21pc2UucmVqZWN0KEludmFsaWRNb2RpZmljYXRpb25FcnJvcik7CiAgICAgICAgICAgICAg ICAgcmV0dXJuOwogICAgICAgICAgICAgfQorICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNh c2UgUmVhbHRpbWVNZWRpYVNvdXJjZTo6VHlwZTo6VmlkZW86CisgICAgICAgICAgICBpZiAoIXRy eVVwZGF0aW5nVHJhY2tTb3VyY2UoKmN1cnJlbnRUcmFjaywgdHJhY2suZ2V0KCksIG1fdmlkZW9T b3VyY2VzKSkgeworICAgICAgICAgICAgICAgIHByb21pc2UucmVqZWN0KEludmFsaWRNb2RpZmlj YXRpb25FcnJvcik7CisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgfQorICAg ICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KLSAgICAgICAgcHJvbWlzZS5yZWplY3QoSW52YWxp ZE1vZGlmaWNhdGlvbkVycm9yKTsKLSAgICAgICAgYnJlYWs7CiAgICAgfQotICAgIGNhc2UgUmVh bHRpbWVNZWRpYVNvdXJjZTo6VHlwZTo6VmlkZW86IHsKLSAgICAgICAgZm9yIChhdXRvJiB2aWRl b1NvdXJjZSA6IG1fdmlkZW9Tb3VyY2VzKSB7Ci0gICAgICAgICAgICBpZiAoJnZpZGVvU291cmNl LT5zb3VyY2UoKSA9PSAmY3VycmVudFRyYWNrLT5wcml2YXRlVHJhY2soKSkgewotICAgICAgICAg ICAgICAgIGlmICghdXBkYXRlVHJhY2tTb3VyY2UodmlkZW9Tb3VyY2UsIHRyYWNrLmdldCgpKSkg ewotICAgICAgICAgICAgICAgICAgICBwcm9taXNlLnJlamVjdChJbnZhbGlkTW9kaWZpY2F0aW9u RXJyb3IpOwotICAgICAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICAgICAgfQot ICAgICAgICAgICAgICAgIGNvbm5lY3Rpb24oKS5lbnF1ZXVlUmVwbGFjZVRyYWNrVGFzayhzZW5k ZXIsIFdURk1vdmUodHJhY2spLCBXVEZNb3ZlKHByb21pc2UpKTsKKyAgICBlbnF1ZXVlUmVwbGFj ZVRyYWNrVGFzayhzZW5kZXIsIFdURk1vdmUodHJhY2spLCBXVEZNb3ZlKHByb21pc2UpKTsKK30K Kwordm9pZCBMaWJXZWJSVENQZWVyQ29ubmVjdGlvbkJhY2tlbmQ6OmVucXVldWVSZXBsYWNlVHJh Y2tUYXNrKFJUQ1J0cFNlbmRlciYgc2VuZGVyLCBSZWZQdHI8TWVkaWFTdHJlYW1UcmFjaz4mJiB3 aXRoVHJhY2ssIERPTVByb21pc2VEZWZlcnJlZDx2b2lkPiYmIHByb21pc2UpCit7CisgICAgbV9w ZWVyQ29ubmVjdGlvbi5zY3JpcHRFeGVjdXRpb25Db250ZXh0KCktPnBvc3RUYXNrKFtwcm90ZWN0 ZWRDb25uZWN0aW9uID0gbWFrZVJlZihtX3BlZXJDb25uZWN0aW9uKSwgcHJvdGVjdGVkU2VuZGVy ID0gbWFrZVJlZihzZW5kZXIpLCBwcm9taXNlID0gV1RGTW92ZShwcm9taXNlKSwgd2l0aFRyYWNr ID0gV1RGTW92ZSh3aXRoVHJhY2spLCB0aGlzXShTY3JpcHRFeGVjdXRpb25Db250ZXh0JikgbXV0 YWJsZSB7CisgICAgICAgIGlmIChwcm90ZWN0ZWRDb25uZWN0aW9uLT5pc0Nsb3NlZCgpKQorICAg ICAgICAgICAgcmV0dXJuOworCisgICAgICAgIGlmICghd2l0aFRyYWNrKSB7CisgICAgICAgICAg ICBwcm90ZWN0ZWRTZW5kZXItPnNldFRyYWNrVG9OdWxsKCk7CisgICAgICAgICAgICBwcm9taXNl LnJlc29sdmUoKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCisgICAgICAgIGJv b2wgaGFzVHJhY2sgPSBwcm90ZWN0ZWRTZW5kZXItPnRyYWNrKCk7CisgICAgICAgIHByb3RlY3Rl ZFNlbmRlci0+c2V0VHJhY2sod2l0aFRyYWNrLnJlbGVhc2VOb25OdWxsKCkpOworICAgICAgICBp ZiAoIWhhc1RyYWNrKSB7CisgICAgICAgICAgICBpZiAoIW1fZW5kcG9pbnQtPmFkZFRyYWNrKGJh Y2tlbmRGcm9tUlRQU2VuZGVyKHByb3RlY3RlZFNlbmRlciksICpwcm90ZWN0ZWRTZW5kZXItPnRy YWNrKCksIHsgfSkpIHsKKyAgICAgICAgICAgICAgICBwcm9taXNlLnJlamVjdChFeGNlcHRpb24g eyBUeXBlRXJyb3IsICJVbmFibGUgdG8gYWRkIHRyYWNrIl9zIH0pOwogICAgICAgICAgICAgICAg IHJldHVybjsKICAgICAgICAgICAgIH0KICAgICAgICAgfQotICAgICAgICBwcm9taXNlLnJlamVj dChJbnZhbGlkTW9kaWZpY2F0aW9uRXJyb3IpOwotICAgICAgICBicmVhazsKLSAgICB9Ci0gICAg fQorICAgICAgICBwcm9taXNlLnJlc29sdmUoKTsKKyAgICB9KTsKIH0KIAogdm9pZCBMaWJXZWJS VENQZWVyQ29ubmVjdGlvbkJhY2tlbmQ6OmFwcGx5Um90YXRpb25Gb3JPdXRnb2luZ1ZpZGVvU291 cmNlcygpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xp YndlYnJ0Yy9MaWJXZWJSVENQZWVyQ29ubmVjdGlvbkJhY2tlbmQuaCBiL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ1BlZXJDb25uZWN0aW9uQmFj a2VuZC5oCmluZGV4IGI1NWYwY2YyZDQ5Yjg1NTgxMWU4N2Y2ODkzZDFjNTljZmQxNTA1ZjcuLjY0 ZTYwOWMyNjA1MDRmMDJmNzkwMzY2YmUwYTA0M2I4YTFiMDJjMDQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ1BlZXJDb25u ZWN0aW9uQmFja2VuZC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0v bGlid2VicnRjL0xpYldlYlJUQ1BlZXJDb25uZWN0aW9uQmFja2VuZC5oCkBAIC0xMTIsNiArMTEy LDggQEAgcHJpdmF0ZToKIAogICAgIFJlZjxSVENSdHBUcmFuc2NlaXZlcj4gY29tcGxldGVBZGRU cmFuc2NlaXZlcihSZWY8UlRDUnRwU2VuZGVyPiYmLCBjb25zdCBSVENSdHBUcmFuc2NlaXZlcklu aXQmLCBjb25zdCBTdHJpbmcmIHRyYWNrSWQsIGNvbnN0IFN0cmluZyYgdHJhY2tLaW5kKTsKIAor ICAgIHZvaWQgZW5xdWV1ZVJlcGxhY2VUcmFja1Rhc2soUlRDUnRwU2VuZGVyJiwgUmVmUHRyPE1l ZGlhU3RyZWFtVHJhY2s+JiYsIERPTVByb21pc2VEZWZlcnJlZDx2b2lkPiYmKTsKKwogICAgIFJl ZjxMaWJXZWJSVENNZWRpYUVuZHBvaW50PiBtX2VuZHBvaW50OwogICAgIGJvb2wgbV9pc0xvY2Fs RGVzY3JpcHRpb25TZXQgeyBmYWxzZSB9OwogICAgIGJvb2wgbV9pc1JlbW90ZURlc2NyaXB0aW9u U2V0IHsgZmFsc2UgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFz dHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ1J0cFNlbmRlckJhY2tlbmQuY3BwIGIvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDUnRwU2VuZGVyQmFj a2VuZC5jcHAKaW5kZXggMmIyNzM1YzI3NGI2NTJiNGI4ODI5NTlmZTdkMWEyZGEwNzRiYTBkMS4u NTFhNzhhZTMxZGJhZmY1YmI1ZjllYzViMTEyNWI3YWY5ZDAxMmMzNyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDUnRwU2Vu ZGVyQmFja2VuZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9s aWJ3ZWJydGMvTGliV2ViUlRDUnRwU2VuZGVyQmFja2VuZC5jcHAKQEAgLTQxLDExICs0MSw2IEBA IHZvaWQgTGliV2ViUlRDUnRwU2VuZGVyQmFja2VuZDo6cmVwbGFjZVRyYWNrKFJUQ1J0cFNlbmRl ciYgc2VuZGVyLCBSZWZQdHI8TWVkaWFTCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBp ZiAoIXNlbmRlci50cmFjaygpICYmIHRyYWNrKSB7Ci0gICAgICAgIG1fcGVlckNvbm5lY3Rpb25C YWNrZW5kLT5jb25uZWN0aW9uKCkuZW5xdWV1ZVJlcGxhY2VUcmFja1Rhc2soc2VuZGVyLCB0cmFj ay5yZWxlYXNlTm9uTnVsbCgpLCBXVEZNb3ZlKHByb21pc2UpKTsKLSAgICAgICAgcmV0dXJuOwot ICAgIH0KLQogICAgIG1fcGVlckNvbm5lY3Rpb25CYWNrZW5kLT5yZXBsYWNlVHJhY2soc2VuZGVy LCBXVEZNb3ZlKHRyYWNrKSwgV1RGTW92ZShwcm9taXNlKSk7CiB9CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2Nzcy9Gb250RmFjZVNldC5oIGIvU291cmNlL1dlYkNvcmUvY3NzL0ZvbnRG YWNlU2V0LmgKaW5kZXggMWM4OTE3MmE4ZTcxZGQ4MzhkNDNiYTZkZDg0MzgzODg2NGVkNmVjNy4u NWY1MDE2M2I2M2Y3ODJiOTNiNjc1M2I1ZWJiZmU5YzA0Y2EzYTRlMyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvY3NzL0ZvbnRGYWNlU2V0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0Zv bnRGYWNlU2V0LmgKQEAgLTM1LDcgKzM1LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBjbGFz cyBET01FeGNlcHRpb247CiAKLWNsYXNzIEZvbnRGYWNlU2V0IGZpbmFsIDogcHVibGljIFJlZkNv dW50ZWQ8Rm9udEZhY2VTZXQ+LCBwcml2YXRlIENTU0ZvbnRGYWNlU2V0Q2xpZW50LCBwdWJsaWMg RXZlbnRUYXJnZXRXaXRoSW5saW5lRGF0YSwgcHJpdmF0ZSBBY3RpdmVET01PYmplY3QgeworY2xh c3MgRm9udEZhY2VTZXQgZmluYWwgOiBwdWJsaWMgUmVmQ291bnRlZDxGb250RmFjZVNldD4sIHBy aXZhdGUgQ1NTRm9udEZhY2VTZXRDbGllbnQsIHB1YmxpYyBFdmVudFRhcmdldFdpdGhJbmxpbmVE YXRhLCBwcml2YXRlICBBY3RpdmVET01PYmplY3QgewogcHVibGljOgogICAgIHN0YXRpYyBSZWY8 Rm9udEZhY2VTZXQ+IGNyZWF0ZShEb2N1bWVudCYsIGNvbnN0IFZlY3RvcjxSZWZQdHI8Rm9udEZh Y2U+PiYgaW5pdGlhbEZhY2VzKTsKICAgICBzdGF0aWMgUmVmPEZvbnRGYWNlU2V0PiBjcmVhdGUo RG9jdW1lbnQmLCBDU1NGb250RmFjZVNldCYgYmFja2luZyk7Cg==