232031 2021-10-20 12:28:13 -0700 [macOS] Update appearance of <datalist> indicator 2021-10-21 11:05:35 -0700 1 1 1 Unclassified WebKit Forms Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 akeerthi akeerthi cdumez changseok esprehn+autocc ews-watchlist glenn kondapallykalyan pdr thorton wenson_hsieh oldest_to_newest 1806763 0 akeerthi 2021-10-20 12:28:13 -0700 The appearance of system combo boxes was updated in Big Sur. The <datalist> indicator should have the new button style. 1806764 1 akeerthi 2021-10-20 12:28:25 -0700 rdar://84474135 1806765 2 441915 akeerthi 2021-10-20 12:31:02 -0700 Created attachment 441915 Patch 1806793 3 441923 akeerthi 2021-10-20 13:02:33 -0700 Created attachment 441923 Patch 1807207 4 441923 wenson_hsieh 2021-10-21 09:27:45 -0700 Comment on attachment 441923 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=441923&action=review > Source/WebCore/rendering/RenderThemeMac.mm:1019 > + if (auto* buttonElement = input.dataListButtonElement()) > + coreUIState = (__bridge NSString *)(buttonElement->active() ? kCUIStatePressed : kCUIStateActive); > + else > + coreUIState = (__bridge NSString *)kCUIStateActive; Nit - might look cleaner with a top-level `else if` like: ``` if (input.isPresentingAttachedView()) coreUIState = (__bridge NSString *)kCUIStatePressed; else if (auto* buttonElement = input.dataListButtonElement()) coreUIState = (__bridge NSString *)(buttonElement->active() ? kCUIStatePressed : kCUIStateActive); else coreUIState = (__bridge NSString *)kCUIStateActive; ``` 1807229 5 442045 akeerthi 2021-10-21 10:14:01 -0700 Created attachment 442045 Patch for landing 1807230 6 akeerthi 2021-10-21 10:14:51 -0700 (In reply to Wenson Hsieh from comment #4) > Comment on attachment 441923 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=441923&action=review > > > Source/WebCore/rendering/RenderThemeMac.mm:1019 > > + if (auto* buttonElement = input.dataListButtonElement()) > > + coreUIState = (__bridge NSString *)(buttonElement->active() ? kCUIStatePressed : kCUIStateActive); > > + else > > + coreUIState = (__bridge NSString *)kCUIStateActive; > > Nit - might look cleaner with a top-level `else if` like: > > ``` > if (input.isPresentingAttachedView()) > coreUIState = (__bridge NSString *)kCUIStatePressed; > else if (auto* buttonElement = input.dataListButtonElement()) > coreUIState = (__bridge NSString *)(buttonElement->active() ? > kCUIStatePressed : kCUIStateActive); > else > coreUIState = (__bridge NSString *)kCUIStateActive; > ``` Done. Thanks for the review! 1807257 7 ews-feeder 2021-10-21 11:05:31 -0700 Committed r284626 (243347@main): <https://commits.webkit.org/243347@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 442045. 441915 2021-10-20 12:31:02 -0700 2021-10-20 13:02:30 -0700 Patch bug-232031-20211020123101.patch text/plain 6389 akeerthi U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0Mzc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2ZkN2IwMWNjM2JiNWY1 N2RmZTNiYWZjMWIzMTFiMDYzMDcxMzFjNC4uMGY5YzA1NDBiZTUzNTIyOTk3NGQzZjhjM2U4ZTM0 YjhiMTU0ZGJiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTEwLTIwICBBZGl0 eWEgS2VlcnRoaSAgPGFrZWVydGhpQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIFVwZGF0 ZSBhcHBlYXJhbmNlIG9mIDxkYXRhbGlzdD4gaW5kaWNhdG9yCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzIwMzEKKyAgICAgICAgcmRhcjovLzg0NDc0 MTM1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVt ZU1hYzo6cGFpbnRMaXN0QnV0dG9uRm9ySW5wdXQpOgorCisgICAgICAgIFVzZSBDb3JlVUkgdG8g cGFpbnQgdGhlIGluZGljYXRvciBvbiBCaWcgU3VyIGFuZCBNb250ZXJleS4KKwogMjAyMS0xMC0x OCAgS2ltbW8gS2lubnVuZW4gIDxra2lubnVuZW5AYXBwbGUuY29tPgogCiAgICAgICAgIENvY29h IEdyYXBoaWNzQ29udGV4dEdMT3BlbkdMIHNob3VsZCBub3QgdXNlIFdlYkdMTGF5ZXIKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9QQUwv Q2hhbmdlTG9nCmluZGV4IDM2MjhjZDM2ZDRiMTM1NDEyZDExNTY3YTliMWE5Yzg2MTE2N2Y2YTMu LmM5ODIxZjI1MjIwMTU1NzYxMjA3M2EyYzE4OTRjOTg0Y2M1YjFhZTEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5n ZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIxLTEwLTIwICBBZGl0eWEgS2VlcnRoaSAgPGFrZWVy dGhpQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIFVwZGF0ZSBhcHBlYXJhbmNlIG9mIDxk YXRhbGlzdD4gaW5kaWNhdG9yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMzIwMzEKKyAgICAgICAgcmRhcjovLzg0NDc0MTM1CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwYWwvc3BpL21hYy9Db3JlVUlT UEkuaDoKKwogMjAyMS0xMC0xOCAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29tPgog CiAgICAgICAgIEJ1ZyAyMzE4ODI6IFdlYktpdDo6R1BVQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6 c2V0VENDSWRlbnRpdHkoKSBsZWFrcyBhIHRjY19pZGVudGl0eV90CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9tYWMvQ29yZVVJU1BJLmggYi9Tb3VyY2UvV2ViQ29yZS9Q QUwvcGFsL3NwaS9tYWMvQ29yZVVJU1BJLmgKaW5kZXggOWEyY2NhYjAxZGMxOTg2ZTNhODVlYTBm NzE2YTVlYzk1MjRhMDhiNS4uMmExMTAwNjZiMTFiYzc4YmU2OTZjMmEzYjQwNWYwNTNkMGU4NDRl MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvbWFjL0NvcmVVSVNQSS5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL21hYy9Db3JlVUlTUEkuaApAQCAtNjgs NSArNjgsOCBAQCBleHRlcm4gY29uc3QgQ0ZTdHJpbmdSZWYga0NVSVdpZGdldEJ1dHRvbkxpdHRs ZUFycm93czsKIGV4dGVybiBjb25zdCBDRlN0cmluZ1JlZiBrQ1VJV2lkZ2V0UHJvZ3Jlc3NJbmRl dGVybWluYXRlQmFyOwogZXh0ZXJuIGNvbnN0IENGU3RyaW5nUmVmIGtDVUlXaWRnZXRQcm9ncmVz c0JhcjsKIGV4dGVybiBjb25zdCBDRlN0cmluZ1JlZiBrQ1VJV2lkZ2V0U2Nyb2xsQmFyVHJhY2tD b3JuZXI7CisjaWYgSEFWRShMQVJHRV9DT05UUk9MX1NJWkUpCitleHRlcm4gY29uc3QgQ0ZTdHJp bmdSZWYga0NVSVdpZGdldEJ1dHRvbkNvbWJvQm94OworI2VuZGlmCiAKICNlbmRpZgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFjLm1tIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFjLm1tCmluZGV4IDhiZWIyOTU3NzM5ZDMx YmI0OTc3YTBlMGE5YjI4M2MzNzFiMWVjNWIuLjA1M2YyYjU0MzQ3MTBlYzY2MzJiNThiMGMxZmYz OGRkZjViN2FjNjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU aGVtZU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMu bW0KQEAgLTk4OCw2ICs5ODgsNjkgQEAgdm9pZCBSZW5kZXJUaGVtZU1hYzo6cGFpbnRMaXN0QnV0 dG9uRm9ySW5wdXQoY29uc3QgUmVuZGVyT2JqZWN0JiBvLCBHcmFwaGljc0NvbnQKIHsKICAgICAv LyBXZSBjYW4ndCBwYWludCBhbiBOU0NvbWJvQm94Q2VsbCBzaW5jZSB0aGV5IGFyZSBub3QgaGVp Z2h0LXJlc2l6YWJsZS4KICAgICBjb25zdCBhdXRvJiBpbnB1dCA9IGRvd25jYXN0PEhUTUxJbnB1 dEVsZW1lbnQ+KCooby5nZW5lcmF0aW5nTm9kZSgpKSk7CisKKyNpZiBIQVZFKExBUkdFX0NPTlRS T0xfU0laRSkKKyAgICBMb2NhbERlZmF1bHRTeXN0ZW1BcHBlYXJhbmNlIGxvY2FsQXBwZWFyYW5j ZShvLnVzZURhcmtBcHBlYXJhbmNlKCksIG8uc3R5bGUoKS5lZmZlY3RpdmVBY2NlbnRDb2xvcigp KTsKKworICAgIGNvbnN0IEZsb2F0U2l6ZSBjb21ib0JveFNpemUgeyA0MCwgMTkgfTsKKyAgICBj b25zdCBGbG9hdFNpemUgY29tYm9Cb3hCdXR0b25TaXplIHsgMTYsIDE2IH07CisgICAgY29uc3Qg RmxvYXRQb2ludCBjb21ib0JveEJ1dHRvbkluc2V0IHsgNSwgMSB9OworICAgIGNvbnN0ZXhwciBh dXRvIGNvbWJvQm94QnV0dG9uQ29ybmVyUmFkaWkgPSA0OworCisgICAgY29uc3QgRmxvYXRTaXpl IGRlc2lyZWRDb21ib0JveEJ1dHRvblNpemUgeyAxMiwgMTIgfTsKKyAgICBjb25zdGV4cHIgYXV0 byBkZXNpcmVkQ29tYm9Cb3hJbnNldCA9IDI7CisKKyAgICBmbG9hdCBkZXZpY2VTY2FsZUZhY3Rv ciA9IG8uZG9jdW1lbnQoKS5kZXZpY2VTY2FsZUZhY3RvcigpOworCisgICAgYXV0byBjb21ib0Jv eEltYWdlQnVmZmVyID0gSW1hZ2VCdWZmZXI6OmNyZWF0ZUNvbXBhdGlibGVCdWZmZXIoY29tYm9C b3hTaXplLCBkZXZpY2VTY2FsZUZhY3RvciwgRGVzdGluYXRpb25Db2xvclNwYWNlOjpTUkdCKCks IGNvbnRleHQpOworICAgIGlmICghY29tYm9Cb3hJbWFnZUJ1ZmZlcikKKyAgICAgICAgcmV0dXJu OworCisgICAgQ29udGV4dENvbnRhaW5lciBjZ0NvbnRleHRDb250YWluZXIoY29tYm9Cb3hJbWFn ZUJ1ZmZlci0+Y29udGV4dCgpKTsKKyAgICBDR0NvbnRleHRSZWYgY2dDb250ZXh0ID0gY2dDb250 ZXh0Q29udGFpbmVyLmNvbnRleHQoKTsKKworICAgIE5TU3RyaW5nICpjb3JlVUlTdGF0ZTsKKyAg ICBpZiAoaW5wdXQuaXNQcmVzZW50aW5nQXR0YWNoZWRWaWV3KCkpCisgICAgICAgIGNvcmVVSVN0 YXRlID0gKF9fYnJpZGdlIE5TU3RyaW5nICopa0NVSVN0YXRlUHJlc3NlZDsKKyAgICBlbHNlIHsK KyAgICAgICAgaWYgKGF1dG8qIGJ1dHRvbkVsZW1lbnQgPSBpbnB1dC5kYXRhTGlzdEJ1dHRvbkVs ZW1lbnQoKSkKKyAgICAgICAgICAgIGNvcmVVSVN0YXRlID0gKF9fYnJpZGdlIE5TU3RyaW5nICop KGJ1dHRvbkVsZW1lbnQtPmFjdGl2ZSgpID8ga0NVSVN0YXRlUHJlc3NlZCA6IGtDVUlTdGF0ZUFj dGl2ZSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGNvcmVVSVN0YXRlID0gKF9fYnJpZGdl IE5TU3RyaW5nICopa0NVSVN0YXRlQWN0aXZlOworICAgIH0KKworICAgIEFMTE9XX0RFUFJFQ0FU RURfREVDTEFSQVRJT05TX0JFR0lOCisgICAgW1tOU0FwcGVhcmFuY2UgY3VycmVudEFwcGVhcmFu Y2VdIF9kcmF3SW5SZWN0Ok5TTWFrZVJlY3QoMCwgMCwgY29tYm9Cb3hTaXplLndpZHRoKCksIGNv bWJvQm94U2l6ZS5oZWlnaHQoKSkgY29udGV4dDpjZ0NvbnRleHQgb3B0aW9uczpAeworICAgIEFM TE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0VORAorICAgICAgICAoX19icmlkZ2UgTlNTdHJp bmcgKilrQ1VJV2lkZ2V0S2V5IDogKF9fYnJpZGdlIE5TU3RyaW5nICopa0NVSVdpZGdldEJ1dHRv bkNvbWJvQm94LAorICAgICAgICAoX19icmlkZ2UgTlNTdHJpbmcgKilrQ1VJU2l6ZUtleSA6IChf X2JyaWRnZSBOU1N0cmluZyAqKWtDVUlTaXplUmVndWxhciwKKyAgICAgICAgKF9fYnJpZGdlIE5T U3RyaW5nICopa0NVSVN0YXRlS2V5IDogY29yZVVJU3RhdGUsCisgICAgICAgIChfX2JyaWRnZSBO U1N0cmluZyAqKWtDVUlVc2VySW50ZXJmYWNlTGF5b3V0RGlyZWN0aW9uS2V5IDogKF9fYnJpZGdl IE5TU3RyaW5nICopa0NVSVVzZXJJbnRlcmZhY2VMYXlvdXREaXJlY3Rpb25MZWZ0VG9SaWdodCwK KyAgICB9XTsKKworICAgIGNvbnN0IEZsb2F0U2l6ZSBkZXNpcmVkQ29tYm9Cb3hCdXR0b25TaXpl IHsgMTIsIDEyIH07CisKKyAgICBhdXRvIGNvbWJvQm94QnV0dG9uSW1hZ2VCdWZmZXIgPSBJbWFn ZUJ1ZmZlcjo6Y3JlYXRlQ29tcGF0aWJsZUJ1ZmZlcihkZXNpcmVkQ29tYm9Cb3hCdXR0b25TaXpl LCBkZXZpY2VTY2FsZUZhY3RvciwgRGVzdGluYXRpb25Db2xvclNwYWNlOjpTUkdCKCksIGNvbnRl eHQpOworICAgIGlmICghY29tYm9Cb3hCdXR0b25JbWFnZUJ1ZmZlcikKKyAgICAgICAgcmV0dXJu OworCisgICAgYXV0byYgY29tYm9Cb3hCdXR0b25Db250ZXh0ID0gY29tYm9Cb3hCdXR0b25JbWFn ZUJ1ZmZlci0+Y29udGV4dCgpOworCisgICAgY29tYm9Cb3hCdXR0b25Db250ZXh0LnNjYWxlKGRl c2lyZWRDb21ib0JveEJ1dHRvblNpemUud2lkdGgoKSAvIGNvbWJvQm94QnV0dG9uU2l6ZS53aWR0 aCgpKTsKKyAgICBjb21ib0JveEJ1dHRvbkNvbnRleHQuY2xpcFJvdW5kZWRSZWN0KEZsb2F0Um91 bmRlZFJlY3QoRmxvYXRSZWN0KEZsb2F0UG9pbnQ6Onplcm8oKSwgY29tYm9Cb3hCdXR0b25TaXpl KSwgRmxvYXRSb3VuZGVkUmVjdDo6UmFkaWkoY29tYm9Cb3hCdXR0b25Db3JuZXJSYWRpaSkpKTsK KyAgICBjb21ib0JveEJ1dHRvbkNvbnRleHQudHJhbnNsYXRlKGNvbWJvQm94QnV0dG9uSW5zZXQu c2NhbGVkKC0xKSk7CisgICAgY29tYm9Cb3hCdXR0b25Db250ZXh0LmRyYXdDb25zdW1pbmdJbWFn ZUJ1ZmZlcihXVEZNb3ZlKGNvbWJvQm94SW1hZ2VCdWZmZXIpLCBGbG9hdFBvaW50Ojp6ZXJvKCks IEltYWdlUGFpbnRpbmdPcHRpb25zIHsgSW1hZ2VPcmllbnRhdGlvbjo6T3JpZ2luQm90dG9tUmln aHQgfSk7CisKKyAgICBGbG9hdFBvaW50IGxpc3RCdXR0b25Mb2NhdGlvbjsKKyAgICBmbG9hdCBs aXN0QnV0dG9uWSA9IHIuY2VudGVyKCkueSgpIC0gZGVzaXJlZENvbWJvQm94QnV0dG9uU2l6ZS5o ZWlnaHQoKSAvIDI7CisgICAgaWYgKG8uc3R5bGUoKS5pc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKCkp CisgICAgICAgIGxpc3RCdXR0b25Mb2NhdGlvbiA9IHsgci5tYXhYKCkgLSBkZXNpcmVkQ29tYm9C b3hCdXR0b25TaXplLndpZHRoKCkgLSBkZXNpcmVkQ29tYm9Cb3hJbnNldCwgbGlzdEJ1dHRvblkg fTsKKyAgICBlbHNlCisgICAgICAgIGxpc3RCdXR0b25Mb2NhdGlvbiA9IHsgci54KCkgKyBkZXNp cmVkQ29tYm9Cb3hJbnNldCwgbGlzdEJ1dHRvblkgfTsKKworICAgIEdyYXBoaWNzQ29udGV4dFN0 YXRlU2F2ZXIgc3RhdGVTYXZlcihjb250ZXh0KTsKKyAgICBjb250ZXh0LmRyYXdDb25zdW1pbmdJ bWFnZUJ1ZmZlcihXVEZNb3ZlKGNvbWJvQm94QnV0dG9uSW1hZ2VCdWZmZXIpLCBsaXN0QnV0dG9u TG9jYXRpb24pOworI2Vsc2UKICAgICBOU0NlbGwgKmxpc3RCdXR0b24gPSB0aGlzLT5saXN0QnV0 dG9uKCk7CiAKICAgICBOU1JlY3QgbGlzdEJ1dHRvbkZyYW1lID0gTlNNYWtlUmVjdChyLm1heFgo KSAtIGxpc3RCdXR0b25XaWR0aCwgci55KCksIGxpc3RCdXR0b25XaWR0aCwgci5oZWlnaHQoKSk7 CkBAIC0xMDIwLDYgKzEwODMsNyBAQCB2b2lkIFJlbmRlclRoZW1lTWFjOjpwYWludExpc3RCdXR0 b25Gb3JJbnB1dChjb25zdCBSZW5kZXJPYmplY3QmIG8sIEdyYXBoaWNzQ29udAogICAgIGltYWdl UmVjdC5zZXRZKE5TTWlkWShsaXN0QnV0dG9uRnJhbWUpIC0gaW1hZ2VSZWN0LmhlaWdodCgpIC8g Mik7CiAKICAgICBjb250ZXh0LmRyYXdJbWFnZSgqaW1hZ2UsIGltYWdlUmVjdCk7CisjZW5kaWYg Ly8gSEFWRShMQVJHRV9DT05UUk9MX1NJWkUpCiB9CiAKIHZvaWQgUmVuZGVyVGhlbWVNYWM6OmFk anVzdExpc3RCdXR0b25TdHlsZShSZW5kZXJTdHlsZSYgc3R5bGUsIGNvbnN0IEVsZW1lbnQqKSBj b25zdAo= 441923 2021-10-20 13:02:33 -0700 2021-10-21 09:27:45 -0700 Patch bug-232031-20211020130232.patch text/plain 6328 akeerthi U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0Mzc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2ZkN2IwMWNjM2JiNWY1 N2RmZTNiYWZjMWIzMTFiMDYzMDcxMzFjNC4uMGY5YzA1NDBiZTUzNTIyOTk3NGQzZjhjM2U4ZTM0 YjhiMTU0ZGJiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTEwLTIwICBBZGl0 eWEgS2VlcnRoaSAgPGFrZWVydGhpQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIFVwZGF0 ZSBhcHBlYXJhbmNlIG9mIDxkYXRhbGlzdD4gaW5kaWNhdG9yCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzIwMzEKKyAgICAgICAgcmRhcjovLzg0NDc0 MTM1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVt ZU1hYzo6cGFpbnRMaXN0QnV0dG9uRm9ySW5wdXQpOgorCisgICAgICAgIFVzZSBDb3JlVUkgdG8g cGFpbnQgdGhlIGluZGljYXRvciBvbiBCaWcgU3VyIGFuZCBNb250ZXJleS4KKwogMjAyMS0xMC0x OCAgS2ltbW8gS2lubnVuZW4gIDxra2lubnVuZW5AYXBwbGUuY29tPgogCiAgICAgICAgIENvY29h IEdyYXBoaWNzQ29udGV4dEdMT3BlbkdMIHNob3VsZCBub3QgdXNlIFdlYkdMTGF5ZXIKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9QQUwv Q2hhbmdlTG9nCmluZGV4IDM2MjhjZDM2ZDRiMTM1NDEyZDExNTY3YTliMWE5Yzg2MTE2N2Y2YTMu LmM5ODIxZjI1MjIwMTU1NzYxMjA3M2EyYzE4OTRjOTg0Y2M1YjFhZTEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5n ZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIxLTEwLTIwICBBZGl0eWEgS2VlcnRoaSAgPGFrZWVy dGhpQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIFVwZGF0ZSBhcHBlYXJhbmNlIG9mIDxk YXRhbGlzdD4gaW5kaWNhdG9yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMzIwMzEKKyAgICAgICAgcmRhcjovLzg0NDc0MTM1CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwYWwvc3BpL21hYy9Db3JlVUlT UEkuaDoKKwogMjAyMS0xMC0xOCAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29tPgog CiAgICAgICAgIEJ1ZyAyMzE4ODI6IFdlYktpdDo6R1BVQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6 c2V0VENDSWRlbnRpdHkoKSBsZWFrcyBhIHRjY19pZGVudGl0eV90CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9tYWMvQ29yZVVJU1BJLmggYi9Tb3VyY2UvV2ViQ29yZS9Q QUwvcGFsL3NwaS9tYWMvQ29yZVVJU1BJLmgKaW5kZXggOWEyY2NhYjAxZGMxOTg2ZTNhODVlYTBm NzE2YTVlYzk1MjRhMDhiNS4uMmExMTAwNjZiMTFiYzc4YmU2OTZjMmEzYjQwNWYwNTNkMGU4NDRl MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvbWFjL0NvcmVVSVNQSS5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL21hYy9Db3JlVUlTUEkuaApAQCAtNjgs NSArNjgsOCBAQCBleHRlcm4gY29uc3QgQ0ZTdHJpbmdSZWYga0NVSVdpZGdldEJ1dHRvbkxpdHRs ZUFycm93czsKIGV4dGVybiBjb25zdCBDRlN0cmluZ1JlZiBrQ1VJV2lkZ2V0UHJvZ3Jlc3NJbmRl dGVybWluYXRlQmFyOwogZXh0ZXJuIGNvbnN0IENGU3RyaW5nUmVmIGtDVUlXaWRnZXRQcm9ncmVz c0JhcjsKIGV4dGVybiBjb25zdCBDRlN0cmluZ1JlZiBrQ1VJV2lkZ2V0U2Nyb2xsQmFyVHJhY2tD b3JuZXI7CisjaWYgSEFWRShMQVJHRV9DT05UUk9MX1NJWkUpCitleHRlcm4gY29uc3QgQ0ZTdHJp bmdSZWYga0NVSVdpZGdldEJ1dHRvbkNvbWJvQm94OworI2VuZGlmCiAKICNlbmRpZgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFjLm1tIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFjLm1tCmluZGV4IDhiZWIyOTU3NzM5ZDMx YmI0OTc3YTBlMGE5YjI4M2MzNzFiMWVjNWIuLmY0ZDhiMWM1MmVmZGM3ZDMyMTY1MGE5MmFhMDFk ZTI4Mjg0MDFmYzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU aGVtZU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMu bW0KQEAgLTk4OCw2ICs5ODgsNjcgQEAgdm9pZCBSZW5kZXJUaGVtZU1hYzo6cGFpbnRMaXN0QnV0 dG9uRm9ySW5wdXQoY29uc3QgUmVuZGVyT2JqZWN0JiBvLCBHcmFwaGljc0NvbnQKIHsKICAgICAv LyBXZSBjYW4ndCBwYWludCBhbiBOU0NvbWJvQm94Q2VsbCBzaW5jZSB0aGV5IGFyZSBub3QgaGVp Z2h0LXJlc2l6YWJsZS4KICAgICBjb25zdCBhdXRvJiBpbnB1dCA9IGRvd25jYXN0PEhUTUxJbnB1 dEVsZW1lbnQ+KCooby5nZW5lcmF0aW5nTm9kZSgpKSk7CisKKyNpZiBIQVZFKExBUkdFX0NPTlRS T0xfU0laRSkKKyAgICBMb2NhbERlZmF1bHRTeXN0ZW1BcHBlYXJhbmNlIGxvY2FsQXBwZWFyYW5j ZShvLnVzZURhcmtBcHBlYXJhbmNlKCksIG8uc3R5bGUoKS5lZmZlY3RpdmVBY2NlbnRDb2xvcigp KTsKKworICAgIGNvbnN0IEZsb2F0U2l6ZSBjb21ib0JveFNpemUgeyA0MCwgMTkgfTsKKyAgICBj b25zdCBGbG9hdFNpemUgY29tYm9Cb3hCdXR0b25TaXplIHsgMTYsIDE2IH07CisgICAgY29uc3Qg RmxvYXRQb2ludCBjb21ib0JveEJ1dHRvbkluc2V0IHsgNSwgMSB9OworICAgIGNvbnN0ZXhwciBh dXRvIGNvbWJvQm94QnV0dG9uQ29ybmVyUmFkaWkgPSA0OworCisgICAgY29uc3QgRmxvYXRTaXpl IGRlc2lyZWRDb21ib0JveEJ1dHRvblNpemUgeyAxMiwgMTIgfTsKKyAgICBjb25zdGV4cHIgYXV0 byBkZXNpcmVkQ29tYm9Cb3hJbnNldCA9IDI7CisKKyAgICBmbG9hdCBkZXZpY2VTY2FsZUZhY3Rv ciA9IG8uZG9jdW1lbnQoKS5kZXZpY2VTY2FsZUZhY3RvcigpOworCisgICAgYXV0byBjb21ib0Jv eEltYWdlQnVmZmVyID0gSW1hZ2VCdWZmZXI6OmNyZWF0ZUNvbXBhdGlibGVCdWZmZXIoY29tYm9C b3hTaXplLCBkZXZpY2VTY2FsZUZhY3RvciwgRGVzdGluYXRpb25Db2xvclNwYWNlOjpTUkdCKCks IGNvbnRleHQpOworICAgIGlmICghY29tYm9Cb3hJbWFnZUJ1ZmZlcikKKyAgICAgICAgcmV0dXJu OworCisgICAgQ29udGV4dENvbnRhaW5lciBjZ0NvbnRleHRDb250YWluZXIoY29tYm9Cb3hJbWFn ZUJ1ZmZlci0+Y29udGV4dCgpKTsKKyAgICBDR0NvbnRleHRSZWYgY2dDb250ZXh0ID0gY2dDb250 ZXh0Q29udGFpbmVyLmNvbnRleHQoKTsKKworICAgIE5TU3RyaW5nICpjb3JlVUlTdGF0ZTsKKyAg ICBpZiAoaW5wdXQuaXNQcmVzZW50aW5nQXR0YWNoZWRWaWV3KCkpCisgICAgICAgIGNvcmVVSVN0 YXRlID0gKF9fYnJpZGdlIE5TU3RyaW5nICopa0NVSVN0YXRlUHJlc3NlZDsKKyAgICBlbHNlIHsK KyAgICAgICAgaWYgKGF1dG8qIGJ1dHRvbkVsZW1lbnQgPSBpbnB1dC5kYXRhTGlzdEJ1dHRvbkVs ZW1lbnQoKSkKKyAgICAgICAgICAgIGNvcmVVSVN0YXRlID0gKF9fYnJpZGdlIE5TU3RyaW5nICop KGJ1dHRvbkVsZW1lbnQtPmFjdGl2ZSgpID8ga0NVSVN0YXRlUHJlc3NlZCA6IGtDVUlTdGF0ZUFj dGl2ZSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGNvcmVVSVN0YXRlID0gKF9fYnJpZGdl IE5TU3RyaW5nICopa0NVSVN0YXRlQWN0aXZlOworICAgIH0KKworICAgIEFMTE9XX0RFUFJFQ0FU RURfREVDTEFSQVRJT05TX0JFR0lOCisgICAgW1tOU0FwcGVhcmFuY2UgY3VycmVudEFwcGVhcmFu Y2VdIF9kcmF3SW5SZWN0Ok5TTWFrZVJlY3QoMCwgMCwgY29tYm9Cb3hTaXplLndpZHRoKCksIGNv bWJvQm94U2l6ZS5oZWlnaHQoKSkgY29udGV4dDpjZ0NvbnRleHQgb3B0aW9uczpAeworICAgIEFM TE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0VORAorICAgICAgICAoX19icmlkZ2UgTlNTdHJp bmcgKilrQ1VJV2lkZ2V0S2V5IDogKF9fYnJpZGdlIE5TU3RyaW5nICopa0NVSVdpZGdldEJ1dHRv bkNvbWJvQm94LAorICAgICAgICAoX19icmlkZ2UgTlNTdHJpbmcgKilrQ1VJU2l6ZUtleSA6IChf X2JyaWRnZSBOU1N0cmluZyAqKWtDVUlTaXplUmVndWxhciwKKyAgICAgICAgKF9fYnJpZGdlIE5T U3RyaW5nICopa0NVSVN0YXRlS2V5IDogY29yZVVJU3RhdGUsCisgICAgICAgIChfX2JyaWRnZSBO U1N0cmluZyAqKWtDVUlVc2VySW50ZXJmYWNlTGF5b3V0RGlyZWN0aW9uS2V5IDogKF9fYnJpZGdl IE5TU3RyaW5nICopa0NVSVVzZXJJbnRlcmZhY2VMYXlvdXREaXJlY3Rpb25MZWZ0VG9SaWdodCwK KyAgICB9XTsKKworICAgIGF1dG8gY29tYm9Cb3hCdXR0b25JbWFnZUJ1ZmZlciA9IEltYWdlQnVm ZmVyOjpjcmVhdGVDb21wYXRpYmxlQnVmZmVyKGRlc2lyZWRDb21ib0JveEJ1dHRvblNpemUsIGRl dmljZVNjYWxlRmFjdG9yLCBEZXN0aW5hdGlvbkNvbG9yU3BhY2U6OlNSR0IoKSwgY29udGV4dCk7 CisgICAgaWYgKCFjb21ib0JveEJ1dHRvbkltYWdlQnVmZmVyKQorICAgICAgICByZXR1cm47CisK KyAgICBhdXRvJiBjb21ib0JveEJ1dHRvbkNvbnRleHQgPSBjb21ib0JveEJ1dHRvbkltYWdlQnVm ZmVyLT5jb250ZXh0KCk7CisKKyAgICBjb21ib0JveEJ1dHRvbkNvbnRleHQuc2NhbGUoZGVzaXJl ZENvbWJvQm94QnV0dG9uU2l6ZS53aWR0aCgpIC8gY29tYm9Cb3hCdXR0b25TaXplLndpZHRoKCkp OworICAgIGNvbWJvQm94QnV0dG9uQ29udGV4dC5jbGlwUm91bmRlZFJlY3QoRmxvYXRSb3VuZGVk UmVjdChGbG9hdFJlY3QoRmxvYXRQb2ludDo6emVybygpLCBjb21ib0JveEJ1dHRvblNpemUpLCBG bG9hdFJvdW5kZWRSZWN0OjpSYWRpaShjb21ib0JveEJ1dHRvbkNvcm5lclJhZGlpKSkpOworICAg IGNvbWJvQm94QnV0dG9uQ29udGV4dC50cmFuc2xhdGUoY29tYm9Cb3hCdXR0b25JbnNldC5zY2Fs ZWQoLTEpKTsKKyAgICBjb21ib0JveEJ1dHRvbkNvbnRleHQuZHJhd0NvbnN1bWluZ0ltYWdlQnVm ZmVyKFdURk1vdmUoY29tYm9Cb3hJbWFnZUJ1ZmZlciksIEZsb2F0UG9pbnQ6Onplcm8oKSwgSW1h Z2VQYWludGluZ09wdGlvbnMgeyBJbWFnZU9yaWVudGF0aW9uOjpPcmlnaW5Cb3R0b21SaWdodCB9 KTsKKworICAgIEZsb2F0UG9pbnQgbGlzdEJ1dHRvbkxvY2F0aW9uOworICAgIGZsb2F0IGxpc3RC dXR0b25ZID0gci5jZW50ZXIoKS55KCkgLSBkZXNpcmVkQ29tYm9Cb3hCdXR0b25TaXplLmhlaWdo dCgpIC8gMjsKKyAgICBpZiAoby5zdHlsZSgpLmlzTGVmdFRvUmlnaHREaXJlY3Rpb24oKSkKKyAg ICAgICAgbGlzdEJ1dHRvbkxvY2F0aW9uID0geyByLm1heFgoKSAtIGRlc2lyZWRDb21ib0JveEJ1 dHRvblNpemUud2lkdGgoKSAtIGRlc2lyZWRDb21ib0JveEluc2V0LCBsaXN0QnV0dG9uWSB9Owor ICAgIGVsc2UKKyAgICAgICAgbGlzdEJ1dHRvbkxvY2F0aW9uID0geyByLngoKSArIGRlc2lyZWRD b21ib0JveEluc2V0LCBsaXN0QnV0dG9uWSB9OworCisgICAgR3JhcGhpY3NDb250ZXh0U3RhdGVT YXZlciBzdGF0ZVNhdmVyKGNvbnRleHQpOworICAgIGNvbnRleHQuZHJhd0NvbnN1bWluZ0ltYWdl QnVmZmVyKFdURk1vdmUoY29tYm9Cb3hCdXR0b25JbWFnZUJ1ZmZlciksIGxpc3RCdXR0b25Mb2Nh dGlvbik7CisjZWxzZQogICAgIE5TQ2VsbCAqbGlzdEJ1dHRvbiA9IHRoaXMtPmxpc3RCdXR0b24o KTsKIAogICAgIE5TUmVjdCBsaXN0QnV0dG9uRnJhbWUgPSBOU01ha2VSZWN0KHIubWF4WCgpIC0g bGlzdEJ1dHRvbldpZHRoLCByLnkoKSwgbGlzdEJ1dHRvbldpZHRoLCByLmhlaWdodCgpKTsKQEAg LTEwMjAsNiArMTA4MSw3IEBAIHZvaWQgUmVuZGVyVGhlbWVNYWM6OnBhaW50TGlzdEJ1dHRvbkZv cklucHV0KGNvbnN0IFJlbmRlck9iamVjdCYgbywgR3JhcGhpY3NDb250CiAgICAgaW1hZ2VSZWN0 LnNldFkoTlNNaWRZKGxpc3RCdXR0b25GcmFtZSkgLSBpbWFnZVJlY3QuaGVpZ2h0KCkgLyAyKTsK IAogICAgIGNvbnRleHQuZHJhd0ltYWdlKCppbWFnZSwgaW1hZ2VSZWN0KTsKKyNlbmRpZiAvLyBI QVZFKExBUkdFX0NPTlRST0xfU0laRSkKIH0KIAogdm9pZCBSZW5kZXJUaGVtZU1hYzo6YWRqdXN0 TGlzdEJ1dHRvblN0eWxlKFJlbmRlclN0eWxlJiBzdHlsZSwgY29uc3QgRWxlbWVudCopIGNvbnN0 Cg== 442045 2021-10-21 10:14:01 -0700 2021-10-21 11:05:33 -0700 Patch for landing bug-232031-20211021101400.patch text/plain 6294 akeerthi U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0Mzc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2ZkN2IwMWNjM2JiNWY1 N2RmZTNiYWZjMWIzMTFiMDYzMDcxMzFjNC4uZGQxZWMzNzliNmZiNDE2NjZkNjE1ZjM2YzhmMzBm ZWJmYjg5MTI4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTEwLTIxICBBZGl0 eWEgS2VlcnRoaSAgPGFrZWVydGhpQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIFVwZGF0 ZSBhcHBlYXJhbmNlIG9mIDxkYXRhbGlzdD4gaW5kaWNhdG9yCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzIwMzEKKyAgICAgICAgcmRhcjovLzg0NDc0 MTM1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgV2Vuc29uIEhzaWVoLgorCisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlclRoZW1lTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVN YWM6OnBhaW50TGlzdEJ1dHRvbkZvcklucHV0KToKKworICAgICAgICBVc2UgQ29yZVVJIHRvIHBh aW50IHRoZSBpbmRpY2F0b3Igb24gQmlnIFN1ciBhbmQgTW9udGVyZXkuCisKIDIwMjEtMTAtMTgg IEtpbW1vIEtpbm51bmVuICA8a2tpbm51bmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBDb2NvYSBH cmFwaGljc0NvbnRleHRHTE9wZW5HTCBzaG91bGQgbm90IHVzZSBXZWJHTExheWVyCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvUEFML0No YW5nZUxvZwppbmRleCAzNjI4Y2QzNmQ0YjEzNTQxMmQxMTU2N2E5YjFhOWM4NjExNjdmNmEzLi4w YmQ2MTRmZDIzMDM0NWVlNDg4MmZiZjc1NzlkYTZmNGFlMTNjNjYyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9QQUwvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMS0xMC0yMSAgQWRpdHlhIEtlZXJ0aGkgIDxha2VlcnRo aUBhcHBsZS5jb20+CisKKyAgICAgICAgW21hY09TXSBVcGRhdGUgYXBwZWFyYW5jZSBvZiA8ZGF0 YWxpc3Q+IGluZGljYXRvcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjMyMDMxCisgICAgICAgIHJkYXI6Ly84NDQ3NDEzNQorCisgICAgICAgIFJldmll d2VkIGJ5IFdlbnNvbiBIc2llaC4KKworICAgICAgICAqIHBhbC9zcGkvbWFjL0NvcmVVSVNQSS5o OgorCiAyMDIxLTEwLTE4ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CiAKICAg ICAgICAgQnVnIDIzMTg4MjogV2ViS2l0OjpHUFVDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpzZXRU Q0NJZGVudGl0eSgpIGxlYWtzIGEgdGNjX2lkZW50aXR5X3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL1BBTC9wYWwvc3BpL21hYy9Db3JlVUlTUEkuaCBiL1NvdXJjZS9XZWJDb3JlL1BBTC9w YWwvc3BpL21hYy9Db3JlVUlTUEkuaAppbmRleCA5YTJjY2FiMDFkYzE5ODZlM2E4NWVhMGY3MTZh NWVjOTUyNGEwOGI1Li4yYTExMDA2NmIxMWJjNzhiZTY5NmMyYTNiNDA1ZjA1M2QwZTg0NGUyIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9tYWMvQ29yZVVJU1BJLmgKKysr IGIvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvbWFjL0NvcmVVSVNQSS5oCkBAIC02OCw1ICs2 OCw4IEBAIGV4dGVybiBjb25zdCBDRlN0cmluZ1JlZiBrQ1VJV2lkZ2V0QnV0dG9uTGl0dGxlQXJy b3dzOwogZXh0ZXJuIGNvbnN0IENGU3RyaW5nUmVmIGtDVUlXaWRnZXRQcm9ncmVzc0luZGV0ZXJt aW5hdGVCYXI7CiBleHRlcm4gY29uc3QgQ0ZTdHJpbmdSZWYga0NVSVdpZGdldFByb2dyZXNzQmFy OwogZXh0ZXJuIGNvbnN0IENGU3RyaW5nUmVmIGtDVUlXaWRnZXRTY3JvbGxCYXJUcmFja0Nvcm5l cjsKKyNpZiBIQVZFKExBUkdFX0NPTlRST0xfU0laRSkKK2V4dGVybiBjb25zdCBDRlN0cmluZ1Jl ZiBrQ1VJV2lkZ2V0QnV0dG9uQ29tYm9Cb3g7CisjZW5kaWYKIAogI2VuZGlmCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMubW0gYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMubW0KaW5kZXggOGJlYjI5NTc3MzlkMzFiYjQ5 NzdhMGUwYTliMjgzYzM3MWIxZWM1Yi4uZGMwMWU2MDU0MDRlNzEyYmNmYjQyNzMyZGU2NjA2NTQ0 NmU0YzM5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1l TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZU1hYy5tbQpA QCAtOTg4LDYgKzk4OCw2NSBAQCB2b2lkIFJlbmRlclRoZW1lTWFjOjpwYWludExpc3RCdXR0b25G b3JJbnB1dChjb25zdCBSZW5kZXJPYmplY3QmIG8sIEdyYXBoaWNzQ29udAogewogICAgIC8vIFdl IGNhbid0IHBhaW50IGFuIE5TQ29tYm9Cb3hDZWxsIHNpbmNlIHRoZXkgYXJlIG5vdCBoZWlnaHQt cmVzaXphYmxlLgogICAgIGNvbnN0IGF1dG8mIGlucHV0ID0gZG93bmNhc3Q8SFRNTElucHV0RWxl bWVudD4oKihvLmdlbmVyYXRpbmdOb2RlKCkpKTsKKworI2lmIEhBVkUoTEFSR0VfQ09OVFJPTF9T SVpFKQorICAgIExvY2FsRGVmYXVsdFN5c3RlbUFwcGVhcmFuY2UgbG9jYWxBcHBlYXJhbmNlKG8u dXNlRGFya0FwcGVhcmFuY2UoKSwgby5zdHlsZSgpLmVmZmVjdGl2ZUFjY2VudENvbG9yKCkpOwor CisgICAgY29uc3QgRmxvYXRTaXplIGNvbWJvQm94U2l6ZSB7IDQwLCAxOSB9OworICAgIGNvbnN0 IEZsb2F0U2l6ZSBjb21ib0JveEJ1dHRvblNpemUgeyAxNiwgMTYgfTsKKyAgICBjb25zdCBGbG9h dFBvaW50IGNvbWJvQm94QnV0dG9uSW5zZXQgeyA1LCAxIH07CisgICAgY29uc3RleHByIGF1dG8g Y29tYm9Cb3hCdXR0b25Db3JuZXJSYWRpaSA9IDQ7CisKKyAgICBjb25zdCBGbG9hdFNpemUgZGVz aXJlZENvbWJvQm94QnV0dG9uU2l6ZSB7IDEyLCAxMiB9OworICAgIGNvbnN0ZXhwciBhdXRvIGRl c2lyZWRDb21ib0JveEluc2V0ID0gMjsKKworICAgIGZsb2F0IGRldmljZVNjYWxlRmFjdG9yID0g by5kb2N1bWVudCgpLmRldmljZVNjYWxlRmFjdG9yKCk7CisKKyAgICBhdXRvIGNvbWJvQm94SW1h Z2VCdWZmZXIgPSBJbWFnZUJ1ZmZlcjo6Y3JlYXRlQ29tcGF0aWJsZUJ1ZmZlcihjb21ib0JveFNp emUsIGRldmljZVNjYWxlRmFjdG9yLCBEZXN0aW5hdGlvbkNvbG9yU3BhY2U6OlNSR0IoKSwgY29u dGV4dCk7CisgICAgaWYgKCFjb21ib0JveEltYWdlQnVmZmVyKQorICAgICAgICByZXR1cm47CisK KyAgICBDb250ZXh0Q29udGFpbmVyIGNnQ29udGV4dENvbnRhaW5lcihjb21ib0JveEltYWdlQnVm ZmVyLT5jb250ZXh0KCkpOworICAgIENHQ29udGV4dFJlZiBjZ0NvbnRleHQgPSBjZ0NvbnRleHRD b250YWluZXIuY29udGV4dCgpOworCisgICAgTlNTdHJpbmcgKmNvcmVVSVN0YXRlOworICAgIGlm IChpbnB1dC5pc1ByZXNlbnRpbmdBdHRhY2hlZFZpZXcoKSkKKyAgICAgICAgY29yZVVJU3RhdGUg PSAoX19icmlkZ2UgTlNTdHJpbmcgKilrQ1VJU3RhdGVQcmVzc2VkOworICAgIGVsc2UgaWYgKGF1 dG8qIGJ1dHRvbkVsZW1lbnQgPSBpbnB1dC5kYXRhTGlzdEJ1dHRvbkVsZW1lbnQoKSkKKyAgICAg ICAgY29yZVVJU3RhdGUgPSAoX19icmlkZ2UgTlNTdHJpbmcgKikoYnV0dG9uRWxlbWVudC0+YWN0 aXZlKCkgPyBrQ1VJU3RhdGVQcmVzc2VkIDoga0NVSVN0YXRlQWN0aXZlKTsKKyAgICBlbHNlCisg ICAgICAgIGNvcmVVSVN0YXRlID0gKF9fYnJpZGdlIE5TU3RyaW5nICopa0NVSVN0YXRlQWN0aXZl OworCisgICAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfQkVHSU4KKyAgICBbW05TQXBw ZWFyYW5jZSBjdXJyZW50QXBwZWFyYW5jZV0gX2RyYXdJblJlY3Q6TlNNYWtlUmVjdCgwLCAwLCBj b21ib0JveFNpemUud2lkdGgoKSwgY29tYm9Cb3hTaXplLmhlaWdodCgpKSBjb250ZXh0OmNnQ29u dGV4dCBvcHRpb25zOkB7CisgICAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfRU5ECisg ICAgICAgIChfX2JyaWRnZSBOU1N0cmluZyAqKWtDVUlXaWRnZXRLZXkgOiAoX19icmlkZ2UgTlNT dHJpbmcgKilrQ1VJV2lkZ2V0QnV0dG9uQ29tYm9Cb3gsCisgICAgICAgIChfX2JyaWRnZSBOU1N0 cmluZyAqKWtDVUlTaXplS2V5IDogKF9fYnJpZGdlIE5TU3RyaW5nICopa0NVSVNpemVSZWd1bGFy LAorICAgICAgICAoX19icmlkZ2UgTlNTdHJpbmcgKilrQ1VJU3RhdGVLZXkgOiBjb3JlVUlTdGF0 ZSwKKyAgICAgICAgKF9fYnJpZGdlIE5TU3RyaW5nICopa0NVSVVzZXJJbnRlcmZhY2VMYXlvdXRE aXJlY3Rpb25LZXkgOiAoX19icmlkZ2UgTlNTdHJpbmcgKilrQ1VJVXNlckludGVyZmFjZUxheW91 dERpcmVjdGlvbkxlZnRUb1JpZ2h0LAorICAgIH1dOworCisgICAgYXV0byBjb21ib0JveEJ1dHRv bkltYWdlQnVmZmVyID0gSW1hZ2VCdWZmZXI6OmNyZWF0ZUNvbXBhdGlibGVCdWZmZXIoZGVzaXJl ZENvbWJvQm94QnV0dG9uU2l6ZSwgZGV2aWNlU2NhbGVGYWN0b3IsIERlc3RpbmF0aW9uQ29sb3JT cGFjZTo6U1JHQigpLCBjb250ZXh0KTsKKyAgICBpZiAoIWNvbWJvQm94QnV0dG9uSW1hZ2VCdWZm ZXIpCisgICAgICAgIHJldHVybjsKKworICAgIGF1dG8mIGNvbWJvQm94QnV0dG9uQ29udGV4dCA9 IGNvbWJvQm94QnV0dG9uSW1hZ2VCdWZmZXItPmNvbnRleHQoKTsKKworICAgIGNvbWJvQm94QnV0 dG9uQ29udGV4dC5zY2FsZShkZXNpcmVkQ29tYm9Cb3hCdXR0b25TaXplLndpZHRoKCkgLyBjb21i b0JveEJ1dHRvblNpemUud2lkdGgoKSk7CisgICAgY29tYm9Cb3hCdXR0b25Db250ZXh0LmNsaXBS b3VuZGVkUmVjdChGbG9hdFJvdW5kZWRSZWN0KEZsb2F0UmVjdChGbG9hdFBvaW50Ojp6ZXJvKCks IGNvbWJvQm94QnV0dG9uU2l6ZSksIEZsb2F0Um91bmRlZFJlY3Q6OlJhZGlpKGNvbWJvQm94QnV0 dG9uQ29ybmVyUmFkaWkpKSk7CisgICAgY29tYm9Cb3hCdXR0b25Db250ZXh0LnRyYW5zbGF0ZShj b21ib0JveEJ1dHRvbkluc2V0LnNjYWxlZCgtMSkpOworICAgIGNvbWJvQm94QnV0dG9uQ29udGV4 dC5kcmF3Q29uc3VtaW5nSW1hZ2VCdWZmZXIoV1RGTW92ZShjb21ib0JveEltYWdlQnVmZmVyKSwg RmxvYXRQb2ludDo6emVybygpLCBJbWFnZVBhaW50aW5nT3B0aW9ucyB7IEltYWdlT3JpZW50YXRp b246Ok9yaWdpbkJvdHRvbVJpZ2h0IH0pOworCisgICAgRmxvYXRQb2ludCBsaXN0QnV0dG9uTG9j YXRpb247CisgICAgZmxvYXQgbGlzdEJ1dHRvblkgPSByLmNlbnRlcigpLnkoKSAtIGRlc2lyZWRD b21ib0JveEJ1dHRvblNpemUuaGVpZ2h0KCkgLyAyOworICAgIGlmIChvLnN0eWxlKCkuaXNMZWZ0 VG9SaWdodERpcmVjdGlvbigpKQorICAgICAgICBsaXN0QnV0dG9uTG9jYXRpb24gPSB7IHIubWF4 WCgpIC0gZGVzaXJlZENvbWJvQm94QnV0dG9uU2l6ZS53aWR0aCgpIC0gZGVzaXJlZENvbWJvQm94 SW5zZXQsIGxpc3RCdXR0b25ZIH07CisgICAgZWxzZQorICAgICAgICBsaXN0QnV0dG9uTG9jYXRp b24gPSB7IHIueCgpICsgZGVzaXJlZENvbWJvQm94SW5zZXQsIGxpc3RCdXR0b25ZIH07CisKKyAg ICBHcmFwaGljc0NvbnRleHRTdGF0ZVNhdmVyIHN0YXRlU2F2ZXIoY29udGV4dCk7CisgICAgY29u dGV4dC5kcmF3Q29uc3VtaW5nSW1hZ2VCdWZmZXIoV1RGTW92ZShjb21ib0JveEJ1dHRvbkltYWdl QnVmZmVyKSwgbGlzdEJ1dHRvbkxvY2F0aW9uKTsKKyNlbHNlCiAgICAgTlNDZWxsICpsaXN0QnV0 dG9uID0gdGhpcy0+bGlzdEJ1dHRvbigpOwogCiAgICAgTlNSZWN0IGxpc3RCdXR0b25GcmFtZSA9 IE5TTWFrZVJlY3Qoci5tYXhYKCkgLSBsaXN0QnV0dG9uV2lkdGgsIHIueSgpLCBsaXN0QnV0dG9u V2lkdGgsIHIuaGVpZ2h0KCkpOwpAQCAtMTAyMCw2ICsxMDc5LDcgQEAgdm9pZCBSZW5kZXJUaGVt ZU1hYzo6cGFpbnRMaXN0QnV0dG9uRm9ySW5wdXQoY29uc3QgUmVuZGVyT2JqZWN0JiBvLCBHcmFw aGljc0NvbnQKICAgICBpbWFnZVJlY3Quc2V0WShOU01pZFkobGlzdEJ1dHRvbkZyYW1lKSAtIGlt YWdlUmVjdC5oZWlnaHQoKSAvIDIpOwogCiAgICAgY29udGV4dC5kcmF3SW1hZ2UoKmltYWdlLCBp bWFnZVJlY3QpOworI2VuZGlmIC8vIEhBVkUoTEFSR0VfQ09OVFJPTF9TSVpFKQogfQogCiB2b2lk IFJlbmRlclRoZW1lTWFjOjphZGp1c3RMaXN0QnV0dG9uU3R5bGUoUmVuZGVyU3R5bGUmIHN0eWxl LCBjb25zdCBFbGVtZW50KikgY29uc3QK