269290 2024-02-13 05:50:29 -0800 REGRESSION(274512@main): broke watchos build 2024-02-14 09:56:44 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 269236 1 commit-queue tzagallo aakash_jain graouts webkit-bug-importer oldest_to_newest 2013142 0 commit-queue 2024-02-13 05:50:29 -0800 https://commits.webkit.org/274512@main introduced a regression: broke watchos build This is an automatic bug report generated by webkitbot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests fail. 2013144 1 469845 commit-queue 2024-02-13 05:50:36 -0800 Created attachment 469845 REVERT of 274512@main Any committer can land this patch automatically by marking it commit-queue+. The commit-queue will build and test the patch before landing to ensure that the revert will be successful. This process takes approximately 15 minutes. If you would like to land the revert faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID where ATTACHMENT_ID is the ID of this attachment. 2013145 2 ews-feeder 2024-02-13 05:55:35 -0800 Committed 274545@main (245919ad04e4): <https://commits.webkit.org/274545@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 469845. 2013146 3 webkit-bug-importer 2024-02-13 05:56:14 -0800 <rdar://problem/122869065> 2013174 4 aakash_jain 2024-02-13 09:13:39 -0800 274512@main broke the watchos build as seen in: https://build.webkit.org/#/builders/930/builds/4199 Previous build (https://build.webkit.org/#/builders/930/builds/4198) succeeded on 274511@main 2013527 5 tzagallo 2024-02-14 09:42:03 -0800 Re-opening for pull request https://github.com/WebKit/WebKit/pull/24422 2013532 6 graouts 2024-02-14 09:56:44 -0800 Was reopened by mistake. 469845 2024-02-13 05:50:36 -0800 2024-02-13 05:55:36 -0800 REVERT of 274512@main bug-269290-20240213135035.patch text/plain 22735 commit-queue RnJvbSA3M2FlNTJlYzY3YzlmYTFmOTRhMjU5YjlkZTk2YjgzNWEyN2NjZjVkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDb21taXQgUXVldWUgPGNvbW1pdC1xdWV1ZUB3ZWJraXQub3Jn PgpEYXRlOiBUdWUsIDEzIEZlYiAyMDI0IDEzOjUwOjMzICswMDAwClN1YmplY3Q6IFtQQVRDSF0g VW5yZXZpZXdlZCwgcmV2ZXJ0aW5nIDI3NDUxMkBtYWluLgogaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTI2OTI5MAoKYnJva2Ugd2F0Y2hvcyBidWlsZAoKUmV2ZXJ0ZWQg Y2hhbmdlc2V0OgoKIlt0aHJlYWRlZC1hbmltYXRpb24tcmVzb2x1dGlvbl0gYWRkIHN1cHBvcnQg Zm9yIGJsZW5kaW5nIGBmaWx0ZXJgIHZhbHVlcyIKaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTI2OTIzNgpodHRwczovL2NvbW1pdHMud2Via2l0Lm9yZy8yNzQ1MTJAbWFp bgotLS0KIC4uLi9wbGF0Zm9ybS9ncmFwaGljcy9jYS9QbGF0Zm9ybUNBRmlsdGVycy5oICB8ICAg NyAtCiAuLi4vY2EvY29jb2EvUGxhdGZvcm1DQUZpbHRlcnNDb2NvYS5tbSAgICAgICAgfCAxODIg Ky0tLS0tLS0tLS0tLS0tLS0tCiAuLi4vUmVtb3RlQWNjZWxlcmF0ZWRFZmZlY3RTdGFjay5oICAg ICAgICAgICAgfCAgMTAgKy0KIC4uLi9SZW1vdGVBY2NlbGVyYXRlZEVmZmVjdFN0YWNrLm1tICAg ICAgICAgICB8ICA5MiArKy0tLS0tLS0KIDQgZmlsZXMgY2hhbmdlZCwgMjIgaW5zZXJ0aW9ucygr KSwgMjY5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2NhL1BsYXRmb3JtQ0FGaWx0ZXJzLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jYS9QbGF0Zm9ybUNBRmlsdGVycy5oCmluZGV4IGJlZWYwNGNjMGE3NS4uNjYw NzA1NGEwNjc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j YS9QbGF0Zm9ybUNBRmlsdGVycy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2NhL1BsYXRmb3JtQ0FGaWx0ZXJzLmgKQEAgLTMxLDIxICszMSwxNCBAQAogI2luY2x1ZGUg PHd0Zi9SZXRhaW5QdHIuaD4KIAogT0JKQ19DTEFTUyBOU1ZhbHVlOwotT0JKQ19DTEFTUyBDQVBy ZXNlbnRhdGlvbk1vZGlmaWVyOwotT0JKQ19DTEFTUyBDQVByZXNlbnRhdGlvbk1vZGlmaWVyR3Jv dXA7CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogY2xhc3MgUGxhdGZvcm1DQUxheWVyOwogCi11 c2luZyBUeXBlZEZpbHRlclByZXNlbnRhdGlvbk1vZGlmaWVyID0gc3RkOjpwYWlyPEZpbHRlck9w ZXJhdGlvbjo6VHlwZSwgUmV0YWluUHRyPENBUHJlc2VudGF0aW9uTW9kaWZpZXI+PjsKLQogY2xh c3MgUGxhdGZvcm1DQUZpbHRlcnMgewogcHVibGljOgogICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRp YyB2b2lkIHNldEZpbHRlcnNPbkxheWVyKFBsYXRmb3JtTGF5ZXIqLCBjb25zdCBGaWx0ZXJPcGVy YXRpb25zJik7Ci0gICAgV0VCQ09SRV9FWFBPUlQgc3RhdGljIHZvaWQgcHJlc2VudGF0aW9uTW9k aWZpZXJzKGNvbnN0IEZpbHRlck9wZXJhdGlvbnMmIGluaXRpYWxGaWx0ZXJzLCBjb25zdCBGaWx0 ZXJPcGVyYXRpb25zKiBjYW5vbmljYWxGaWx0ZXJzLCBWZWN0b3I8VHlwZWRGaWx0ZXJQcmVzZW50 YXRpb25Nb2RpZmllcj4mIHByZXNlbnRhdGlvbk1vZGlmaWVycywgUmV0YWluUHRyPENBUHJlc2Vu dGF0aW9uTW9kaWZpZXJHcm91cD4mKTsKLSAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMgdm9pZCB1 cGRhdGVQcmVzZW50YXRpb25Nb2RpZmllcnMoY29uc3QgRmlsdGVyT3BlcmF0aW9ucyYgZmlsdGVy cywgY29uc3QgVmVjdG9yPFR5cGVkRmlsdGVyUHJlc2VudGF0aW9uTW9kaWZpZXI+JiBwcmVzZW50 YXRpb25Nb2RpZmllcnMpOwotICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRpYyBzaXplX3QgcHJlc2Vu dGF0aW9uTW9kaWZpZXJDb3VudChjb25zdCBGaWx0ZXJPcGVyYXRpb25zJik7CiAgICAgV0VCQ09S RV9FWFBPUlQgc3RhdGljIHZvaWQgc2V0QmxlbmRpbmdGaWx0ZXJzT25MYXllcihQbGF0Zm9ybUxh eWVyKiwgY29uc3QgQmxlbmRNb2RlKTsKICAgICBzdGF0aWMgYm9vbCBpc0FuaW1hdGVkRmlsdGVy UHJvcGVydHkoRmlsdGVyT3BlcmF0aW9uOjpUeXBlKTsKICAgICBzdGF0aWMgU3RyaW5nIGFuaW1h dGVkRmlsdGVyUHJvcGVydHlOYW1lKEZpbHRlck9wZXJhdGlvbjo6VHlwZSk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9jb2NvYS9QbGF0Zm9ybUNBRmls dGVyc0NvY29hLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvY29jb2Ev UGxhdGZvcm1DQUZpbHRlcnNDb2NvYS5tbQppbmRleCA0MGMyMGZlZjhmMmIuLjQ5ZDVkMGJmMzFh MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvY29jb2Ev UGxhdGZvcm1DQUZpbHRlcnNDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jYS9jb2NvYS9QbGF0Zm9ybUNBRmlsdGVyc0NvY29hLm1tCkBAIC0zNywxODcgKzM3 LDYgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1zdGF0aWMgdW5zaWduZWQga2V5VmFsdWVD b3VudEZvckZpbHRlcihjb25zdCBGaWx0ZXJPcGVyYXRpb24mIGZpbHRlck9wZXJhdGlvbikKLXsK LSAgICBzd2l0Y2ggKGZpbHRlck9wZXJhdGlvbi50eXBlKCkpIHsKLSAgICBjYXNlIEZpbHRlck9w ZXJhdGlvbjo6VHlwZTo6RGVmYXVsdDoKLSAgICBjYXNlIEZpbHRlck9wZXJhdGlvbjo6VHlwZTo6 UmVmZXJlbmNlOgotICAgIGNhc2UgRmlsdGVyT3BlcmF0aW9uOjpUeXBlOjpOb25lOgotICAgICAg ICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICAgICAgcmV0dXJuIDA7Ci0gICAgY2FzZSBGaWx0 ZXJPcGVyYXRpb246OlR5cGU6OkRyb3BTaGFkb3c6Ci0gICAgICAgIHJldHVybiAzOwotICAgIGNh c2UgRmlsdGVyT3BlcmF0aW9uOjpUeXBlOjpTZXBpYToKLSAgICBjYXNlIEZpbHRlck9wZXJhdGlv bjo6VHlwZTo6U2F0dXJhdGU6Ci0gICAgY2FzZSBGaWx0ZXJPcGVyYXRpb246OlR5cGU6Okh1ZVJv dGF0ZToKLSAgICBjYXNlIEZpbHRlck9wZXJhdGlvbjo6VHlwZTo6SW52ZXJ0OgotICAgIGNhc2Ug RmlsdGVyT3BlcmF0aW9uOjpUeXBlOjpPcGFjaXR5OgotICAgIGNhc2UgRmlsdGVyT3BlcmF0aW9u OjpUeXBlOjpCcmlnaHRuZXNzOgotICAgIGNhc2UgRmlsdGVyT3BlcmF0aW9uOjpUeXBlOjpDb250 cmFzdDoKLSAgICBjYXNlIEZpbHRlck9wZXJhdGlvbjo6VHlwZTo6R3JheXNjYWxlOgotICAgIGNh c2UgRmlsdGVyT3BlcmF0aW9uOjpUeXBlOjpCbHVyOgotICAgICAgICByZXR1cm4gMTsKLSAgICBj YXNlIEZpbHRlck9wZXJhdGlvbjo6VHlwZTo6QXBwbGVJbnZlcnRMaWdodG5lc3M6Ci0gICAgICAg IEFTU0VSVF9OT1RfUkVBQ0hFRCgpOyAvLyBBcHBsZUludmVydExpZ2h0bmVzcyBpcyBvbmx5IHVz ZWQgaW4gLWFwcGxlLWNvbG9yLWZpbHRlci4KLSAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBGaWx0 ZXJPcGVyYXRpb246OlR5cGU6OlBhc3N0aHJvdWdoOgotICAgICAgICByZXR1cm4gMDsKLSAgICB9 Ci0gICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgcmV0dXJuIDA7Ci19Ci0KLXNpemVfdCBQ bGF0Zm9ybUNBRmlsdGVyczo6cHJlc2VudGF0aW9uTW9kaWZpZXJDb3VudChjb25zdCBGaWx0ZXJP cGVyYXRpb25zJiBmaWx0ZXJzKQotewotICAgIHNpemVfdCBjb3VudCA9IDA7Ci0gICAgZm9yIChj b25zdCBhdXRvJiBmaWx0ZXIgOiBmaWx0ZXJzLm9wZXJhdGlvbnMoKSkKLSAgICAgICAgY291bnQg Kz0ga2V5VmFsdWVDb3VudEZvckZpbHRlcigqZmlsdGVyLmdldCgpKTsKLSAgICByZXR1cm4gY291 bnQ7Ci19Ci0KLXN0YXRpYyBjb25zdCBGaWx0ZXJPcGVyYXRpb24mIHBhc3N0aHJvdWdoRmlsdGVy KGNvbnN0IEZpbHRlck9wZXJhdGlvbjo6VHlwZSB0eXBlVG9NYXRjaCkKLXsKLSAgICBzd2l0Y2gg KHR5cGVUb01hdGNoKSB7Ci0gICAgY2FzZSBGaWx0ZXJPcGVyYXRpb246OlR5cGU6OkRyb3BTaGFk b3c6Ci0gICAgICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxSZWY8RHJvcFNoYWRvd0ZpbHRlck9w ZXJhdGlvbj4+IHBhc3N0aHJvdWdoRHJvcFNoYWRvd0ZpbHRlciA9IERyb3BTaGFkb3dGaWx0ZXJP cGVyYXRpb246OmNyZWF0ZSh7IH0sIDAsIHsgfSk7Ci0gICAgICAgIHJldHVybiBwYXNzdGhyb3Vn aERyb3BTaGFkb3dGaWx0ZXIuZ2V0KCk7Ci0gICAgY2FzZSBGaWx0ZXJPcGVyYXRpb246OlR5cGU6 OkdyYXlzY2FsZToKLSAgICAgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPFJlZjxCYXNpY0NvbG9y TWF0cml4RmlsdGVyT3BlcmF0aW9uPj4gcGFzc3Rocm91Z2hHcmF5c2NhbGVGaWx0ZXIgPSBCYXNp Y0NvbG9yTWF0cml4RmlsdGVyT3BlcmF0aW9uOjpjcmVhdGUoMCwgdHlwZVRvTWF0Y2gpOwotICAg ICAgICByZXR1cm4gcGFzc3Rocm91Z2hHcmF5c2NhbGVGaWx0ZXIuZ2V0KCk7Ci0gICAgY2FzZSBG aWx0ZXJPcGVyYXRpb246OlR5cGU6OlNlcGlhOgotICAgICAgICBzdGF0aWMgTmV2ZXJEZXN0cm95 ZWQ8UmVmPEJhc2ljQ29sb3JNYXRyaXhGaWx0ZXJPcGVyYXRpb24+PiBwYXNzdGhyb3VnaFNlcGlh RmlsdGVyID0gQmFzaWNDb2xvck1hdHJpeEZpbHRlck9wZXJhdGlvbjo6Y3JlYXRlKDAsIHR5cGVU b01hdGNoKTsKLSAgICAgICAgcmV0dXJuIHBhc3N0aHJvdWdoU2VwaWFGaWx0ZXIuZ2V0KCk7Ci0g ICAgY2FzZSBGaWx0ZXJPcGVyYXRpb246OlR5cGU6OlNhdHVyYXRlOgotICAgICAgICBzdGF0aWMg TmV2ZXJEZXN0cm95ZWQ8UmVmPEJhc2ljQ29sb3JNYXRyaXhGaWx0ZXJPcGVyYXRpb24+PiBwYXNz dGhyb3VnaFNhdHVyYXRlRmlsdGVyID0gQmFzaWNDb2xvck1hdHJpeEZpbHRlck9wZXJhdGlvbjo6 Y3JlYXRlKDAsIHR5cGVUb01hdGNoKTsKLSAgICAgICAgcmV0dXJuIHBhc3N0aHJvdWdoU2F0dXJh dGVGaWx0ZXIuZ2V0KCk7Ci0gICAgY2FzZSBGaWx0ZXJPcGVyYXRpb246OlR5cGU6Okh1ZVJvdGF0 ZToKLSAgICAgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPFJlZjxCYXNpY0NvbG9yTWF0cml4Rmls dGVyT3BlcmF0aW9uPj4gcGFzc3Rocm91Z2hIdWVSb3RhdGVGaWx0ZXIgPSBCYXNpY0NvbG9yTWF0 cml4RmlsdGVyT3BlcmF0aW9uOjpjcmVhdGUoMCwgdHlwZVRvTWF0Y2gpOwotICAgICAgICByZXR1 cm4gcGFzc3Rocm91Z2hIdWVSb3RhdGVGaWx0ZXIuZ2V0KCk7Ci0gICAgY2FzZSBGaWx0ZXJPcGVy YXRpb246OlR5cGU6OkludmVydDoKLSAgICAgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPFJlZjxC YXNpY0NvbG9yTWF0cml4RmlsdGVyT3BlcmF0aW9uPj4gcGFzc3Rocm91Z2hJbnZlcnRGaWx0ZXIg PSBCYXNpY0NvbG9yTWF0cml4RmlsdGVyT3BlcmF0aW9uOjpjcmVhdGUoMCwgdHlwZVRvTWF0Y2gp OwotICAgICAgICByZXR1cm4gcGFzc3Rocm91Z2hJbnZlcnRGaWx0ZXIuZ2V0KCk7Ci0gICAgY2Fz ZSBGaWx0ZXJPcGVyYXRpb246OlR5cGU6Ok9wYWNpdHk6Ci0gICAgICAgIHN0YXRpYyBOZXZlckRl c3Ryb3llZDxSZWY8QmFzaWNDb2xvck1hdHJpeEZpbHRlck9wZXJhdGlvbj4+IHBhc3N0aHJvdWdo T3BhY2l0eUZpbHRlciA9IEJhc2ljQ29sb3JNYXRyaXhGaWx0ZXJPcGVyYXRpb246OmNyZWF0ZSgw LCB0eXBlVG9NYXRjaCk7Ci0gICAgICAgIHJldHVybiBwYXNzdGhyb3VnaE9wYWNpdHlGaWx0ZXIu Z2V0KCk7Ci0gICAgY2FzZSBGaWx0ZXJPcGVyYXRpb246OlR5cGU6OkJyaWdodG5lc3M6Ci0gICAg ICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxSZWY8QmFzaWNDb2xvck1hdHJpeEZpbHRlck9wZXJh dGlvbj4+IHBhc3N0aHJvdWdoQnJpZ2h0bmVzc0ZpbHRlciA9IEJhc2ljQ29sb3JNYXRyaXhGaWx0 ZXJPcGVyYXRpb246OmNyZWF0ZSgwLCB0eXBlVG9NYXRjaCk7Ci0gICAgICAgIHJldHVybiBwYXNz dGhyb3VnaEJyaWdodG5lc3NGaWx0ZXIuZ2V0KCk7Ci0gICAgY2FzZSBGaWx0ZXJPcGVyYXRpb246 OlR5cGU6OkNvbnRyYXN0OgotICAgICAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8UmVmPEJhc2lj Q29sb3JNYXRyaXhGaWx0ZXJPcGVyYXRpb24+PiBwYXNzdGhyb3VnaENvbnRyYXN0RmlsdGVyID0g QmFzaWNDb2xvck1hdHJpeEZpbHRlck9wZXJhdGlvbjo6Y3JlYXRlKDAsIHR5cGVUb01hdGNoKTsK LSAgICAgICAgcmV0dXJuIHBhc3N0aHJvdWdoQ29udHJhc3RGaWx0ZXIuZ2V0KCk7Ci0gICAgY2Fz ZSBGaWx0ZXJPcGVyYXRpb246OlR5cGU6OkJsdXI6Ci0gICAgICAgIHN0YXRpYyBOZXZlckRlc3Ry b3llZDxSZWY8Qmx1ckZpbHRlck9wZXJhdGlvbj4+IHBhc3N0aHJvdWdoQmx1ckZpbHRlciA9IEJs dXJGaWx0ZXJPcGVyYXRpb246OmNyZWF0ZSh7IDAsIExlbmd0aFR5cGU6OkZpeGVkIH0pOwotICAg ICAgICByZXR1cm4gcGFzc3Rocm91Z2hCbHVyRmlsdGVyLmdldCgpOwotICAgIGRlZmF1bHQ6Ci0g ICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgICAgICBzdGF0aWMgTmV2ZXJEZXN0cm95 ZWQ8UmVmPEJhc2ljQ29sb3JNYXRyaXhGaWx0ZXJPcGVyYXRpb24+PiBwYXNzdGhyb3VnaERlZmF1 bHRGaWx0ZXIgPSBCYXNpY0NvbG9yTWF0cml4RmlsdGVyT3BlcmF0aW9uOjpjcmVhdGUoMCwgRmls dGVyT3BlcmF0aW9uOjpUeXBlOjpHcmF5c2NhbGUpOwotICAgICAgICByZXR1cm4gcGFzc3Rocm91 Z2hEZWZhdWx0RmlsdGVyLmdldCgpOwotICAgIH0KLX0KLQotdm9pZCBQbGF0Zm9ybUNBRmlsdGVy czo6cHJlc2VudGF0aW9uTW9kaWZpZXJzKGNvbnN0IEZpbHRlck9wZXJhdGlvbnMmIGluaXRpYWxG aWx0ZXJzLCBjb25zdCBGaWx0ZXJPcGVyYXRpb25zKiBjYW5vbmljYWxGaWx0ZXJzLCBWZWN0b3I8 VHlwZWRGaWx0ZXJQcmVzZW50YXRpb25Nb2RpZmllcj4mIHByZXNlbnRhdGlvbk1vZGlmaWVycywg UmV0YWluUHRyPENBUHJlc2VudGF0aW9uTW9kaWZpZXJHcm91cD4mIGdyb3VwKQotewotICAgIGlm ICghY2Fub25pY2FsRmlsdGVycyB8fCBjYW5vbmljYWxGaWx0ZXJzLT5pc0VtcHR5KCkpCi0gICAg ICAgIHJldHVybjsKLQotICAgIEFTU0VSVChjYW5vbmljYWxGaWx0ZXJzLT5zaXplKCkgPj0gaW5p dGlhbEZpbHRlcnMuc2l6ZSgpKTsKLSAgICBBU1NFUlQocHJlc2VudGF0aW9uTW9kaWZpZXJDb3Vu dCgqY2Fub25pY2FsRmlsdGVycykpOwotCi0gICAgYXV0byYgY2Fub25pY2FsRmlsdGVyT3BlcmF0 aW9ucyA9IGNhbm9uaWNhbEZpbHRlcnMtPm9wZXJhdGlvbnMoKTsKLSAgICBhdXRvJiBpbml0aWFs RmlsdGVyT3BlcmF0aW9ucyA9IGluaXRpYWxGaWx0ZXJzLm9wZXJhdGlvbnMoKTsKLSAgICBhdXRv IG51bWJlck9mSW5pdGlhbEZpbHRlcnMgPSBpbml0aWFsRmlsdGVyT3BlcmF0aW9ucy5zaXplKCk7 Ci0gICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBjYW5vbmljYWxGaWx0ZXJPcGVyYXRpb25zLnNp emUoKTsgKytpKSB7Ci0gICAgICAgIGF1dG8mIGNhbm9uaWNhbEZpbHRlck9wZXJhdGlvbiA9ICpj YW5vbmljYWxGaWx0ZXJPcGVyYXRpb25zW2ldOwotICAgICAgICBhdXRvJiBpbml0aWFsRmlsdGVy T3BlcmF0aW9uID0gaSA8IG51bWJlck9mSW5pdGlhbEZpbHRlcnMgPyAqaW5pdGlhbEZpbHRlck9w ZXJhdGlvbnNbaV0gOiBwYXNzdGhyb3VnaEZpbHRlcihjYW5vbmljYWxGaWx0ZXJPcGVyYXRpb24u dHlwZSgpKTsKLSAgICAgICAgQVNTRVJUKGNhbm9uaWNhbEZpbHRlck9wZXJhdGlvbi50eXBlKCkg PT0gaW5pdGlhbEZpbHRlck9wZXJhdGlvbi50eXBlKCkpOwotICAgICAgICBhdXRvIGZpbHRlck5h bWUgPSBtYWtlU3RyaW5nKCJmaWx0ZXJfIiwgaSk7Ci0gICAgICAgIGF1dG8gdHlwZSA9IGluaXRp YWxGaWx0ZXJPcGVyYXRpb24udHlwZSgpOwotICAgICAgICBzd2l0Y2ggKHR5cGUpIHsKLSAgICAg ICAgY2FzZSBGaWx0ZXJPcGVyYXRpb246OlR5cGU6OkRlZmF1bHQ6Ci0gICAgICAgIGNhc2UgRmls dGVyT3BlcmF0aW9uOjpUeXBlOjpSZWZlcmVuY2U6Ci0gICAgICAgIGNhc2UgRmlsdGVyT3BlcmF0 aW9uOjpUeXBlOjpOb25lOgotICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAg ICAgICAgICBicmVhazsKLSAgICAgICAgY2FzZSBGaWx0ZXJPcGVyYXRpb246OlR5cGU6OkRyb3BT aGFkb3c6IHsKLSAgICAgICAgICAgIGNvbnN0IGF1dG8mIGRyb3BTaGFkb3dPcGVyYXRpb24gPSBk b3duY2FzdDxEcm9wU2hhZG93RmlsdGVyT3BlcmF0aW9uPihpbml0aWFsRmlsdGVyT3BlcmF0aW9u KTsKLSAgICAgICAgICAgIGF1dG8gc2l6ZSA9IENHU2l6ZU1ha2UoZHJvcFNoYWRvd09wZXJhdGlv bi54KCksIGRyb3BTaGFkb3dPcGVyYXRpb24ueSgpKTsKLSAgICAgICAgICAgIHByZXNlbnRhdGlv bk1vZGlmaWVycy5hcHBlbmQoeyB0eXBlLCBhZG9wdE5TKFtbQ0FQcmVzZW50YXRpb25Nb2RpZmll ciBhbGxvY10gaW5pdFdpdGhLZXlQYXRoOkAic2hhZG93T2Zmc2V0IiBpbml0aWFsVmFsdWU6W05T VmFsdWUgdmFsdWU6JnNpemUgd2l0aE9iakNUeXBlOkBlbmNvZGUoQ0dTaXplKV0gYWRkaXRpdmU6 Tk8gZ3JvdXA6Z3JvdXAuZ2V0KCldKSB9KTsKLSAgICAgICAgICAgIHByZXNlbnRhdGlvbk1vZGlm aWVycy5hcHBlbmQoeyB0eXBlLCBhZG9wdE5TKFtbQ0FQcmVzZW50YXRpb25Nb2RpZmllciBhbGxv Y10gaW5pdFdpdGhLZXlQYXRoOkAic2hhZG93Q29sb3IiIGluaXRpYWxWYWx1ZTooaWQpIGNhY2hl ZENHQ29sb3IoZHJvcFNoYWRvd09wZXJhdGlvbi5jb2xvcigpKS5hdXRvcmVsZWFzZSgpIGFkZGl0 aXZlOk5PIGdyb3VwOmdyb3VwLmdldCgpXSkgfSk7Ci0gICAgICAgICAgICBwcmVzZW50YXRpb25N b2RpZmllcnMuYXBwZW5kKHsgdHlwZSwgYWRvcHROUyhbW0NBUHJlc2VudGF0aW9uTW9kaWZpZXIg YWxsb2NdIGluaXRXaXRoS2V5UGF0aDpAInNoYWRvd1JhZGl1cyIgaW5pdGlhbFZhbHVlOkAoZHJv cFNoYWRvd09wZXJhdGlvbi5zdGREZXZpYXRpb24oKSkgYWRkaXRpdmU6Tk8gZ3JvdXA6Z3JvdXAu Z2V0KCldKSB9KTsKLSAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICB9Ci0gICAgICAgIGNh c2UgRmlsdGVyT3BlcmF0aW9uOjpUeXBlOjpHcmF5c2NhbGU6Ci0gICAgICAgIGNhc2UgRmlsdGVy T3BlcmF0aW9uOjpUeXBlOjpTZXBpYToKLSAgICAgICAgY2FzZSBGaWx0ZXJPcGVyYXRpb246OlR5 cGU6OlNhdHVyYXRlOgotICAgICAgICBjYXNlIEZpbHRlck9wZXJhdGlvbjo6VHlwZTo6SHVlUm90 YXRlOgotICAgICAgICBjYXNlIEZpbHRlck9wZXJhdGlvbjo6VHlwZTo6SW52ZXJ0OgotICAgICAg ICBjYXNlIEZpbHRlck9wZXJhdGlvbjo6VHlwZTo6T3BhY2l0eToKLSAgICAgICAgY2FzZSBGaWx0 ZXJPcGVyYXRpb246OlR5cGU6OkJyaWdodG5lc3M6Ci0gICAgICAgIGNhc2UgRmlsdGVyT3BlcmF0 aW9uOjpUeXBlOjpDb250cmFzdDoKLSAgICAgICAgY2FzZSBGaWx0ZXJPcGVyYXRpb246OlR5cGU6 OkJsdXI6IHsKLSAgICAgICAgICAgIGF1dG8ga2V5VmFsdWVOYW1lID0gbWFrZVN0cmluZygiZmls dGVycy4iLCBmaWx0ZXJOYW1lLCAiLiIsIGFuaW1hdGVkRmlsdGVyUHJvcGVydHlOYW1lKGluaXRp YWxGaWx0ZXJPcGVyYXRpb24udHlwZSgpKSk7Ci0gICAgICAgICAgICBwcmVzZW50YXRpb25Nb2Rp ZmllcnMuYXBwZW5kKHsgdHlwZSwgYWRvcHROUyhbW0NBUHJlc2VudGF0aW9uTW9kaWZpZXIgYWxs b2NdIGluaXRXaXRoS2V5UGF0aDprZXlWYWx1ZU5hbWUgaW5pdGlhbFZhbHVlOmZpbHRlclZhbHVl Rm9yT3BlcmF0aW9uKCZpbml0aWFsRmlsdGVyT3BlcmF0aW9uKS5nZXQoKSBhZGRpdGl2ZTpOTyBn cm91cDpncm91cC5nZXQoKV0pIH0pOwotICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgIH0K LSAgICAgICAgY2FzZSBGaWx0ZXJPcGVyYXRpb246OlR5cGU6OkFwcGxlSW52ZXJ0TGlnaHRuZXNz OgotICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7IC8vIEFwcGxlSW52ZXJ0TGlnaHRu ZXNzIGlzIG9ubHkgdXNlZCBpbiAtYXBwbGUtY29sb3ItZmlsdGVyLgotICAgICAgICAgICAgYnJl YWs7Ci0gICAgICAgIGNhc2UgRmlsdGVyT3BlcmF0aW9uOjpUeXBlOjpQYXNzdGhyb3VnaDoKLSAg ICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICB9Ci0gICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hF RCgpOwotICAgICAgICBicmVhazsKLSAgICB9Ci0KLSAgICBBU1NFUlQocHJlc2VudGF0aW9uTW9k aWZpZXJDb3VudCgqY2Fub25pY2FsRmlsdGVycykgPT0gcHJlc2VudGF0aW9uTW9kaWZpZXJzLnNp emUoKSk7Ci19Ci0KLXZvaWQgUGxhdGZvcm1DQUZpbHRlcnM6OnVwZGF0ZVByZXNlbnRhdGlvbk1v ZGlmaWVycyhjb25zdCBGaWx0ZXJPcGVyYXRpb25zJiBmaWx0ZXJzLCBjb25zdCBWZWN0b3I8VHlw ZWRGaWx0ZXJQcmVzZW50YXRpb25Nb2RpZmllcj4mIHByZXNlbnRhdGlvbk1vZGlmaWVycykKLXsK LSAgICBBU1NFUlQocHJlc2VudGF0aW9uTW9kaWZpZXJDb3VudChmaWx0ZXJzKSA8PSBwcmVzZW50 YXRpb25Nb2RpZmllcnMuc2l6ZSgpKTsKLQotICAgIHNpemVfdCBmaWx0ZXJJbmRleCA9IDA7Ci0g ICAgYXV0byBudW1iZXJPZkZpbHRlcnMgPSBmaWx0ZXJzLnNpemUoKTsKLSAgICBmb3IgKHNpemVf dCBpID0gMDsgaSA8IHByZXNlbnRhdGlvbk1vZGlmaWVycy5zaXplKCk7ICsraSkgewotICAgICAg ICBhdXRvJiBmaWx0ZXJPcGVyYXRpb24gPSBmaWx0ZXJJbmRleCA8IG51bWJlck9mRmlsdGVycyA/ ICpmaWx0ZXJzLmF0KGZpbHRlckluZGV4KSA6IHBhc3N0aHJvdWdoRmlsdGVyKHByZXNlbnRhdGlv bk1vZGlmaWVyc1tpXS5maXJzdCk7Ci0gICAgICAgICsrZmlsdGVySW5kZXg7Ci0gICAgICAgIHN3 aXRjaCAoZmlsdGVyT3BlcmF0aW9uLnR5cGUoKSkgewotICAgICAgICBjYXNlIEZpbHRlck9wZXJh dGlvbjo6VHlwZTo6RGVmYXVsdDoKLSAgICAgICAgY2FzZSBGaWx0ZXJPcGVyYXRpb246OlR5cGU6 OlJlZmVyZW5jZToKLSAgICAgICAgY2FzZSBGaWx0ZXJPcGVyYXRpb246OlR5cGU6Ok5vbmU6Ci0g ICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAg ICAgICAgY2FzZSBGaWx0ZXJPcGVyYXRpb246OlR5cGU6OkRyb3BTaGFkb3c6IHsKLSAgICAgICAg ICAgIGNvbnN0IGF1dG8mIGRyb3BTaGFkb3dPcGVyYXRpb24gPSBkb3duY2FzdDxEcm9wU2hhZG93 RmlsdGVyT3BlcmF0aW9uPihmaWx0ZXJPcGVyYXRpb24pOwotICAgICAgICAgICAgYXV0byBzaXpl ID0gQ0dTaXplTWFrZShkcm9wU2hhZG93T3BlcmF0aW9uLngoKSwgZHJvcFNoYWRvd09wZXJhdGlv bi55KCkpOwotICAgICAgICAgICAgW3ByZXNlbnRhdGlvbk1vZGlmaWVyc1tpXS5zZWNvbmQuZ2V0 KCkgc2V0VmFsdWU6W05TVmFsdWUgdmFsdWU6JnNpemUgd2l0aE9iakNUeXBlOkBlbmNvZGUoQ0dT aXplKV1dOwotICAgICAgICAgICAgW3ByZXNlbnRhdGlvbk1vZGlmaWVyc1tpKytdLnNlY29uZC5n ZXQoKSBzZXRWYWx1ZTooaWQpIGNhY2hlZENHQ29sb3IoZHJvcFNoYWRvd09wZXJhdGlvbi5jb2xv cigpKS5hdXRvcmVsZWFzZSgpXTsKLSAgICAgICAgICAgIFtwcmVzZW50YXRpb25Nb2RpZmllcnNb aSsrXS5zZWNvbmQuZ2V0KCkgc2V0VmFsdWU6QChkcm9wU2hhZG93T3BlcmF0aW9uLnN0ZERldmlh dGlvbigpKV07Ci0gICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgfQotICAgICAgICBjYXNl IEZpbHRlck9wZXJhdGlvbjo6VHlwZTo6R3JheXNjYWxlOgotICAgICAgICBjYXNlIEZpbHRlck9w ZXJhdGlvbjo6VHlwZTo6U2VwaWE6Ci0gICAgICAgIGNhc2UgRmlsdGVyT3BlcmF0aW9uOjpUeXBl OjpTYXR1cmF0ZToKLSAgICAgICAgY2FzZSBGaWx0ZXJPcGVyYXRpb246OlR5cGU6Okh1ZVJvdGF0 ZToKLSAgICAgICAgY2FzZSBGaWx0ZXJPcGVyYXRpb246OlR5cGU6OkludmVydDoKLSAgICAgICAg Y2FzZSBGaWx0ZXJPcGVyYXRpb246OlR5cGU6Ok9wYWNpdHk6Ci0gICAgICAgIGNhc2UgRmlsdGVy T3BlcmF0aW9uOjpUeXBlOjpCcmlnaHRuZXNzOgotICAgICAgICBjYXNlIEZpbHRlck9wZXJhdGlv bjo6VHlwZTo6Q29udHJhc3Q6Ci0gICAgICAgIGNhc2UgRmlsdGVyT3BlcmF0aW9uOjpUeXBlOjpC bHVyOiB7Ci0gICAgICAgICAgICBbcHJlc2VudGF0aW9uTW9kaWZpZXJzW2ldLnNlY29uZC5nZXQo KSBzZXRWYWx1ZTpmaWx0ZXJWYWx1ZUZvck9wZXJhdGlvbigmZmlsdGVyT3BlcmF0aW9uKS5nZXQo KV07Ci0gICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgfQotICAgICAgICBjYXNlIEZpbHRl ck9wZXJhdGlvbjo6VHlwZTo6QXBwbGVJbnZlcnRMaWdodG5lc3M6Ci0gICAgICAgICAgICBBU1NF UlRfTk9UX1JFQUNIRUQoKTsgLy8gQXBwbGVJbnZlcnRMaWdodG5lc3MgaXMgb25seSB1c2VkIGlu IC1hcHBsZS1jb2xvci1maWx0ZXIuCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIGNhc2Ug RmlsdGVyT3BlcmF0aW9uOjpUeXBlOjpQYXNzdGhyb3VnaDoKLSAgICAgICAgICAgIGNvbnRpbnVl OwotICAgICAgICB9Ci0gICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgICAgICByZXR1 cm47Ci0gICAgfQotfQotCiB2b2lkIFBsYXRmb3JtQ0FGaWx0ZXJzOjpzZXRGaWx0ZXJzT25MYXll cihQbGF0Zm9ybUxheWVyKiBsYXllciwgY29uc3QgRmlsdGVyT3BlcmF0aW9ucyYgZmlsdGVycykK IHsKICAgICBpZiAoIWZpbHRlcnMuc2l6ZSgpKSB7CkBAIC0yODIsNiArMTAxLDcgQEAgdm9pZCBQ bGF0Zm9ybUNBRmlsdGVyczo6c2V0RmlsdGVyc09uTGF5ZXIoUGxhdGZvcm1MYXllciogbGF5ZXIs IGNvbnN0IEZpbHRlck9wZXIKICAgICAgICAgICAgIGNvbnN0IGF1dG8mIGNvbG9yTWF0cml4T3Bl cmF0aW9uID0gZG93bmNhc3Q8QmFzaWNDb2xvck1hdHJpeEZpbHRlck9wZXJhdGlvbj4oZmlsdGVy T3BlcmF0aW9uKTsKICAgICAgICAgICAgIENBRmlsdGVyICpmaWx0ZXIgPSBbQ0FGaWx0ZXIgZmls dGVyV2l0aFR5cGU6a0NBRmlsdGVyQ29sb3JIdWVSb3RhdGVdOwogICAgICAgICAgICAgW2ZpbHRl ciBzZXRWYWx1ZTpbTlNOdW1iZXIgbnVtYmVyV2l0aEZsb2F0OmRlZzJyYWQoY29sb3JNYXRyaXhP cGVyYXRpb24uYW1vdW50KCkpXSBmb3JLZXk6QCJpbnB1dEFuZ2xlIl07CisgICAgICAgICAgICBb ZmlsdGVyIHNldE5hbWU6QCJodWVSb3RhdGUiXTsKICAgICAgICAgICAgIFtmaWx0ZXIgc2V0TmFt ZTpmaWx0ZXJOYW1lXTsKICAgICAgICAgICAgIHJldHVybiBmaWx0ZXI7CiAgICAgICAgIH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVB Y2NlbGVyYXRlZEVmZmVjdFN0YWNrLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1vdGVM YXllclRyZWUvUmVtb3RlQWNjZWxlcmF0ZWRFZmZlY3RTdGFjay5oCmluZGV4IDBmMGJkYjZkYzgy My4uODQ1ZmQ4NjgyNTkyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1v dGVMYXllclRyZWUvUmVtb3RlQWNjZWxlcmF0ZWRFZmZlY3RTdGFjay5oCisrKyBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVBY2NlbGVyYXRlZEVmZmVjdFN0 YWNrLmgKQEAgLTMwLDkgKzMwLDcgQEAKICNpbmNsdWRlIDxXZWJDb3JlL0FjY2VsZXJhdGVkRWZm ZWN0Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9BY2NlbGVyYXRlZEVmZmVjdFN0YWNrLmg+CiAjaW5j bHVkZSA8V2ViQ29yZS9BY2NlbGVyYXRlZEVmZmVjdFZhbHVlcy5oPgotI2luY2x1ZGUgPFdlYkNv cmUvUGxhdGZvcm1DQUZpbHRlcnMuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1BsYXRmb3JtTGF5ZXIu aD4KLSNpbmNsdWRlIDx3dGYvT3B0aW9uU2V0Lmg+CiAjaW5jbHVkZSA8d3RmL1JldGFpblB0ci5o PgogCiBPQkpDX0NMQVNTIENBUHJlc2VudGF0aW9uTW9kaWZpZXJHcm91cDsKQEAgLTYxLDE0ICs1 OSw5IEBAIHByaXZhdGU6CiAKICAgICBXZWJDb3JlOjpBY2NlbGVyYXRlZEVmZmVjdFZhbHVlcyBj b21wdXRlVmFsdWVzKE1vbm90b25pY1RpbWUgbm93KSBjb25zdDsKIAotI2lmIFBMQVRGT1JNKE1B QykKLSAgICBjb25zdCBXZWJDb3JlOjpGaWx0ZXJPcGVyYXRpb25zKiBsb25nZXN0RmlsdGVyTGlz dCgpIGNvbnN0OwotI2VuZGlmCi0KICAgICBlbnVtIGNsYXNzIExheWVyUHJvcGVydHkgOiB1aW50 OF90IHsKICAgICAgICAgT3BhY2l0eSA9IDEgPDwgMSwKLSAgICAgICAgVHJhbnNmb3JtID0gMSA8 PCAyLAotICAgICAgICBGaWx0ZXIgPSAxIDw8IDMKKyAgICAgICAgVHJhbnNmb3JtID0gMSA8PCAy CiAgICAgfTsKIAogICAgIE9wdGlvblNldDxMYXllclByb3BlcnR5PiBtX2FmZmVjdGVkTGF5ZXJQ cm9wZXJ0aWVzOwpAQCAtNzksNyArNzIsNiBAQCBwcml2YXRlOgogICAgIFJldGFpblB0cjxDQVBy ZXNlbnRhdGlvbk1vZGlmaWVyR3JvdXA+IG1fcHJlc2VudGF0aW9uTW9kaWZpZXJHcm91cDsKICAg ICBSZXRhaW5QdHI8Q0FQcmVzZW50YXRpb25Nb2RpZmllcj4gbV9vcGFjaXR5UHJlc2VudGF0aW9u TW9kaWZpZXI7CiAgICAgUmV0YWluUHRyPENBUHJlc2VudGF0aW9uTW9kaWZpZXI+IG1fdHJhbnNm b3JtUHJlc2VudGF0aW9uTW9kaWZpZXI7Ci0gICAgVmVjdG9yPFdlYkNvcmU6OlR5cGVkRmlsdGVy UHJlc2VudGF0aW9uTW9kaWZpZXI+IG1fZmlsdGVyUHJlc2VudGF0aW9uTW9kaWZpZXJzOwogfTsK IAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9SZW1vdGVMYXllclRyZWUvUmVtb3RlQWNjZWxlcmF0ZWRFZmZlY3RTdGFjay5tbSBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVBY2NlbGVyYXRlZEVm ZmVjdFN0YWNrLm1tCmluZGV4IDAxN2RkN2YzZTc0OS4uZmI1MzhmNDMzMDIzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvUmVtb3RlQWNjZWxlcmF0 ZWRFZmZlY3RTdGFjay5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1vdGVMYXll clRyZWUvUmVtb3RlQWNjZWxlcmF0ZWRFZmZlY3RTdGFjay5tbQpAQCAtNTAsMjMgKzUwLDE3IEBA IHZvaWQgUmVtb3RlQWNjZWxlcmF0ZWRFZmZlY3RTdGFjazo6c2V0RWZmZWN0cyhBY2NlbGVyYXRl ZEVmZmVjdHMmJiBlZmZlY3RzKQogewogICAgIEFjY2VsZXJhdGVkRWZmZWN0U3RhY2s6OnNldEVm ZmVjdHMoV1RGTW92ZShlZmZlY3RzKSk7CiAKLSAgICBib29sIGFmZmVjdHNGaWx0ZXIgPSBmYWxz ZTsKICAgICBib29sIGFmZmVjdHNPcGFjaXR5ID0gZmFsc2U7CiAgICAgYm9vbCBhZmZlY3RzVHJh bnNmb3JtID0gZmFsc2U7CiAKLSAgICBmb3IgKGF1dG8mIGVmZmVjdCA6IG1fYmFja2Ryb3BMYXll ckVmZmVjdHMuaXNFbXB0eSgpID8gbV9wcmltYXJ5TGF5ZXJFZmZlY3RzIDogbV9iYWNrZHJvcExh eWVyRWZmZWN0cykgeworICAgIGZvciAoYXV0byYgZWZmZWN0IDogbV9wcmltYXJ5TGF5ZXJFZmZl Y3RzKSB7CiAgICAgICAgIGF1dG8mIHByb3BlcnRpZXMgPSBlZmZlY3QtPmFuaW1hdGVkUHJvcGVy dGllcygpOwotICAgICAgICBhZmZlY3RzRmlsdGVyID0gYWZmZWN0c0ZpbHRlciB8fCBwcm9wZXJ0 aWVzLmNvbnRhaW5zQW55KHsgQWNjZWxlcmF0ZWRFZmZlY3RQcm9wZXJ0eTo6RmlsdGVyLCBBY2Nl bGVyYXRlZEVmZmVjdFByb3BlcnR5OjpCYWNrZHJvcEZpbHRlciB9KTsKICAgICAgICAgYWZmZWN0 c09wYWNpdHkgPSBhZmZlY3RzT3BhY2l0eSB8fCBwcm9wZXJ0aWVzLmNvbnRhaW5zKEFjY2VsZXJh dGVkRWZmZWN0UHJvcGVydHk6Ok9wYWNpdHkpOwogICAgICAgICBhZmZlY3RzVHJhbnNmb3JtID0g YWZmZWN0c1RyYW5zZm9ybSB8fCBwcm9wZXJ0aWVzLmNvbnRhaW5zQW55KHRyYW5zZm9ybVJlbGF0 ZWRBY2NlbGVyYXRlZFByb3BlcnRpZXMpOwotICAgICAgICBpZiAoYWZmZWN0c0ZpbHRlciAmJiBh ZmZlY3RzT3BhY2l0eSAmJiBhZmZlY3RzVHJhbnNmb3JtKQorICAgICAgICBpZiAoYWZmZWN0c09w YWNpdHkgJiYgYWZmZWN0c1RyYW5zZm9ybSkKICAgICAgICAgICAgIGJyZWFrOwogICAgIH0KIAot ICAgIEFTU0VSVChhZmZlY3RzRmlsdGVyIHx8IGFmZmVjdHNPcGFjaXR5IHx8IGFmZmVjdHNUcmFu c2Zvcm0pOwotCi0gICAgaWYgKGFmZmVjdHNGaWx0ZXIpCi0gICAgICAgIG1fYWZmZWN0ZWRMYXll clByb3BlcnRpZXMuYWRkKExheWVyUHJvcGVydHk6OkZpbHRlcik7CiAgICAgaWYgKGFmZmVjdHNP cGFjaXR5KQogICAgICAgICBtX2FmZmVjdGVkTGF5ZXJQcm9wZXJ0aWVzLmFkZChMYXllclByb3Bl cnR5OjpPcGFjaXR5KTsKICAgICBpZiAoYWZmZWN0c1RyYW5zZm9ybSkKQEAgLTc0LDY5ICs2OCwy MCBAQCB2b2lkIFJlbW90ZUFjY2VsZXJhdGVkRWZmZWN0U3RhY2s6OnNldEVmZmVjdHMoQWNjZWxl cmF0ZWRFZmZlY3RzJiYgZWZmZWN0cykKIH0KIAogI2lmIFBMQVRGT1JNKE1BQykKLWNvbnN0IFdl YkNvcmU6OkZpbHRlck9wZXJhdGlvbnMqIFJlbW90ZUFjY2VsZXJhdGVkRWZmZWN0U3RhY2s6Omxv bmdlc3RGaWx0ZXJMaXN0KCkgY29uc3QKLXsKLSAgICBpZiAoIW1fYWZmZWN0ZWRMYXllclByb3Bl cnRpZXMuY29udGFpbnMoTGF5ZXJQcm9wZXJ0eTo6RmlsdGVyKSkKLSAgICAgICAgcmV0dXJuIG51 bGxwdHI7Ci0KLSAgICBhdXRvIGlzQmFja2Ryb3AgPSAhbV9iYWNrZHJvcExheWVyRWZmZWN0cy5p c0VtcHR5KCk7Ci0gICAgYXV0byBmaWx0ZXJQcm9wZXJ0eSA9IGlzQmFja2Ryb3AgPyBBY2NlbGVy YXRlZEVmZmVjdFByb3BlcnR5OjpCYWNrZHJvcEZpbHRlciA6IEFjY2VsZXJhdGVkRWZmZWN0UHJv cGVydHk6OkZpbHRlcjsKLSAgICBhdXRvJiBlZmZlY3RzID0gaXNCYWNrZHJvcCA/IG1fYmFja2Ry b3BMYXllckVmZmVjdHMgOiBtX3ByaW1hcnlMYXllckVmZmVjdHM7Ci0KLSAgICBjb25zdCBXZWJD b3JlOjpGaWx0ZXJPcGVyYXRpb25zKiBsb25nZXN0RmlsdGVyTGlzdCA9IG51bGxwdHI7Ci0gICAg Zm9yIChhdXRvJiBlZmZlY3QgOiBlZmZlY3RzKSB7Ci0gICAgICAgIGlmICghZWZmZWN0LT5hbmlt YXRlZFByb3BlcnRpZXMoKS5jb250YWlucyhmaWx0ZXJQcm9wZXJ0eSkpCi0gICAgICAgICAgICBj b250aW51ZTsKLSAgICAgICAgZm9yIChhdXRvJiBrZXlmcmFtZSA6IGVmZmVjdC0+a2V5ZnJhbWVz KCkpIHsKLSAgICAgICAgICAgIGlmICgha2V5ZnJhbWUuYW5pbWF0ZWRQcm9wZXJ0aWVzKCkuY29u dGFpbnMoZmlsdGVyUHJvcGVydHkpKQotICAgICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAg ICAgICAgYXV0byYgZmlsdGVyID0gaXNCYWNrZHJvcCA/IGtleWZyYW1lLnZhbHVlcygpLmJhY2tk cm9wRmlsdGVyIDoga2V5ZnJhbWUudmFsdWVzKCkuZmlsdGVyOwotICAgICAgICAgICAgaWYgKCFs b25nZXN0RmlsdGVyTGlzdCB8fCBsb25nZXN0RmlsdGVyTGlzdC0+c2l6ZSgpIDwgZmlsdGVyLnNp emUoKSkKLSAgICAgICAgICAgICAgICBsb25nZXN0RmlsdGVyTGlzdCA9ICZmaWx0ZXI7Ci0gICAg ICAgIH0KLSAgICB9Ci0KLSAgICBpZiAobG9uZ2VzdEZpbHRlckxpc3QpIHsKLSAgICAgICAgYXV0 byYgYmFzZUZpbHRlciA9IGlzQmFja2Ryb3AgPyBtX2Jhc2VWYWx1ZXMuYmFja2Ryb3BGaWx0ZXIg OiBtX2Jhc2VWYWx1ZXMuZmlsdGVyOwotICAgICAgICBpZiAobG9uZ2VzdEZpbHRlckxpc3QtPnNp emUoKSA8IGJhc2VGaWx0ZXIuc2l6ZSgpKQotICAgICAgICAgICAgbG9uZ2VzdEZpbHRlckxpc3Qg PSAmYmFzZUZpbHRlcjsKLSAgICB9Ci0KLSAgICByZXR1cm4gbG9uZ2VzdEZpbHRlckxpc3QgJiYg IWxvbmdlc3RGaWx0ZXJMaXN0LT5pc0VtcHR5KCkgPyBsb25nZXN0RmlsdGVyTGlzdCA6IG51bGxw dHI7Ci19Ci0KIHZvaWQgUmVtb3RlQWNjZWxlcmF0ZWRFZmZlY3RTdGFjazo6aW5pdEVmZmVjdHNG cm9tTWFpblRocmVhZChQbGF0Zm9ybUxheWVyICpsYXllciwgTW9ub3RvbmljVGltZSBub3cpCiB7 Ci0gICAgQVNTRVJUKG1fZmlsdGVyUHJlc2VudGF0aW9uTW9kaWZpZXJzLmlzRW1wdHkoKSk7CiAg ICAgQVNTRVJUKCFtX29wYWNpdHlQcmVzZW50YXRpb25Nb2RpZmllcik7CiAgICAgQVNTRVJUKCFt X3RyYW5zZm9ybVByZXNlbnRhdGlvbk1vZGlmaWVyKTsKICAgICBBU1NFUlQoIW1fcHJlc2VudGF0 aW9uTW9kaWZpZXJHcm91cCk7CiAKLSAgICBhdXRvIGNvbXB1dGVkVmFsdWVzID0gY29tcHV0ZVZh bHVlcyhub3cpOworICAgIGlmICghbV9hZmZlY3RlZExheWVyUHJvcGVydGllcy5jb250YWluc0Fu eSh7IExheWVyUHJvcGVydHk6Ok9wYWNpdHksIExheWVyUHJvcGVydHk6OlRyYW5zZm9ybSB9KSkK KyAgICAgICAgcmV0dXJuOwogCi0gICAgYXV0byogY2Fub25pY2FsRmlsdGVycyA9IGxvbmdlc3RG aWx0ZXJMaXN0KCk7Ci0KLSAgICBhdXRvIG51bWJlck9mUHJlc2VudGF0aW9uTW9kaWZpZXJzID0g WyZdKCkgewotICAgICAgICBzaXplX3QgY291bnQgPSAwOwotICAgICAgICBpZiAobV9hZmZlY3Rl ZExheWVyUHJvcGVydGllcy5jb250YWlucyhMYXllclByb3BlcnR5OjpGaWx0ZXIpKSB7Ci0gICAg ICAgICAgICBBU1NFUlQoY2Fub25pY2FsRmlsdGVycyk7Ci0gICAgICAgICAgICBjb3VudCArPSBQ bGF0Zm9ybUNBRmlsdGVyczo6cHJlc2VudGF0aW9uTW9kaWZpZXJDb3VudCgqY2Fub25pY2FsRmls dGVycyk7Ci0gICAgICAgIH0KLSAgICAgICAgaWYgKG1fYWZmZWN0ZWRMYXllclByb3BlcnRpZXMu Y29udGFpbnMoTGF5ZXJQcm9wZXJ0eTo6T3BhY2l0eSkpCi0gICAgICAgICAgICBjb3VudCsrOwot ICAgICAgICBpZiAobV9hZmZlY3RlZExheWVyUHJvcGVydGllcy5jb250YWlucyhMYXllclByb3Bl cnR5OjpUcmFuc2Zvcm0pKQotICAgICAgICAgICAgY291bnQrKzsKLSAgICAgICAgcmV0dXJuIGNv dW50OwotICAgIH0oKTsKKyAgICBhdXRvIGNvbXB1dGVkVmFsdWVzID0gY29tcHV0ZVZhbHVlcyhu b3cpOwogCisgICAgYXV0byBudW1iZXJPZlByZXNlbnRhdGlvbk1vZGlmaWVycyA9IG1fYWZmZWN0 ZWRMYXllclByb3BlcnRpZXMuY29udGFpbnNBbGwoeyBMYXllclByb3BlcnR5OjpPcGFjaXR5LCBM YXllclByb3BlcnR5OjpUcmFuc2Zvcm0gfSkgPyAyIDogMTsKICAgICBtX3ByZXNlbnRhdGlvbk1v ZGlmaWVyR3JvdXAgPSBbQ0FQcmVzZW50YXRpb25Nb2RpZmllckdyb3VwIGdyb3VwV2l0aENhcGFj aXR5Om51bWJlck9mUHJlc2VudGF0aW9uTW9kaWZpZXJzXTsKIAotICAgIGlmIChtX2FmZmVjdGVk TGF5ZXJQcm9wZXJ0aWVzLmNvbnRhaW5zKExheWVyUHJvcGVydHk6OkZpbHRlcikpIHsKLSAgICAg ICAgUGxhdGZvcm1DQUZpbHRlcnM6OnByZXNlbnRhdGlvbk1vZGlmaWVycyhjb21wdXRlZFZhbHVl cy5maWx0ZXIsIGxvbmdlc3RGaWx0ZXJMaXN0KCksIG1fZmlsdGVyUHJlc2VudGF0aW9uTW9kaWZp ZXJzLCBtX3ByZXNlbnRhdGlvbk1vZGlmaWVyR3JvdXApOwotICAgICAgICBmb3IgKGF1dG8mIGZp bHRlclByZXNlbnRhdGlvbk1vZGlmaWVyIDogbV9maWx0ZXJQcmVzZW50YXRpb25Nb2RpZmllcnMp Ci0gICAgICAgICAgICBbbGF5ZXIgYWRkUHJlc2VudGF0aW9uTW9kaWZpZXI6ZmlsdGVyUHJlc2Vu dGF0aW9uTW9kaWZpZXIuc2Vjb25kLmdldCgpXTsKLSAgICB9Ci0KICAgICBpZiAobV9hZmZlY3Rl ZExheWVyUHJvcGVydGllcy5jb250YWlucyhMYXllclByb3BlcnR5OjpPcGFjaXR5KSkgewogICAg ICAgICBhdXRvICpvcGFjaXR5ID0gQChjb21wdXRlZFZhbHVlcy5vcGFjaXR5KTsKICAgICAgICAg bV9vcGFjaXR5UHJlc2VudGF0aW9uTW9kaWZpZXIgPSBhZG9wdE5TKFtbQ0FQcmVzZW50YXRpb25N b2RpZmllciBhbGxvY10gaW5pdFdpdGhLZXlQYXRoOkAib3BhY2l0eSIgaW5pdGlhbFZhbHVlOm9w YWNpdHkgYWRkaXRpdmU6Tk8gZ3JvdXA6bV9wcmVzZW50YXRpb25Nb2RpZmllckdyb3VwLmdldCgp XSk7CkBAIC0xNTUsMTMgKzEwMCwxNCBAQCB2b2lkIFJlbW90ZUFjY2VsZXJhdGVkRWZmZWN0U3Rh Y2s6OmluaXRFZmZlY3RzRnJvbU1haW5UaHJlYWQoUGxhdGZvcm1MYXllciAqbGF5ZQogCiB2b2lk IFJlbW90ZUFjY2VsZXJhdGVkRWZmZWN0U3RhY2s6OmFwcGx5RWZmZWN0c0Zyb21TY3JvbGxpbmdU aHJlYWQoTW9ub3RvbmljVGltZSBub3cpIGNvbnN0CiB7CisgICAgaWYgKCFtX2FmZmVjdGVkTGF5 ZXJQcm9wZXJ0aWVzLmNvbnRhaW5zQW55KHsgTGF5ZXJQcm9wZXJ0eTo6T3BhY2l0eSwgTGF5ZXJQ cm9wZXJ0eTo6VHJhbnNmb3JtIH0pKQorICAgICAgICByZXR1cm47CisKKyAgICBBU1NFUlQobV9v cGFjaXR5UHJlc2VudGF0aW9uTW9kaWZpZXIgfHwgbV90cmFuc2Zvcm1QcmVzZW50YXRpb25Nb2Rp Zmllcik7CiAgICAgQVNTRVJUKG1fcHJlc2VudGF0aW9uTW9kaWZpZXJHcm91cCk7CiAKICAgICBh dXRvIGNvbXB1dGVkVmFsdWVzID0gY29tcHV0ZVZhbHVlcyhub3cpOwogCi0gICAgaWYgKCFtX2Zp bHRlclByZXNlbnRhdGlvbk1vZGlmaWVycy5pc0VtcHR5KCkpCi0gICAgICAgIFBsYXRmb3JtQ0FG aWx0ZXJzOjp1cGRhdGVQcmVzZW50YXRpb25Nb2RpZmllcnMoY29tcHV0ZWRWYWx1ZXMuZmlsdGVy LCBtX2ZpbHRlclByZXNlbnRhdGlvbk1vZGlmaWVycyk7Ci0KICAgICBpZiAobV9vcGFjaXR5UHJl c2VudGF0aW9uTW9kaWZpZXIpIHsKICAgICAgICAgYXV0byAqb3BhY2l0eSA9IEAoY29tcHV0ZWRW YWx1ZXMub3BhY2l0eSk7CiAgICAgICAgIFttX29wYWNpdHlQcmVzZW50YXRpb25Nb2RpZmllciBz ZXRWYWx1ZTpvcGFjaXR5XTsKQEAgLTE3OSwxMCArMTI1LDEwIEBAIHZvaWQgUmVtb3RlQWNjZWxl cmF0ZWRFZmZlY3RTdGFjazo6YXBwbHlFZmZlY3RzRnJvbVNjcm9sbGluZ1RocmVhZChNb25vdG9u aWNUaW1lCiAKIHZvaWQgUmVtb3RlQWNjZWxlcmF0ZWRFZmZlY3RTdGFjazo6YXBwbHlFZmZlY3Rz RnJvbU1haW5UaHJlYWQoUGxhdGZvcm1MYXllciAqbGF5ZXIsIE1vbm90b25pY1RpbWUgbm93KSBj b25zdAogewotICAgIGF1dG8gY29tcHV0ZWRWYWx1ZXMgPSBjb21wdXRlVmFsdWVzKG5vdyk7Cisg ICAgaWYgKCFtX2FmZmVjdGVkTGF5ZXJQcm9wZXJ0aWVzLmNvbnRhaW5zQW55KHsgTGF5ZXJQcm9w ZXJ0eTo6T3BhY2l0eSwgTGF5ZXJQcm9wZXJ0eTo6VHJhbnNmb3JtIH0pKQorICAgICAgICByZXR1 cm47CiAKLSAgICBpZiAobV9hZmZlY3RlZExheWVyUHJvcGVydGllcy5jb250YWlucyhMYXllclBy b3BlcnR5OjpGaWx0ZXIpKQotICAgICAgICBQbGF0Zm9ybUNBRmlsdGVyczo6c2V0RmlsdGVyc09u TGF5ZXIobGF5ZXIsIGNvbXB1dGVkVmFsdWVzLmZpbHRlcik7CisgICAgYXV0byBjb21wdXRlZFZh bHVlcyA9IGNvbXB1dGVWYWx1ZXMobm93KTsKIAogICAgIGlmIChtX2FmZmVjdGVkTGF5ZXJQcm9w ZXJ0aWVzLmNvbnRhaW5zKExheWVyUHJvcGVydHk6Ok9wYWNpdHkpKQogICAgICAgICBbbGF5ZXIg c2V0T3BhY2l0eTpjb21wdXRlZFZhbHVlcy5vcGFjaXR5XTsKQEAgLTE5NywxNyArMTQzLDIwIEBA IEFjY2VsZXJhdGVkRWZmZWN0VmFsdWVzIFJlbW90ZUFjY2VsZXJhdGVkRWZmZWN0U3RhY2s6OmNv bXB1dGVWYWx1ZXMoTW9ub3RvbmljVGltCiB7CiAgICAgYXV0byB2YWx1ZXMgPSBtX2Jhc2VWYWx1 ZXM7CiAgICAgYXV0byBjdXJyZW50VGltZSA9IG5vdy5zZWNvbmRzU2luY2VFcG9jaCgpIC0gbV9h Y2NlbGVyYXRlZFRpbWVsaW5lVGltZU9yaWdpbjsKLSAgICBmb3IgKGF1dG8mIGVmZmVjdCA6IG1f YmFja2Ryb3BMYXllckVmZmVjdHMuaXNFbXB0eSgpID8gbV9wcmltYXJ5TGF5ZXJFZmZlY3RzIDog bV9iYWNrZHJvcExheWVyRWZmZWN0cykKKyAgICBmb3IgKGF1dG8mIGVmZmVjdCA6IG1fcHJpbWFy eUxheWVyRWZmZWN0cykKICAgICAgICAgZWZmZWN0LT5hcHBseShjdXJyZW50VGltZSwgdmFsdWVz LCBtX2JvdW5kcyk7CiAgICAgcmV0dXJuIHZhbHVlczsKIH0KIAogdm9pZCBSZW1vdGVBY2NlbGVy YXRlZEVmZmVjdFN0YWNrOjpjbGVhcihQbGF0Zm9ybUxheWVyICpsYXllcikKIHsKLSAgICBBU1NF UlQobV9wcmVzZW50YXRpb25Nb2RpZmllckdyb3VwKTsKKyAgICBpZiAoIW1fcHJlc2VudGF0aW9u TW9kaWZpZXJHcm91cCkgeworICAgICAgICBBU1NFUlQoIW1fb3BhY2l0eVByZXNlbnRhdGlvbk1v ZGlmaWVyICYmICFtX3RyYW5zZm9ybVByZXNlbnRhdGlvbk1vZGlmaWVyKTsKKyAgICAgICAgcmV0 dXJuOworICAgIH0KKworICAgIEFTU0VSVChtX29wYWNpdHlQcmVzZW50YXRpb25Nb2RpZmllciB8 fCBtX3RyYW5zZm9ybVByZXNlbnRhdGlvbk1vZGlmaWVyKTsKIAotICAgIGZvciAoYXV0byYgZmls dGVyUHJlc2VudGF0aW9uTW9kaWZpZXIgOiBtX2ZpbHRlclByZXNlbnRhdGlvbk1vZGlmaWVycykK LSAgICAgICAgW2xheWVyIHJlbW92ZVByZXNlbnRhdGlvbk1vZGlmaWVyOmZpbHRlclByZXNlbnRh dGlvbk1vZGlmaWVyLnNlY29uZC5nZXQoKV07CiAgICAgaWYgKG1fb3BhY2l0eVByZXNlbnRhdGlv bk1vZGlmaWVyKQogICAgICAgICBbbGF5ZXIgcmVtb3ZlUHJlc2VudGF0aW9uTW9kaWZpZXI6bV9v cGFjaXR5UHJlc2VudGF0aW9uTW9kaWZpZXIuZ2V0KCldOwogICAgIGlmIChtX3RyYW5zZm9ybVBy ZXNlbnRhdGlvbk1vZGlmaWVyKQpAQCAtMjE1LDcgKzE2NCw2IEBAIHZvaWQgUmVtb3RlQWNjZWxl cmF0ZWRFZmZlY3RTdGFjazo6Y2xlYXIoUGxhdGZvcm1MYXllciAqbGF5ZXIpCiAKICAgICBbbV9w cmVzZW50YXRpb25Nb2RpZmllckdyb3VwIGZsdXNoV2l0aFRyYW5zYWN0aW9uXTsKIAotICAgIG1f ZmlsdGVyUHJlc2VudGF0aW9uTW9kaWZpZXJzLmNsZWFyKCk7CiAgICAgbV9vcGFjaXR5UHJlc2Vu dGF0aW9uTW9kaWZpZXIgPSBuaWw7CiAgICAgbV90cmFuc2Zvcm1QcmVzZW50YXRpb25Nb2RpZmll ciA9IG5pbDsKICAgICBtX3ByZXNlbnRhdGlvbk1vZGlmaWVyR3JvdXAgPSBuaWw7Cg==