234391 2021-12-16 07:36:06 -0800 ANGLE Metal retain counts managed inconsistently after ownership identity change 2022-01-10 02:21:42 -0800 1 1 1 Unclassified WebKit ANGLE WebKit Local Build Unspecified Unspecified RESOLVED CONFIGURATION CHANGED https://bugs.webkit.org/show_bug.cgi?id=234356 InRadar P2 Normal --- 234523 1 kkinnunen kkinnunen dino ews-watchlist johncunningham kbr kkinnunen kondapallykalyan webkit-bug-importer oldest_to_newest 1824754 0 kkinnunen 2021-12-16 07:36:06 -0800 ANGLE Metal retain counts managed inconsistently after ownership identity change 1824760 1 447356 kkinnunen 2021-12-16 08:00:26 -0800 Created attachment 447356 Patch 1824761 2 ews-watchlist 2021-12-16 08:01:26 -0800 Note that there are important steps to take when updating ANGLE. See https://trac.webkit.org/wiki/UpdatingANGLE 1825716 3 kbr 2021-12-20 13:33:22 -0800 Kyle's pulling in this upstream fix in Bug 234523. Would you like to land this separately? 1825921 4 447356 kkinnunen 2021-12-21 01:27:47 -0800 Comment on attachment 447356 Patch lets get this with the merge 1826553 5 webkit-bug-importer 2021-12-23 07:37:17 -0800 <rdar://problem/86852537> 447356 2021-12-16 08:00:26 -0800 2021-12-21 01:27:47 -0800 Patch bug-234391-20211216180024.patch text/plain 18135 kkinnunen U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MDk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k ZXggNTViNjIyOGMyODlkNTA5M2VmM2IzMmU2MjJjOWZiMmUyMjA4NGNkMS4uOTEzN2NjODNmZGVk MzQ2NDQyMjIxNmE5MDY2YWIxNjkwNjhmMDYwYSAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDQ2IEBACisyMDIxLTEyLTE2ICBLaW1tbyBLaW5udW5lbiAgPGtraW5udW5l bkBhcHBsZS5jb20+CisKKyAgICAgICAgRml4IEFOR0xFIE1ldGFsIGluY29uc2lzdGVuY2llcyBh ZnRlciBvd25lcnNoaXAgaWRlbnRpdHkgY2hhbmdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzQzOTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBNZXRhbCBuZXcqIG1ldGhvZHMgY3JlYXRlIG9iamVjdHMg d2l0aCArMSByZXRhaW4gY291bnQuCisgICAgICAgIEF1dG9PYmpDUHRyIGlzIGludGVuZGVkIHRv IGFkb3B0IHRoaXMgcmVmZXJlbmNlLgorICAgICAgICBPdGhlcndpc2UsIGxpa2UgYmVmb3JlIHRo aXMgcGF0Y2gsIHRoZSBBdXRvT2JqQ1B0ciBob2xkcworICAgICAgICBvYmplY3Qgd2l0aCArMiBj b3VudC4gQmVmb3JlIHRoaXMgcGF0Y2gsIHNvbWUgYnV0IG5vdCBhbGwKKyAgICAgICAgY2FsbCBz aXRlcyBkb25hdGVkIHRoZSBleHRyYSByZXRhaW4gY291bnQgdG8gYXV0b3JlbGVhc2Vwb29sCisg ICAgICAgICJvdXQgb2YgYmFuZCIsIGFuZCBhcyBzdWNoIHRoZSBjb2RlIGRpZCBub3QgbGVhayB0 aGF0IG11Y2guCisKKyAgICAgICAgVXNlIHRoZSBpZGVudGl0eS1hd2FyZSBhcGkgZm9yIHRoZSBh bGxvY2F0aW9uIGRvbmUgaW4KKyAgICAgICAgVGV4dHVyZTo6cmVzaXplLgorCisgICAgICAgICog c3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL0lPU3VyZmFjZVN1cmZhY2VNdGwubW06CisgICAg ICAgIChyeDo6SU9TdXJmYWNlU3VyZmFjZU10bDo6ZW5zdXJlQ29sb3JUZXh0dXJlQ3JlYXRlZCk6 CisgICAgICAgICogc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL1N5bmNNdGwubW06CisgICAg ICAgIChyeDo6bXRsOjpTeW5jOjppbml0aWFsaXplKToKKyAgICAgICAgKiBzcmMvbGliQU5HTEUv cmVuZGVyZXIvbWV0YWwvbXRsX2NvbnRleHRfZGV2aWNlLm1tOgorICAgICAgICAocng6Om10bDo6 Q29udGV4dERldmljZTo6bmV3U2FtcGxlclN0YXRlV2l0aERlc2NyaXB0b3IgY29uc3QpOgorICAg ICAgICAocng6Om10bDo6Q29udGV4dERldmljZTo6bmV3VGV4dHVyZVdpdGhEZXNjcmlwdG9yIGNv bnN0KToKKyAgICAgICAgKHJ4OjptdGw6OkNvbnRleHREZXZpY2U6Om5ld0J1ZmZlcldpdGhMZW5n dGggY29uc3QpOgorICAgICAgICAocng6Om10bDo6Q29udGV4dERldmljZTo6bmV3QnVmZmVyV2l0 aEJ5dGVzIGNvbnN0KToKKyAgICAgICAgKHJ4OjptdGw6OkNvbnRleHREZXZpY2U6Om5ld0NvbXB1 dGVQaXBlbGluZVN0YXRlV2l0aEZ1bmN0aW9uIGNvbnN0KToKKyAgICAgICAgKHJ4OjptdGw6OkNv bnRleHREZXZpY2U6Om5ld1JlbmRlclBpcGVsaW5lU3RhdGVXaXRoRGVzY3JpcHRvciBjb25zdCk6 CisgICAgICAgIChyeDo6bXRsOjpDb250ZXh0RGV2aWNlOjpuZXdMaWJyYXJ5V2l0aFNvdXJjZSBj b25zdCk6CisgICAgICAgIChyeDo6bXRsOjpDb250ZXh0RGV2aWNlOjpuZXdEZXB0aFN0ZW5jaWxT dGF0ZVdpdGhEZXNjcmlwdG9yIGNvbnN0KToKKyAgICAgICAgKHJ4OjptdGw6OkNvbnRleHREZXZp Y2U6Om5ld1NoYXJlZEV2ZW50IGNvbnN0KToKKyAgICAgICAgKiBzcmMvbGliQU5HTEUvcmVuZGVy ZXIvbWV0YWwvbXRsX3JlbmRlcl91dGlscy5tbToKKyAgICAgICAgKiBzcmMvbGliQU5HTEUvcmVu ZGVyZXIvbWV0YWwvbXRsX3Jlc291cmNlcy5tbToKKyAgICAgICAgKHJ4OjptdGw6OlRleHR1cmU6 OlRleHR1cmUpOgorICAgICAgICAocng6Om10bDo6VGV4dHVyZTo6cmVzaXplKToKKyAgICAgICAg KHJ4OjptdGw6OlRleHR1cmU6OmdldFJlYWRhYmxlQ29weSk6CisgICAgICAgIChyeDo6bXRsOjpC dWZmZXI6OnJlc2V0V2l0aFJlc09wdCk6CisgICAgICAgICogc3JjL2xpYkFOR0xFL3JlbmRlcmVy L21ldGFsL210bF9zdGF0ZV9jYWNoZS5tbToKKyAgICAgICAgKHJ4OjptdGw6OlN0YXRlQ2FjaGU6 OmdldERlcHRoU3RlbmNpbFN0YXRlKToKKyAgICAgICAgKHJ4OjptdGw6OlN0YXRlQ2FjaGU6Omdl dFNhbXBsZXJTdGF0ZSk6CisgICAgICAgICogc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL210 bF91dGlscy5tbToKKyAgICAgICAgKHJ4OjptdGw6OkNyZWF0ZVNoYWRlckxpYnJhcnkpOgorCiAy MDIxLTEyLTE1ICBEZWFuIEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KIAogICAgICAgICBbQU5H TEVdIGNsYW5nIHdpdGggLVd1bmtub3duLXdhcm5pbmctb3B0aW9uIHdpbGwgZmFpbCBvbiAtV3dl YWstdGVtcGxhdGUtdnRhYmxlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUv c3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL0lPU3VyZmFjZVN1cmZhY2VNdGwubW0gYi9Tb3Vy Y2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvSU9TdXJmYWNl U3VyZmFjZU10bC5tbQppbmRleCA0YWUyMjU1M2QyN2I3MThhNjEzZGI1M2VhMzM2MzEyZmU3YTlj ZTk5Li4xMjBiZmM0YWQyNjNlODFjMzI1NWUyMTk4MTJmZWE5MjMzZTA2ZjNkIDEwMDY0NAotLS0g YS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvSU9T dXJmYWNlU3VyZmFjZU10bC5tbQorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGli QU5HTEUvcmVuZGVyZXIvbWV0YWwvSU9TdXJmYWNlU3VyZmFjZU10bC5tbQpAQCAtMTQ5LDExICsx NDksOSBAQCBhbmdsZTo6UmVzdWx0IElPU3VyZmFjZVN1cmZhY2VNdGw6OmVuc3VyZUNvbG9yVGV4 dHVyZUNyZWF0ZWQoY29uc3QgZ2w6OkNvbnRleHQgKgogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtaXBtYXBwZWQ6Tk9dOwogCiAgICAg ICAgIHRleERlc2MudXNhZ2UgPSBNVExUZXh0dXJlVXNhZ2VTaGFkZXJSZWFkIHwgTVRMVGV4dHVy ZVVzYWdlUmVuZGVyVGFyZ2V0OwotCi0gICAgICAgIGlkPE1UTFRleHR1cmU+IHRleHR1cmUgPSBj b250ZXh0TXRsLT5nZXRNZXRhbERldmljZSgpLm5ld1RleHR1cmVXaXRoRGVzY3JpcHRvcigKLSAg ICAgICAgICAgIHRleERlc2MsIG1JT1N1cmZhY2UsIG1JT1N1cmZhY2VQbGFuZSk7Ci0KLSAgICAg ICAgbUNvbG9yVGV4dHVyZSA9IG10bDo6VGV4dHVyZTo6TWFrZUZyb21NZXRhbChbdGV4dHVyZSBB TkdMRV9NVExfQVVUT1JFTEVBU0VdKTsKKyAgICAgICAgbUNvbG9yVGV4dHVyZSA9CisgICAgICAg ICAgICBtdGw6OlRleHR1cmU6Ok1ha2VGcm9tTWV0YWwoY29udGV4dE10bC0+Z2V0TWV0YWxEZXZp Y2UoKS5uZXdUZXh0dXJlV2l0aERlc2NyaXB0b3IoCisgICAgICAgICAgICAgICAgdGV4RGVzYywg bUlPU3VyZmFjZSwgbUlPU3VyZmFjZVBsYW5lKSk7CiAgICAgfQogCiAgICAgbUNvbG9yUmVuZGVy VGFyZ2V0LnNldChtQ29sb3JUZXh0dXJlLCBtdGw6OmtaZXJvTmF0aXZlTWlwTGV2ZWwsIDAsIG1D b2xvckZvcm1hdCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGli QU5HTEUvcmVuZGVyZXIvbWV0YWwvU3luY010bC5tbSBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xF L3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9TeW5jTXRsLm1tCmluZGV4IGRiZTc1YzgwYWQ1 Yzc4Y2Y3MzJiNWE1NTY3OWY2MGEzNzc5MDNkNmYuLjI1YWEyMDc0NTVkZjZmMDBkMjdiMTgwZjBh ZTE2N2U1NmFmNDQ0NjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9s aWJBTkdMRS9yZW5kZXJlci9tZXRhbC9TeW5jTXRsLm1tCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5 L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9TeW5jTXRsLm1tCkBAIC0zNSwxMSAr MzUsNyBAQCB2b2lkIFN5bmM6Om9uRGVzdHJveSgpCiAKIGFuZ2xlOjpSZXN1bHQgU3luYzo6aW5p dGlhbGl6ZShDb250ZXh0TXRsICpjb250ZXh0TXRsKQogewotICAgIEFOR0xFX01UTF9PQkpDX1ND T1BFCi0gICAgewotICAgICAgICBtTWV0YWxTaGFyZWRFdmVudCA9IFtjb250ZXh0TXRsLT5nZXRN ZXRhbERldmljZSgpLm5ld1NoYXJlZEV2ZW50KCkgQU5HTEVfTVRMX0FVVE9SRUxFQVNFXTsKLSAg ICB9Ci0KKyAgICBtTWV0YWxTaGFyZWRFdmVudCA9IGNvbnRleHRNdGwtPmdldE1ldGFsRGV2aWNl KCkubmV3U2hhcmVkRXZlbnQoKTsKICAgICBtU2V0Q291bnRlciA9IG1NZXRhbFNoYXJlZEV2ZW50 LmdldCgpLnNpZ25hbGVkVmFsdWU7CiAKICAgICBtQ3YucmVzZXQobmV3IHN0ZDo6Y29uZGl0aW9u X3ZhcmlhYmxlKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xp YkFOR0xFL3JlbmRlcmVyL21ldGFsL210bF9jb250ZXh0X2RldmljZS5tbSBiL1NvdXJjZS9UaGly ZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9tdGxfY29udGV4dF9kZXZp Y2UubW0KaW5kZXggNGU4MjQwZDM1MWYzMWQ4MzY0Zjc2MzM1ODZmMmZhNmQ3ZmM2ZjQwOC4uYjc1 ZWY2OGQ4YWQ5ZDdiMDA1YjBhNDE1ZTJkNWRmMDIyYzQ0YjcxNSAxMDA2NDQKLS0tIGEvU291cmNl L1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL210bF9jb250ZXh0 X2RldmljZS5tbQorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVu ZGVyZXIvbWV0YWwvbXRsX2NvbnRleHRfZGV2aWNlLm1tCkBAIC01MywxNCArNTMsMTMgQEAgQ29u dGV4dERldmljZTo6fkNvbnRleHREZXZpY2UoKQogQXV0b09iakNQdHI8aWQ8TVRMU2FtcGxlclN0 YXRlPj4gQ29udGV4dERldmljZTo6bmV3U2FtcGxlclN0YXRlV2l0aERlc2NyaXB0b3IoCiAgICAg TVRMU2FtcGxlckRlc2NyaXB0b3IgKmRlc2NyaXB0b3IpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIFtn ZXQoKSBuZXdTYW1wbGVyU3RhdGVXaXRoRGVzY3JpcHRvcjpkZXNjcmlwdG9yXTsKKyAgICByZXR1 cm4gYWRvcHRPYmpDT2JqKFtnZXQoKSBuZXdTYW1wbGVyU3RhdGVXaXRoRGVzY3JpcHRvcjpkZXNj cmlwdG9yXSk7CiB9CiAKIEF1dG9PYmpDUHRyPGlkPE1UTFRleHR1cmU+PiBDb250ZXh0RGV2aWNl OjpuZXdUZXh0dXJlV2l0aERlc2NyaXB0b3IoCiAgICAgTVRMVGV4dHVyZURlc2NyaXB0b3IgKmRl c2NyaXB0b3IpIGNvbnN0CiB7Ci0KLSAgICBhdXRvIHJlc291cmNlID0gW2dldCgpIG5ld1RleHR1 cmVXaXRoRGVzY3JpcHRvcjpkZXNjcmlwdG9yXTsKKyAgICBhdXRvIHJlc291cmNlID0gYWRvcHRP YmpDT2JqKFtnZXQoKSBuZXdUZXh0dXJlV2l0aERlc2NyaXB0b3I6ZGVzY3JpcHRvcl0pOwogICAg IHNldE93bmVyV2l0aElkZW50aXR5KHJlc291cmNlKTsKICAgICByZXR1cm4gcmVzb3VyY2U7CiB9 CkBAIC03MCwxMyArNjksMTUgQEAgQXV0b09iakNQdHI8aWQ8TVRMVGV4dHVyZT4+IENvbnRleHRE ZXZpY2U6Om5ld1RleHR1cmVXaXRoRGVzY3JpcHRvcigKICAgICBJT1N1cmZhY2VSZWYgaW9zdXJm YWNlLAogICAgIE5TVUludGVnZXIgcGxhbmUpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIFtnZXQoKSBu ZXdUZXh0dXJlV2l0aERlc2NyaXB0b3I6ZGVzY3JpcHRvciBpb3N1cmZhY2U6aW9zdXJmYWNlIHBs YW5lOnBsYW5lXTsKKyAgICByZXR1cm4gYWRvcHRPYmpDT2JqKFtnZXQoKSBuZXdUZXh0dXJlV2l0 aERlc2NyaXB0b3I6ZGVzY3JpcHRvcgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGlvc3VyZmFjZTppb3N1cmZhY2UKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgcGxhbmU6cGxhbmVdKTsKIH0KIAogQXV0b09iakNQ dHI8aWQ8TVRMQnVmZmVyPj4gQ29udGV4dERldmljZTo6bmV3QnVmZmVyV2l0aExlbmd0aChOU1VJ bnRlZ2VyIGxlbmd0aCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgTVRMUmVzb3VyY2VPcHRpb25zIG9wdGlvbnMpIGNvbnN0CiB7 Ci0gICAgYXV0byByZXNvdXJjZSA9IFtnZXQoKSBuZXdCdWZmZXJXaXRoTGVuZ3RoOmxlbmd0aCBv cHRpb25zOm9wdGlvbnNdOworICAgIGF1dG8gcmVzb3VyY2UgPSBhZG9wdE9iakNPYmooW2dldCgp IG5ld0J1ZmZlcldpdGhMZW5ndGg6bGVuZ3RoIG9wdGlvbnM6b3B0aW9uc10pOwogICAgIHNldE93 bmVyV2l0aElkZW50aXR5KHJlc291cmNlKTsKICAgICByZXR1cm4gcmVzb3VyY2U7CiB9CkBAIC04 NSw3ICs4Niw3IEBAIEF1dG9PYmpDUHRyPGlkPE1UTEJ1ZmZlcj4+IENvbnRleHREZXZpY2U6Om5l d0J1ZmZlcldpdGhCeXRlcyhjb25zdCB2b2lkICpwb2ludGVyCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTlNVSW50ZWdlciBsZW5n dGgsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgTVRMUmVzb3VyY2VPcHRpb25zIG9wdGlvbnMpIGNvbnN0CiB7Ci0gICAgYXV0byBy ZXNvdXJjZSA9IFtnZXQoKSBuZXdCdWZmZXJXaXRoQnl0ZXM6cG9pbnRlciBsZW5ndGg6bGVuZ3Ro IG9wdGlvbnM6b3B0aW9uc107CisgICAgYXV0byByZXNvdXJjZSA9IGFkb3B0T2JqQ09iaihbZ2V0 KCkgbmV3QnVmZmVyV2l0aEJ5dGVzOnBvaW50ZXIgbGVuZ3RoOmxlbmd0aCBvcHRpb25zOm9wdGlv bnNdKTsKICAgICBzZXRPd25lcldpdGhJZGVudGl0eShyZXNvdXJjZSk7CiAgICAgcmV0dXJuIHJl c291cmNlOwogfQpAQCAtOTQsMTQgKzk1LDE0IEBAIEF1dG9PYmpDUHRyPGlkPE1UTENvbXB1dGVQ aXBlbGluZVN0YXRlPj4gQ29udGV4dERldmljZTo6bmV3Q29tcHV0ZVBpcGVsaW5lU3RhdGVXCiAg ICAgaWQ8TVRMRnVuY3Rpb24+IGNvbXB1dGVGdW5jdGlvbiwKICAgICBfX2F1dG9yZWxlYXNpbmcg TlNFcnJvciAqKmVycm9yKSBjb25zdAogewotICAgIHJldHVybiBbZ2V0KCkgbmV3Q29tcHV0ZVBp cGVsaW5lU3RhdGVXaXRoRnVuY3Rpb246Y29tcHV0ZUZ1bmN0aW9uIGVycm9yOmVycm9yXTsKKyAg ICByZXR1cm4gYWRvcHRPYmpDT2JqKFtnZXQoKSBuZXdDb21wdXRlUGlwZWxpbmVTdGF0ZVdpdGhG dW5jdGlvbjpjb21wdXRlRnVuY3Rpb24gZXJyb3I6ZXJyb3JdKTsKIH0KIAogQXV0b09iakNQdHI8 aWQ8TVRMUmVuZGVyUGlwZWxpbmVTdGF0ZT4+IENvbnRleHREZXZpY2U6Om5ld1JlbmRlclBpcGVs aW5lU3RhdGVXaXRoRGVzY3JpcHRvcigKICAgICBNVExSZW5kZXJQaXBlbGluZURlc2NyaXB0b3Ig KmRlc2NyaXB0b3IsCiAgICAgX19hdXRvcmVsZWFzaW5nIE5TRXJyb3IgKiplcnJvcikgY29uc3QK IHsKLSAgICByZXR1cm4gW2dldCgpIG5ld1JlbmRlclBpcGVsaW5lU3RhdGVXaXRoRGVzY3JpcHRv cjpkZXNjcmlwdG9yIGVycm9yOmVycm9yXTsKKyAgICByZXR1cm4gYWRvcHRPYmpDT2JqKFtnZXQo KSBuZXdSZW5kZXJQaXBlbGluZVN0YXRlV2l0aERlc2NyaXB0b3I6ZGVzY3JpcHRvciBlcnJvcjpl cnJvcl0pOwogfQogCiBBdXRvT2JqQ1B0cjxpZDxNVExMaWJyYXJ5Pj4gQ29udGV4dERldmljZTo6 bmV3TGlicmFyeVdpdGhTb3VyY2UoCkBAIC0xMDksMTggKzExMCwxOCBAQCBBdXRvT2JqQ1B0cjxp ZDxNVExMaWJyYXJ5Pj4gQ29udGV4dERldmljZTo6bmV3TGlicmFyeVdpdGhTb3VyY2UoCiAgICAg TVRMQ29tcGlsZU9wdGlvbnMgKm9wdGlvbnMsCiAgICAgX19hdXRvcmVsZWFzaW5nIE5TRXJyb3Ig KiplcnJvcikgY29uc3QKIHsKLSAgICByZXR1cm4gW2dldCgpIG5ld0xpYnJhcnlXaXRoU291cmNl OnNvdXJjZSBvcHRpb25zOm9wdGlvbnMgZXJyb3I6ZXJyb3JdOworICAgIHJldHVybiBhZG9wdE9i akNPYmooW2dldCgpIG5ld0xpYnJhcnlXaXRoU291cmNlOnNvdXJjZSBvcHRpb25zOm9wdGlvbnMg ZXJyb3I6ZXJyb3JdKTsKIH0KIAogQXV0b09iakNQdHI8aWQ8TVRMRGVwdGhTdGVuY2lsU3RhdGU+ PiBDb250ZXh0RGV2aWNlOjpuZXdEZXB0aFN0ZW5jaWxTdGF0ZVdpdGhEZXNjcmlwdG9yKAogICAg IE1UTERlcHRoU3RlbmNpbERlc2NyaXB0b3IgKmRlc2NyaXB0b3IpIGNvbnN0CiB7Ci0gICAgcmV0 dXJuIFtnZXQoKSBuZXdEZXB0aFN0ZW5jaWxTdGF0ZVdpdGhEZXNjcmlwdG9yOmRlc2NyaXB0b3Jd OworICAgIHJldHVybiBhZG9wdE9iakNPYmooW2dldCgpIG5ld0RlcHRoU3RlbmNpbFN0YXRlV2l0 aERlc2NyaXB0b3I6ZGVzY3JpcHRvcl0pOwogfQogCiBBdXRvT2JqQ1B0cjxpZDxNVExTaGFyZWRF dmVudD4+IENvbnRleHREZXZpY2U6Om5ld1NoYXJlZEV2ZW50KCkgY29uc3QKIHsKLSAgICByZXR1 cm4gW2dldCgpIG5ld1NoYXJlZEV2ZW50XTsKKyAgICByZXR1cm4gYWRvcHRPYmpDT2JqKFtnZXQo KSBuZXdTaGFyZWRFdmVudF0pOwogfQogCiB2b2lkIENvbnRleHREZXZpY2U6OnNldE93bmVyV2l0 aElkZW50aXR5KGlkPE1UTFJlc291cmNlPiByZXNvdXJjZSkgY29uc3QKZGlmZiAtLWdpdCBhL1Nv dXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9tdGxfcmVu ZGVyX3V0aWxzLm1tIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRl cmVyL21ldGFsL210bF9yZW5kZXJfdXRpbHMubW0KaW5kZXggMmQ4ZDkxMDcxZTM4MmE4YTZjMTIw Mjk4Mzg0NTM2YjlhZjkyOGQxYy4uMjgyNGRmMWExZGU3NDJhY2RmYjRhZGYyOGY1OWYxMjQ4MWNh MmE0NiAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3Jl bmRlcmVyL21ldGFsL210bF9yZW5kZXJfdXRpbHMubW0KKysrIGIvU291cmNlL1RoaXJkUGFydHkv QU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL210bF9yZW5kZXJfdXRpbHMubW0KQEAg LTUyMSw4ICs1MjEsNyBAQCB2b2lkIEVuc3VyZUNvbXB1dGVQaXBlbGluZUluaXRpYWxpemVkKENv bnRleHRNdGwgKmNvbnRleHQsCiAKICAgICAgICAgW3NoYWRlciBBTkdMRV9NVExfQVVUT1JFTEVB U0VdOwogCi0gICAgICAgIHBpcGVsaW5lID0KLSAgICAgICAgICAgIFttZXRhbERldmljZS5uZXdD b21wdXRlUGlwZWxpbmVTdGF0ZVdpdGhGdW5jdGlvbihzaGFkZXIsICZlcnIpIEFOR0xFX01UTF9B VVRPUkVMRUFTRV07CisgICAgICAgIHBpcGVsaW5lID0gbWV0YWxEZXZpY2UubmV3Q29tcHV0ZVBp cGVsaW5lU3RhdGVXaXRoRnVuY3Rpb24oc2hhZGVyLCAmZXJyKTsKICAgICAgICAgaWYgKGVyciAm JiAhcGlwZWxpbmUpCiAgICAgICAgIHsKICAgICAgICAgICAgIEVSUigpIDw8ICJJbnRlcm5hbCBl cnJvcjogIiA8PCBlcnIubG9jYWxpemVkRGVzY3JpcHRpb24uVVRGOFN0cmluZyA8PCAiXG4iOwpk aWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVy L21ldGFsL210bF9yZXNvdXJjZXMubW0gYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGli QU5HTEUvcmVuZGVyZXIvbWV0YWwvbXRsX3Jlc291cmNlcy5tbQppbmRleCA5YTU1NDJkYzYxZmZk MTFjOGQwMTRiYmE0ZTUyOTE0N2Y2ZDM3YWIyLi44ODhmMjFkNjgzMDkyYmRmNGJkMzg0NDEzNWE3 MjQxZjgwYjM0ODE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGli QU5HTEUvcmVuZGVyZXIvbWV0YWwvbXRsX3Jlc291cmNlcy5tbQorKysgYi9Tb3VyY2UvVGhpcmRQ YXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvbXRsX3Jlc291cmNlcy5tbQpA QCAtNDA0LDcgKzQwNCw3IEBAIFRleHR1cmU6OlRleHR1cmUoQ29udGV4dE10bCAqY29udGV4dCwK ICAgICAgICAgICAgIGRlc2MudXNhZ2UgPSBkZXNjLnVzYWdlIHwgTVRMVGV4dHVyZVVzYWdlUGl4 ZWxGb3JtYXRWaWV3OwogICAgICAgICB9CiAKLSAgICAgICAgc2V0KFttZXRhbERldmljZS5uZXdU ZXh0dXJlV2l0aERlc2NyaXB0b3IoZGVzYykgQU5HTEVfTVRMX0FVVE9SRUxFQVNFXSk7CisgICAg ICAgIHNldChtZXRhbERldmljZS5uZXdUZXh0dXJlV2l0aERlc2NyaXB0b3IoZGVzYykpOwogCiAg ICAgICAgIG1DcmVhdGlvbkRlc2MucmV0YWluQXNzaWduKGRlc2MpOwogICAgIH0KQEAgLTQ0Myw4 ICs0NDMsNyBAQCBUZXh0dXJlOjpUZXh0dXJlKENvbnRleHRNdGwgKmNvbnRleHQsCiAgICAgICAg ICAgICAgICAgZGVzYy51c2FnZSA9IGRlc2MudXNhZ2UgfCBNVExUZXh0dXJlVXNhZ2VTaGFkZXJX cml0ZTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQotICAgICAgICBpZDxNVExUZXh0dXJlPiBp b3N1cmZUZXh0dXJlID0gbWV0YWxEZXZpY2UubmV3VGV4dHVyZVdpdGhEZXNjcmlwdG9yKGRlc2Ms IGlvc3VyZmFjZSwgcGxhbmUpOwotICAgICAgICBzZXQoW2lvc3VyZlRleHR1cmUgQU5HTEVfTVRM X0FVVE9SRUxFQVNFXSk7CisgICAgICAgIHNldChtZXRhbERldmljZS5uZXdUZXh0dXJlV2l0aERl c2NyaXB0b3IoZGVzYywgaW9zdXJmYWNlLCBwbGFuZSkpOwogICAgIH0KIH0KIApAQCAtNzU2LDEz ICs3NTUsOSBAQCBhbmdsZTo6UmVzdWx0IFRleHR1cmU6OnJlc2l6ZShDb250ZXh0TXRsICpjb250 ZXh0LCB1aW50MzJfdCB3aWR0aCwgdWludDMyX3QgaGVpZwogICAgICAgICBNVExUZXh0dXJlRGVz Y3JpcHRvciAqbmV3RGVzYyA9IFtbbUNyZWF0aW9uRGVzYy5nZXQoKSBjb3B5XSBBTkdMRV9NVExf QVVUT1JFTEVBU0VdOwogICAgICAgICBuZXdEZXNjLndpZHRoICAgICAgICAgICAgICAgICA9IHdp ZHRoOwogICAgICAgICBuZXdEZXNjLmhlaWdodCAgICAgICAgICAgICAgICA9IGhlaWdodDsKLSAg ICAgICAgaWQ8TVRMVGV4dHVyZT4gbmV3VGV4dHVyZSA9Ci0gICAgICAgICAgICBbW2dldCgpLmRl dmljZSBuZXdUZXh0dXJlV2l0aERlc2NyaXB0b3I6bmV3RGVzY10gQU5HTEVfTVRMX0FVVE9SRUxF QVNFXTsKLQorICAgICAgICBhdXRvIG5ld1RleHR1cmUgICAgICAgICAgICAgICA9IGNvbnRleHQt PmdldE1ldGFsRGV2aWNlKCkubmV3VGV4dHVyZVdpdGhEZXNjcmlwdG9yKG5ld0Rlc2MpOwogICAg ICAgICBBTkdMRV9DSEVDS19HTF9BTExPQyhjb250ZXh0LCBuZXdUZXh0dXJlKTsKLQogICAgICAg ICBtQ3JlYXRpb25EZXNjLnJldGFpbkFzc2lnbihuZXdEZXNjKTsKLQogICAgICAgICBzZXQobmV3 VGV4dHVyZSk7CiAKICAgICAgICAgLy8gUmVzZXQgcmVmZXJlbmNlIGNvdW50ZXIKQEAgLTgxOCw5 ICs4MTMsNyBAQCBUZXh0dXJlUmVmIFRleHR1cmU6OmdldFJlYWRhYmxlQ29weShDb250ZXh0TXRs ICpjb250ZXh0LAogICAgICAgICAgICAgZGVzYy5yZXNvdXJjZU9wdGlvbnMgPSBNVExSZXNvdXJj ZVN0b3JhZ2VNb2RlUHJpdmF0ZTsKICAgICAgICAgICAgIGRlc2Muc2FtcGxlQ291bnQgICAgID0g Z2V0KCkuc2FtcGxlQ291bnQ7CiAgICAgICAgICAgICBkZXNjLnVzYWdlICAgICAgICAgICA9IE1U TFRleHR1cmVVc2FnZVNoYWRlclJlYWQgfCBNVExUZXh0dXJlVXNhZ2VQaXhlbEZvcm1hdFZpZXc7 Ci0KLSAgICAgICAgICAgIGlkPE1UTFRleHR1cmU+IG10bFRleHR1cmUgPSBjb250ZXh0LT5nZXRN ZXRhbERldmljZSgpLm5ld1RleHR1cmVXaXRoRGVzY3JpcHRvcihkZXNjKTsKLSAgICAgICAgICAg IG1SZWFkQ29weS5yZXNldChuZXcgVGV4dHVyZShtdGxUZXh0dXJlKSk7CisgICAgICAgICAgICBt UmVhZENvcHkucmVzZXQobmV3IFRleHR1cmUoY29udGV4dC0+Z2V0TWV0YWxEZXZpY2UoKS5uZXdU ZXh0dXJlV2l0aERlc2NyaXB0b3IoZGVzYykpKTsKICAgICAgICAgfSAgLy8gQU5HTEVfTVRMX09C SkNfU0NPUEUKICAgICB9CiAKQEAgLTk1OSwyNyArOTUyLDE5IEBAIGFuZ2xlOjpSZXN1bHQgQnVm ZmVyOjpyZXNldFdpdGhSZXNPcHQoQ29udGV4dE10bCAqY29udGV4dCwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgc2l6ZV90IHNpemUsCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGNvbnN0IHVpbnQ4X3QgKmRhdGEpCiB7Ci0gICAgQU5HTEVfTVRM X09CSkNfU0NPUEUKLSAgICB7Ci0gICAgICAgIGlkPE1UTEJ1ZmZlcj4gbmV3QnVmZmVyOworICAg IHNldChbJl0gewogICAgICAgICBjb25zdCBtdGw6OkNvbnRleHREZXZpY2UgJm1ldGFsRGV2aWNl ID0gY29udGV4dC0+Z2V0TWV0YWxEZXZpY2UoKTsKLQogICAgICAgICBpZiAoZGF0YSkKICAgICAg ICAgewotICAgICAgICAgICAgbmV3QnVmZmVyID0gbWV0YWxEZXZpY2UubmV3QnVmZmVyV2l0aEJ5 dGVzKGRhdGEsIHNpemUsIG9wdGlvbnMpOworICAgICAgICAgICAgcmV0dXJuIG1ldGFsRGV2aWNl Lm5ld0J1ZmZlcldpdGhCeXRlcyhkYXRhLCBzaXplLCBvcHRpb25zKTsKICAgICAgICAgfQotICAg ICAgICBlbHNlCi0gICAgICAgIHsKLSAgICAgICAgICAgIG5ld0J1ZmZlciA9IG1ldGFsRGV2aWNl Lm5ld0J1ZmZlcldpdGhMZW5ndGgoc2l6ZSwgb3B0aW9ucyk7Ci0gICAgICAgIH0KLQotICAgICAg ICBzZXQoW25ld0J1ZmZlciBBTkdMRV9NVExfQVVUT1JFTEVBU0VdKTsKKyAgICAgICAgcmV0dXJu IG1ldGFsRGV2aWNlLm5ld0J1ZmZlcldpdGhMZW5ndGgoc2l6ZSwgb3B0aW9ucyk7CisgICAgfSgp KTsKIAotICAgICAgICAvLyBSZXNldCBjb21tYW5kIGJ1ZmZlcidzIHJlZmVyZW5jZSBzZXJpYWwK LSAgICAgICAgUmVzb3VyY2U6OnJlc2V0KCk7CisgICAgLy8gUmVzZXQgY29tbWFuZCBidWZmZXIn cyByZWZlcmVuY2Ugc2VyaWFsCisgICAgUmVzb3VyY2U6OnJlc2V0KCk7CiAKLSAgICAgICAgcmV0 dXJuIGFuZ2xlOjpSZXN1bHQ6OkNvbnRpbnVlOwotICAgIH0KKyAgICByZXR1cm4gYW5nbGU6OlJl c3VsdDo6Q29udGludWU7CiB9CiAKIHZvaWQgQnVmZmVyOjpzeW5jQ29udGVudChDb250ZXh0TXRs ICpjb250ZXh0LCBtdGw6OkJsaXRDb21tYW5kRW5jb2RlciAqYmxpdEVuY29kZXIpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwv bXRsX3N0YXRlX2NhY2hlLm1tIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xF L3JlbmRlcmVyL21ldGFsL210bF9zdGF0ZV9jYWNoZS5tbQppbmRleCA2NWQ0N2ViN2QyNTdmYWI0 ZmUwMzY1MzJmZjA3Yjk4YTI4YzJkYzNiLi5jNjJjMDcxZThhNGU5ZDZkY2NiZTM1MzU3YzQ2NmVl ZTUxMDVkY2M3IDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5H TEUvcmVuZGVyZXIvbWV0YWwvbXRsX3N0YXRlX2NhY2hlLm1tCisrKyBiL1NvdXJjZS9UaGlyZFBh cnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9tdGxfc3RhdGVfY2FjaGUubW0K QEAgLTEyNjcsNTQgKzEyNjcsNDMgQEAgQXV0b09iakNQdHI8aWQ8TVRMRGVwdGhTdGVuY2lsU3Rh dGU+PiBTdGF0ZUNhY2hlOjpnZXREZXB0aFN0ZW5jaWxTdGF0ZSgKICAgICBjb25zdCBtdGw6OkNv bnRleHREZXZpY2UgJmRldmljZSwKICAgICBjb25zdCBEZXB0aFN0ZW5jaWxEZXNjICZkZXNjKQog ewotICAgIEFOR0xFX01UTF9PQkpDX1NDT1BFCisgICAgYXV0byBpdGUgPSBtRGVwdGhTdGVuY2ls U3RhdGVzLmZpbmQoZGVzYyk7CisgICAgaWYgKGl0ZSA9PSBtRGVwdGhTdGVuY2lsU3RhdGVzLmVu ZCgpKQogICAgIHsKLSAgICAgICAgYXV0byBpdGUgPSBtRGVwdGhTdGVuY2lsU3RhdGVzLmZpbmQo ZGVzYyk7Ci0gICAgICAgIGlmIChpdGUgPT0gbURlcHRoU3RlbmNpbFN0YXRlcy5lbmQoKSkKKyAg ICAgICAgYXV0byBvYmpDRGVzYyA9IFRvT2JqQyhkZXNjKTsKKyAgICAgICAgYXV0byByZSAgICAg ICA9IG1EZXB0aFN0ZW5jaWxTdGF0ZXMuaW5zZXJ0KAorICAgICAgICAgICAgICAgICAgc3RkOjpt YWtlX3BhaXIoZGVzYywgZGV2aWNlLm5ld0RlcHRoU3RlbmNpbFN0YXRlV2l0aERlc2NyaXB0b3Io b2JqQ0Rlc2MpKSk7CisgICAgICAgIGlmICghcmUuc2Vjb25kKQogICAgICAgICB7Ci0gICAgICAg ICAgICBBdXRvT2JqQ09iajxNVExEZXB0aFN0ZW5jaWxEZXNjcmlwdG9yPiBvYmpDRGVzYyA9IFRv T2JqQyhkZXNjKTsKLSAgICAgICAgICAgIEF1dG9PYmpDUHRyPGlkPE1UTERlcHRoU3RlbmNpbFN0 YXRlPj4gbmV3U3RhdGUgPQotICAgICAgICAgICAgICAgIFtkZXZpY2UubmV3RGVwdGhTdGVuY2ls U3RhdGVXaXRoRGVzY3JpcHRvcihvYmpDRGVzYykgQU5HTEVfTVRMX0FVVE9SRUxFQVNFXTsKLQot ICAgICAgICAgICAgYXV0byByZSA9IG1EZXB0aFN0ZW5jaWxTdGF0ZXMuaW5zZXJ0KHN0ZDo6bWFr ZV9wYWlyKGRlc2MsIG5ld1N0YXRlKSk7Ci0gICAgICAgICAgICBpZiAoIXJlLnNlY29uZCkKLSAg ICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICByZXR1cm4gbmlsOwotICAgICAgICAgICAgfQot Ci0gICAgICAgICAgICBpdGUgPSByZS5maXJzdDsKKyAgICAgICAgICAgIHJldHVybiBuaWw7CiAg ICAgICAgIH0KIAotICAgICAgICByZXR1cm4gaXRlLT5zZWNvbmQ7CisgICAgICAgIGl0ZSA9IHJl LmZpcnN0OwogICAgIH0KKworICAgIHJldHVybiBpdGUtPnNlY29uZDsKIH0KIAogQXV0b09iakNQ dHI8aWQ8TVRMU2FtcGxlclN0YXRlPj4gU3RhdGVDYWNoZTo6Z2V0U2FtcGxlclN0YXRlKGNvbnN0 IG10bDo6Q29udGV4dERldmljZSAmZGV2aWNlLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IFNhbXBsZXJEZXNjICZkZXNj KQogewotICAgIEFOR0xFX01UTF9PQkpDX1NDT1BFCisgICAgYXV0byBpdGUgPSBtU2FtcGxlclN0 YXRlcy5maW5kKGRlc2MpOworICAgIGlmIChpdGUgPT0gbVNhbXBsZXJTdGF0ZXMuZW5kKCkpCiAg ICAgewotICAgICAgICBhdXRvIGl0ZSA9IG1TYW1wbGVyU3RhdGVzLmZpbmQoZGVzYyk7Ci0gICAg ICAgIGlmIChpdGUgPT0gbVNhbXBsZXJTdGF0ZXMuZW5kKCkpCisgICAgICAgIEF1dG9PYmpDT2Jq PE1UTFNhbXBsZXJEZXNjcmlwdG9yPiBvYmpDRGVzYyA9IFRvT2JqQyhkZXNjKTsKKyAgICAgICAg aWYgKCFtRmVhdHVyZXMuYWxsb3dSdW50aW1lU2FtcGxlckNvbXBhcmVNb2RlLmVuYWJsZWQpCiAg ICAgICAgIHsKLSAgICAgICAgICAgIEF1dG9PYmpDT2JqPE1UTFNhbXBsZXJEZXNjcmlwdG9yPiBv YmpDRGVzYyA9IFRvT2JqQyhkZXNjKTsKLSAgICAgICAgICAgIGlmICghbUZlYXR1cmVzLmFsbG93 UnVudGltZVNhbXBsZXJDb21wYXJlTW9kZS5lbmFibGVkKQotICAgICAgICAgICAgewotICAgICAg ICAgICAgICAgIC8vIFJ1bnRpbWUgc2FtcGxlciBjb21wYXJlIG1vZGUgaXMgbm90IHN1cHBvcnRl ZCwgZmFsbGJhY2sgdG8gbmV2ZXIuCi0gICAgICAgICAgICAgICAgb2JqQ0Rlc2MuZ2V0KCkuY29t cGFyZUZ1bmN0aW9uID0gTVRMQ29tcGFyZUZ1bmN0aW9uTmV2ZXI7Ci0gICAgICAgICAgICB9Ci0g ICAgICAgICAgICBBdXRvT2JqQ1B0cjxpZDxNVExTYW1wbGVyU3RhdGU+PiBuZXdTdGF0ZSA9Ci0g ICAgICAgICAgICAgICAgW2RldmljZS5uZXdTYW1wbGVyU3RhdGVXaXRoRGVzY3JpcHRvcihvYmpD RGVzYykgQU5HTEVfTVRMX0FVVE9SRUxFQVNFXTsKLQotICAgICAgICAgICAgYXV0byByZSA9IG1T YW1wbGVyU3RhdGVzLmluc2VydChzdGQ6Om1ha2VfcGFpcihkZXNjLCBuZXdTdGF0ZSkpOwotICAg ICAgICAgICAgaWYgKCFyZS5zZWNvbmQpCi0gICAgICAgICAgICAgICAgcmV0dXJuIG5pbDsKLQot ICAgICAgICAgICAgaXRlID0gcmUuZmlyc3Q7CisgICAgICAgICAgICAvLyBSdW50aW1lIHNhbXBs ZXIgY29tcGFyZSBtb2RlIGlzIG5vdCBzdXBwb3J0ZWQsIGZhbGxiYWNrIHRvIG5ldmVyLgorICAg ICAgICAgICAgb2JqQ0Rlc2MuZ2V0KCkuY29tcGFyZUZ1bmN0aW9uID0gTVRMQ29tcGFyZUZ1bmN0 aW9uTmV2ZXI7CiAgICAgICAgIH0KKyAgICAgICAgYXV0byByZSA9IG1TYW1wbGVyU3RhdGVzLmlu c2VydCgKKyAgICAgICAgICAgIHN0ZDo6bWFrZV9wYWlyKGRlc2MsIGRldmljZS5uZXdTYW1wbGVy U3RhdGVXaXRoRGVzY3JpcHRvcihvYmpDRGVzYykpKTsKKyAgICAgICAgaWYgKCFyZS5zZWNvbmQp CisgICAgICAgICAgICByZXR1cm4gbmlsOwogCi0gICAgICAgIHJldHVybiBpdGUtPnNlY29uZDsK KyAgICAgICAgaXRlID0gcmUuZmlyc3Q7CiAgICAgfQorICAgIHJldHVybiBpdGUtPnNlY29uZDsK IH0KIAogQXV0b09iakNQdHI8aWQ8TVRMU2FtcGxlclN0YXRlPj4gU3RhdGVDYWNoZTo6Z2V0TnVs bFNhbXBsZXJTdGF0ZShDb250ZXh0TXRsICpjb250ZXh0KQpkaWZmIC0tZ2l0IGEvU291cmNlL1Ro aXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL210bF91dGlscy5tbSBi L1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9tdGxf dXRpbHMubW0KaW5kZXggN2YxNWE0MDlkYTQ3ZTQ2MzQ3YjEyODc4ZDVhZDg5YzEyYmE3ZWQ1MC4u NjBlZGFlYTJlZjA3NGNhZDlkY2Q3M2E0ODYwM2ZlYWNkODVjY2ZkOCAxMDA2NDQKLS0tIGEvU291 cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL210bF91dGls cy5tbQorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIv bWV0YWwvbXRsX3V0aWxzLm1tCkBAIC04MDcsMTAgKzgwNywxMCBAQCBBdXRvT2JqQ1B0cjxpZDxN VExMaWJyYXJ5Pj4gQ3JlYXRlU2hhZGVyTGlicmFyeSgKICAgICBBTkdMRV9NVExfT0JKQ19TQ09Q RQogICAgIHsKICAgICAgICAgTlNFcnJvciAqbnNFcnJvciA9IG5pbDsKLSAgICAgICAgYXV0byBu c1NvdXJjZSAgICA9IFtbTlNTdHJpbmcgYWxsb2NdIGluaXRXaXRoQnl0ZXNOb0NvcHk6Y29uc3Rf Y2FzdDxjaGFyICo+KHNvdXJjZSkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBsZW5ndGg6c291cmNlTGVuCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGVuY29kaW5nOk5TVVRGOFN0cmluZ0Vu Y29kaW5nCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ZnJlZVdoZW5Eb25lOk5PXTsKKyAgICAgICAgYXV0byBuc1NvdXJjZSAgICA9IFtbW05TU3RyaW5n IGFsbG9jXSBpbml0V2l0aEJ5dGVzTm9Db3B5OmNvbnN0X2Nhc3Q8Y2hhciAqPihzb3VyY2UpCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGxl bmd0aDpzb3VyY2VMZW4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGVuY29kaW5nOk5TVVRGOFN0cmluZ0VuY29kaW5nCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZyZWVXaGVuRG9uZTpOT10gQU5H TEVfTVRMX0FVVE9SRUxFQVNFXTsKICAgICAgICAgYXV0byBvcHRpb25zICAgICA9IFtbW01UTENv bXBpbGVPcHRpb25zIGFsbG9jXSBpbml0XSBBTkdMRV9NVExfQVVUT1JFTEVBU0VdOwogICAgICAg ICAvLyBNYXJrIGFsbCBwb3NpdGlvbnMgaW4gVlMgd2l0aCBhdHRyaWJ1dGUgaW52YXJpYW50IGFz IG5vbi1vcHRpbWl6YWJsZQogI2lmIChkZWZpbmVkKF9fTUFDXzExXzApICYmIF9fTUFDX09TX1hf VkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gX19NQUNfMTFfMCkgfHwgICAgICAgIFwKQEAgLTgyOSwx MCArODI5LDkgQEAgQXV0b09iakNQdHI8aWQ8TVRMTGlicmFyeT4+IENyZWF0ZVNoYWRlckxpYnJh cnkoCiAgICAgICAgIHsKICAgICAgICAgICAgIE5TTG9nKEAiJUBcbiIsIG5zU291cmNlKTsKICAg ICAgICAgfQotICAgICAgICBbbnNTb3VyY2UgQU5HTEVfTVRMX0FVVE9SRUxFQVNFXTsKICAgICAg ICAgKmVycm9yT3V0ID0gc3RkOjptb3ZlKG5zRXJyb3IpOwogCi0gICAgICAgIHJldHVybiBbbGli cmFyeSBBTkdMRV9NVExfQVVUT1JFTEVBU0VdOworICAgICAgICByZXR1cm4gbGlicmFyeTsKICAg ICB9CiB9CiAK