231569 2021-10-12 05:19:56 -0700 MediaCapabilities should enqueue a task to resolve promises 2021-10-14 23:34:17 -0700 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 231568 1 youennf youennf eric.carlson ews-watchlist glenn jer.noble philipj sergio webkit-bug-importer youennf oldest_to_newest 1803072 0 youennf 2021-10-12 05:19:56 -0700 MediaCapabilities should enqueue a task to resolve promises 1803073 1 440918 youennf 2021-10-12 05:21:43 -0700 Created attachment 440918 Patch 1803784 2 440918 eric.carlson 2021-10-13 08:53:35 -0700 Comment on attachment 440918 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=440918&action=review > Source/WebCore/Modules/mediacapabilities/MediaCapabilities.cpp:215 > logger->info(LogMedia, identifier, "::callback() - Resolved. info: ", info); It looks like this indentation is wrong now > Source/WebCore/Modules/mediacapabilities/MediaCapabilities.cpp:269 > + logger->info(LogMedia, identifier, "::callback() - Resolved. info: ", info); Ditto 1804211 3 441201 youennf 2021-10-14 04:04:05 -0700 Created attachment 441201 Patch for landing 1804212 4 youennf 2021-10-14 04:04:20 -0700 (In reply to Eric Carlson from comment #2) > Comment on attachment 440918 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=440918&action=review > > > Source/WebCore/Modules/mediacapabilities/MediaCapabilities.cpp:215 > > logger->info(LogMedia, identifier, "::callback() - Resolved. info: ", info); > > It looks like this indentation is wrong now > > > Source/WebCore/Modules/mediacapabilities/MediaCapabilities.cpp:269 > > + logger->info(LogMedia, identifier, "::callback() - Resolved. info: ", info); > > Ditto Fixed in landing patch 1804715 5 ews-feeder 2021-10-14 23:33:11 -0700 Committed r284236 (243045@main): <https://commits.webkit.org/243045@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 441201. 1804716 6 webkit-bug-importer 2021-10-14 23:34:17 -0700 <rdar://problem/84290404> 440918 2021-10-12 05:21:43 -0700 2021-10-14 04:03:56 -0700 Patch bug-231569-20211012142141.patch text/plain 10707 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzODg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTZiOGRjNTIwMDkxZGU4 NzNiZTQ5YmQ5YTY3MzJmNDYyZGM2NDNlMC4uZjBiYmJjMzdjYTZlMGMwMzNhYzM4NzRlYWFhNzZk Y2JlOTcyZTE0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTEwLTEyICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBNZWRpYUNhcGFiaWxpdGll cyBzaG91bGQgZW5xdWV1ZSBhIHRhc2sgdG8gcmVzb2x2ZSBwcm9taXNlcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMxNTY5CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBNb2R1bGVzL21lZGlhY2FwYWJp bGl0aWVzL01lZGlhQ2FwYWJpbGl0aWVzLmNwcDoKKyAgICAgICAgV2Ugc2hvdWxkIHJlc29sdmUg cHJvbWlzZXMgaW5zaWRlIGFuIGV2ZW50IGxvb3AgdGFzay4KKyAgICAgICAgVG8gZG8gdGhpcywg aW5zdGVhZCBvZiBlbnF1ZXVpbmcgYSB0YXNrIHRvIGRvIHNvbWUgd29yayB0aGF0IGNhbiBiZSBh c3luY2hyb25vdXMsIHdlIGRvIHRoZSBhc3luY2hyb25vdXMgd29yayBhbmQgdGhlbiBlbnF1ZXVl IGEgdGFzayB0byByZXNvbHZlIHRoZSBwcm9taXNlLgorCiAyMDIxLTEwLTEyICBZb3Vlbm4gRmFi bGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgc3VwcG9ydCBmb3IgV2ViUlRD IG1lZGlhIGNhcGFiaWxpdGllcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9t ZWRpYWNhcGFiaWxpdGllcy9NZWRpYUNhcGFiaWxpdGllcy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL21lZGlhY2FwYWJpbGl0aWVzL01lZGlhQ2FwYWJpbGl0aWVzLmNwcAppbmRleCBjZDMw YzRhMjgyNDc5NTQ5MGM3MWYxZjg3NjYyNGVlMjViNDU4ZDI2Li5iYTZlZjIzNzg4MDcxYTBjNGU4 ZTZjODlkZmJiNTExNjE4MjA2N2MyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L21lZGlhY2FwYWJpbGl0aWVzL01lZGlhQ2FwYWJpbGl0aWVzLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL21lZGlhY2FwYWJpbGl0aWVzL01lZGlhQ2FwYWJpbGl0aWVzLmNwcApAQCAt MTc4LDYgKzE3OCwxOCBAQCB2b2lkIE1lZGlhQ2FwYWJpbGl0aWVzOjpkZWNvZGluZ0luZm8oRG9j dW1lbnQmIGRvY3VtZW50LCBNZWRpYURlY29kaW5nQ29uZmlndXJhdAogCiAgICAgLy8gMS4gSWYg Y29uZmlndXJhdGlvbiBpcyBub3QgYSB2YWxpZCBNZWRpYUNvbmZpZ3VyYXRpb24sIHJldHVybiBh IFByb21pc2UgcmVqZWN0ZWQgd2l0aCBhIFR5cGVFcnJvci4KICAgICAvLyAyLiBJZiBjb25maWd1 cmF0aW9uLnZpZGVvIGlzIHByZXNlbnQgYW5kIGlzIG5vdCBhIHZhbGlkIHZpZGVvIGNvbmZpZ3Vy YXRpb24sIHJldHVybiBhIFByb21pc2UgcmVqZWN0ZWQgd2l0aCBhIFR5cGVFcnJvci4KKyAgICAv LyAyLjIuMyBJZiBjb25maWd1cmF0aW9uIGlzIG9mIHR5cGUgTWVkaWFEZWNvZGluZ0NvbmZpZ3Vy YXRpb24sIHJ1biB0aGUgZm9sbG93aW5nIHN1YnN0ZXBzOgorICAgIC8vIDIuMi4zLjEuIElmIHRo ZSB1c2VyIGFnZW50IGlzIGFibGUgdG8gZGVjb2RlIHRoZSBtZWRpYSByZXByZXNlbnRlZCBieQor ICAgIC8vIGNvbmZpZ3VyYXRpb24sIHNldCBzdXBwb3J0ZWQgdG8gdHJ1ZS4gT3RoZXJ3aXNlIHNl dCBpdCB0byBmYWxzZS4KKyAgICAvLyAyLjIuMy4yLiBJZiB0aGUgdXNlciBhZ2VudCBpcyBhYmxl IHRvIGRlY29kZSB0aGUgbWVkaWEgcmVwcmVzZW50ZWQgYnkKKyAgICAvLyBjb25maWd1cmF0aW9u IGF0IGEgcGFjZSB0aGF0IGFsbG93cyBhIHNtb290aCBwbGF5YmFjaywgc2V0IHNtb290aCB0bwor ICAgIC8vIHRydWUuIE90aGVyd2lzZSBzZXQgaXQgdG8gZmFsc2UuCisgICAgLy8gMi4yLjMuMy4g SWYgdGhlIHVzZXIgYWdlbnQgaXMgYWJsZSB0byBkZWNvZGUgdGhlIG1lZGlhIHJlcHJlc2VudGVk IGJ5CisgICAgLy8gY29uZmlndXJhdGlvbiBpbiBhIHBvd2VyIGVmZmljaWVudCBtYW5uZXIsIHNl dCBwb3dlckVmZmljaWVudCB0bworICAgIC8vIHRydWUuIE90aGVyd2lzZSBzZXQgaXQgdG8gZmFs c2UuIFRoZSB1c2VyIGFnZW50IFNIT1VMRCBOT1QgdGFrZSBpbnRvCisgICAgLy8gY29uc2lkZXJh dGlvbiB0aGUgY3VycmVudCBwb3dlciBzb3VyY2UgaW4gb3JkZXIgdG8gZGV0ZXJtaW5lIHRoZQor ICAgIC8vIGRlY29kaW5nIHBvd2VyIGVmZmljaWVuY3kgdW5sZXNzIHRoZSBkZXZpY2XigJlzIHBv d2VyIHNvdXJjZSBoYXMgc2lkZQorICAgIC8vIGVmZmVjdHMgc3VjaCBhcyBlbmFibGluZyBkaWZm ZXJlbnQgZGVjb2RpbmcgbW9kdWxlcy4KICAgICAvLyAzLiBJZiBjb25maWd1cmF0aW9uLmF1ZGlv IGlzIHByZXNlbnQgYW5kIGlzIG5vdCBhIHZhbGlkIGF1ZGlvIGNvbmZpZ3VyYXRpb24sIHJldHVy biBhIFByb21pc2UgcmVqZWN0ZWQgd2l0aCBhIFR5cGVFcnJvci4KICAgICBpZiAoIWlzVmFsaWRN ZWRpYUNvbmZpZ3VyYXRpb24oY29uZmlndXJhdGlvbikpIHsKICNpZiAhUkVMRUFTRV9MT0dfRElT QUJMRUQKQEAgLTE5NywzNyArMjA5LDI0IEBAIHZvaWQgTWVkaWFDYXBhYmlsaXRpZXM6OmRlY29k aW5nSW5mbyhEb2N1bWVudCYgZG9jdW1lbnQsIE1lZGlhRGVjb2RpbmdDb25maWd1cmF0CiAgICAg Ly8gNC4gTGV0IHAgYmUgYSBuZXcgcHJvbWlzZS4KICAgICAvLyA1LiBJbiBwYXJhbGxlbCwgcnVu IHRoZSBjcmVhdGUgYSBNZWRpYUNhcGFiaWxpdGllc0luZm8gYWxnb3JpdGhtIHdpdGggY29uZmln dXJhdGlvbiBhbmQgcmVzb2x2ZSBwIHdpdGggaXRzIHJlc3VsdC4KICAgICAvLyA2LiBSZXR1cm4g cC4KLSAgICBkb2N1bWVudC5ldmVudExvb3AoKS5xdWV1ZVRhc2soVGFza1NvdXJjZTo6TWVkaWFF bGVtZW50LCBbY29uZmlndXJhdGlvbiA9IFdURk1vdmUoY29uZmlndXJhdGlvbiksIHByb21pc2Ug PSBXVEZNb3ZlKHByb21pc2UpLCBsb2dnZXIgPSBXVEZNb3ZlKGxvZ2dlciksIGlkZW50aWZpZXIg PSBXVEZNb3ZlKGlkZW50aWZpZXIpLCBkb2N1bWVudCA9IFJlZiB7IGRvY3VtZW50IH1dICgpIG11 dGFibGUgewotCi0gICAgICAgIC8vIDIuMi4zIElmIGNvbmZpZ3VyYXRpb24gaXMgb2YgdHlwZSBN ZWRpYURlY29kaW5nQ29uZmlndXJhdGlvbiwgcnVuIHRoZSBmb2xsb3dpbmcgc3Vic3RlcHM6Ci0g ICAgICAgIE1lZGlhRW5naW5lQ29uZmlndXJhdGlvbkZhY3Rvcnk6OkRlY29kaW5nQ29uZmlndXJh dGlvbkNhbGxiYWNrIGNhbGxiYWNrID0gW3Byb21pc2UgPSBXVEZNb3ZlKHByb21pc2UpLCBsb2dn ZXIgPSBXVEZNb3ZlKGxvZ2dlciksIGlkZW50aWZpZXIgPSBXVEZNb3ZlKGlkZW50aWZpZXIpXSAo YXV0byBpbmZvKSBtdXRhYmxlIHsKLSAgICAgICAgICAgIC8vIDIuMi4zLjEuIElmIHRoZSB1c2Vy IGFnZW50IGlzIGFibGUgdG8gZGVjb2RlIHRoZSBtZWRpYSByZXByZXNlbnRlZCBieQotICAgICAg ICAgICAgLy8gY29uZmlndXJhdGlvbiwgc2V0IHN1cHBvcnRlZCB0byB0cnVlLiBPdGhlcndpc2Ug c2V0IGl0IHRvIGZhbHNlLgotICAgICAgICAgICAgLy8gMi4yLjMuMi4gSWYgdGhlIHVzZXIgYWdl bnQgaXMgYWJsZSB0byBkZWNvZGUgdGhlIG1lZGlhIHJlcHJlc2VudGVkIGJ5Ci0gICAgICAgICAg ICAvLyBjb25maWd1cmF0aW9uIGF0IGEgcGFjZSB0aGF0IGFsbG93cyBhIHNtb290aCBwbGF5YmFj aywgc2V0IHNtb290aCB0bwotICAgICAgICAgICAgLy8gdHJ1ZS4gT3RoZXJ3aXNlIHNldCBpdCB0 byBmYWxzZS4KLSAgICAgICAgICAgIC8vIDIuMi4zLjMuIElmIHRoZSB1c2VyIGFnZW50IGlzIGFi bGUgdG8gZGVjb2RlIHRoZSBtZWRpYSByZXByZXNlbnRlZCBieQotICAgICAgICAgICAgLy8gY29u ZmlndXJhdGlvbiBpbiBhIHBvd2VyIGVmZmljaWVudCBtYW5uZXIsIHNldCBwb3dlckVmZmljaWVu dCB0bwotICAgICAgICAgICAgLy8gdHJ1ZS4gT3RoZXJ3aXNlIHNldCBpdCB0byBmYWxzZS4gVGhl IHVzZXIgYWdlbnQgU0hPVUxEIE5PVCB0YWtlIGludG8KLSAgICAgICAgICAgIC8vIGNvbnNpZGVy YXRpb24gdGhlIGN1cnJlbnQgcG93ZXIgc291cmNlIGluIG9yZGVyIHRvIGRldGVybWluZSB0aGUK LSAgICAgICAgICAgIC8vIGRlY29kaW5nIHBvd2VyIGVmZmljaWVuY3kgdW5sZXNzIHRoZSBkZXZp Y2XigJlzIHBvd2VyIHNvdXJjZSBoYXMgc2lkZQotICAgICAgICAgICAgLy8gZWZmZWN0cyBzdWNo IGFzIGVuYWJsaW5nIGRpZmZlcmVudCBkZWNvZGluZyBtb2R1bGVzLgorCisgICAgTWVkaWFFbmdp bmVDb25maWd1cmF0aW9uRmFjdG9yeTo6RGVjb2RpbmdDb25maWd1cmF0aW9uQ2FsbGJhY2sgY2Fs bGJhY2sgPSBbcHJvbWlzZSA9IFdURk1vdmUocHJvbWlzZSksIGlkZW50aWZpZXIgPSBXVEZNb3Zl KGlkZW50aWZpZXIpLCBsb2dnZXIgPSBXVEZNb3ZlKGxvZ2dlciksIGRvY3VtZW50ID0gUmVmIHsg ZG9jdW1lbnQgfV0oYXV0byBpbmZvKSBtdXRhYmxlIHsKICNpZiAhUkVMRUFTRV9MT0dfRElTQUJM RUQKICAgICAgICAgICAgIGxvZ2dlci0+aW5mbyhMb2dNZWRpYSwgaWRlbnRpZmllciwgIjo6Y2Fs bGJhY2soKSAtIFJlc29sdmVkLiBpbmZvOiAiLCBpbmZvKTsKICNlbmRpZgorICAgICAgICBkb2N1 bWVudC0+ZXZlbnRMb29wKCkucXVldWVUYXNrKFRhc2tTb3VyY2U6Ok1lZGlhRWxlbWVudCwgW3By b21pc2UgPSBXVEZNb3ZlKHByb21pc2UpLCBpbmZvID0gV1RGTW92ZShpbmZvKV0gKCkgbXV0YWJs ZSB7CiAgICAgICAgICAgICBwcm9taXNlLT5yZXNvbHZlPElETERpY3Rpb25hcnk8TWVkaWFDYXBh YmlsaXRpZXNEZWNvZGluZ0luZm8+PihXVEZNb3ZlKGluZm8pKTsKLSAgICAgICAgfTsKKyAgICAg ICAgfSk7CisgICAgfTsKIAogI2lmIEVOQUJMRShXRUJfUlRDKQotICAgICAgICBpZiAoY29uZmln dXJhdGlvbi50eXBlID09IE1lZGlhRGVjb2RpbmdUeXBlOjpXZWJSVEMpIHsKLSAgICAgICAgICAg IGlmIChhdXRvKiBwYWdlID0gZG9jdW1lbnQtPnBhZ2UoKSkKLSAgICAgICAgICAgICAgICBwYWdl LT5saWJXZWJSVENQcm92aWRlcigpLmNyZWF0ZURlY29kaW5nQ29uZmlndXJhdGlvbihXVEZNb3Zl KGNvbmZpZ3VyYXRpb24pLCBXVEZNb3ZlKGNhbGxiYWNrKSk7Ci0gICAgICAgICAgICByZXR1cm47 Ci0gICAgICAgIH0KKyAgICBpZiAoY29uZmlndXJhdGlvbi50eXBlID09IE1lZGlhRGVjb2RpbmdU eXBlOjpXZWJSVEMpIHsKKyAgICAgICAgaWYgKGF1dG8qIHBhZ2UgPSBkb2N1bWVudC5wYWdlKCkp CisgICAgICAgICAgICBwYWdlLT5saWJXZWJSVENQcm92aWRlcigpLmNyZWF0ZURlY29kaW5nQ29u ZmlndXJhdGlvbihXVEZNb3ZlKGNvbmZpZ3VyYXRpb24pLCBXVEZNb3ZlKGNhbGxiYWNrKSk7Cisg ICAgICAgIHJldHVybjsKKyAgICB9CiAjZW5kaWYKLQotICAgICAgICBNZWRpYUVuZ2luZUNvbmZp Z3VyYXRpb25GYWN0b3J5OjpjcmVhdGVEZWNvZGluZ0NvbmZpZ3VyYXRpb24oV1RGTW92ZShjb25m aWd1cmF0aW9uKSwgV1RGTW92ZShjYWxsYmFjaykpOwotICAgIH0pOworICAgIE1lZGlhRW5naW5l Q29uZmlndXJhdGlvbkZhY3Rvcnk6OmNyZWF0ZURlY29kaW5nQ29uZmlndXJhdGlvbihXVEZNb3Zl KGNvbmZpZ3VyYXRpb24pLCBXVEZNb3ZlKGNhbGxiYWNrKSk7CiB9CiAKIHZvaWQgTWVkaWFDYXBh YmlsaXRpZXM6OmVuY29kaW5nSW5mbyhEb2N1bWVudCYgZG9jdW1lbnQsIE1lZGlhRW5jb2RpbmdD b25maWd1cmF0aW9uJiYgY29uZmlndXJhdGlvbiwgUmVmPERlZmVycmVkUHJvbWlzZT4mJiBwcm9t aXNlKQpAQCAtMjM1LDkgKzIzNCwyNyBAQCB2b2lkIE1lZGlhQ2FwYWJpbGl0aWVzOjplbmNvZGlu Z0luZm8oRG9jdW1lbnQmIGRvY3VtZW50LCBNZWRpYUVuY29kaW5nQ29uZmlndXJhdAogICAgIC8v IDIuNCBNZWRpYSBDYXBhYmlsaXRpZXMgSW50ZXJmYWNlCiAgICAgLy8gaHR0cHM6Ly93aWNnLmdp dGh1Yi5pby9tZWRpYS1jYXBhYmlsaXRpZXMvI21lZGlhLWNhcGFiaWxpdGllcy1pbnRlcmZhY2UK IAorICAgIGF1dG8gaWRlbnRpZmllciA9IFdURjo6TG9nZ2VyOjpMb2dTaXRlSWRlbnRpZmllcigi TWVkaWFDYXBhYmlsaXRpZXMiLCBfX2Z1bmNfXywgdGhpcyk7CisgICAgUmVmPExvZ2dlcj4gbG9n Z2VyID0gZG9jdW1lbnQubG9nZ2VyKCk7CisKICAgICAvLyAxLiBJZiBjb25maWd1cmF0aW9uIGlz IG5vdCBhIHZhbGlkIE1lZGlhQ29uZmlndXJhdGlvbiwgcmV0dXJuIGEgUHJvbWlzZSByZWplY3Rl ZCB3aXRoIGEgVHlwZUVycm9yLgogICAgIC8vIDIuIElmIGNvbmZpZ3VyYXRpb24udmlkZW8gaXMg cHJlc2VudCBhbmQgaXMgbm90IGEgdmFsaWQgdmlkZW8gY29uZmlndXJhdGlvbiwgcmV0dXJuIGEg UHJvbWlzZSByZWplY3RlZCB3aXRoIGEgVHlwZUVycm9yLgogICAgIC8vIDMuIElmIGNvbmZpZ3Vy YXRpb24uYXVkaW8gaXMgcHJlc2VudCBhbmQgaXMgbm90IGEgdmFsaWQgYXVkaW8gY29uZmlndXJh dGlvbiwgcmV0dXJuIGEgUHJvbWlzZSByZWplY3RlZCB3aXRoIGEgVHlwZUVycm9yLgorICAgIC8v IDIuMi40LiBJZiBjb25maWd1cmF0aW9uIGlzIG9mIHR5cGUgTWVkaWFFbmNvZGluZ0NvbmZpZ3Vy YXRpb24sIHJ1biB0aGUgZm9sbG93aW5nIHN1YnN0ZXBzOgorICAgIC8vIDIuMi40LjEuIElmIHRo ZSB1c2VyIGFnZW50IGlzIGFibGUgdG8gZW5jb2RlIHRoZSBtZWRpYQorICAgIC8vIHJlcHJlc2Vu dGVkIGJ5IGNvbmZpZ3VyYXRpb24sIHNldCBzdXBwb3J0ZWQgdG8gdHJ1ZS4gT3RoZXJ3aXNlCisg ICAgLy8gc2V0IGl0IHRvIGZhbHNlLgorICAgIC8vIDIuMi40LjIuIElmIHRoZSB1c2VyIGFnZW50 IGlzIGFibGUgdG8gZW5jb2RlIHRoZSBtZWRpYQorICAgIC8vIHJlcHJlc2VudGVkIGJ5IGNvbmZp Z3VyYXRpb24gYXQgYSBwYWNlIHRoYXQgYWxsb3dzIGVuY29kaW5nCisgICAgLy8gZnJhbWVzIGF0 IHRoZSBzYW1lIHBhY2UgYXMgdGhleSBhcmUgc2VudCB0byB0aGUgZW5jb2Rlciwgc2V0CisgICAg Ly8gc21vb3RoIHRvIHRydWUuIE90aGVyd2lzZSBzZXQgaXQgdG8gZmFsc2UuCisgICAgLy8gMi4y LjQuMy4gSWYgdGhlIHVzZXIgYWdlbnQgaXMgYWJsZSB0byBlbmNvZGUgdGhlIG1lZGlhCisgICAg Ly8gcmVwcmVzZW50ZWQgYnkgY29uZmlndXJhdGlvbiBpbiBhIHBvd2VyIGVmZmljaWVudCBtYW5u ZXIsIHNldAorICAgIC8vIHBvd2VyRWZmaWNpZW50IHRvIHRydWUuIE90aGVyd2lzZSBzZXQgaXQg dG8gZmFsc2UuIFRoZSB1c2VyIGFnZW50CisgICAgLy8gU0hPVUxEIE5PVCB0YWtlIGludG8gY29u c2lkZXJhdGlvbiB0aGUgY3VycmVudCBwb3dlciBzb3VyY2UgaW4KKyAgICAvLyBvcmRlciB0byBk ZXRlcm1pbmUgdGhlIGVuY29kaW5nIHBvd2VyIGVmZmljaWVuY3kgdW5sZXNzIHRoZQorICAgIC8v IGRldmljZeKAmXMgcG93ZXIgc291cmNlIGhhcyBzaWRlIGVmZmVjdHMgc3VjaCBhcyBlbmFibGlu ZyBkaWZmZXJlbnQKKyAgICAvLyBlbmNvZGluZyBtb2R1bGVzLgogICAgIGlmICghaXNWYWxpZE1l ZGlhQ29uZmlndXJhdGlvbihjb25maWd1cmF0aW9uKSkgewogICAgICAgICBwcm9taXNlLT5yZWpl Y3QoVHlwZUVycm9yKTsKICAgICAgICAgcmV0dXJuOwpAQCAtMjQ2LDM3ICsyNjMsMjUgQEAgdm9p ZCBNZWRpYUNhcGFiaWxpdGllczo6ZW5jb2RpbmdJbmZvKERvY3VtZW50JiBkb2N1bWVudCwgTWVk aWFFbmNvZGluZ0NvbmZpZ3VyYXQKICAgICAvLyA0LiBMZXQgcCBiZSBhIG5ldyBwcm9taXNlLgog ICAgIC8vIDUuIEluIHBhcmFsbGVsLCBydW4gdGhlIGNyZWF0ZSBhIE1lZGlhQ2FwYWJpbGl0aWVz SW5mbyBhbGdvcml0aG0gd2l0aCBjb25maWd1cmF0aW9uIGFuZCByZXNvbHZlIHAgd2l0aCBpdHMg cmVzdWx0LgogICAgIC8vIDYuIFJldHVybiBwLgotICAgIGRvY3VtZW50LmV2ZW50TG9vcCgpLnF1 ZXVlVGFzayhUYXNrU291cmNlOjpNZWRpYUVsZW1lbnQsIFtjb25maWd1cmF0aW9uID0gV1RGTW92 ZShjb25maWd1cmF0aW9uKSwgcHJvbWlzZSA9IFdURk1vdmUocHJvbWlzZSksICBkb2N1bWVudCA9 IFJlZiB7IGRvY3VtZW50IH1dICgpIG11dGFibGUgewotICAgICAgICAvLyAyLjIuNC4gSWYgY29u ZmlndXJhdGlvbiBpcyBvZiB0eXBlIE1lZGlhRW5jb2RpbmdDb25maWd1cmF0aW9uLCBydW4gdGhl IGZvbGxvd2luZyBzdWJzdGVwczoKLSAgICAgICAgTWVkaWFFbmdpbmVDb25maWd1cmF0aW9uRmFj dG9yeTo6RW5jb2RpbmdDb25maWd1cmF0aW9uQ2FsbGJhY2sgY2FsbGJhY2sgPSBbcHJvbWlzZSA9 IFdURk1vdmUocHJvbWlzZSldIChhdXRvIGluZm8pIG11dGFibGUgewotICAgICAgICAgICAgLy8g Mi4yLjQuMS4gSWYgdGhlIHVzZXIgYWdlbnQgaXMgYWJsZSB0byBlbmNvZGUgdGhlIG1lZGlhCi0g ICAgICAgICAgICAvLyByZXByZXNlbnRlZCBieSBjb25maWd1cmF0aW9uLCBzZXQgc3VwcG9ydGVk IHRvIHRydWUuIE90aGVyd2lzZQotICAgICAgICAgICAgLy8gc2V0IGl0IHRvIGZhbHNlLgotICAg ICAgICAgICAgLy8gMi4yLjQuMi4gSWYgdGhlIHVzZXIgYWdlbnQgaXMgYWJsZSB0byBlbmNvZGUg dGhlIG1lZGlhCi0gICAgICAgICAgICAvLyByZXByZXNlbnRlZCBieSBjb25maWd1cmF0aW9uIGF0 IGEgcGFjZSB0aGF0IGFsbG93cyBlbmNvZGluZwotICAgICAgICAgICAgLy8gZnJhbWVzIGF0IHRo ZSBzYW1lIHBhY2UgYXMgdGhleSBhcmUgc2VudCB0byB0aGUgZW5jb2Rlciwgc2V0Ci0gICAgICAg ICAgICAvLyBzbW9vdGggdG8gdHJ1ZS4gT3RoZXJ3aXNlIHNldCBpdCB0byBmYWxzZS4KLSAgICAg ICAgICAgIC8vIDIuMi40LjMuIElmIHRoZSB1c2VyIGFnZW50IGlzIGFibGUgdG8gZW5jb2RlIHRo ZSBtZWRpYQotICAgICAgICAgICAgLy8gcmVwcmVzZW50ZWQgYnkgY29uZmlndXJhdGlvbiBpbiBh IHBvd2VyIGVmZmljaWVudCBtYW5uZXIsIHNldAotICAgICAgICAgICAgLy8gcG93ZXJFZmZpY2ll bnQgdG8gdHJ1ZS4gT3RoZXJ3aXNlIHNldCBpdCB0byBmYWxzZS4gVGhlIHVzZXIgYWdlbnQKLSAg ICAgICAgICAgIC8vIFNIT1VMRCBOT1QgdGFrZSBpbnRvIGNvbnNpZGVyYXRpb24gdGhlIGN1cnJl bnQgcG93ZXIgc291cmNlIGluCi0gICAgICAgICAgICAvLyBvcmRlciB0byBkZXRlcm1pbmUgdGhl IGVuY29kaW5nIHBvd2VyIGVmZmljaWVuY3kgdW5sZXNzIHRoZQotICAgICAgICAgICAgLy8gZGV2 aWNl4oCZcyBwb3dlciBzb3VyY2UgaGFzIHNpZGUgZWZmZWN0cyBzdWNoIGFzIGVuYWJsaW5nIGRp ZmZlcmVudAotICAgICAgICAgICAgLy8gZW5jb2RpbmcgbW9kdWxlcy4KKworICAgIE1lZGlhRW5n aW5lQ29uZmlndXJhdGlvbkZhY3Rvcnk6OkVuY29kaW5nQ29uZmlndXJhdGlvbkNhbGxiYWNrIGNh bGxiYWNrID0gW3Byb21pc2UgPSBXVEZNb3ZlKHByb21pc2UpLCBpZGVudGlmaWVyID0gV1RGTW92 ZShpZGVudGlmaWVyKSwgbG9nZ2VyID0gV1RGTW92ZShsb2dnZXIpLCBkb2N1bWVudCA9IFJlZiB7 IGRvY3VtZW50IH1dKGF1dG8gaW5mbykgbXV0YWJsZSB7CisjaWYgIVJFTEVBU0VfTE9HX0RJU0FC TEVECisgICAgICAgICAgICBsb2dnZXItPmluZm8oTG9nTWVkaWEsIGlkZW50aWZpZXIsICI6OmNh bGxiYWNrKCkgLSBSZXNvbHZlZC4gaW5mbzogIiwgaW5mbyk7CisjZW5kaWYKKyAgICAgICAgZG9j dW1lbnQtPmV2ZW50TG9vcCgpLnF1ZXVlVGFzayhUYXNrU291cmNlOjpNZWRpYUVsZW1lbnQsIFtw cm9taXNlID0gV1RGTW92ZShwcm9taXNlKSwgaW5mbyA9IFdURk1vdmUoaW5mbyldICgpIG11dGFi bGUgewogICAgICAgICAgICAgcHJvbWlzZS0+cmVzb2x2ZTxJRExEaWN0aW9uYXJ5PE1lZGlhQ2Fw YWJpbGl0aWVzRW5jb2RpbmdJbmZvPj4oV1RGTW92ZShpbmZvKSk7Ci0gICAgICAgIH07CisgICAg ICAgIH0pOworICAgIH07CiAKICNpZiBFTkFCTEUoV0VCX1JUQykKLSAgICAgICAgaWYgKGNvbmZp Z3VyYXRpb24udHlwZSA9PSBNZWRpYUVuY29kaW5nVHlwZTo6V2ViUlRDKSB7Ci0gICAgICAgICAg ICBpZiAoYXV0byogcGFnZSA9IGRvY3VtZW50LT5wYWdlKCkpCi0gICAgICAgICAgICAgICAgcGFn ZS0+bGliV2ViUlRDUHJvdmlkZXIoKS5jcmVhdGVFbmNvZGluZ0NvbmZpZ3VyYXRpb24oV1RGTW92 ZShjb25maWd1cmF0aW9uKSwgV1RGTW92ZShjYWxsYmFjaykpOwotICAgICAgICAgICAgcmV0dXJu OwotICAgICAgICB9CisgICAgaWYgKGNvbmZpZ3VyYXRpb24udHlwZSA9PSBNZWRpYUVuY29kaW5n VHlwZTo6V2ViUlRDKSB7CisgICAgICAgIGlmIChhdXRvKiBwYWdlID0gZG9jdW1lbnQucGFnZSgp KQorICAgICAgICAgICAgcGFnZS0+bGliV2ViUlRDUHJvdmlkZXIoKS5jcmVhdGVFbmNvZGluZ0Nv bmZpZ3VyYXRpb24oV1RGTW92ZShjb25maWd1cmF0aW9uKSwgV1RGTW92ZShjYWxsYmFjaykpOwor ICAgICAgICByZXR1cm47CisgICAgfQogI2VuZGlmCiAKLSAgICAgICAgTWVkaWFFbmdpbmVDb25m aWd1cmF0aW9uRmFjdG9yeTo6Y3JlYXRlRW5jb2RpbmdDb25maWd1cmF0aW9uKFdURk1vdmUoY29u ZmlndXJhdGlvbiksIFdURk1vdmUoY2FsbGJhY2spKTsKLQotICAgIH0pOworICAgIE1lZGlhRW5n aW5lQ29uZmlndXJhdGlvbkZhY3Rvcnk6OmNyZWF0ZUVuY29kaW5nQ29uZmlndXJhdGlvbihXVEZN b3ZlKGNvbmZpZ3VyYXRpb24pLCBXVEZNb3ZlKGNhbGxiYWNrKSk7CiB9CiAKIH0K 441201 2021-10-14 04:04:05 -0700 2021-10-14 23:33:12 -0700 Patch for landing bug-231569-20211014130403.patch text/plain 10807 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0MTUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTg4OWQ1OGY1ODkyZTJi NmFiOTAwYzFhMzljNDliYzRmYTkzM2JiNC4uMGZhMDViZGFlZThhODkxNjc4OGE1ZGU0ZDFlOGVk Zjk4ZTJlMDE2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTEwLTE0ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBNZWRpYUNhcGFiaWxpdGll cyBzaG91bGQgZW5xdWV1ZSBhIHRhc2sgdG8gcmVzb2x2ZSBwcm9taXNlcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMxNTY5CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgRXJpYyBDYXJsc29uLgorCisgICAgICAgICogTW9kdWxlcy9tZWRpYWNhcGFiaWxp dGllcy9NZWRpYUNhcGFiaWxpdGllcy5jcHA6CisgICAgICAgIFdlIHNob3VsZCByZXNvbHZlIHBy b21pc2VzIGluc2lkZSBhbiBldmVudCBsb29wIHRhc2suCisgICAgICAgIFRvIGRvIHRoaXMsIGlu c3RlYWQgb2YgZW5xdWV1aW5nIGEgdGFzayB0byBkbyBzb21lIHdvcmsgdGhhdCBjYW4gYmUgYXN5 bmNocm9ub3VzLCB3ZSBkbyB0aGUgYXN5bmNocm9ub3VzIHdvcmsgYW5kIHRoZW4gZW5xdWV1ZSBh IHRhc2sgdG8gcmVzb2x2ZSB0aGUgcHJvbWlzZS4KKwogMjAyMS0xMC0xNCAgVGltIE5ndXllbiAg PG50aW1AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSB1c2VsZXNzIGlzQ29ubmVjdGVkKCkg Y2hlY2sgZnJvbSBIVE1MRGlhbG9nRWxlbWVudDo6Y2xvc2UoKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNhcGFiaWxpdGllcy9NZWRpYUNhcGFiaWxpdGllcy5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY2FwYWJpbGl0aWVzL01lZGlhQ2FwYWJpbGl0 aWVzLmNwcAppbmRleCBjZDMwYzRhMjgyNDc5NTQ5MGM3MWYxZjg3NjYyNGVlMjViNDU4ZDI2Li4z ZGNiNjUyZTM2NTJhNTNlMjRlOTVkMTg5ZWJmMTc5NDc0MmNhNmViIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY2FwYWJpbGl0aWVzL01lZGlhQ2FwYWJpbGl0aWVzLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY2FwYWJpbGl0aWVzL01lZGlhQ2Fw YWJpbGl0aWVzLmNwcApAQCAtMTc4LDYgKzE3OCwxOCBAQCB2b2lkIE1lZGlhQ2FwYWJpbGl0aWVz OjpkZWNvZGluZ0luZm8oRG9jdW1lbnQmIGRvY3VtZW50LCBNZWRpYURlY29kaW5nQ29uZmlndXJh dAogCiAgICAgLy8gMS4gSWYgY29uZmlndXJhdGlvbiBpcyBub3QgYSB2YWxpZCBNZWRpYUNvbmZp Z3VyYXRpb24sIHJldHVybiBhIFByb21pc2UgcmVqZWN0ZWQgd2l0aCBhIFR5cGVFcnJvci4KICAg ICAvLyAyLiBJZiBjb25maWd1cmF0aW9uLnZpZGVvIGlzIHByZXNlbnQgYW5kIGlzIG5vdCBhIHZh bGlkIHZpZGVvIGNvbmZpZ3VyYXRpb24sIHJldHVybiBhIFByb21pc2UgcmVqZWN0ZWQgd2l0aCBh IFR5cGVFcnJvci4KKyAgICAvLyAyLjIuMyBJZiBjb25maWd1cmF0aW9uIGlzIG9mIHR5cGUgTWVk aWFEZWNvZGluZ0NvbmZpZ3VyYXRpb24sIHJ1biB0aGUgZm9sbG93aW5nIHN1YnN0ZXBzOgorICAg IC8vIDIuMi4zLjEuIElmIHRoZSB1c2VyIGFnZW50IGlzIGFibGUgdG8gZGVjb2RlIHRoZSBtZWRp YSByZXByZXNlbnRlZCBieQorICAgIC8vIGNvbmZpZ3VyYXRpb24sIHNldCBzdXBwb3J0ZWQgdG8g dHJ1ZS4gT3RoZXJ3aXNlIHNldCBpdCB0byBmYWxzZS4KKyAgICAvLyAyLjIuMy4yLiBJZiB0aGUg dXNlciBhZ2VudCBpcyBhYmxlIHRvIGRlY29kZSB0aGUgbWVkaWEgcmVwcmVzZW50ZWQgYnkKKyAg ICAvLyBjb25maWd1cmF0aW9uIGF0IGEgcGFjZSB0aGF0IGFsbG93cyBhIHNtb290aCBwbGF5YmFj aywgc2V0IHNtb290aCB0bworICAgIC8vIHRydWUuIE90aGVyd2lzZSBzZXQgaXQgdG8gZmFsc2Uu CisgICAgLy8gMi4yLjMuMy4gSWYgdGhlIHVzZXIgYWdlbnQgaXMgYWJsZSB0byBkZWNvZGUgdGhl IG1lZGlhIHJlcHJlc2VudGVkIGJ5CisgICAgLy8gY29uZmlndXJhdGlvbiBpbiBhIHBvd2VyIGVm ZmljaWVudCBtYW5uZXIsIHNldCBwb3dlckVmZmljaWVudCB0bworICAgIC8vIHRydWUuIE90aGVy d2lzZSBzZXQgaXQgdG8gZmFsc2UuIFRoZSB1c2VyIGFnZW50IFNIT1VMRCBOT1QgdGFrZSBpbnRv CisgICAgLy8gY29uc2lkZXJhdGlvbiB0aGUgY3VycmVudCBwb3dlciBzb3VyY2UgaW4gb3JkZXIg dG8gZGV0ZXJtaW5lIHRoZQorICAgIC8vIGRlY29kaW5nIHBvd2VyIGVmZmljaWVuY3kgdW5sZXNz IHRoZSBkZXZpY2XigJlzIHBvd2VyIHNvdXJjZSBoYXMgc2lkZQorICAgIC8vIGVmZmVjdHMgc3Vj aCBhcyBlbmFibGluZyBkaWZmZXJlbnQgZGVjb2RpbmcgbW9kdWxlcy4KICAgICAvLyAzLiBJZiBj b25maWd1cmF0aW9uLmF1ZGlvIGlzIHByZXNlbnQgYW5kIGlzIG5vdCBhIHZhbGlkIGF1ZGlvIGNv bmZpZ3VyYXRpb24sIHJldHVybiBhIFByb21pc2UgcmVqZWN0ZWQgd2l0aCBhIFR5cGVFcnJvci4K ICAgICBpZiAoIWlzVmFsaWRNZWRpYUNvbmZpZ3VyYXRpb24oY29uZmlndXJhdGlvbikpIHsKICNp ZiAhUkVMRUFTRV9MT0dfRElTQUJMRUQKQEAgLTE5NywzNyArMjA5LDI0IEBAIHZvaWQgTWVkaWFD YXBhYmlsaXRpZXM6OmRlY29kaW5nSW5mbyhEb2N1bWVudCYgZG9jdW1lbnQsIE1lZGlhRGVjb2Rp bmdDb25maWd1cmF0CiAgICAgLy8gNC4gTGV0IHAgYmUgYSBuZXcgcHJvbWlzZS4KICAgICAvLyA1 LiBJbiBwYXJhbGxlbCwgcnVuIHRoZSBjcmVhdGUgYSBNZWRpYUNhcGFiaWxpdGllc0luZm8gYWxn b3JpdGhtIHdpdGggY29uZmlndXJhdGlvbiBhbmQgcmVzb2x2ZSBwIHdpdGggaXRzIHJlc3VsdC4K ICAgICAvLyA2LiBSZXR1cm4gcC4KLSAgICBkb2N1bWVudC5ldmVudExvb3AoKS5xdWV1ZVRhc2so VGFza1NvdXJjZTo6TWVkaWFFbGVtZW50LCBbY29uZmlndXJhdGlvbiA9IFdURk1vdmUoY29uZmln dXJhdGlvbiksIHByb21pc2UgPSBXVEZNb3ZlKHByb21pc2UpLCBsb2dnZXIgPSBXVEZNb3ZlKGxv Z2dlciksIGlkZW50aWZpZXIgPSBXVEZNb3ZlKGlkZW50aWZpZXIpLCBkb2N1bWVudCA9IFJlZiB7 IGRvY3VtZW50IH1dICgpIG11dGFibGUgewotCi0gICAgICAgIC8vIDIuMi4zIElmIGNvbmZpZ3Vy YXRpb24gaXMgb2YgdHlwZSBNZWRpYURlY29kaW5nQ29uZmlndXJhdGlvbiwgcnVuIHRoZSBmb2xs b3dpbmcgc3Vic3RlcHM6Ci0gICAgICAgIE1lZGlhRW5naW5lQ29uZmlndXJhdGlvbkZhY3Rvcnk6 OkRlY29kaW5nQ29uZmlndXJhdGlvbkNhbGxiYWNrIGNhbGxiYWNrID0gW3Byb21pc2UgPSBXVEZN b3ZlKHByb21pc2UpLCBsb2dnZXIgPSBXVEZNb3ZlKGxvZ2dlciksIGlkZW50aWZpZXIgPSBXVEZN b3ZlKGlkZW50aWZpZXIpXSAoYXV0byBpbmZvKSBtdXRhYmxlIHsKLSAgICAgICAgICAgIC8vIDIu Mi4zLjEuIElmIHRoZSB1c2VyIGFnZW50IGlzIGFibGUgdG8gZGVjb2RlIHRoZSBtZWRpYSByZXBy ZXNlbnRlZCBieQotICAgICAgICAgICAgLy8gY29uZmlndXJhdGlvbiwgc2V0IHN1cHBvcnRlZCB0 byB0cnVlLiBPdGhlcndpc2Ugc2V0IGl0IHRvIGZhbHNlLgotICAgICAgICAgICAgLy8gMi4yLjMu Mi4gSWYgdGhlIHVzZXIgYWdlbnQgaXMgYWJsZSB0byBkZWNvZGUgdGhlIG1lZGlhIHJlcHJlc2Vu dGVkIGJ5Ci0gICAgICAgICAgICAvLyBjb25maWd1cmF0aW9uIGF0IGEgcGFjZSB0aGF0IGFsbG93 cyBhIHNtb290aCBwbGF5YmFjaywgc2V0IHNtb290aCB0bwotICAgICAgICAgICAgLy8gdHJ1ZS4g T3RoZXJ3aXNlIHNldCBpdCB0byBmYWxzZS4KLSAgICAgICAgICAgIC8vIDIuMi4zLjMuIElmIHRo ZSB1c2VyIGFnZW50IGlzIGFibGUgdG8gZGVjb2RlIHRoZSBtZWRpYSByZXByZXNlbnRlZCBieQot ICAgICAgICAgICAgLy8gY29uZmlndXJhdGlvbiBpbiBhIHBvd2VyIGVmZmljaWVudCBtYW5uZXIs IHNldCBwb3dlckVmZmljaWVudCB0bwotICAgICAgICAgICAgLy8gdHJ1ZS4gT3RoZXJ3aXNlIHNl dCBpdCB0byBmYWxzZS4gVGhlIHVzZXIgYWdlbnQgU0hPVUxEIE5PVCB0YWtlIGludG8KLSAgICAg ICAgICAgIC8vIGNvbnNpZGVyYXRpb24gdGhlIGN1cnJlbnQgcG93ZXIgc291cmNlIGluIG9yZGVy IHRvIGRldGVybWluZSB0aGUKLSAgICAgICAgICAgIC8vIGRlY29kaW5nIHBvd2VyIGVmZmljaWVu Y3kgdW5sZXNzIHRoZSBkZXZpY2XigJlzIHBvd2VyIHNvdXJjZSBoYXMgc2lkZQotICAgICAgICAg ICAgLy8gZWZmZWN0cyBzdWNoIGFzIGVuYWJsaW5nIGRpZmZlcmVudCBkZWNvZGluZyBtb2R1bGVz LgorCisgICAgTWVkaWFFbmdpbmVDb25maWd1cmF0aW9uRmFjdG9yeTo6RGVjb2RpbmdDb25maWd1 cmF0aW9uQ2FsbGJhY2sgY2FsbGJhY2sgPSBbcHJvbWlzZSA9IFdURk1vdmUocHJvbWlzZSksIGlk ZW50aWZpZXIgPSBXVEZNb3ZlKGlkZW50aWZpZXIpLCBsb2dnZXIgPSBXVEZNb3ZlKGxvZ2dlciks IGRvY3VtZW50ID0gUmVmIHsgZG9jdW1lbnQgfV0oYXV0byBpbmZvKSBtdXRhYmxlIHsKICNpZiAh UkVMRUFTRV9MT0dfRElTQUJMRUQKLSAgICAgICAgICAgIGxvZ2dlci0+aW5mbyhMb2dNZWRpYSwg aWRlbnRpZmllciwgIjo6Y2FsbGJhY2soKSAtIFJlc29sdmVkLiBpbmZvOiAiLCBpbmZvKTsKKyAg ICAgICAgbG9nZ2VyLT5pbmZvKExvZ01lZGlhLCBpZGVudGlmaWVyLCAiOjpjYWxsYmFjaygpIC0g UmVzb2x2ZWQuIGluZm86ICIsIGluZm8pOwogI2VuZGlmCisgICAgICAgIGRvY3VtZW50LT5ldmVu dExvb3AoKS5xdWV1ZVRhc2soVGFza1NvdXJjZTo6TWVkaWFFbGVtZW50LCBbcHJvbWlzZSA9IFdU Rk1vdmUocHJvbWlzZSksIGluZm8gPSBXVEZNb3ZlKGluZm8pXSAoKSBtdXRhYmxlIHsKICAgICAg ICAgICAgIHByb21pc2UtPnJlc29sdmU8SURMRGljdGlvbmFyeTxNZWRpYUNhcGFiaWxpdGllc0Rl Y29kaW5nSW5mbz4+KFdURk1vdmUoaW5mbykpOwotICAgICAgICB9OworICAgICAgICB9KTsKKyAg ICB9OwogCiAjaWYgRU5BQkxFKFdFQl9SVEMpCi0gICAgICAgIGlmIChjb25maWd1cmF0aW9uLnR5 cGUgPT0gTWVkaWFEZWNvZGluZ1R5cGU6OldlYlJUQykgewotICAgICAgICAgICAgaWYgKGF1dG8q IHBhZ2UgPSBkb2N1bWVudC0+cGFnZSgpKQotICAgICAgICAgICAgICAgIHBhZ2UtPmxpYldlYlJU Q1Byb3ZpZGVyKCkuY3JlYXRlRGVjb2RpbmdDb25maWd1cmF0aW9uKFdURk1vdmUoY29uZmlndXJh dGlvbiksIFdURk1vdmUoY2FsbGJhY2spKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAg fQorICAgIGlmIChjb25maWd1cmF0aW9uLnR5cGUgPT0gTWVkaWFEZWNvZGluZ1R5cGU6OldlYlJU QykgeworICAgICAgICBpZiAoYXV0byogcGFnZSA9IGRvY3VtZW50LnBhZ2UoKSkKKyAgICAgICAg ICAgIHBhZ2UtPmxpYldlYlJUQ1Byb3ZpZGVyKCkuY3JlYXRlRGVjb2RpbmdDb25maWd1cmF0aW9u KFdURk1vdmUoY29uZmlndXJhdGlvbiksIFdURk1vdmUoY2FsbGJhY2spKTsKKyAgICAgICAgcmV0 dXJuOworICAgIH0KICNlbmRpZgotCi0gICAgICAgIE1lZGlhRW5naW5lQ29uZmlndXJhdGlvbkZh Y3Rvcnk6OmNyZWF0ZURlY29kaW5nQ29uZmlndXJhdGlvbihXVEZNb3ZlKGNvbmZpZ3VyYXRpb24p LCBXVEZNb3ZlKGNhbGxiYWNrKSk7Ci0gICAgfSk7CisgICAgTWVkaWFFbmdpbmVDb25maWd1cmF0 aW9uRmFjdG9yeTo6Y3JlYXRlRGVjb2RpbmdDb25maWd1cmF0aW9uKFdURk1vdmUoY29uZmlndXJh dGlvbiksIFdURk1vdmUoY2FsbGJhY2spKTsKIH0KIAogdm9pZCBNZWRpYUNhcGFiaWxpdGllczo6 ZW5jb2RpbmdJbmZvKERvY3VtZW50JiBkb2N1bWVudCwgTWVkaWFFbmNvZGluZ0NvbmZpZ3VyYXRp b24mJiBjb25maWd1cmF0aW9uLCBSZWY8RGVmZXJyZWRQcm9taXNlPiYmIHByb21pc2UpCkBAIC0y MzUsOSArMjM0LDI3IEBAIHZvaWQgTWVkaWFDYXBhYmlsaXRpZXM6OmVuY29kaW5nSW5mbyhEb2N1 bWVudCYgZG9jdW1lbnQsIE1lZGlhRW5jb2RpbmdDb25maWd1cmF0CiAgICAgLy8gMi40IE1lZGlh IENhcGFiaWxpdGllcyBJbnRlcmZhY2UKICAgICAvLyBodHRwczovL3dpY2cuZ2l0aHViLmlvL21l ZGlhLWNhcGFiaWxpdGllcy8jbWVkaWEtY2FwYWJpbGl0aWVzLWludGVyZmFjZQogCisgICAgYXV0 byBpZGVudGlmaWVyID0gV1RGOjpMb2dnZXI6OkxvZ1NpdGVJZGVudGlmaWVyKCJNZWRpYUNhcGFi aWxpdGllcyIsIF9fZnVuY19fLCB0aGlzKTsKKyAgICBSZWY8TG9nZ2VyPiBsb2dnZXIgPSBkb2N1 bWVudC5sb2dnZXIoKTsKKwogICAgIC8vIDEuIElmIGNvbmZpZ3VyYXRpb24gaXMgbm90IGEgdmFs aWQgTWVkaWFDb25maWd1cmF0aW9uLCByZXR1cm4gYSBQcm9taXNlIHJlamVjdGVkIHdpdGggYSBU eXBlRXJyb3IuCiAgICAgLy8gMi4gSWYgY29uZmlndXJhdGlvbi52aWRlbyBpcyBwcmVzZW50IGFu ZCBpcyBub3QgYSB2YWxpZCB2aWRlbyBjb25maWd1cmF0aW9uLCByZXR1cm4gYSBQcm9taXNlIHJl amVjdGVkIHdpdGggYSBUeXBlRXJyb3IuCiAgICAgLy8gMy4gSWYgY29uZmlndXJhdGlvbi5hdWRp byBpcyBwcmVzZW50IGFuZCBpcyBub3QgYSB2YWxpZCBhdWRpbyBjb25maWd1cmF0aW9uLCByZXR1 cm4gYSBQcm9taXNlIHJlamVjdGVkIHdpdGggYSBUeXBlRXJyb3IuCisgICAgLy8gMi4yLjQuIElm IGNvbmZpZ3VyYXRpb24gaXMgb2YgdHlwZSBNZWRpYUVuY29kaW5nQ29uZmlndXJhdGlvbiwgcnVu IHRoZSBmb2xsb3dpbmcgc3Vic3RlcHM6CisgICAgLy8gMi4yLjQuMS4gSWYgdGhlIHVzZXIgYWdl bnQgaXMgYWJsZSB0byBlbmNvZGUgdGhlIG1lZGlhCisgICAgLy8gcmVwcmVzZW50ZWQgYnkgY29u ZmlndXJhdGlvbiwgc2V0IHN1cHBvcnRlZCB0byB0cnVlLiBPdGhlcndpc2UKKyAgICAvLyBzZXQg aXQgdG8gZmFsc2UuCisgICAgLy8gMi4yLjQuMi4gSWYgdGhlIHVzZXIgYWdlbnQgaXMgYWJsZSB0 byBlbmNvZGUgdGhlIG1lZGlhCisgICAgLy8gcmVwcmVzZW50ZWQgYnkgY29uZmlndXJhdGlvbiBh dCBhIHBhY2UgdGhhdCBhbGxvd3MgZW5jb2RpbmcKKyAgICAvLyBmcmFtZXMgYXQgdGhlIHNhbWUg cGFjZSBhcyB0aGV5IGFyZSBzZW50IHRvIHRoZSBlbmNvZGVyLCBzZXQKKyAgICAvLyBzbW9vdGgg dG8gdHJ1ZS4gT3RoZXJ3aXNlIHNldCBpdCB0byBmYWxzZS4KKyAgICAvLyAyLjIuNC4zLiBJZiB0 aGUgdXNlciBhZ2VudCBpcyBhYmxlIHRvIGVuY29kZSB0aGUgbWVkaWEKKyAgICAvLyByZXByZXNl bnRlZCBieSBjb25maWd1cmF0aW9uIGluIGEgcG93ZXIgZWZmaWNpZW50IG1hbm5lciwgc2V0Cisg ICAgLy8gcG93ZXJFZmZpY2llbnQgdG8gdHJ1ZS4gT3RoZXJ3aXNlIHNldCBpdCB0byBmYWxzZS4g VGhlIHVzZXIgYWdlbnQKKyAgICAvLyBTSE9VTEQgTk9UIHRha2UgaW50byBjb25zaWRlcmF0aW9u IHRoZSBjdXJyZW50IHBvd2VyIHNvdXJjZSBpbgorICAgIC8vIG9yZGVyIHRvIGRldGVybWluZSB0 aGUgZW5jb2RpbmcgcG93ZXIgZWZmaWNpZW5jeSB1bmxlc3MgdGhlCisgICAgLy8gZGV2aWNl4oCZ cyBwb3dlciBzb3VyY2UgaGFzIHNpZGUgZWZmZWN0cyBzdWNoIGFzIGVuYWJsaW5nIGRpZmZlcmVu dAorICAgIC8vIGVuY29kaW5nIG1vZHVsZXMuCiAgICAgaWYgKCFpc1ZhbGlkTWVkaWFDb25maWd1 cmF0aW9uKGNvbmZpZ3VyYXRpb24pKSB7CiAgICAgICAgIHByb21pc2UtPnJlamVjdChUeXBlRXJy b3IpOwogICAgICAgICByZXR1cm47CkBAIC0yNDYsMzcgKzI2MywyNSBAQCB2b2lkIE1lZGlhQ2Fw YWJpbGl0aWVzOjplbmNvZGluZ0luZm8oRG9jdW1lbnQmIGRvY3VtZW50LCBNZWRpYUVuY29kaW5n Q29uZmlndXJhdAogICAgIC8vIDQuIExldCBwIGJlIGEgbmV3IHByb21pc2UuCiAgICAgLy8gNS4g SW4gcGFyYWxsZWwsIHJ1biB0aGUgY3JlYXRlIGEgTWVkaWFDYXBhYmlsaXRpZXNJbmZvIGFsZ29y aXRobSB3aXRoIGNvbmZpZ3VyYXRpb24gYW5kIHJlc29sdmUgcCB3aXRoIGl0cyByZXN1bHQuCiAg ICAgLy8gNi4gUmV0dXJuIHAuCi0gICAgZG9jdW1lbnQuZXZlbnRMb29wKCkucXVldWVUYXNrKFRh c2tTb3VyY2U6Ok1lZGlhRWxlbWVudCwgW2NvbmZpZ3VyYXRpb24gPSBXVEZNb3ZlKGNvbmZpZ3Vy YXRpb24pLCBwcm9taXNlID0gV1RGTW92ZShwcm9taXNlKSwgIGRvY3VtZW50ID0gUmVmIHsgZG9j dW1lbnQgfV0gKCkgbXV0YWJsZSB7Ci0gICAgICAgIC8vIDIuMi40LiBJZiBjb25maWd1cmF0aW9u IGlzIG9mIHR5cGUgTWVkaWFFbmNvZGluZ0NvbmZpZ3VyYXRpb24sIHJ1biB0aGUgZm9sbG93aW5n IHN1YnN0ZXBzOgotICAgICAgICBNZWRpYUVuZ2luZUNvbmZpZ3VyYXRpb25GYWN0b3J5OjpFbmNv ZGluZ0NvbmZpZ3VyYXRpb25DYWxsYmFjayBjYWxsYmFjayA9IFtwcm9taXNlID0gV1RGTW92ZShw cm9taXNlKV0gKGF1dG8gaW5mbykgbXV0YWJsZSB7Ci0gICAgICAgICAgICAvLyAyLjIuNC4xLiBJ ZiB0aGUgdXNlciBhZ2VudCBpcyBhYmxlIHRvIGVuY29kZSB0aGUgbWVkaWEKLSAgICAgICAgICAg IC8vIHJlcHJlc2VudGVkIGJ5IGNvbmZpZ3VyYXRpb24sIHNldCBzdXBwb3J0ZWQgdG8gdHJ1ZS4g T3RoZXJ3aXNlCi0gICAgICAgICAgICAvLyBzZXQgaXQgdG8gZmFsc2UuCi0gICAgICAgICAgICAv LyAyLjIuNC4yLiBJZiB0aGUgdXNlciBhZ2VudCBpcyBhYmxlIHRvIGVuY29kZSB0aGUgbWVkaWEK LSAgICAgICAgICAgIC8vIHJlcHJlc2VudGVkIGJ5IGNvbmZpZ3VyYXRpb24gYXQgYSBwYWNlIHRo YXQgYWxsb3dzIGVuY29kaW5nCi0gICAgICAgICAgICAvLyBmcmFtZXMgYXQgdGhlIHNhbWUgcGFj ZSBhcyB0aGV5IGFyZSBzZW50IHRvIHRoZSBlbmNvZGVyLCBzZXQKLSAgICAgICAgICAgIC8vIHNt b290aCB0byB0cnVlLiBPdGhlcndpc2Ugc2V0IGl0IHRvIGZhbHNlLgotICAgICAgICAgICAgLy8g Mi4yLjQuMy4gSWYgdGhlIHVzZXIgYWdlbnQgaXMgYWJsZSB0byBlbmNvZGUgdGhlIG1lZGlhCi0g ICAgICAgICAgICAvLyByZXByZXNlbnRlZCBieSBjb25maWd1cmF0aW9uIGluIGEgcG93ZXIgZWZm aWNpZW50IG1hbm5lciwgc2V0Ci0gICAgICAgICAgICAvLyBwb3dlckVmZmljaWVudCB0byB0cnVl LiBPdGhlcndpc2Ugc2V0IGl0IHRvIGZhbHNlLiBUaGUgdXNlciBhZ2VudAotICAgICAgICAgICAg Ly8gU0hPVUxEIE5PVCB0YWtlIGludG8gY29uc2lkZXJhdGlvbiB0aGUgY3VycmVudCBwb3dlciBz b3VyY2UgaW4KLSAgICAgICAgICAgIC8vIG9yZGVyIHRvIGRldGVybWluZSB0aGUgZW5jb2Rpbmcg cG93ZXIgZWZmaWNpZW5jeSB1bmxlc3MgdGhlCi0gICAgICAgICAgICAvLyBkZXZpY2XigJlzIHBv d2VyIHNvdXJjZSBoYXMgc2lkZSBlZmZlY3RzIHN1Y2ggYXMgZW5hYmxpbmcgZGlmZmVyZW50Ci0g ICAgICAgICAgICAvLyBlbmNvZGluZyBtb2R1bGVzLgorCisgICAgTWVkaWFFbmdpbmVDb25maWd1 cmF0aW9uRmFjdG9yeTo6RW5jb2RpbmdDb25maWd1cmF0aW9uQ2FsbGJhY2sgY2FsbGJhY2sgPSBb cHJvbWlzZSA9IFdURk1vdmUocHJvbWlzZSksIGlkZW50aWZpZXIgPSBXVEZNb3ZlKGlkZW50aWZp ZXIpLCBsb2dnZXIgPSBXVEZNb3ZlKGxvZ2dlciksIGRvY3VtZW50ID0gUmVmIHsgZG9jdW1lbnQg fV0oYXV0byBpbmZvKSBtdXRhYmxlIHsKKyNpZiAhUkVMRUFTRV9MT0dfRElTQUJMRUQKKyAgICAg ICAgbG9nZ2VyLT5pbmZvKExvZ01lZGlhLCBpZGVudGlmaWVyLCAiOjpjYWxsYmFjaygpIC0gUmVz b2x2ZWQuIGluZm86ICIsIGluZm8pOworI2VuZGlmCisgICAgICAgIGRvY3VtZW50LT5ldmVudExv b3AoKS5xdWV1ZVRhc2soVGFza1NvdXJjZTo6TWVkaWFFbGVtZW50LCBbcHJvbWlzZSA9IFdURk1v dmUocHJvbWlzZSksIGluZm8gPSBXVEZNb3ZlKGluZm8pXSAoKSBtdXRhYmxlIHsKICAgICAgICAg ICAgIHByb21pc2UtPnJlc29sdmU8SURMRGljdGlvbmFyeTxNZWRpYUNhcGFiaWxpdGllc0VuY29k aW5nSW5mbz4+KFdURk1vdmUoaW5mbykpOwotICAgICAgICB9OworICAgICAgICB9KTsKKyAgICB9 OwogCiAjaWYgRU5BQkxFKFdFQl9SVEMpCi0gICAgICAgIGlmIChjb25maWd1cmF0aW9uLnR5cGUg PT0gTWVkaWFFbmNvZGluZ1R5cGU6OldlYlJUQykgewotICAgICAgICAgICAgaWYgKGF1dG8qIHBh Z2UgPSBkb2N1bWVudC0+cGFnZSgpKQotICAgICAgICAgICAgICAgIHBhZ2UtPmxpYldlYlJUQ1By b3ZpZGVyKCkuY3JlYXRlRW5jb2RpbmdDb25maWd1cmF0aW9uKFdURk1vdmUoY29uZmlndXJhdGlv biksIFdURk1vdmUoY2FsbGJhY2spKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQor ICAgIGlmIChjb25maWd1cmF0aW9uLnR5cGUgPT0gTWVkaWFFbmNvZGluZ1R5cGU6OldlYlJUQykg eworICAgICAgICBpZiAoYXV0byogcGFnZSA9IGRvY3VtZW50LnBhZ2UoKSkKKyAgICAgICAgICAg IHBhZ2UtPmxpYldlYlJUQ1Byb3ZpZGVyKCkuY3JlYXRlRW5jb2RpbmdDb25maWd1cmF0aW9uKFdU Rk1vdmUoY29uZmlndXJhdGlvbiksIFdURk1vdmUoY2FsbGJhY2spKTsKKyAgICAgICAgcmV0dXJu OworICAgIH0KICNlbmRpZgogCi0gICAgICAgIE1lZGlhRW5naW5lQ29uZmlndXJhdGlvbkZhY3Rv cnk6OmNyZWF0ZUVuY29kaW5nQ29uZmlndXJhdGlvbihXVEZNb3ZlKGNvbmZpZ3VyYXRpb24pLCBX VEZNb3ZlKGNhbGxiYWNrKSk7Ci0KLSAgICB9KTsKKyAgICBNZWRpYUVuZ2luZUNvbmZpZ3VyYXRp b25GYWN0b3J5OjpjcmVhdGVFbmNvZGluZ0NvbmZpZ3VyYXRpb24oV1RGTW92ZShjb25maWd1cmF0 aW9uKSwgV1RGTW92ZShjYWxsYmFjaykpOwogfQogCiB9Cg==