237408 2022-03-02 22:34:22 -0800 [iOS] Support PDF search when using a find interaction 2022-03-21 17:23:20 -0700 1 1 1 Unclassified WebKit New Bugs Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 akeerthi akeerthi darin hi katherine_cheney megan_gardner thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1847749 0 akeerthi 2022-03-02 22:34:22 -0800 ... 1847750 1 akeerthi 2022-03-02 22:34:46 -0800 rdar://89437334 1847751 2 453698 akeerthi 2022-03-02 22:37:23 -0800 Created attachment 453698 Patch 1847754 3 453699 akeerthi 2022-03-02 22:56:08 -0800 Created attachment 453699 Patch 1850882 4 453699 wenson_hsieh 2022-03-14 08:49:07 -0700 Comment on attachment 453699 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=453699&action=review > Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm:787 > + if ([_customContentView conformsToProtocol:@protocol(_UITextSearching)]) > + [_findInteraction setSearchableObject:(id<_UITextSearching>)_customContentView.get()]; > + else > + [_findInteraction setSearchableObject:_contentView.get()]; Nit - perhaps you could factor this out into a helper function, and use it both here and in `-_setFindInteractionEnabled:` below. > Source/WebKit/UIProcess/ios/WKPDFView.mm:101 > + auto pos = adoptNS([[WKPDFFoundTextPosition alloc] init]); Nit - we usually don't abbreviate local variable names. Maybe rename to `position`? 1852347 5 454986 akeerthi 2022-03-17 10:18:06 -0700 Created attachment 454986 Patch for landing 1852348 6 akeerthi 2022-03-17 10:18:43 -0700 (In reply to Wenson Hsieh from comment #4) > Comment on attachment 453699 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=453699&action=review Thanks for the review! > > Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm:787 > > + if ([_customContentView conformsToProtocol:@protocol(_UITextSearching)]) > > + [_findInteraction setSearchableObject:(id<_UITextSearching>)_customContentView.get()]; > > + else > > + [_findInteraction setSearchableObject:_contentView.get()]; > > Nit - perhaps you could factor this out into a helper function, and use it > both here and in `-_setFindInteractionEnabled:` below. Done. > > Source/WebKit/UIProcess/ios/WKPDFView.mm:101 > > + auto pos = adoptNS([[WKPDFFoundTextPosition alloc] init]); > > Nit - we usually don't abbreviate local variable names. Maybe rename to > `position`? Done. 1852507 7 ews-feeder 2022-03-17 14:59:07 -0700 Committed r291445 (248568@main): <https://commits.webkit.org/248568@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 454986. 1853314 8 454986 darin 2022-03-21 13:14:52 -0700 Comment on attachment 454986 Patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=454986&action=review > Source/WebKit/UIProcess/ios/WKPDFView.mm:718 > + NSInteger offset = from.index - to.index; > + > + if (offset < 0) > + return NSOrderedAscending; > + > + if (offset > 0) > + return NSOrderedDescending; > + > + return NSOrderedSame; Probably not a real risk here, but typically doing subtraction to determine ordering can introduce overflow, so it’s better not to use that pattern. 1853329 9 akeerthi 2022-03-21 13:58:32 -0700 Reopening to attach new patch. 1853330 10 455273 akeerthi 2022-03-21 13:58:33 -0700 Created attachment 455273 Address post-landing feedback 1853428 11 ews-feeder 2022-03-21 17:23:17 -0700 Committed r291591 (248685@main): <https://commits.webkit.org/248685@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 455273. 453698 2022-03-02 22:37:23 -0800 2022-03-02 23:34:24 -0800 Patch bug-237408-20220302223722.patch text/plain 8571 akeerthi U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMzgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDNlZWIxNTE4ZTIwMjVlOTFl ZDAzN2ZmNDExMDZmYzU2MzU4NmYwM2IuLmI0YmFmOWE5ZGQ1OWQ1ZGY2ZjZmNzVkNzRmM2JmY2Zk NTcwNDMzZGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDAgQEAKKzIwMjItMDMtMDIgIEFkaXR5YSBL ZWVydGhpICA8YWtlZXJ0aGlAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIFN1cHBvcnQgUERG IHNlYXJjaCB3aGVuIHVzaW5nIGEgZmluZCBpbnRlcmFjdGlvbgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM3NDA4CisgICAgICAgIHJkYXI6Ly84OTQz NzMzNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVu c3VyZSB0aGF0IFBERnMgY2FuIGJlIHNlYXJjaGVkIHdoZW4gdXNpbmcgYSBfVUlGaW5kSW50ZXJh Y3Rpb24gYnkKKyAgICAgICAgbWFraW5nIFdLUERGVmlldyBjb25mb3JtIHRvIF9VSVRleHRTZWFy Y2hpbmcuCisKKyAgICAgICAgVGhlIGltcGxlbWVudGF0aW9uIGlzIGEgdGhpbiB3cmFwcGVyIGFy b3VuZCBleGlzdGluZyBmaW5kIFNQSSBvbgorICAgICAgICBQREZIb3N0Vmlld0NvbnRyb2xsZXIu IEZvdW5kIHJhbmdlcyBpbiBQREZzIGFyZSB1bmlxdWVseSBpZGVudGlmaWVkCisgICAgICAgIGJ5 IGFuIGluZGV4LCBhcyBtb3JlIGRldGFpbGVkIHJhbmdlIGluZm9ybWF0aW9uIGlzIG5vdCBleHBv c2VkLiBVbmxpa2UKKyAgICAgICAgd2ViIGNvbnRlbnQsIHRoZXJlIGlzIGN1cnJlbnRseSBubyBy ZXF1aXJlbWVudCB0byBzdXBwb3J0IHJlc3RvcmFibGUKKyAgICAgICAgZm91bmQgcmFuZ2VzIGZv ciBQREZzLCBtYWtpbmcgaW5kZXhlcyBzYWZlIHRvIHVzZS4KKworICAgICAgICAqIFVJUHJvY2Vz cy9BUEkvaW9zL1dLV2ViVmlld0lPUy5tbToKKworICAgICAgICBVc2UgV0tQREZWaWV3IG9yIFdL Q29udGVudFZpZXcgYXMgdGhlIHNlYXJjaGFibGUgb2JqZWN0LCBkZXBlbmRpbmcgb24KKyAgICAg ICAgdGhlIGxvYWRlZCBjb250ZW50LgorCisgICAgICAgICgtW1dLV2ViVmlldyBfZGlkQ29tbWl0 TG9hZEZvck1haW5GcmFtZV0pOgorICAgICAgICAoLVtXS1dlYlZpZXcgX3NldEZpbmRJbnRlcmFj dGlvbkVuYWJsZWQ6XSk6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcubW06Cisg ICAgICAgICgrW1dLUERGRm91bmRUZXh0UmFuZ2UgZm91bmRUZXh0UmFuZ2VXaXRoSW5kZXg6XSk6 CisgICAgICAgICgtW1dLUERGRm91bmRUZXh0UmFuZ2Ugc3RhcnRdKToKKyAgICAgICAgKC1bV0tQ REZGb3VuZFRleHRSYW5nZSBlbmRdKToKKyAgICAgICAgKC1bV0tQREZGb3VuZFRleHRSYW5nZSBp c0VtcHR5XSk6CisgICAgICAgICgrW1dLUERGRm91bmRUZXh0UG9zaXRpb24gdGV4dFBvc2l0aW9u V2l0aEluZGV4Ol0pOgorICAgICAgICAoLVtXS1BERlZpZXcgcGRmSG9zdFZpZXdDb250cm9sbGVy OmZpbmRTdHJpbmdVcGRhdGU6ZG9uZTpdKToKKyAgICAgICAgKC1bV0tQREZWaWV3IHNlbGVjdGVk VGV4dFJhbmdlXSk6CisgICAgICAgICgtW1dLUERGVmlldyBjb21wYXJlRm91bmRSYW5nZTp0b1Jh bmdlOmluRG9jdW1lbnQ6XSk6CisgICAgICAgICgtW1dLUERGVmlldyBwZXJmb3JtVGV4dFNlYXJj aFdpdGhRdWVyeVN0cmluZzp1c2luZ09wdGlvbnM6cmVzdWx0QWdncmVnYXRvcjpdKToKKyAgICAg ICAgKC1bV0tQREZWaWV3IGRlY29yYXRlRm91bmRUZXh0UmFuZ2U6aW5Eb2N1bWVudDp1c2luZ1N0 eWxlOl0pOgorICAgICAgICAoLVtXS1BERlZpZXcgY2xlYXJBbGxEZWNvcmF0ZWRGb3VuZFRleHRd KToKKwogMjAyMi0wMi0yNCAgQWRpdHlhIEtlZXJ0aGkgIDxha2VlcnRoaUBhcHBsZS5jb20+CiAK ICAgICAgICAgW2lPU10gQWRkIHN1cHBvcnQgZm9yIHJlcGxhY2luZyBXS0ZvdW5kVGV4dFJhbmdl cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdJ T1MubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lPUy5tbQpp bmRleCA2YjdiZmZiMjAzNjY1ZjQyNWRkMjdlNmZmYjE2NGQ4YTY5MTIwY2QwLi4xMmZlMTJjZjAw ZmZmNWZhYWZhOTliNDg1ZTI5YjE4ZWM3NDUxY2YzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lPUy5tbQpAQCAtNzc3LDYgKzc3NywxNiBAQCBzdGF0 aWMgV2ViQ29yZTo6Q29sb3Igc2Nyb2xsVmlld0JhY2tncm91bmRDb2xvcihXS1dlYlZpZXcgKndl YlZpZXcsIEFsbG93UGFnZUJhYwogCiAgICAgaWYgKCFbc2VsZiBfc2Nyb2xsVmlld0lzUnViYmVy QmFuZGluZ0ZvclJlZnJlc2hDb250cm9sXSkKICAgICAgICAgW19zY3JvbGxWaWV3IF9zdG9wU2Ny b2xsaW5nQW5kWm9vbWluZ0FuaW1hdGlvbnNdOworCisjaWYgSEFWRShVSUZJTkRJTlRFUkFDVElP TikKKyAgICBpZiAoX2ZpbmRJbnRlcmFjdGlvbkVuYWJsZWQpIHsKKyAgICAgICAgW19maW5kSW50 ZXJhY3Rpb24gZGlzbWlzc0ZpbmROYXZpZ2F0b3JdOworICAgICAgICBpZiAoW19jdXN0b21Db250 ZW50VmlldyBjb25mb3Jtc1RvUHJvdG9jb2w6QHByb3RvY29sKF9VSVRleHRTZWFyY2hpbmcpXSkK KyAgICAgICAgICAgIFtfZmluZEludGVyYWN0aW9uIHNldFNlYXJjaGFibGVPYmplY3Q6KGlkPF9V SVRleHRTZWFyY2hpbmc+KV9jdXN0b21Db250ZW50Vmlldy5nZXQoKV07CisgICAgICAgIGVsc2UK KyAgICAgICAgICAgIFtfZmluZEludGVyYWN0aW9uIHNldFNlYXJjaGFibGVPYmplY3Q6X2NvbnRl bnRWaWV3LmdldCgpXTsKKyAgICB9CisjZW5kaWYKIH0KIAogc3RhdGljIENHUG9pbnQgY29udGVu dE9mZnNldEJvdW5kZWRJblZhbGlkUmFuZ2UoVUlTY3JvbGxWaWV3ICpzY3JvbGxWaWV3LCBDR1Bv aW50IGNvbnRlbnRPZmZzZXQpCkBAIC0zNTM3LDcgKzM1NDcsMTAgQEAgc3RhdGljIHN0ZDo6b3B0 aW9uYWw8V2ViQ29yZTo6Vmlld3BvcnRBcmd1bWVudHM+IHZpZXdwb3J0QXJndW1lbnRzRnJvbURp Y3Rpb25hcnkKICAgICAgICAgaWYgKGVuYWJsZWQpIHsKICAgICAgICAgICAgIGlmICghX2ZpbmRJ bnRlcmFjdGlvbikgewogICAgICAgICAgICAgICAgIF9maW5kSW50ZXJhY3Rpb24gPSBhZG9wdE5T KFtbX1VJRmluZEludGVyYWN0aW9uIGFsbG9jXSBpbml0XSk7Ci0gICAgICAgICAgICAgICAgW19m aW5kSW50ZXJhY3Rpb24gc2V0U2VhcmNoYWJsZU9iamVjdDpfY29udGVudFZpZXcuZ2V0KCldOwor ICAgICAgICAgICAgICAgIGlmIChbX2N1c3RvbUNvbnRlbnRWaWV3IGNvbmZvcm1zVG9Qcm90b2Nv bDpAcHJvdG9jb2woX1VJVGV4dFNlYXJjaGluZyldKQorICAgICAgICAgICAgICAgICAgICBbX2Zp bmRJbnRlcmFjdGlvbiBzZXRTZWFyY2hhYmxlT2JqZWN0OihpZDxfVUlUZXh0U2VhcmNoaW5nPilf Y3VzdG9tQ29udGVudFZpZXcuZ2V0KCldOworICAgICAgICAgICAgICAgIGVsc2UKKyAgICAgICAg ICAgICAgICAgICAgW19maW5kSW50ZXJhY3Rpb24gc2V0U2VhcmNoYWJsZU9iamVjdDpfY29udGVu dFZpZXcuZ2V0KCldOwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICBbc2VsZiBhZGRJbnRl cmFjdGlvbjpfZmluZEludGVyYWN0aW9uLmdldCgpXTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9p b3MvV0tQREZWaWV3Lm1tCmluZGV4IDE3MjEyNzBkMDA2NmI0YjllMTk5MTE0ZWU3MzdjMGUzY2Vh NzlkMWMuLjNlYzdkOThkNzNiOTBhZGEwN2QzYmVjODE0YzE3NjI3N2Q0ODZhOTIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcubW0KKysrIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLUERGVmlldy5tbQpAQCAtNDksNyArNDksNjkgQEAKICNp bXBvcnQgPHd0Zi9jb2NvYS9FbnRpdGxlbWVudHMuaD4KICNpbXBvcnQgPHd0Zi9jb2NvYS9OU1VS TEV4dHJhcy5oPgogCi1AaW50ZXJmYWNlIFdLUERGVmlldyAoKSA8UERGSG9zdFZpZXdDb250cm9s bGVyRGVsZWdhdGUsIFdLQWN0aW9uU2hlZXRBc3Npc3RhbnREZWxlZ2F0ZT4KKyNpZiBIQVZFKFVJ RklORElOVEVSQUNUSU9OKQorCitAaW50ZXJmYWNlIFdLUERGRm91bmRUZXh0UmFuZ2UgOiBVSVRl eHRSYW5nZQorCitAcHJvcGVydHkgKG5vbmF0b21pYykgTlNVSW50ZWdlciBpbmRleDsKKworKyAo V0tQREZGb3VuZFRleHRSYW5nZSAqKWZvdW5kVGV4dFJhbmdlV2l0aEluZGV4OihOU1VJbnRlZ2Vy KWluZGV4OworCitAZW5kCisKK0BpbnRlcmZhY2UgV0tQREZGb3VuZFRleHRQb3NpdGlvbiA6IFVJ VGV4dFBvc2l0aW9uCisKK0Bwcm9wZXJ0eSAobm9uYXRvbWljKSBOU1VJbnRlZ2VyIGluZGV4Owor CisrIChXS1BERkZvdW5kVGV4dFBvc2l0aW9uICopdGV4dFBvc2l0aW9uV2l0aEluZGV4OihOU1VJ bnRlZ2VyKWluZGV4OworCitAZW5kCisKK0BpbXBsZW1lbnRhdGlvbiBXS1BERkZvdW5kVGV4dFJh bmdlCisKKysgKFdLUERGRm91bmRUZXh0UmFuZ2UgKilmb3VuZFRleHRSYW5nZVdpdGhJbmRleDoo TlNVSW50ZWdlcilpbmRleAoreworICAgIGF1dG8gcmFuZ2UgPSBhZG9wdE5TKFtbV0tQREZGb3Vu ZFRleHRSYW5nZSBhbGxvY10gaW5pdF0pOworICAgIFtyYW5nZSBzZXRJbmRleDppbmRleF07Cisg ICAgcmV0dXJuIHJhbmdlLmF1dG9yZWxlYXNlKCk7Cit9CisKKy0gKFdLUERGRm91bmRUZXh0UG9z aXRpb24gKilzdGFydAoreworICAgIFdLUERGRm91bmRUZXh0UG9zaXRpb24gKnBvc2l0aW9uID0g W1dLUERGRm91bmRUZXh0UG9zaXRpb24gdGV4dFBvc2l0aW9uV2l0aEluZGV4OnNlbGYuaW5kZXhd OworICAgIHJldHVybiBwb3NpdGlvbjsKK30KKworLSAoVUlUZXh0UG9zaXRpb24gKillbmQKK3sK KyAgICByZXR1cm4gc2VsZi5zdGFydDsKK30KKworLSAoQk9PTClpc0VtcHR5Cit7CisgICAgcmV0 dXJuIE5POworfQorCitAZW5kCisKK0BpbXBsZW1lbnRhdGlvbiBXS1BERkZvdW5kVGV4dFBvc2l0 aW9uCisKKysgKFdLUERGRm91bmRUZXh0UG9zaXRpb24gKil0ZXh0UG9zaXRpb25XaXRoSW5kZXg6 KE5TVUludGVnZXIpaW5kZXgKK3sKKyAgICBhdXRvIHBvcyA9IGFkb3B0TlMoW1tXS1BERkZvdW5k VGV4dFBvc2l0aW9uIGFsbG9jXSBpbml0XSk7CisgICAgW3BvcyBzZXRJbmRleDppbmRleF07Cisg ICAgcmV0dXJuIHBvcy5hdXRvcmVsZWFzZSgpOworfQorCitAZW5kCisKKyNlbmRpZiAvLyBIQVZF KFVJRklORElOVEVSQUNUSU9OKQorCitAaW50ZXJmYWNlIFdLUERGVmlldyAoKSA8UERGSG9zdFZp ZXdDb250cm9sbGVyRGVsZWdhdGUsIFdLQWN0aW9uU2hlZXRBc3Npc3RhbnREZWxlZ2F0ZQorI2lm IEhBVkUoVUlGSU5ESU5URVJBQ1RJT04pCisgICAgLCBfVUlUZXh0U2VhcmNoaW5nCisjZW5kaWYK Kz4KIEBlbmQKIAogQGltcGxlbWVudGF0aW9uIFdLUERGVmlldyB7CkBAIC03Miw2ICsxMzQsOCBA QAogICAgIFdlYWtPYmpDUHRyPFdLV2ViVmlldz4gX3dlYlZpZXc7CiAgICAgUmV0YWluUHRyPFdL S2V5Ym9hcmRTY3JvbGxWaWV3QW5pbWF0b3I+IF9rZXlib2FyZFNjcm9sbGluZ0FuaW1hdG9yOwog ICAgIFJldGFpblB0cjxXS1NoYXJlU2hlZXQ+IF9zaGFyZVNoZWV0OworICAgIFJldGFpblB0cjxp ZDxfVUlUZXh0U2VhcmNoQWdncmVnYXRvcj4+IF9zZWFyY2hBZ2dyZWdhdG9yOworICAgIFJldGFp blB0cjxOU1N0cmluZz4gX3NlYXJjaFN0cmluZzsKIH0KIAogLSAodm9pZClkZWFsbG9jCkBAIC00 MzIsNiArNDk2LDIyIEBAIHN0YXRpYyBOU1N0cmluZ0NvbXBhcmVPcHRpb25zIHN0cmluZ0NvbXBh cmVPcHRpb25zKF9XS0ZpbmRPcHRpb25zIGZpbmRPcHRpb25zKQogCiAtICh2b2lkKXBkZkhvc3RW aWV3Q29udHJvbGxlcjooUERGSG9zdFZpZXdDb250cm9sbGVyICopY29udHJvbGxlciBmaW5kU3Ry aW5nVXBkYXRlOihOU1VJbnRlZ2VyKW51bUZvdW5kIGRvbmU6KEJPT0wpZG9uZQogeworICAgIGlm IChfc2VhcmNoQWdncmVnYXRvcikgeworICAgICAgICBpZiAoIWRvbmUpCisgICAgICAgICAgICBy ZXR1cm47CisKKyAgICAgICAgZm9yIChOU1VJbnRlZ2VyIGluZGV4ID0gMDsgaW5kZXggPCBudW1G b3VuZDsgaW5kZXgrKykgeworICAgICAgICAgICAgV0tQREZGb3VuZFRleHRSYW5nZSAqcmFuZ2Ug PSBbV0tQREZGb3VuZFRleHRSYW5nZSBmb3VuZFRleHRSYW5nZVdpdGhJbmRleDppbmRleF07Cisg ICAgICAgICAgICBbX3NlYXJjaEFnZ3JlZ2F0b3IgZm91bmRSYW5nZTpyYW5nZSBmb3JTZWFyY2hT dHJpbmc6X3NlYXJjaFN0cmluZy5nZXQoKSBpbkRvY3VtZW50Om5pbF07CisgICAgICAgIH0KKwor ICAgICAgICBbX3NlYXJjaEFnZ3JlZ2F0b3IgZmluaXNoZWRTZWFyY2hpbmddOworCisgICAgICAg IF9zZWFyY2hBZ2dyZWdhdG9yID0gbmlsOworICAgICAgICBfc2VhcmNoU3RyaW5nID0gbmlsOwor ICAgICAgICByZXR1cm47CisgICAgfQorCiAgICAgaWYgKG51bUZvdW5kID4gX2ZpbmRTdHJpbmdN YXhDb3VudCAmJiAhZG9uZSkgewogICAgICAgICBbY29udHJvbGxlciBjYW5jZWxGaW5kU3RyaW5n V2l0aEhpZ2hsaWdodHNDbGVhcmVkOk5PXTsKICAgICAgICAgZG9uZSA9IFlFUzsKQEAgLTYwMCw2 ICs2ODAsNjQgQEAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfRU5ECiAgICAgcmV0dXJu IFt1aURlbGVnYXRlIF9kYXRhRGV0ZWN0aW9uQ29udGV4dEZvcldlYlZpZXc6d2ViVmlld107CiB9 CiAKKyNwcmFnbWEgbWFyayBfVUlUZXh0U2VhcmNoaW5nCisKKyNpZiBIQVZFKFVJRklORElOVEVS QUNUSU9OKQorCistIChVSVRleHRSYW5nZSAqKXNlbGVjdGVkVGV4dFJhbmdlCit7CisgICAgcmV0 dXJuIG5pbDsKK30KKworLSAoTlNDb21wYXJpc29uUmVzdWx0KWNvbXBhcmVGb3VuZFJhbmdlOihV SVRleHRSYW5nZSAqKWZyb21SYW5nZSB0b1JhbmdlOihVSVRleHRSYW5nZSAqKXRvUmFuZ2UgaW5E b2N1bWVudDooX1VJVGV4dFNlYXJjaERvY3VtZW50SWRlbnRpZmllcilkb2N1bWVudAoreworICAg IGF1dG8gZnJvbSA9IGR5bmFtaWNfb2JqY19jYXN0PFdLUERGRm91bmRUZXh0UG9zaXRpb24+KGZy b21SYW5nZS5zdGFydCk7CisgICAgaWYgKCFmcm9tKQorICAgICAgICByZXR1cm4gTlNPcmRlcmVk U2FtZTsKKworICAgIGF1dG8gdG8gPSBkeW5hbWljX29iamNfY2FzdDxXS1BERkZvdW5kVGV4dFBv c2l0aW9uPih0b1JhbmdlLnN0YXJ0KTsKKyAgICBpZiAoIXRvKQorICAgICAgICByZXR1cm4gTlNP cmRlcmVkU2FtZTsKKworICAgIE5TSW50ZWdlciBvZmZzZXQgPSBmcm9tLmluZGV4IC0gdG8uaW5k ZXg7CisKKyAgICBpZiAob2Zmc2V0IDwgMCkKKyAgICAgICAgcmV0dXJuIE5TT3JkZXJlZEFzY2Vu ZGluZzsKKworICAgIGlmIChvZmZzZXQgPiAwKQorICAgICAgICByZXR1cm4gTlNPcmRlcmVkRGVz Y2VuZGluZzsKKworICAgIHJldHVybiBOU09yZGVyZWRTYW1lOworfQorCistICh2b2lkKXBlcmZv cm1UZXh0U2VhcmNoV2l0aFF1ZXJ5U3RyaW5nOihOU1N0cmluZyAqKXN0cmluZyB1c2luZ09wdGlv bnM6KF9VSVRleHRTZWFyY2hPcHRpb25zICopb3B0aW9ucyByZXN1bHRBZ2dyZWdhdG9yOihpZDxf VUlUZXh0U2VhcmNoQWdncmVnYXRvcj4pYWdncmVnYXRvcgoreworICAgIFtfaG9zdFZpZXdDb250 cm9sbGVyIGNhbmNlbEZpbmRTdHJpbmddOworICAgIF9zZWFyY2hBZ2dyZWdhdG9yID0gYWdncmVn YXRvcjsKKyAgICBfc2VhcmNoU3RyaW5nID0gc3RyaW5nOworICAgIFtfaG9zdFZpZXdDb250cm9s bGVyIGZpbmRTdHJpbmc6c3RyaW5nIHdpdGhPcHRpb25zOm9wdGlvbnMuc3RyaW5nQ29tcGFyZU9w dGlvbnNdOworfQorCistICh2b2lkKWRlY29yYXRlRm91bmRUZXh0UmFuZ2U6KFVJVGV4dFJhbmdl ICopcmFuZ2UgaW5Eb2N1bWVudDooX1VJVGV4dFNlYXJjaERvY3VtZW50SWRlbnRpZmllcilkb2N1 bWVudCB1c2luZ1N0eWxlOihfVUlGb3VuZFRleHRTdHlsZSlzdHlsZQoreworICAgIGlmIChzdHls ZSAhPSBfVUlGb3VuZFRleHRTdHlsZUhpZ2hsaWdodGVkKQorICAgICAgICByZXR1cm47CisKKyAg ICBhdXRvIGZvdW5kVGV4dFJhbmdlID0gZHluYW1pY19vYmpjX2Nhc3Q8V0tQREZGb3VuZFRleHRS YW5nZT4ocmFuZ2UpOworICAgIGlmICghZm91bmRUZXh0UmFuZ2UpCisgICAgICAgIHJldHVybjsK KworICAgIFtfaG9zdFZpZXdDb250cm9sbGVyIGZvY3VzT25TZWFyY2hSZXN1bHRBdEluZGV4OmZv dW5kVGV4dFJhbmdlLmluZGV4XTsKK30KKworLSAodm9pZCljbGVhckFsbERlY29yYXRlZEZvdW5k VGV4dAoreworICAgIFtfaG9zdFZpZXdDb250cm9sbGVyIGNhbmNlbEZpbmRTdHJpbmddOworICAg IF9zZWFyY2hBZ2dyZWdhdG9yID0gbmlsOworfQorCisjZW5kaWYgLy8gSEFWRShVSUZJTkRJTlRF UkFDVElPTikKKwogQGVuZAogCiAK 453699 2022-03-02 22:56:08 -0800 2022-03-14 08:49:07 -0700 Patch bug-237408-20220302225607.patch text/plain 8969 akeerthi U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMzgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDNlZWIxNTE4ZTIwMjVlOTFl ZDAzN2ZmNDExMDZmYzU2MzU4NmYwM2IuLmI0YmFmOWE5ZGQ1OWQ1ZGY2ZjZmNzVkNzRmM2JmY2Zk NTcwNDMzZGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDAgQEAKKzIwMjItMDMtMDIgIEFkaXR5YSBL ZWVydGhpICA8YWtlZXJ0aGlAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIFN1cHBvcnQgUERG IHNlYXJjaCB3aGVuIHVzaW5nIGEgZmluZCBpbnRlcmFjdGlvbgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM3NDA4CisgICAgICAgIHJkYXI6Ly84OTQz NzMzNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVu c3VyZSB0aGF0IFBERnMgY2FuIGJlIHNlYXJjaGVkIHdoZW4gdXNpbmcgYSBfVUlGaW5kSW50ZXJh Y3Rpb24gYnkKKyAgICAgICAgbWFraW5nIFdLUERGVmlldyBjb25mb3JtIHRvIF9VSVRleHRTZWFy Y2hpbmcuCisKKyAgICAgICAgVGhlIGltcGxlbWVudGF0aW9uIGlzIGEgdGhpbiB3cmFwcGVyIGFy b3VuZCBleGlzdGluZyBmaW5kIFNQSSBvbgorICAgICAgICBQREZIb3N0Vmlld0NvbnRyb2xsZXIu IEZvdW5kIHJhbmdlcyBpbiBQREZzIGFyZSB1bmlxdWVseSBpZGVudGlmaWVkCisgICAgICAgIGJ5 IGFuIGluZGV4LCBhcyBtb3JlIGRldGFpbGVkIHJhbmdlIGluZm9ybWF0aW9uIGlzIG5vdCBleHBv c2VkLiBVbmxpa2UKKyAgICAgICAgd2ViIGNvbnRlbnQsIHRoZXJlIGlzIGN1cnJlbnRseSBubyBy ZXF1aXJlbWVudCB0byBzdXBwb3J0IHJlc3RvcmFibGUKKyAgICAgICAgZm91bmQgcmFuZ2VzIGZv ciBQREZzLCBtYWtpbmcgaW5kZXhlcyBzYWZlIHRvIHVzZS4KKworICAgICAgICAqIFVJUHJvY2Vz cy9BUEkvaW9zL1dLV2ViVmlld0lPUy5tbToKKworICAgICAgICBVc2UgV0tQREZWaWV3IG9yIFdL Q29udGVudFZpZXcgYXMgdGhlIHNlYXJjaGFibGUgb2JqZWN0LCBkZXBlbmRpbmcgb24KKyAgICAg ICAgdGhlIGxvYWRlZCBjb250ZW50LgorCisgICAgICAgICgtW1dLV2ViVmlldyBfZGlkQ29tbWl0 TG9hZEZvck1haW5GcmFtZV0pOgorICAgICAgICAoLVtXS1dlYlZpZXcgX3NldEZpbmRJbnRlcmFj dGlvbkVuYWJsZWQ6XSk6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcubW06Cisg ICAgICAgICgrW1dLUERGRm91bmRUZXh0UmFuZ2UgZm91bmRUZXh0UmFuZ2VXaXRoSW5kZXg6XSk6 CisgICAgICAgICgtW1dLUERGRm91bmRUZXh0UmFuZ2Ugc3RhcnRdKToKKyAgICAgICAgKC1bV0tQ REZGb3VuZFRleHRSYW5nZSBlbmRdKToKKyAgICAgICAgKC1bV0tQREZGb3VuZFRleHRSYW5nZSBp c0VtcHR5XSk6CisgICAgICAgICgrW1dLUERGRm91bmRUZXh0UG9zaXRpb24gdGV4dFBvc2l0aW9u V2l0aEluZGV4Ol0pOgorICAgICAgICAoLVtXS1BERlZpZXcgcGRmSG9zdFZpZXdDb250cm9sbGVy OmZpbmRTdHJpbmdVcGRhdGU6ZG9uZTpdKToKKyAgICAgICAgKC1bV0tQREZWaWV3IHNlbGVjdGVk VGV4dFJhbmdlXSk6CisgICAgICAgICgtW1dLUERGVmlldyBjb21wYXJlRm91bmRSYW5nZTp0b1Jh bmdlOmluRG9jdW1lbnQ6XSk6CisgICAgICAgICgtW1dLUERGVmlldyBwZXJmb3JtVGV4dFNlYXJj aFdpdGhRdWVyeVN0cmluZzp1c2luZ09wdGlvbnM6cmVzdWx0QWdncmVnYXRvcjpdKToKKyAgICAg ICAgKC1bV0tQREZWaWV3IGRlY29yYXRlRm91bmRUZXh0UmFuZ2U6aW5Eb2N1bWVudDp1c2luZ1N0 eWxlOl0pOgorICAgICAgICAoLVtXS1BERlZpZXcgY2xlYXJBbGxEZWNvcmF0ZWRGb3VuZFRleHRd KToKKwogMjAyMi0wMi0yNCAgQWRpdHlhIEtlZXJ0aGkgIDxha2VlcnRoaUBhcHBsZS5jb20+CiAK ICAgICAgICAgW2lPU10gQWRkIHN1cHBvcnQgZm9yIHJlcGxhY2luZyBXS0ZvdW5kVGV4dFJhbmdl cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdJ T1MubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lPUy5tbQpp bmRleCA2YjdiZmZiMjAzNjY1ZjQyNWRkMjdlNmZmYjE2NGQ4YTY5MTIwY2QwLi4xMmZlMTJjZjAw ZmZmNWZhYWZhOTliNDg1ZTI5YjE4ZWM3NDUxY2YzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lPUy5tbQpAQCAtNzc3LDYgKzc3NywxNiBAQCBzdGF0 aWMgV2ViQ29yZTo6Q29sb3Igc2Nyb2xsVmlld0JhY2tncm91bmRDb2xvcihXS1dlYlZpZXcgKndl YlZpZXcsIEFsbG93UGFnZUJhYwogCiAgICAgaWYgKCFbc2VsZiBfc2Nyb2xsVmlld0lzUnViYmVy QmFuZGluZ0ZvclJlZnJlc2hDb250cm9sXSkKICAgICAgICAgW19zY3JvbGxWaWV3IF9zdG9wU2Ny b2xsaW5nQW5kWm9vbWluZ0FuaW1hdGlvbnNdOworCisjaWYgSEFWRShVSUZJTkRJTlRFUkFDVElP TikKKyAgICBpZiAoX2ZpbmRJbnRlcmFjdGlvbkVuYWJsZWQpIHsKKyAgICAgICAgW19maW5kSW50 ZXJhY3Rpb24gZGlzbWlzc0ZpbmROYXZpZ2F0b3JdOworICAgICAgICBpZiAoW19jdXN0b21Db250 ZW50VmlldyBjb25mb3Jtc1RvUHJvdG9jb2w6QHByb3RvY29sKF9VSVRleHRTZWFyY2hpbmcpXSkK KyAgICAgICAgICAgIFtfZmluZEludGVyYWN0aW9uIHNldFNlYXJjaGFibGVPYmplY3Q6KGlkPF9V SVRleHRTZWFyY2hpbmc+KV9jdXN0b21Db250ZW50Vmlldy5nZXQoKV07CisgICAgICAgIGVsc2UK KyAgICAgICAgICAgIFtfZmluZEludGVyYWN0aW9uIHNldFNlYXJjaGFibGVPYmplY3Q6X2NvbnRl bnRWaWV3LmdldCgpXTsKKyAgICB9CisjZW5kaWYKIH0KIAogc3RhdGljIENHUG9pbnQgY29udGVu dE9mZnNldEJvdW5kZWRJblZhbGlkUmFuZ2UoVUlTY3JvbGxWaWV3ICpzY3JvbGxWaWV3LCBDR1Bv aW50IGNvbnRlbnRPZmZzZXQpCkBAIC0zNTM3LDcgKzM1NDcsMTAgQEAgc3RhdGljIHN0ZDo6b3B0 aW9uYWw8V2ViQ29yZTo6Vmlld3BvcnRBcmd1bWVudHM+IHZpZXdwb3J0QXJndW1lbnRzRnJvbURp Y3Rpb25hcnkKICAgICAgICAgaWYgKGVuYWJsZWQpIHsKICAgICAgICAgICAgIGlmICghX2ZpbmRJ bnRlcmFjdGlvbikgewogICAgICAgICAgICAgICAgIF9maW5kSW50ZXJhY3Rpb24gPSBhZG9wdE5T KFtbX1VJRmluZEludGVyYWN0aW9uIGFsbG9jXSBpbml0XSk7Ci0gICAgICAgICAgICAgICAgW19m aW5kSW50ZXJhY3Rpb24gc2V0U2VhcmNoYWJsZU9iamVjdDpfY29udGVudFZpZXcuZ2V0KCldOwor ICAgICAgICAgICAgICAgIGlmIChbX2N1c3RvbUNvbnRlbnRWaWV3IGNvbmZvcm1zVG9Qcm90b2Nv bDpAcHJvdG9jb2woX1VJVGV4dFNlYXJjaGluZyldKQorICAgICAgICAgICAgICAgICAgICBbX2Zp bmRJbnRlcmFjdGlvbiBzZXRTZWFyY2hhYmxlT2JqZWN0OihpZDxfVUlUZXh0U2VhcmNoaW5nPilf Y3VzdG9tQ29udGVudFZpZXcuZ2V0KCldOworICAgICAgICAgICAgICAgIGVsc2UKKyAgICAgICAg ICAgICAgICAgICAgW19maW5kSW50ZXJhY3Rpb24gc2V0U2VhcmNoYWJsZU9iamVjdDpfY29udGVu dFZpZXcuZ2V0KCldOwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICBbc2VsZiBhZGRJbnRl cmFjdGlvbjpfZmluZEludGVyYWN0aW9uLmdldCgpXTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9p b3MvV0tQREZWaWV3Lm1tCmluZGV4IDE3MjEyNzBkMDA2NmI0YjllMTk5MTE0ZWU3MzdjMGUzY2Vh NzlkMWMuLjQzNjNiOTVjZWZlZmE2ZWFkYzM4NmMyMDBlMjgxNjNlZjRlNWRiZjIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcubW0KKysrIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLUERGVmlldy5tbQpAQCAtNDksNyArNDksNjkgQEAKICNp bXBvcnQgPHd0Zi9jb2NvYS9FbnRpdGxlbWVudHMuaD4KICNpbXBvcnQgPHd0Zi9jb2NvYS9OU1VS TEV4dHJhcy5oPgogCi1AaW50ZXJmYWNlIFdLUERGVmlldyAoKSA8UERGSG9zdFZpZXdDb250cm9s bGVyRGVsZWdhdGUsIFdLQWN0aW9uU2hlZXRBc3Npc3RhbnREZWxlZ2F0ZT4KKyNpZiBIQVZFKFVJ RklORElOVEVSQUNUSU9OKQorCitAaW50ZXJmYWNlIFdLUERGRm91bmRUZXh0UmFuZ2UgOiBVSVRl eHRSYW5nZQorCitAcHJvcGVydHkgKG5vbmF0b21pYykgTlNVSW50ZWdlciBpbmRleDsKKworKyAo V0tQREZGb3VuZFRleHRSYW5nZSAqKWZvdW5kVGV4dFJhbmdlV2l0aEluZGV4OihOU1VJbnRlZ2Vy KWluZGV4OworCitAZW5kCisKK0BpbnRlcmZhY2UgV0tQREZGb3VuZFRleHRQb3NpdGlvbiA6IFVJ VGV4dFBvc2l0aW9uCisKK0Bwcm9wZXJ0eSAobm9uYXRvbWljKSBOU1VJbnRlZ2VyIGluZGV4Owor CisrIChXS1BERkZvdW5kVGV4dFBvc2l0aW9uICopdGV4dFBvc2l0aW9uV2l0aEluZGV4OihOU1VJ bnRlZ2VyKWluZGV4OworCitAZW5kCisKK0BpbXBsZW1lbnRhdGlvbiBXS1BERkZvdW5kVGV4dFJh bmdlCisKKysgKFdLUERGRm91bmRUZXh0UmFuZ2UgKilmb3VuZFRleHRSYW5nZVdpdGhJbmRleDoo TlNVSW50ZWdlcilpbmRleAoreworICAgIGF1dG8gcmFuZ2UgPSBhZG9wdE5TKFtbV0tQREZGb3Vu ZFRleHRSYW5nZSBhbGxvY10gaW5pdF0pOworICAgIFtyYW5nZSBzZXRJbmRleDppbmRleF07Cisg ICAgcmV0dXJuIHJhbmdlLmF1dG9yZWxlYXNlKCk7Cit9CisKKy0gKFdLUERGRm91bmRUZXh0UG9z aXRpb24gKilzdGFydAoreworICAgIFdLUERGRm91bmRUZXh0UG9zaXRpb24gKnBvc2l0aW9uID0g W1dLUERGRm91bmRUZXh0UG9zaXRpb24gdGV4dFBvc2l0aW9uV2l0aEluZGV4OnNlbGYuaW5kZXhd OworICAgIHJldHVybiBwb3NpdGlvbjsKK30KKworLSAoVUlUZXh0UG9zaXRpb24gKillbmQKK3sK KyAgICByZXR1cm4gc2VsZi5zdGFydDsKK30KKworLSAoQk9PTClpc0VtcHR5Cit7CisgICAgcmV0 dXJuIE5POworfQorCitAZW5kCisKK0BpbXBsZW1lbnRhdGlvbiBXS1BERkZvdW5kVGV4dFBvc2l0 aW9uCisKKysgKFdLUERGRm91bmRUZXh0UG9zaXRpb24gKil0ZXh0UG9zaXRpb25XaXRoSW5kZXg6 KE5TVUludGVnZXIpaW5kZXgKK3sKKyAgICBhdXRvIHBvcyA9IGFkb3B0TlMoW1tXS1BERkZvdW5k VGV4dFBvc2l0aW9uIGFsbG9jXSBpbml0XSk7CisgICAgW3BvcyBzZXRJbmRleDppbmRleF07Cisg ICAgcmV0dXJuIHBvcy5hdXRvcmVsZWFzZSgpOworfQorCitAZW5kCisKKyNlbmRpZiAvLyBIQVZF KFVJRklORElOVEVSQUNUSU9OKQorCitAaW50ZXJmYWNlIFdLUERGVmlldyAoKSA8UERGSG9zdFZp ZXdDb250cm9sbGVyRGVsZWdhdGUsIFdLQWN0aW9uU2hlZXRBc3Npc3RhbnREZWxlZ2F0ZQorI2lm IEhBVkUoVUlGSU5ESU5URVJBQ1RJT04pCisgICAgLCBfVUlUZXh0U2VhcmNoaW5nCisjZW5kaWYK Kz4KIEBlbmQKIAogQGltcGxlbWVudGF0aW9uIFdLUERGVmlldyB7CkBAIC03Miw2ICsxMzQsMTAg QEAKICAgICBXZWFrT2JqQ1B0cjxXS1dlYlZpZXc+IF93ZWJWaWV3OwogICAgIFJldGFpblB0cjxX S0tleWJvYXJkU2Nyb2xsVmlld0FuaW1hdG9yPiBfa2V5Ym9hcmRTY3JvbGxpbmdBbmltYXRvcjsK ICAgICBSZXRhaW5QdHI8V0tTaGFyZVNoZWV0PiBfc2hhcmVTaGVldDsKKyNpZiBIQVZFKFVJRklO RElOVEVSQUNUSU9OKQorICAgIFJldGFpblB0cjxpZDxfVUlUZXh0U2VhcmNoQWdncmVnYXRvcj4+ IF9zZWFyY2hBZ2dyZWdhdG9yOworICAgIFJldGFpblB0cjxOU1N0cmluZz4gX3NlYXJjaFN0cmlu ZzsKKyNlbmRpZgogfQogCiAtICh2b2lkKWRlYWxsb2MKQEAgLTg2LDYgKzE1MiwxMCBAQAogICAg IFtfcGFnZU51bWJlckluZGljYXRvciByZW1vdmVGcm9tU3VwZXJ2aWV3XTsKICAgICBbX2tleWJv YXJkU2Nyb2xsaW5nQW5pbWF0b3IgaW52YWxpZGF0ZV07CiAgICAgc3RkOjptZW1zZXQoX3Bhc3N3 b3JkRm9yUHJpbnRpbmcubXV0YWJsZURhdGEoKSwgMCwgX3Bhc3N3b3JkRm9yUHJpbnRpbmcubGVu Z3RoKCkpOworI2lmIEhBVkUoVUlGSU5ESU5URVJBQ1RJT04pCisgICAgX3NlYXJjaEFnZ3JlZ2F0 b3IgPSBuaWw7CisgICAgX3NlYXJjaFN0cmluZyA9IG5pbDsKKyNlbmRpZgogICAgIFtzdXBlciBk ZWFsbG9jXTsKIH0KIApAQCAtNDMyLDYgKzUwMiwyNCBAQCBzdGF0aWMgTlNTdHJpbmdDb21wYXJl T3B0aW9ucyBzdHJpbmdDb21wYXJlT3B0aW9ucyhfV0tGaW5kT3B0aW9ucyBmaW5kT3B0aW9ucykK IAogLSAodm9pZClwZGZIb3N0Vmlld0NvbnRyb2xsZXI6KFBERkhvc3RWaWV3Q29udHJvbGxlciAq KWNvbnRyb2xsZXIgZmluZFN0cmluZ1VwZGF0ZTooTlNVSW50ZWdlciludW1Gb3VuZCBkb25lOihC T09MKWRvbmUKIHsKKyNpZiBIQVZFKFVJRklORElOVEVSQUNUSU9OKQorICAgIGlmIChfc2VhcmNo QWdncmVnYXRvcikgeworICAgICAgICBpZiAoIWRvbmUpCisgICAgICAgICAgICByZXR1cm47CisK KyAgICAgICAgZm9yIChOU1VJbnRlZ2VyIGluZGV4ID0gMDsgaW5kZXggPCBudW1Gb3VuZDsgaW5k ZXgrKykgeworICAgICAgICAgICAgV0tQREZGb3VuZFRleHRSYW5nZSAqcmFuZ2UgPSBbV0tQREZG b3VuZFRleHRSYW5nZSBmb3VuZFRleHRSYW5nZVdpdGhJbmRleDppbmRleF07CisgICAgICAgICAg ICBbX3NlYXJjaEFnZ3JlZ2F0b3IgZm91bmRSYW5nZTpyYW5nZSBmb3JTZWFyY2hTdHJpbmc6X3Nl YXJjaFN0cmluZy5nZXQoKSBpbkRvY3VtZW50Om5pbF07CisgICAgICAgIH0KKworICAgICAgICBb X3NlYXJjaEFnZ3JlZ2F0b3IgZmluaXNoZWRTZWFyY2hpbmddOworCisgICAgICAgIF9zZWFyY2hB Z2dyZWdhdG9yID0gbmlsOworICAgICAgICBfc2VhcmNoU3RyaW5nID0gbmlsOworICAgICAgICBy ZXR1cm47CisgICAgfQorI2VuZGlmCisKICAgICBpZiAobnVtRm91bmQgPiBfZmluZFN0cmluZ01h eENvdW50ICYmICFkb25lKSB7CiAgICAgICAgIFtjb250cm9sbGVyIGNhbmNlbEZpbmRTdHJpbmdX aXRoSGlnaGxpZ2h0c0NsZWFyZWQ6Tk9dOwogICAgICAgICBkb25lID0gWUVTOwpAQCAtNjAwLDYg KzY4OCw2NCBAQCBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQKICAgICByZXR1cm4g W3VpRGVsZWdhdGUgX2RhdGFEZXRlY3Rpb25Db250ZXh0Rm9yV2ViVmlldzp3ZWJWaWV3XTsKIH0K IAorI3ByYWdtYSBtYXJrIF9VSVRleHRTZWFyY2hpbmcKKworI2lmIEhBVkUoVUlGSU5ESU5URVJB Q1RJT04pCisKKy0gKFVJVGV4dFJhbmdlICopc2VsZWN0ZWRUZXh0UmFuZ2UKK3sKKyAgICByZXR1 cm4gbmlsOworfQorCistIChOU0NvbXBhcmlzb25SZXN1bHQpY29tcGFyZUZvdW5kUmFuZ2U6KFVJ VGV4dFJhbmdlICopZnJvbVJhbmdlIHRvUmFuZ2U6KFVJVGV4dFJhbmdlICopdG9SYW5nZSBpbkRv Y3VtZW50OihfVUlUZXh0U2VhcmNoRG9jdW1lbnRJZGVudGlmaWVyKWRvY3VtZW50Cit7CisgICAg YXV0byBmcm9tID0gZHluYW1pY19vYmpjX2Nhc3Q8V0tQREZGb3VuZFRleHRQb3NpdGlvbj4oZnJv bVJhbmdlLnN0YXJ0KTsKKyAgICBpZiAoIWZyb20pCisgICAgICAgIHJldHVybiBOU09yZGVyZWRT YW1lOworCisgICAgYXV0byB0byA9IGR5bmFtaWNfb2JqY19jYXN0PFdLUERGRm91bmRUZXh0UG9z aXRpb24+KHRvUmFuZ2Uuc3RhcnQpOworICAgIGlmICghdG8pCisgICAgICAgIHJldHVybiBOU09y ZGVyZWRTYW1lOworCisgICAgTlNJbnRlZ2VyIG9mZnNldCA9IGZyb20uaW5kZXggLSB0by5pbmRl eDsKKworICAgIGlmIChvZmZzZXQgPCAwKQorICAgICAgICByZXR1cm4gTlNPcmRlcmVkQXNjZW5k aW5nOworCisgICAgaWYgKG9mZnNldCA+IDApCisgICAgICAgIHJldHVybiBOU09yZGVyZWREZXNj ZW5kaW5nOworCisgICAgcmV0dXJuIE5TT3JkZXJlZFNhbWU7Cit9CisKKy0gKHZvaWQpcGVyZm9y bVRleHRTZWFyY2hXaXRoUXVlcnlTdHJpbmc6KE5TU3RyaW5nICopc3RyaW5nIHVzaW5nT3B0aW9u czooX1VJVGV4dFNlYXJjaE9wdGlvbnMgKilvcHRpb25zIHJlc3VsdEFnZ3JlZ2F0b3I6KGlkPF9V SVRleHRTZWFyY2hBZ2dyZWdhdG9yPilhZ2dyZWdhdG9yCit7CisgICAgW19ob3N0Vmlld0NvbnRy b2xsZXIgY2FuY2VsRmluZFN0cmluZ107CisgICAgX3NlYXJjaEFnZ3JlZ2F0b3IgPSBhZ2dyZWdh dG9yOworICAgIF9zZWFyY2hTdHJpbmcgPSBzdHJpbmc7CisgICAgW19ob3N0Vmlld0NvbnRyb2xs ZXIgZmluZFN0cmluZzpzdHJpbmcgd2l0aE9wdGlvbnM6b3B0aW9ucy5zdHJpbmdDb21wYXJlT3B0 aW9uc107Cit9CisKKy0gKHZvaWQpZGVjb3JhdGVGb3VuZFRleHRSYW5nZTooVUlUZXh0UmFuZ2Ug KilyYW5nZSBpbkRvY3VtZW50OihfVUlUZXh0U2VhcmNoRG9jdW1lbnRJZGVudGlmaWVyKWRvY3Vt ZW50IHVzaW5nU3R5bGU6KF9VSUZvdW5kVGV4dFN0eWxlKXN0eWxlCit7CisgICAgaWYgKHN0eWxl ICE9IF9VSUZvdW5kVGV4dFN0eWxlSGlnaGxpZ2h0ZWQpCisgICAgICAgIHJldHVybjsKKworICAg IGF1dG8gZm91bmRUZXh0UmFuZ2UgPSBkeW5hbWljX29iamNfY2FzdDxXS1BERkZvdW5kVGV4dFJh bmdlPihyYW5nZSk7CisgICAgaWYgKCFmb3VuZFRleHRSYW5nZSkKKyAgICAgICAgcmV0dXJuOwor CisgICAgW19ob3N0Vmlld0NvbnRyb2xsZXIgZm9jdXNPblNlYXJjaFJlc3VsdEF0SW5kZXg6Zm91 bmRUZXh0UmFuZ2UuaW5kZXhdOworfQorCistICh2b2lkKWNsZWFyQWxsRGVjb3JhdGVkRm91bmRU ZXh0Cit7CisgICAgW19ob3N0Vmlld0NvbnRyb2xsZXIgY2FuY2VsRmluZFN0cmluZ107CisgICAg X3NlYXJjaEFnZ3JlZ2F0b3IgPSBuaWw7Cit9CisKKyNlbmRpZiAvLyBIQVZFKFVJRklORElOVEVS QUNUSU9OKQorCiBAZW5kCiAKIAo= 454986 2022-03-17 10:18:06 -0700 2022-03-17 14:59:09 -0700 Patch for landing bug-237408-20220317101805.patch text/plain 9746 akeerthi U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMzgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGVjYjU0MzY3OWM1NjRiOTIz ZmQ1ZmQxZjFjODM2MTUzYzBhOTFiYjMuLjMyYWE3OWFjOGE4MTg4ODE5M2QzNDVjMjg3OTAxMjRl ZWM1NzJkZjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDMgQEAKKzIwMjItMDMtMTcgIEFkaXR5YSBL ZWVydGhpICA8YWtlZXJ0aGlAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIFN1cHBvcnQgUERG IHNlYXJjaCB3aGVuIHVzaW5nIGEgZmluZCBpbnRlcmFjdGlvbgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM3NDA4CisgICAgICAgIHJkYXI6Ly84OTQz NzMzNAorCisgICAgICAgIFJldmlld2VkIGJ5IFdlbnNvbiBIc2llaC4KKworICAgICAgICBFbnN1 cmUgdGhhdCBQREZzIGNhbiBiZSBzZWFyY2hlZCB3aGVuIHVzaW5nIGEgX1VJRmluZEludGVyYWN0 aW9uIGJ5CisgICAgICAgIG1ha2luZyBXS1BERlZpZXcgY29uZm9ybSB0byBfVUlUZXh0U2VhcmNo aW5nLgorCisgICAgICAgIFRoZSBpbXBsZW1lbnRhdGlvbiBpcyBhIHRoaW4gd3JhcHBlciBhcm91 bmQgZXhpc3RpbmcgZmluZCBTUEkgb24KKyAgICAgICAgUERGSG9zdFZpZXdDb250cm9sbGVyLiBG b3VuZCByYW5nZXMgaW4gUERGcyBhcmUgdW5pcXVlbHkgaWRlbnRpZmllZAorICAgICAgICBieSBh biBpbmRleCwgYXMgbW9yZSBkZXRhaWxlZCByYW5nZSBpbmZvcm1hdGlvbiBpcyBub3QgZXhwb3Nl ZC4gVW5saWtlCisgICAgICAgIHdlYiBjb250ZW50LCB0aGVyZSBpcyBjdXJyZW50bHkgbm8gcmVx dWlyZW1lbnQgdG8gc3VwcG9ydCByZXN0b3JhYmxlCisgICAgICAgIGZvdW5kIHJhbmdlcyBmb3Ig UERGcywgbWFraW5nIGluZGV4ZXMgc2FmZSB0byB1c2UuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL2lvcy9XS1dlYlZpZXdJT1MuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2lvcy9XS1dl YlZpZXdJT1MubW06CisKKyAgICAgICAgVXNlIFdLUERGVmlldyBvciBXS0NvbnRlbnRWaWV3IGFz IHRoZSBzZWFyY2hhYmxlIG9iamVjdCwgZGVwZW5kaW5nIG9uCisgICAgICAgIHRoZSBsb2FkZWQg Y29udGVudC4KKworICAgICAgICAoLVtXS1dlYlZpZXcgX2RpZENvbW1pdExvYWRGb3JNYWluRnJh bWVdKToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9zZWFyY2hhYmxlT2JqZWN0XSk6CisgICAgICAg ICgtW1dLV2ViVmlldyBfc2V0RmluZEludGVyYWN0aW9uRW5hYmxlZDpdKToKKyAgICAgICAgKiBV SVByb2Nlc3MvaW9zL1dLUERGVmlldy5tbToKKyAgICAgICAgKCtbV0tQREZGb3VuZFRleHRSYW5n ZSBmb3VuZFRleHRSYW5nZVdpdGhJbmRleDpdKToKKyAgICAgICAgKC1bV0tQREZGb3VuZFRleHRS YW5nZSBzdGFydF0pOgorICAgICAgICAoLVtXS1BERkZvdW5kVGV4dFJhbmdlIGVuZF0pOgorICAg ICAgICAoLVtXS1BERkZvdW5kVGV4dFJhbmdlIGlzRW1wdHldKToKKyAgICAgICAgKCtbV0tQREZG b3VuZFRleHRQb3NpdGlvbiB0ZXh0UG9zaXRpb25XaXRoSW5kZXg6XSk6CisgICAgICAgICgtW1dL UERGVmlldyBkZWFsbG9jXSk6CisgICAgICAgICgtW1dLUERGVmlldyBwZGZIb3N0Vmlld0NvbnRy b2xsZXI6ZmluZFN0cmluZ1VwZGF0ZTpkb25lOl0pOgorICAgICAgICAoLVtXS1BERlZpZXcgc2Vs ZWN0ZWRUZXh0UmFuZ2VdKToKKyAgICAgICAgKC1bV0tQREZWaWV3IGNvbXBhcmVGb3VuZFJhbmdl OnRvUmFuZ2U6aW5Eb2N1bWVudDpdKToKKyAgICAgICAgKC1bV0tQREZWaWV3IHBlcmZvcm1UZXh0 U2VhcmNoV2l0aFF1ZXJ5U3RyaW5nOnVzaW5nT3B0aW9uczpyZXN1bHRBZ2dyZWdhdG9yOl0pOgor ICAgICAgICAoLVtXS1BERlZpZXcgZGVjb3JhdGVGb3VuZFRleHRSYW5nZTppbkRvY3VtZW50OnVz aW5nU3R5bGU6XSk6CisgICAgICAgICgtW1dLUERGVmlldyBjbGVhckFsbERlY29yYXRlZEZvdW5k VGV4dF0pOgorCiAyMDIyLTAzLTE2ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAK ICAgICAgICAgRG9uJ3QgYnVpbGQgV2ViUGFnZVByb3h5Ojp3cml0ZVByb21pc2VkQXR0YWNobWVu dFRvUGFzdGVib2FyZCgpIGFuZCBpdHMgSVBDIG9uIG1hY09TCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lPUy5oIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdJT1MuaAppbmRleCA5OWZjNzg5NmQwOGVmOTBkNDgz NmRiNmIyNmFkMjkzM2NkNjY3NTZmLi44ZjNmYzJmMjFlOTdkZmIyMjM3YjI4MjFjODU4MDIwN2Fj OGRjYTkwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2Vi Vmlld0lPUy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3 SU9TLmgKQEAgLTEzMCw2ICsxMzAsOCBAQCBlbnVtIGNsYXNzIFRhcEhhbmRsaW5nUmVzdWx0IDog dWludDhfdDsKIC0gKHZvaWQpZmluZDooaWQpc2VuZGVyOwogLSAodm9pZClmaW5kTmV4dDooaWQp c2VuZGVyOwogLSAodm9pZClmaW5kUHJldmlvdXM6KGlkKXNlbmRlcjsKKworLSAoaWQ8X1VJVGV4 dFNlYXJjaGluZz4pX3NlYXJjaGFibGVPYmplY3Q7CiAjZW5kaWYKIAogLSAodm9pZClfbmV4dEFj Y2Vzc29yeVRhYjooaWQpc2VuZGVyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL2lvcy9XS1dlYlZpZXdJT1MubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv aW9zL1dLV2ViVmlld0lPUy5tbQppbmRleCA0OTAyNWUxMDUzMWU0NmE3NjFjNDE2YzY2ZWNlZjUx YWIxODYwNjc5Li41NDRjNzE0YWM2MTBmNGRlYTA3YmMxNjFkNDAzYjE2ZTc2YTIxZjEyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lPUy5tbQor KysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lPUy5tbQpAQCAt Nzc4LDYgKzc3OCwxMyBAQCBzdGF0aWMgV2ViQ29yZTo6Q29sb3Igc2Nyb2xsVmlld0JhY2tncm91 bmRDb2xvcihXS1dlYlZpZXcgKndlYlZpZXcsIEFsbG93UGFnZUJhYwogCiAgICAgaWYgKCFbc2Vs ZiBfc2Nyb2xsVmlld0lzUnViYmVyQmFuZGluZ0ZvclJlZnJlc2hDb250cm9sXSkKICAgICAgICAg W19zY3JvbGxWaWV3IF9zdG9wU2Nyb2xsaW5nQW5kWm9vbWluZ0FuaW1hdGlvbnNdOworCisjaWYg SEFWRShVSUZJTkRJTlRFUkFDVElPTikKKyAgICBpZiAoX2ZpbmRJbnRlcmFjdGlvbkVuYWJsZWQp IHsKKyAgICAgICAgW19maW5kSW50ZXJhY3Rpb24gZGlzbWlzc0ZpbmROYXZpZ2F0b3JdOworICAg ICAgICBbX2ZpbmRJbnRlcmFjdGlvbiBzZXRTZWFyY2hhYmxlT2JqZWN0OltzZWxmIF9zZWFyY2hh YmxlT2JqZWN0XV07CisgICAgfQorI2VuZGlmCiB9CiAKIHN0YXRpYyBDR1BvaW50IGNvbnRlbnRP ZmZzZXRCb3VuZGVkSW5WYWxpZFJhbmdlKFVJU2Nyb2xsVmlldyAqc2Nyb2xsVmlldywgQ0dQb2lu dCBjb250ZW50T2Zmc2V0KQpAQCAtMjcxMSw2ICsyNzE4LDE4IEBAIHN0YXRpYyBXZWJDb3JlOjpV c2VySW50ZXJmYWNlTGF5b3V0RGlyZWN0aW9uIHRvVXNlckludGVyZmFjZUxheW91dERpcmVjdGlv bihVSVNlCiAgICAgW3N1cGVyIGJ1aWxkTWVudVdpdGhCdWlsZGVyOmJ1aWxkZXJdOwogfQogCisj aWYgSEFWRShVSUZJTkRJTlRFUkFDVElPTikKKworLSAoaWQ8X1VJVGV4dFNlYXJjaGluZz4pX3Nl YXJjaGFibGVPYmplY3QKK3sKKyAgICBpZiAoW19jdXN0b21Db250ZW50VmlldyBjb25mb3Jtc1Rv UHJvdG9jb2w6QHByb3RvY29sKF9VSVRleHRTZWFyY2hpbmcpXSkKKyAgICAgICAgcmV0dXJuIChp ZDxfVUlUZXh0U2VhcmNoaW5nPilfY3VzdG9tQ29udGVudFZpZXcuZ2V0KCk7CisKKyAgICByZXR1 cm4gX2NvbnRlbnRWaWV3LmdldCgpOworfQorCisjZW5kaWYKKwogQGVuZAogCiBAaW1wbGVtZW50 YXRpb24gV0tXZWJWaWV3IChXS1ByaXZhdGVJT1MpCkBAIC0zNTUxLDcgKzM1NzAsNyBAQCBzdGF0 aWMgc3RkOjpvcHRpb25hbDxXZWJDb3JlOjpWaWV3cG9ydEFyZ3VtZW50cz4gdmlld3BvcnRBcmd1 bWVudHNGcm9tRGljdGlvbmFyeQogICAgICAgICBpZiAoZW5hYmxlZCkgewogICAgICAgICAgICAg aWYgKCFfZmluZEludGVyYWN0aW9uKSB7CiAgICAgICAgICAgICAgICAgX2ZpbmRJbnRlcmFjdGlv biA9IGFkb3B0TlMoW1tfVUlGaW5kSW50ZXJhY3Rpb24gYWxsb2NdIGluaXRdKTsKLSAgICAgICAg ICAgICAgICBbX2ZpbmRJbnRlcmFjdGlvbiBzZXRTZWFyY2hhYmxlT2JqZWN0Ol9jb250ZW50Vmll dy5nZXQoKV07CisgICAgICAgICAgICAgICAgW19maW5kSW50ZXJhY3Rpb24gc2V0U2VhcmNoYWJs ZU9iamVjdDpbc2VsZiBfc2VhcmNoYWJsZU9iamVjdF1dOwogICAgICAgICAgICAgfQogCiAgICAg ICAgICAgICBbc2VsZiBhZGRJbnRlcmFjdGlvbjpfZmluZEludGVyYWN0aW9uLmdldCgpXTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcubW0gYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tQREZWaWV3Lm1tCmluZGV4IGNhMzE3MDc4NzU2ODYw ODZhYzZhZGRlYzkwODhjN2Y3MWZkMjRlMmYuLmY4OGYwY2U1ZmU3YmMwMDFlZGFjNGRmOTFkMWZh NzYyY2UwMmNmOWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS1BE RlZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLUERGVmlldy5tbQpA QCAtNDksNyArNDksNjkgQEAKICNpbXBvcnQgPHd0Zi9jb2NvYS9FbnRpdGxlbWVudHMuaD4KICNp bXBvcnQgPHd0Zi9jb2NvYS9OU1VSTEV4dHJhcy5oPgogCi1AaW50ZXJmYWNlIFdLUERGVmlldyAo KSA8UERGSG9zdFZpZXdDb250cm9sbGVyRGVsZWdhdGUsIFdLQWN0aW9uU2hlZXRBc3Npc3RhbnRE ZWxlZ2F0ZT4KKyNpZiBIQVZFKFVJRklORElOVEVSQUNUSU9OKQorCitAaW50ZXJmYWNlIFdLUERG Rm91bmRUZXh0UmFuZ2UgOiBVSVRleHRSYW5nZQorCitAcHJvcGVydHkgKG5vbmF0b21pYykgTlNV SW50ZWdlciBpbmRleDsKKworKyAoV0tQREZGb3VuZFRleHRSYW5nZSAqKWZvdW5kVGV4dFJhbmdl V2l0aEluZGV4OihOU1VJbnRlZ2VyKWluZGV4OworCitAZW5kCisKK0BpbnRlcmZhY2UgV0tQREZG b3VuZFRleHRQb3NpdGlvbiA6IFVJVGV4dFBvc2l0aW9uCisKK0Bwcm9wZXJ0eSAobm9uYXRvbWlj KSBOU1VJbnRlZ2VyIGluZGV4OworCisrIChXS1BERkZvdW5kVGV4dFBvc2l0aW9uICopdGV4dFBv c2l0aW9uV2l0aEluZGV4OihOU1VJbnRlZ2VyKWluZGV4OworCitAZW5kCisKK0BpbXBsZW1lbnRh dGlvbiBXS1BERkZvdW5kVGV4dFJhbmdlCisKKysgKFdLUERGRm91bmRUZXh0UmFuZ2UgKilmb3Vu ZFRleHRSYW5nZVdpdGhJbmRleDooTlNVSW50ZWdlcilpbmRleAoreworICAgIGF1dG8gcmFuZ2Ug PSBhZG9wdE5TKFtbV0tQREZGb3VuZFRleHRSYW5nZSBhbGxvY10gaW5pdF0pOworICAgIFtyYW5n ZSBzZXRJbmRleDppbmRleF07CisgICAgcmV0dXJuIHJhbmdlLmF1dG9yZWxlYXNlKCk7Cit9CisK Ky0gKFdLUERGRm91bmRUZXh0UG9zaXRpb24gKilzdGFydAoreworICAgIFdLUERGRm91bmRUZXh0 UG9zaXRpb24gKnBvc2l0aW9uID0gW1dLUERGRm91bmRUZXh0UG9zaXRpb24gdGV4dFBvc2l0aW9u V2l0aEluZGV4OnNlbGYuaW5kZXhdOworICAgIHJldHVybiBwb3NpdGlvbjsKK30KKworLSAoVUlU ZXh0UG9zaXRpb24gKillbmQKK3sKKyAgICByZXR1cm4gc2VsZi5zdGFydDsKK30KKworLSAoQk9P TClpc0VtcHR5Cit7CisgICAgcmV0dXJuIE5POworfQorCitAZW5kCisKK0BpbXBsZW1lbnRhdGlv biBXS1BERkZvdW5kVGV4dFBvc2l0aW9uCisKKysgKFdLUERGRm91bmRUZXh0UG9zaXRpb24gKil0 ZXh0UG9zaXRpb25XaXRoSW5kZXg6KE5TVUludGVnZXIpaW5kZXgKK3sKKyAgICBhdXRvIHBvc2l0 aW9uID0gYWRvcHROUyhbW1dLUERGRm91bmRUZXh0UG9zaXRpb24gYWxsb2NdIGluaXRdKTsKKyAg ICBbcG9zaXRpb24gc2V0SW5kZXg6aW5kZXhdOworICAgIHJldHVybiBwb3NpdGlvbi5hdXRvcmVs ZWFzZSgpOworfQorCitAZW5kCisKKyNlbmRpZiAvLyBIQVZFKFVJRklORElOVEVSQUNUSU9OKQor CitAaW50ZXJmYWNlIFdLUERGVmlldyAoKSA8UERGSG9zdFZpZXdDb250cm9sbGVyRGVsZWdhdGUs IFdLQWN0aW9uU2hlZXRBc3Npc3RhbnREZWxlZ2F0ZQorI2lmIEhBVkUoVUlGSU5ESU5URVJBQ1RJ T04pCisgICAgLCBfVUlUZXh0U2VhcmNoaW5nCisjZW5kaWYKKz4KIEBlbmQKIAogQGltcGxlbWVu dGF0aW9uIFdLUERGVmlldyB7CkBAIC03Miw2ICsxMzQsMTAgQEAKICAgICBXZWFrT2JqQ1B0cjxX S1dlYlZpZXc+IF93ZWJWaWV3OwogICAgIFJldGFpblB0cjxXS0tleWJvYXJkU2Nyb2xsVmlld0Fu aW1hdG9yPiBfa2V5Ym9hcmRTY3JvbGxpbmdBbmltYXRvcjsKICAgICBSZXRhaW5QdHI8V0tTaGFy ZVNoZWV0PiBfc2hhcmVTaGVldDsKKyNpZiBIQVZFKFVJRklORElOVEVSQUNUSU9OKQorICAgIFJl dGFpblB0cjxpZDxfVUlUZXh0U2VhcmNoQWdncmVnYXRvcj4+IF9zZWFyY2hBZ2dyZWdhdG9yOwor ICAgIFJldGFpblB0cjxOU1N0cmluZz4gX3NlYXJjaFN0cmluZzsKKyNlbmRpZgogfQogCiAtICh2 b2lkKWRlYWxsb2MKQEAgLTg2LDYgKzE1MiwxMCBAQAogICAgIFtfcGFnZU51bWJlckluZGljYXRv ciByZW1vdmVGcm9tU3VwZXJ2aWV3XTsKICAgICBbX2tleWJvYXJkU2Nyb2xsaW5nQW5pbWF0b3Ig aW52YWxpZGF0ZV07CiAgICAgc3RkOjptZW1zZXQoX3Bhc3N3b3JkRm9yUHJpbnRpbmcubXV0YWJs ZURhdGEoKSwgMCwgX3Bhc3N3b3JkRm9yUHJpbnRpbmcubGVuZ3RoKCkpOworI2lmIEhBVkUoVUlG SU5ESU5URVJBQ1RJT04pCisgICAgX3NlYXJjaEFnZ3JlZ2F0b3IgPSBuaWw7CisgICAgX3NlYXJj aFN0cmluZyA9IG5pbDsKKyNlbmRpZgogICAgIFtzdXBlciBkZWFsbG9jXTsKIH0KIApAQCAtNDMy LDYgKzUwMiwyNCBAQCBzdGF0aWMgTlNTdHJpbmdDb21wYXJlT3B0aW9ucyBzdHJpbmdDb21wYXJl T3B0aW9ucyhfV0tGaW5kT3B0aW9ucyBmaW5kT3B0aW9ucykKIAogLSAodm9pZClwZGZIb3N0Vmll d0NvbnRyb2xsZXI6KFBERkhvc3RWaWV3Q29udHJvbGxlciAqKWNvbnRyb2xsZXIgZmluZFN0cmlu Z1VwZGF0ZTooTlNVSW50ZWdlciludW1Gb3VuZCBkb25lOihCT09MKWRvbmUKIHsKKyNpZiBIQVZF KFVJRklORElOVEVSQUNUSU9OKQorICAgIGlmIChfc2VhcmNoQWdncmVnYXRvcikgeworICAgICAg ICBpZiAoIWRvbmUpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgZm9yIChOU1VJbnRl Z2VyIGluZGV4ID0gMDsgaW5kZXggPCBudW1Gb3VuZDsgaW5kZXgrKykgeworICAgICAgICAgICAg V0tQREZGb3VuZFRleHRSYW5nZSAqcmFuZ2UgPSBbV0tQREZGb3VuZFRleHRSYW5nZSBmb3VuZFRl eHRSYW5nZVdpdGhJbmRleDppbmRleF07CisgICAgICAgICAgICBbX3NlYXJjaEFnZ3JlZ2F0b3Ig Zm91bmRSYW5nZTpyYW5nZSBmb3JTZWFyY2hTdHJpbmc6X3NlYXJjaFN0cmluZy5nZXQoKSBpbkRv Y3VtZW50Om5pbF07CisgICAgICAgIH0KKworICAgICAgICBbX3NlYXJjaEFnZ3JlZ2F0b3IgZmlu aXNoZWRTZWFyY2hpbmddOworCisgICAgICAgIF9zZWFyY2hBZ2dyZWdhdG9yID0gbmlsOworICAg ICAgICBfc2VhcmNoU3RyaW5nID0gbmlsOworICAgICAgICByZXR1cm47CisgICAgfQorI2VuZGlm CisKICAgICBpZiAobnVtRm91bmQgPiBfZmluZFN0cmluZ01heENvdW50ICYmICFkb25lKSB7CiAg ICAgICAgIFtjb250cm9sbGVyIGNhbmNlbEZpbmRTdHJpbmdXaXRoSGlnaGxpZ2h0c0NsZWFyZWQ6 Tk9dOwogICAgICAgICBkb25lID0gWUVTOwpAQCAtNjAwLDYgKzY4OCw2NCBAQCBBTExPV19ERVBS RUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQKICAgICByZXR1cm4gW3VpRGVsZWdhdGUgX2RhdGFEZXRl Y3Rpb25Db250ZXh0Rm9yV2ViVmlldzp3ZWJWaWV3XTsKIH0KIAorI3ByYWdtYSBtYXJrIF9VSVRl eHRTZWFyY2hpbmcKKworI2lmIEhBVkUoVUlGSU5ESU5URVJBQ1RJT04pCisKKy0gKFVJVGV4dFJh bmdlICopc2VsZWN0ZWRUZXh0UmFuZ2UKK3sKKyAgICByZXR1cm4gbmlsOworfQorCistIChOU0Nv bXBhcmlzb25SZXN1bHQpY29tcGFyZUZvdW5kUmFuZ2U6KFVJVGV4dFJhbmdlICopZnJvbVJhbmdl IHRvUmFuZ2U6KFVJVGV4dFJhbmdlICopdG9SYW5nZSBpbkRvY3VtZW50OihfVUlUZXh0U2VhcmNo RG9jdW1lbnRJZGVudGlmaWVyKWRvY3VtZW50Cit7CisgICAgYXV0byBmcm9tID0gZHluYW1pY19v YmpjX2Nhc3Q8V0tQREZGb3VuZFRleHRQb3NpdGlvbj4oZnJvbVJhbmdlLnN0YXJ0KTsKKyAgICBp ZiAoIWZyb20pCisgICAgICAgIHJldHVybiBOU09yZGVyZWRTYW1lOworCisgICAgYXV0byB0byA9 IGR5bmFtaWNfb2JqY19jYXN0PFdLUERGRm91bmRUZXh0UG9zaXRpb24+KHRvUmFuZ2Uuc3RhcnQp OworICAgIGlmICghdG8pCisgICAgICAgIHJldHVybiBOU09yZGVyZWRTYW1lOworCisgICAgTlNJ bnRlZ2VyIG9mZnNldCA9IGZyb20uaW5kZXggLSB0by5pbmRleDsKKworICAgIGlmIChvZmZzZXQg PCAwKQorICAgICAgICByZXR1cm4gTlNPcmRlcmVkQXNjZW5kaW5nOworCisgICAgaWYgKG9mZnNl dCA+IDApCisgICAgICAgIHJldHVybiBOU09yZGVyZWREZXNjZW5kaW5nOworCisgICAgcmV0dXJu IE5TT3JkZXJlZFNhbWU7Cit9CisKKy0gKHZvaWQpcGVyZm9ybVRleHRTZWFyY2hXaXRoUXVlcnlT dHJpbmc6KE5TU3RyaW5nICopc3RyaW5nIHVzaW5nT3B0aW9uczooX1VJVGV4dFNlYXJjaE9wdGlv bnMgKilvcHRpb25zIHJlc3VsdEFnZ3JlZ2F0b3I6KGlkPF9VSVRleHRTZWFyY2hBZ2dyZWdhdG9y PilhZ2dyZWdhdG9yCit7CisgICAgW19ob3N0Vmlld0NvbnRyb2xsZXIgY2FuY2VsRmluZFN0cmlu Z107CisgICAgX3NlYXJjaEFnZ3JlZ2F0b3IgPSBhZ2dyZWdhdG9yOworICAgIF9zZWFyY2hTdHJp bmcgPSBzdHJpbmc7CisgICAgW19ob3N0Vmlld0NvbnRyb2xsZXIgZmluZFN0cmluZzpzdHJpbmcg d2l0aE9wdGlvbnM6b3B0aW9ucy5zdHJpbmdDb21wYXJlT3B0aW9uc107Cit9CisKKy0gKHZvaWQp ZGVjb3JhdGVGb3VuZFRleHRSYW5nZTooVUlUZXh0UmFuZ2UgKilyYW5nZSBpbkRvY3VtZW50Oihf VUlUZXh0U2VhcmNoRG9jdW1lbnRJZGVudGlmaWVyKWRvY3VtZW50IHVzaW5nU3R5bGU6KF9VSUZv dW5kVGV4dFN0eWxlKXN0eWxlCit7CisgICAgaWYgKHN0eWxlICE9IF9VSUZvdW5kVGV4dFN0eWxl SGlnaGxpZ2h0ZWQpCisgICAgICAgIHJldHVybjsKKworICAgIGF1dG8gZm91bmRUZXh0UmFuZ2Ug PSBkeW5hbWljX29iamNfY2FzdDxXS1BERkZvdW5kVGV4dFJhbmdlPihyYW5nZSk7CisgICAgaWYg KCFmb3VuZFRleHRSYW5nZSkKKyAgICAgICAgcmV0dXJuOworCisgICAgW19ob3N0Vmlld0NvbnRy b2xsZXIgZm9jdXNPblNlYXJjaFJlc3VsdEF0SW5kZXg6Zm91bmRUZXh0UmFuZ2UuaW5kZXhdOwor fQorCistICh2b2lkKWNsZWFyQWxsRGVjb3JhdGVkRm91bmRUZXh0Cit7CisgICAgW19ob3N0Vmll d0NvbnRyb2xsZXIgY2FuY2VsRmluZFN0cmluZ107CisgICAgX3NlYXJjaEFnZ3JlZ2F0b3IgPSBu aWw7Cit9CisKKyNlbmRpZiAvLyBIQVZFKFVJRklORElOVEVSQUNUSU9OKQorCiBAZW5kCiAKIAo= 455273 2022-03-21 13:58:33 -0700 2022-03-21 17:23:19 -0700 Address post-landing feedback bug-237408-20220321135832.patch text/plain 1358 akeerthi U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxNTQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDdkNDE3NTU5NTA1NmU0Mjhj MjJiMzBmZGY2Y2Y2MzA4MzcxZjQ2NTIuLjRhZWQ5NTc4OTI0MGZlZjg1ZDYyMTM5YjBlZTY0NjQ4 MDY3MTU2MGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjItMDMtMjEgIEFkaXR5YSBL ZWVydGhpICA8YWtlZXJ0aGlAYXBwbGUuY29tPgorCisgICAgICAgIFVucmV2aWV3ZWQsIGFkZHJl c3MgcG9zdC1sYW5kaW5nIGZlZWRiYWNrIG9uIHIyOTE0NDUKKworICAgICAgICAqIFVJUHJvY2Vz cy9pb3MvV0tQREZWaWV3Lm1tOgorICAgICAgICAoLVtXS1BERlZpZXcgY29tcGFyZUZvdW5kUmFu Z2U6dG9SYW5nZTppbkRvY3VtZW50Ol0pOgorCisgICAgICAgIFN1YnRyYWN0aW9uIHRvIGRldGVy bWluZSBvcmRlcmluZyBpcyBhbiBhbnRpLXBhdHRlcm4sIGR1ZSB0byB0aGUKKyAgICAgICAgcG9z c2liaWxpdHkgb2Ygb3ZlcmZsb3cuIFVzZSBjb21wYXJpc29uIG9wZXJhdG9ycy4KKwogMjAyMi0w My0xOSAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBG aXggdGhlIGJ1aWxkIChob3BlZnVsbHkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9pb3MvV0tQREZWaWV3Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLUERG Vmlldy5tbQppbmRleCBmODhmMGNlNWZlN2JjMDAxZWRhYzRkZjkxZDFmYTc2MmNlMDJjZjljLi44 MDBjZTM5YWVlZDk2NDk1MmVhNWJiY2FiNTAzZGFhZWYwZjIyOGZjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tQREZWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL2lvcy9XS1BERlZpZXcubW0KQEAgLTcwNywxMiArNzA3LDEwIEBAIEFMTE9XX0RF UFJFQ0FURURfREVDTEFSQVRJT05TX0VORAogICAgIGlmICghdG8pCiAgICAgICAgIHJldHVybiBO U09yZGVyZWRTYW1lOwogCi0gICAgTlNJbnRlZ2VyIG9mZnNldCA9IGZyb20uaW5kZXggLSB0by5p bmRleDsKLQotICAgIGlmIChvZmZzZXQgPCAwKQorICAgIGlmIChmcm9tLmluZGV4IDwgdG8uaW5k ZXgpCiAgICAgICAgIHJldHVybiBOU09yZGVyZWRBc2NlbmRpbmc7CiAKLSAgICBpZiAob2Zmc2V0 ID4gMCkKKyAgICBpZiAoZnJvbS5pbmRleCA+IHRvLmluZGV4KQogICAgICAgICByZXR1cm4gTlNP cmRlcmVkRGVzY2VuZGluZzsKIAogICAgIHJldHVybiBOU09yZGVyZWRTYW1lOwo=