206009 2020-01-09 08:14:39 -0800 WKAccessibilityWebPageObject should use Accessibility::retrieveValueFromMainThread. 2020-01-09 13:40:13 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 andresg_22 andresg_22 cfleizach commit-queue dino webkit-bug-importer oldest_to_newest 1604632 0 andresg_22 2020-01-09 08:14:39 -0800 Make WKAccessibilityWebPageObjectt should use Accessibility::retrieveValueFromMainThread. 1604647 1 387235 andresg_22 2020-01-09 08:45:19 -0800 Created attachment 387235 Patch 1604664 2 387235 cfleizach 2020-01-09 09:09:16 -0800 Comment on attachment 387235 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=387235&action=review > Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm:193 > + return [NSValue valueWithPoint:(NSPoint)protectedSelf->m_page->accessibilityPosition()]; we should also check 'if (!protectedSelf->m_page) here > Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm:203 > + if (protectedSelf->m_page->corePage()->pageOverlayController().copyAccessibilityAttributeBoolValueForPoint(attribute, point, boolValue)) if (!protectedSelf->m_page) > Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm:208 > + if (protectedSelf->m_page->corePage()->pageOverlayController().copyAccessibilityAttributeStringValueForPoint(attribute, point, stringValue)) if (!protectedSelf->m_page) 1604696 3 387242 andresg_22 2020-01-09 10:22:41 -0800 Created attachment 387242 Patch 1604699 4 andresg_22 2020-01-09 10:25:36 -0800 (In reply to chris fleizach from comment #2) > Comment on attachment 387235 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=387235&action=review Also added the check in line 118. > > > Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm:193 > > + return [NSValue valueWithPoint:(NSPoint)protectedSelf->m_page->accessibilityPosition()]; > > we should also check > 'if (!protectedSelf->m_page) here Done. > > > Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm:203 > > + if (protectedSelf->m_page->corePage()->pageOverlayController().copyAccessibilityAttributeBoolValueForPoint(attribute, point, boolValue)) > > if (!protectedSelf->m_page) Done. > > > Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm:208 > > + if (protectedSelf->m_page->corePage()->pageOverlayController().copyAccessibilityAttributeStringValueForPoint(attribute, point, stringValue)) > > if (!protectedSelf->m_page) Done. 1604713 5 387242 dino 2020-01-09 10:38:43 -0800 Comment on attachment 387242 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=387242&action=review Is there any testable behaviour here? > Source/WebKit/ChangeLog:3 > + WKAccessibilityWebPageObjectt should use Accessibility::retrieveValueFromMainThread. Typo Objectt > Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm:56 > +#define PROTECTED_SELF protectedSelf = RetainPtr<WKAccessibilityWebPageObject>(self) We don't normally do something like this. We just duplicate the code. I don't really mind though. 1604720 6 387244 andresg_22 2020-01-09 10:52:08 -0800 Created attachment 387244 Patch 1604725 7 andresg_22 2020-01-09 11:00:59 -0800 (In reply to Dean Jackson from comment #5) > Comment on attachment 387242 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=387242&action=review > > Is there any testable behaviour here? Thanks Dean. We don't have a framework to test the WKAccessibilityWebPageObject functionality. We are working on a way to test the accessibility multi-threaded mode though, but are not there yet. > > > Source/WebKit/ChangeLog:3 > > + WKAccessibilityWebPageObjectt should use Accessibility::retrieveValueFromMainThread. > > Typo Objectt Fixed. > > > Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm:56 > > +#define PROTECTED_SELF protectedSelf = RetainPtr<WKAccessibilityWebPageObject>(self) > > We don't normally do something like this. We just duplicate the code. I > don't really mind though. Thought that it is more readable this way. 1604828 8 387244 commit-queue 2020-01-09 13:39:50 -0800 Comment on attachment 387244 Patch Clearing flags on attachment: 387244 Committed r254294: <https://trac.webkit.org/changeset/254294> 1604829 9 commit-queue 2020-01-09 13:39:51 -0800 All reviewed patches have been landed. Closing bug. 1604831 10 webkit-bug-importer 2020-01-09 13:40:13 -0800 <rdar://problem/58455650> 387235 2020-01-09 08:45:19 -0800 2020-01-09 10:22:39 -0800 Patch bug-206009-20200109114518.patch text/plain 8206 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0MTkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGFiMDA1ZmI2YjE0NWUxN2Ex M2Q0ZGZlZWZmNjJlMjI5ZmEyODk3ZWQuLmEyN2VjNzBlNmNjYmI5Y2Y0ZDMzYTQ3OGRiY2I4NGQy MGY5MDQ4ZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMjAtMDEtMDkgIEFuZHJlcyBH b256YWxleiAgPGFuZHJlc2dfMjJAYXBwbGUuY29tPgorCisgICAgICAgIFdLQWNjZXNzaWJpbGl0 eVdlYlBhZ2VPYmplY3R0IHNob3VsZCB1c2UgQWNjZXNzaWJpbGl0eTo6cmV0cmlldmVWYWx1ZUZy b21NYWluVGhyZWFkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjA2MDA5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgLSBXS0FjY2Vzc2liaWxpdHlXZWJQYWdlT2JqZWN0IG5vdyB1c2VzIEFjY2Vzc2liaWxp dHk6OnJldHJpZXZlVmFsdWVGcm9tTWFpblRocmVhZCwKKyAgICAgICAgd2hpY2ggaXMgY29uc2lz dGVudCB3aXRoIFdlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyLgorICAgICAgICAtIEl0IGFs c28gdXNlcyBhIGNhcHR1cmVkIHByb3RlY3RlZFNlbGYgdG8gZW5zdXJlIHRoZSBvYmplY3QgaXMg YWxpdmUKKyAgICAgICAgd2hlbiB0aGUgbGFtYmRhIGlzIGludm9rZWQgb24gdGhlIG1haW4gdGhy ZWFkLgorICAgICAgICAtIEFkZGVkIG51bGxpdHkgY2hlY2sgZm9yIG1fcGFnZSBpbiBhY2Nlc3Np YmlsaXR5QXR0cmlidXRlU2l6ZVZhbHVlLAorICAgICAgICB3aGljaCBpcyBhIHBvdGVudGlhbCBj cmFzaGVyIGluIHRoZSBtdWx0aXRocmVhZGVkIG1vZGUuCisKKyAgICAgICAgKiBXZWJQcm9jZXNz L1dlYlBhZ2UvbWFjL1dLQWNjZXNzaWJpbGl0eVdlYlBhZ2VPYmplY3RNYWMubW06CisgICAgICAg ICgtW1dLQWNjZXNzaWJpbGl0eVdlYlBhZ2VPYmplY3QgQUxMT1dfREVQUkVDQVRFRF9JTVBMRU1F TlRBVElPTlNfRU5EXSk6CisgICAgICAgICgtW1dLQWNjZXNzaWJpbGl0eVdlYlBhZ2VPYmplY3Qg Y29udmVydFNjcmVlblBvaW50VG9Sb290VmlldzpdKToKKyAgICAgICAgKC1bV0tBY2Nlc3NpYmls aXR5V2ViUGFnZU9iamVjdCBhY2Nlc3NpYmlsaXR5QXR0cmlidXRlU2l6ZVZhbHVlXSk6CisgICAg ICAgICgtW1dLQWNjZXNzaWJpbGl0eVdlYlBhZ2VPYmplY3QgYWNjZXNzaWJpbGl0eUF0dHJpYnV0 ZVBvc2l0aW9uVmFsdWVdKToKKyAgICAgICAgKC1bV0tBY2Nlc3NpYmlsaXR5V2ViUGFnZU9iamVj dCBhY2Nlc3NpYmlsaXR5RGF0YURldGVjdG9yVmFsdWU6cG9pbnQ6XSk6CisgICAgICAgICgtW1dL QWNjZXNzaWJpbGl0eVdlYlBhZ2VPYmplY3QgYWNjZXNzaWJpbGl0eUhpdFRlc3Q6XSk6CisgICAg ICAgIChyZXRyaWV2ZUFjY2Vzc2liaWxpdHlWYWx1ZUZyb21NYWluVGhyZWFkKTogTm90IG5lZWRl ZCBzaW5jZSBpdCB1c2VzIG5vdyB0aGUgb25lIGluIEFjY2Vzc2liaWxpdHkgbmFzZXNwYWNlLgor CiAyMDIwLTAxLTA4ICB5b3Vlbm4gZmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAg ICBJbXByb3ZlIGxvZ2dpbmcgb2YgY3JlYXRpbmcgYSBzZXJ2aWNlIHdvcmtlcgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dLQWNjZXNzaWJpbGl0eVdl YlBhZ2VPYmplY3RNYWMubW0gYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMv V0tBY2Nlc3NpYmlsaXR5V2ViUGFnZU9iamVjdE1hYy5tbQppbmRleCA4ZDEyMWJjYjM3MDA2Yjc0 M2I3MzY1YmI3ZGVhZjFmNjMzMjdiZTUwLi4zZDkxODNmMjllNDMxNWRjNWFhYzRkMjcxZWQwMmE1 MDlkNGIxNzE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9t YWMvV0tBY2Nlc3NpYmlsaXR5V2ViUGFnZU9iamVjdE1hYy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvV0tBY2Nlc3NpYmlsaXR5V2ViUGFnZU9iamVjdE1hYy5t bQpAQCAtNDksOSArNDksMTIgQEAKICNpbXBvcnQgPHBhbC9zcGkvY29jb2EvTlNBY2Nlc3NpYmls aXR5U1BJLmg+CiAjaW1wb3J0IDx3dGYvT2JqQ1J1bnRpbWVFeHRyYXMuaD4KIAorbmFtZXNwYWNl IGF4ID0gV2ViQ29yZTo6QWNjZXNzaWJpbGl0eTsKIAogQGltcGxlbWVudGF0aW9uIFdLQWNjZXNz aWJpbGl0eVdlYlBhZ2VPYmplY3QKIAorI2RlZmluZSBQUk9URUNURURfU0VMRiBwcm90ZWN0ZWRT ZWxmID0gUmV0YWluUHRyPFdLQWNjZXNzaWJpbGl0eVdlYlBhZ2VPYmplY3Q+KHNlbGYpCisKIC0g KHZvaWQpZGVhbGxvYwogewogICAgIE5TQWNjZXNzaWJpbGl0eVVucmVnaXN0ZXJVbmlxdWVJZEZv clVJRWxlbWVudChzZWxmKTsKQEAgLTc5LDI4ICs4MiwxNiBAQCBBTExPV19ERVBSRUNBVEVEX0lN UExFTUVOVEFUSU9OU19FTkQKICAgICByZXR1cm4gbV9hdHRyaWJ1dGVOYW1lcy5nZXQoKTsKIH0K IAotdGVtcGxhdGU8dHlwZW5hbWUgVCwgdHlwZW5hbWUgVT4gaW5saW5lIFQgcmV0cmlldmVBY2Nl c3NpYmlsaXR5VmFsdWVGcm9tTWFpblRocmVhZChVJiYgbGFtYmRhKQotewotICAgIGlmIChpc01h aW5UaHJlYWQoKSkKLSAgICAgICAgcmV0dXJuIGxhbWJkYSgpOwotCi0gICAgVCB2YWx1ZTsKLSAg ICBjYWxsT25NYWluVGhyZWFkQW5kV2FpdChbJnZhbHVlLCAmbGFtYmRhXSB7Ci0gICAgICAgIHZh bHVlID0gbGFtYmRhKCk7Ci0gICAgfSk7Ci0gICAgcmV0dXJuIHZhbHVlOwotfQotCiBBTExPV19E RVBSRUNBVEVEX0lNUExFTUVOVEFUSU9OU19CRUdJTgogLSAoTlNBcnJheSAqKWFjY2Vzc2liaWxp dHlQYXJhbWV0ZXJpemVkQXR0cmlidXRlTmFtZXMKIEFMTE9XX0RFUFJFQ0FURURfSU1QTEVNRU5U QVRJT05TX0VORAogewotICAgIHJldHVybiByZXRyaWV2ZUFjY2Vzc2liaWxpdHlWYWx1ZUZyb21N YWluVGhyZWFkPGlkPihbJnNlbGZdICgpIC0+IGlkIHsKKyAgICByZXR1cm4gYXg6OnJldHJpZXZl VmFsdWVGcm9tTWFpblRocmVhZDxpZD4oW1BST1RFQ1RFRF9TRUxGXSAoKSAtPiBpZCB7CiAgICAg ICAgIE5TTXV0YWJsZUFycmF5ICpuYW1lcyA9IFtOU011dGFibGVBcnJheSBhcnJheV07Ci0gICAg ICAgIGlmICghbV9wYWdlKQorICAgICAgICBpZiAoIXByb3RlY3RlZFNlbGYtPm1fcGFnZSkKICAg ICAgICAgICAgIHJldHVybiBuYW1lczsKICAgICAgICAgCi0gICAgICAgIGlmIChhdXRvIGNvcmVQ YWdlID0gbV9wYWdlLT5jb3JlUGFnZSgpKSB7CisgICAgICAgIGlmIChhdXRvIGNvcmVQYWdlID0g cHJvdGVjdGVkU2VsZi0+bV9wYWdlLT5jb3JlUGFnZSgpKSB7CiAgICAgICAgICAgICBmb3IgKGF1 dG8mIG5hbWUgOiBjb3JlUGFnZS0+cGFnZU92ZXJsYXlDb250cm9sbGVyKCkuY29weUFjY2Vzc2li aWxpdHlBdHRyaWJ1dGVzTmFtZXModHJ1ZSkpCiAgICAgICAgICAgICAgICAgW25hbWVzIGFkZE9i amVjdDooTlNTdHJpbmcgKiluYW1lXTsKICAgICAgICAgfQpAQCAtMTIzLDggKzExNCw4IEBAIEFM TE9XX0RFUFJFQ0FURURfSU1QTEVNRU5UQVRJT05TX0VORAogCiAtIChOU1BvaW50KWNvbnZlcnRT Y3JlZW5Qb2ludFRvUm9vdFZpZXc6KE5TUG9pbnQpcG9pbnQKIHsKLSAgICByZXR1cm4gcmV0cmll dmVBY2Nlc3NpYmlsaXR5VmFsdWVGcm9tTWFpblRocmVhZDxOU1BvaW50PihbJnNlbGYsICZwb2lu dF0gKCkgLT4gTlNQb2ludCB7Ci0gICAgICAgIHJldHVybiBtX3BhZ2UtPnNjcmVlblRvUm9vdFZp ZXcoV2ViQ29yZTo6SW50UG9pbnQocG9pbnQueCwgcG9pbnQueSkpOworICAgIHJldHVybiBheDo6 cmV0cmlldmVWYWx1ZUZyb21NYWluVGhyZWFkPE5TUG9pbnQ+KFsmcG9pbnQsIFBST1RFQ1RFRF9T RUxGXSAoKSAtPiBOU1BvaW50IHsKKyAgICAgICAgcmV0dXJuIHByb3RlY3RlZFNlbGYtPm1fcGFn ZS0+c2NyZWVuVG9Sb290VmlldyhXZWJDb3JlOjpJbnRQb2ludChwb2ludC54LCBwb2ludC55KSk7 CiAgICAgfSk7CiB9CiAKQEAgLTE4OSwzMCArMTgwLDMyIEBAIEFMTE9XX0RFUFJFQ0FURURfSU1Q TEVNRU5UQVRJT05TX0VORAogCiAtIChOU1ZhbHVlICopYWNjZXNzaWJpbGl0eUF0dHJpYnV0ZVNp emVWYWx1ZQogewotICAgIHJldHVybiByZXRyaWV2ZUFjY2Vzc2liaWxpdHlWYWx1ZUZyb21NYWlu VGhyZWFkPGlkPihbJnNlbGZdICgpIC0+IGlkIHsKLSAgICAgICAgcmV0dXJuIFtOU1ZhbHVlIHZh bHVlV2l0aFNpemU6KE5TU2l6ZSltX3BhZ2UtPnNpemUoKV07CisgICAgcmV0dXJuIGF4OjpyZXRy aWV2ZVZhbHVlRnJvbU1haW5UaHJlYWQ8aWQ+KFtQUk9URUNURURfU0VMRl0gKCkgLT4gaWQgewor ICAgICAgICBpZiAoIXByb3RlY3RlZFNlbGYtPm1fcGFnZSkKKyAgICAgICAgICAgIHJldHVybiBu aWw7CisgICAgICAgIHJldHVybiBbTlNWYWx1ZSB2YWx1ZVdpdGhTaXplOihOU1NpemUpcHJvdGVj dGVkU2VsZi0+bV9wYWdlLT5zaXplKCldOwogICAgIH0pOwogfQogCiAtIChOU1ZhbHVlICopYWNj ZXNzaWJpbGl0eUF0dHJpYnV0ZVBvc2l0aW9uVmFsdWUKIHsKLSAgICByZXR1cm4gcmV0cmlldmVB Y2Nlc3NpYmlsaXR5VmFsdWVGcm9tTWFpblRocmVhZDxpZD4oWyZzZWxmXSAoKSAtPiBpZCB7Ci0g ICAgICAgIHJldHVybiBbTlNWYWx1ZSB2YWx1ZVdpdGhQb2ludDooTlNQb2ludCltX3BhZ2UtPmFj Y2Vzc2liaWxpdHlQb3NpdGlvbigpXTsKKyAgICByZXR1cm4gYXg6OnJldHJpZXZlVmFsdWVGcm9t TWFpblRocmVhZDxpZD4oW1BST1RFQ1RFRF9TRUxGXSAoKSAtPiBpZCB7CisgICAgICAgIHJldHVy biBbTlNWYWx1ZSB2YWx1ZVdpdGhQb2ludDooTlNQb2ludClwcm90ZWN0ZWRTZWxmLT5tX3BhZ2Ut PmFjY2Vzc2liaWxpdHlQb3NpdGlvbigpXTsKICAgICB9KTsKIH0KIAogLSAoaWQpYWNjZXNzaWJp bGl0eURhdGFEZXRlY3RvclZhbHVlOihOU1N0cmluZyAqKWF0dHJpYnV0ZSBwb2ludDooV2ViQ29y ZTo6RmxvYXRQb2ludCYpcG9pbnQKIHsKLSAgICByZXR1cm4gcmV0cmlldmVBY2Nlc3NpYmlsaXR5 VmFsdWVGcm9tTWFpblRocmVhZDxpZD4oWyZzZWxmLCAmYXR0cmlidXRlLCAmcG9pbnRdICgpIC0+ IGlkIHsKKyAgICByZXR1cm4gYXg6OnJldHJpZXZlVmFsdWVGcm9tTWFpblRocmVhZDxpZD4oWyZh dHRyaWJ1dGUsICZwb2ludCwgUFJPVEVDVEVEX1NFTEZdICgpIC0+IGlkIHsKICAgICAgICAgaWQg dmFsdWUgPSBuaWw7CiAgICAgICAgIGlmIChbYXR0cmlidXRlIGlzRXF1YWxUb1N0cmluZzpAIkFY RGF0YURldGVjdG9yRXhpc3RzQXRQb2ludCJdIHx8IFthdHRyaWJ1dGUgaXNFcXVhbFRvU3RyaW5n OkAiQVhEaWRTaG93RGF0YURldGVjdG9yTWVudUF0UG9pbnQiXSkgewogICAgICAgICAgICAgYm9v bCBib29sVmFsdWU7Ci0gICAgICAgICAgICBpZiAobV9wYWdlLT5jb3JlUGFnZSgpLT5wYWdlT3Zl cmxheUNvbnRyb2xsZXIoKS5jb3B5QWNjZXNzaWJpbGl0eUF0dHJpYnV0ZUJvb2xWYWx1ZUZvclBv aW50KGF0dHJpYnV0ZSwgcG9pbnQsIGJvb2xWYWx1ZSkpCisgICAgICAgICAgICBpZiAocHJvdGVj dGVkU2VsZi0+bV9wYWdlLT5jb3JlUGFnZSgpLT5wYWdlT3ZlcmxheUNvbnRyb2xsZXIoKS5jb3B5 QWNjZXNzaWJpbGl0eUF0dHJpYnV0ZUJvb2xWYWx1ZUZvclBvaW50KGF0dHJpYnV0ZSwgcG9pbnQs IGJvb2xWYWx1ZSkpCiAgICAgICAgICAgICAgICAgdmFsdWUgPSBbTlNOdW1iZXIgbnVtYmVyV2l0 aEJvb2w6Ym9vbFZhbHVlXTsKICAgICAgICAgfQogICAgICAgICBpZiAoW2F0dHJpYnV0ZSBpc0Vx dWFsVG9TdHJpbmc6QCJBWERhdGFEZXRlY3RvclR5cGVBdFBvaW50Il0pIHsKICAgICAgICAgICAg IFN0cmluZyBzdHJpbmdWYWx1ZTsKLSAgICAgICAgICAgIGlmIChtX3BhZ2UtPmNvcmVQYWdlKCkt PnBhZ2VPdmVybGF5Q29udHJvbGxlcigpLmNvcHlBY2Nlc3NpYmlsaXR5QXR0cmlidXRlU3RyaW5n VmFsdWVGb3JQb2ludChhdHRyaWJ1dGUsIHBvaW50LCBzdHJpbmdWYWx1ZSkpCisgICAgICAgICAg ICBpZiAocHJvdGVjdGVkU2VsZi0+bV9wYWdlLT5jb3JlUGFnZSgpLT5wYWdlT3ZlcmxheUNvbnRy b2xsZXIoKS5jb3B5QWNjZXNzaWJpbGl0eUF0dHJpYnV0ZVN0cmluZ1ZhbHVlRm9yUG9pbnQoYXR0 cmlidXRlLCBwb2ludCwgc3RyaW5nVmFsdWUpKQogICAgICAgICAgICAgICAgIHZhbHVlID0gW05T U3RyaW5nIHN0cmluZ1dpdGhTdHJpbmc6c3RyaW5nVmFsdWVdOwogICAgICAgICB9CiAgICAgICAg IHJldHVybiB2YWx1ZTsKQEAgLTI0MywxMiArMjM2LDEyIEBAIEFMTE9XX0RFUFJFQ0FURURfSU1Q TEVNRU5UQVRJT05TX0VORAogQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfQkVHSU4KIC0g KGlkKWFjY2Vzc2liaWxpdHlIaXRUZXN0OihOU1BvaW50KXBvaW50CiB7Ci0gICAgYXV0byBjb252 ZXJ0ZWRQb2ludCA9IHJldHJpZXZlQWNjZXNzaWJpbGl0eVZhbHVlRnJvbU1haW5UaHJlYWQ8V2Vi Q29yZTo6SW50UG9pbnQ+KFsmc2VsZiwgJnBvaW50XSAoKSAtPiBXZWJDb3JlOjpJbnRQb2ludCB7 Ci0gICAgICAgIGlmICghbV9wYWdlKQorICAgIGF1dG8gY29udmVydGVkUG9pbnQgPSBheDo6cmV0 cmlldmVWYWx1ZUZyb21NYWluVGhyZWFkPFdlYkNvcmU6OkludFBvaW50PihbJnBvaW50LCBQUk9U RUNURURfU0VMRl0gKCkgLT4gV2ViQ29yZTo6SW50UG9pbnQgeworICAgICAgICBpZiAoIXByb3Rl Y3RlZFNlbGYtPm1fcGFnZSkKICAgICAgICAgICAgIHJldHVybiBXZWJDb3JlOjpJbnRQb2ludChw b2ludCk7Ci0gICAgICAgIAotICAgICAgICBhdXRvIGNvbnZlcnRlZFBvaW50ID0gbV9wYWdlLT5z Y3JlZW5Ub1Jvb3RWaWV3KFdlYkNvcmU6OkludFBvaW50KHBvaW50KSk7Ci0gICAgICAgIAorCisg ICAgICAgIGF1dG8gY29udmVydGVkUG9pbnQgPSBwcm90ZWN0ZWRTZWxmLT5tX3BhZ2UtPnNjcmVl blRvUm9vdFZpZXcoV2ViQ29yZTo6SW50UG9pbnQocG9pbnQpKTsKKwogICAgICAgICAvLyBTb21l IHBsdWdpbnMgbWF5IGJlIGFibGUgdG8gZmlndXJlIG91dCB0aGUgc2Nyb2xsIHBvc2l0aW9uIGFu ZCBpbnNldCBvbiB0aGVpciBvd24uCiAgICAgICAgIGJvb2wgYXBwbHlDb250ZW50T2Zmc2V0ID0g dHJ1ZTsKIApAQCAtMjU3LDE1ICsyNTAsMTUgQEAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElP TlNfQkVHSU4KICAgICAgICAgYm9vbCBxdWVyeWluZ0lzb2xhdGVkVHJlZSA9IFdlYkNvcmU6OkFY T2JqZWN0Q2FjaGU6OmNsaWVudFN1cHBvcnRzSXNvbGF0ZWRUcmVlKCkgJiYgX0FYVUlFbGVtZW50 UmVxdWVzdFNlcnZpY2VkQnlTZWNvbmRhcnlBWFRocmVhZCgpOwogICAgICAgICBhcHBseUNvbnRl bnRPZmZzZXQgPSAhcXVlcnlpbmdJc29sYXRlZFRyZWU7CiAjZW5kaWYKLSAgICAgICAgaWYgKGF1 dG8gcGx1Z2luVmlldyA9IFdlYktpdDo6V2ViUGFnZTo6cGx1Z2luVmlld0ZvckZyYW1lKG1fcGFn ZS0+bWFpbkZyYW1lKCkpKQorICAgICAgICBpZiAoYXV0byBwbHVnaW5WaWV3ID0gV2ViS2l0OjpX ZWJQYWdlOjpwbHVnaW5WaWV3Rm9yRnJhbWUocHJvdGVjdGVkU2VsZi0+bV9wYWdlLT5tYWluRnJh bWUoKSkpCiAgICAgICAgICAgICBhcHBseUNvbnRlbnRPZmZzZXQgPSAhcGx1Z2luVmlldy0+cGx1 Z2luKCktPnBsdWdpbkhhbmRsZXNDb250ZW50T2Zmc2V0Rm9yQWNjZXNzaWJpbGl0eUhpdFRlc3Qo KTsKICAgICAgICAgCiAgICAgICAgIGlmICghYXBwbHlDb250ZW50T2Zmc2V0KQogICAgICAgICAg ICAgcmV0dXJuIGNvbnZlcnRlZFBvaW50OwogCi0gICAgICAgIGlmIChXZWJDb3JlOjpGcmFtZVZp ZXcqIGZyYW1lVmlldyA9IG1fcGFnZS0+bWFpbkZyYW1lVmlldygpKQorICAgICAgICBpZiAoYXV0 byogZnJhbWVWaWV3ID0gcHJvdGVjdGVkU2VsZi0+bV9wYWdlLT5tYWluRnJhbWVWaWV3KCkpCiAg ICAgICAgICAgICBjb252ZXJ0ZWRQb2ludC5tb3ZlQnkoZnJhbWVWaWV3LT5zY3JvbGxQb3NpdGlv bigpKTsKLSAgICAgICAgaWYgKFdlYkNvcmU6OlBhZ2UqIHBhZ2UgPSBtX3BhZ2UtPmNvcmVQYWdl KCkpCisgICAgICAgIGlmIChhdXRvKiBwYWdlID0gcHJvdGVjdGVkU2VsZi0+bV9wYWdlLT5jb3Jl UGFnZSgpKQogICAgICAgICAgICAgY29udmVydGVkUG9pbnQubW92ZSgwLCAtcGFnZS0+dG9wQ29u dGVudEluc2V0KCkpOwogICAgICAgICByZXR1cm4gY29udmVydGVkUG9pbnQ7CiAgICAgfSk7Cg== 387242 2020-01-09 10:22:41 -0800 2020-01-09 10:52:06 -0800 Patch bug-206009-20200109132240.patch text/plain 8395 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0MTkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGFiMDA1ZmI2YjE0NWUxN2Ex M2Q0ZGZlZWZmNjJlMjI5ZmEyODk3ZWQuLmEyN2VjNzBlNmNjYmI5Y2Y0ZDMzYTQ3OGRiY2I4NGQy MGY5MDQ4ZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMjAtMDEtMDkgIEFuZHJlcyBH b256YWxleiAgPGFuZHJlc2dfMjJAYXBwbGUuY29tPgorCisgICAgICAgIFdLQWNjZXNzaWJpbGl0 eVdlYlBhZ2VPYmplY3R0IHNob3VsZCB1c2UgQWNjZXNzaWJpbGl0eTo6cmV0cmlldmVWYWx1ZUZy b21NYWluVGhyZWFkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjA2MDA5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgLSBXS0FjY2Vzc2liaWxpdHlXZWJQYWdlT2JqZWN0IG5vdyB1c2VzIEFjY2Vzc2liaWxp dHk6OnJldHJpZXZlVmFsdWVGcm9tTWFpblRocmVhZCwKKyAgICAgICAgd2hpY2ggaXMgY29uc2lz dGVudCB3aXRoIFdlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyLgorICAgICAgICAtIEl0IGFs c28gdXNlcyBhIGNhcHR1cmVkIHByb3RlY3RlZFNlbGYgdG8gZW5zdXJlIHRoZSBvYmplY3QgaXMg YWxpdmUKKyAgICAgICAgd2hlbiB0aGUgbGFtYmRhIGlzIGludm9rZWQgb24gdGhlIG1haW4gdGhy ZWFkLgorICAgICAgICAtIEFkZGVkIG51bGxpdHkgY2hlY2sgZm9yIG1fcGFnZSBpbiBhY2Nlc3Np YmlsaXR5QXR0cmlidXRlU2l6ZVZhbHVlLAorICAgICAgICB3aGljaCBpcyBhIHBvdGVudGlhbCBj cmFzaGVyIGluIHRoZSBtdWx0aXRocmVhZGVkIG1vZGUuCisKKyAgICAgICAgKiBXZWJQcm9jZXNz L1dlYlBhZ2UvbWFjL1dLQWNjZXNzaWJpbGl0eVdlYlBhZ2VPYmplY3RNYWMubW06CisgICAgICAg ICgtW1dLQWNjZXNzaWJpbGl0eVdlYlBhZ2VPYmplY3QgQUxMT1dfREVQUkVDQVRFRF9JTVBMRU1F TlRBVElPTlNfRU5EXSk6CisgICAgICAgICgtW1dLQWNjZXNzaWJpbGl0eVdlYlBhZ2VPYmplY3Qg Y29udmVydFNjcmVlblBvaW50VG9Sb290VmlldzpdKToKKyAgICAgICAgKC1bV0tBY2Nlc3NpYmls aXR5V2ViUGFnZU9iamVjdCBhY2Nlc3NpYmlsaXR5QXR0cmlidXRlU2l6ZVZhbHVlXSk6CisgICAg ICAgICgtW1dLQWNjZXNzaWJpbGl0eVdlYlBhZ2VPYmplY3QgYWNjZXNzaWJpbGl0eUF0dHJpYnV0 ZVBvc2l0aW9uVmFsdWVdKToKKyAgICAgICAgKC1bV0tBY2Nlc3NpYmlsaXR5V2ViUGFnZU9iamVj dCBhY2Nlc3NpYmlsaXR5RGF0YURldGVjdG9yVmFsdWU6cG9pbnQ6XSk6CisgICAgICAgICgtW1dL QWNjZXNzaWJpbGl0eVdlYlBhZ2VPYmplY3QgYWNjZXNzaWJpbGl0eUhpdFRlc3Q6XSk6CisgICAg ICAgIChyZXRyaWV2ZUFjY2Vzc2liaWxpdHlWYWx1ZUZyb21NYWluVGhyZWFkKTogTm90IG5lZWRl ZCBzaW5jZSBpdCB1c2VzIG5vdyB0aGUgb25lIGluIEFjY2Vzc2liaWxpdHkgbmFzZXNwYWNlLgor CiAyMDIwLTAxLTA4ICB5b3Vlbm4gZmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAg ICBJbXByb3ZlIGxvZ2dpbmcgb2YgY3JlYXRpbmcgYSBzZXJ2aWNlIHdvcmtlcgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dLQWNjZXNzaWJpbGl0eVdl YlBhZ2VPYmplY3RNYWMubW0gYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMv V0tBY2Nlc3NpYmlsaXR5V2ViUGFnZU9iamVjdE1hYy5tbQppbmRleCA4ZDEyMWJjYjM3MDA2Yjc0 M2I3MzY1YmI3ZGVhZjFmNjMzMjdiZTUwLi41OTE0ZWM0MjI4NTdhZjExNTE2ODgwMTBlZTNiNjJk MmFkNTM1ZGY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9t YWMvV0tBY2Nlc3NpYmlsaXR5V2ViUGFnZU9iamVjdE1hYy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvV0tBY2Nlc3NpYmlsaXR5V2ViUGFnZU9iamVjdE1hYy5t bQpAQCAtNDksOSArNDksMTIgQEAKICNpbXBvcnQgPHBhbC9zcGkvY29jb2EvTlNBY2Nlc3NpYmls aXR5U1BJLmg+CiAjaW1wb3J0IDx3dGYvT2JqQ1J1bnRpbWVFeHRyYXMuaD4KIAorbmFtZXNwYWNl IGF4ID0gV2ViQ29yZTo6QWNjZXNzaWJpbGl0eTsKIAogQGltcGxlbWVudGF0aW9uIFdLQWNjZXNz aWJpbGl0eVdlYlBhZ2VPYmplY3QKIAorI2RlZmluZSBQUk9URUNURURfU0VMRiBwcm90ZWN0ZWRT ZWxmID0gUmV0YWluUHRyPFdLQWNjZXNzaWJpbGl0eVdlYlBhZ2VPYmplY3Q+KHNlbGYpCisKIC0g KHZvaWQpZGVhbGxvYwogewogICAgIE5TQWNjZXNzaWJpbGl0eVVucmVnaXN0ZXJVbmlxdWVJZEZv clVJRWxlbWVudChzZWxmKTsKQEAgLTc5LDI4ICs4MiwxNiBAQCBBTExPV19ERVBSRUNBVEVEX0lN UExFTUVOVEFUSU9OU19FTkQKICAgICByZXR1cm4gbV9hdHRyaWJ1dGVOYW1lcy5nZXQoKTsKIH0K IAotdGVtcGxhdGU8dHlwZW5hbWUgVCwgdHlwZW5hbWUgVT4gaW5saW5lIFQgcmV0cmlldmVBY2Nl c3NpYmlsaXR5VmFsdWVGcm9tTWFpblRocmVhZChVJiYgbGFtYmRhKQotewotICAgIGlmIChpc01h aW5UaHJlYWQoKSkKLSAgICAgICAgcmV0dXJuIGxhbWJkYSgpOwotCi0gICAgVCB2YWx1ZTsKLSAg ICBjYWxsT25NYWluVGhyZWFkQW5kV2FpdChbJnZhbHVlLCAmbGFtYmRhXSB7Ci0gICAgICAgIHZh bHVlID0gbGFtYmRhKCk7Ci0gICAgfSk7Ci0gICAgcmV0dXJuIHZhbHVlOwotfQotCiBBTExPV19E RVBSRUNBVEVEX0lNUExFTUVOVEFUSU9OU19CRUdJTgogLSAoTlNBcnJheSAqKWFjY2Vzc2liaWxp dHlQYXJhbWV0ZXJpemVkQXR0cmlidXRlTmFtZXMKIEFMTE9XX0RFUFJFQ0FURURfSU1QTEVNRU5U QVRJT05TX0VORAogewotICAgIHJldHVybiByZXRyaWV2ZUFjY2Vzc2liaWxpdHlWYWx1ZUZyb21N YWluVGhyZWFkPGlkPihbJnNlbGZdICgpIC0+IGlkIHsKKyAgICByZXR1cm4gYXg6OnJldHJpZXZl VmFsdWVGcm9tTWFpblRocmVhZDxpZD4oW1BST1RFQ1RFRF9TRUxGXSAoKSAtPiBpZCB7CiAgICAg ICAgIE5TTXV0YWJsZUFycmF5ICpuYW1lcyA9IFtOU011dGFibGVBcnJheSBhcnJheV07Ci0gICAg ICAgIGlmICghbV9wYWdlKQorICAgICAgICBpZiAoIXByb3RlY3RlZFNlbGYtPm1fcGFnZSkKICAg ICAgICAgICAgIHJldHVybiBuYW1lczsKICAgICAgICAgCi0gICAgICAgIGlmIChhdXRvIGNvcmVQ YWdlID0gbV9wYWdlLT5jb3JlUGFnZSgpKSB7CisgICAgICAgIGlmIChhdXRvIGNvcmVQYWdlID0g cHJvdGVjdGVkU2VsZi0+bV9wYWdlLT5jb3JlUGFnZSgpKSB7CiAgICAgICAgICAgICBmb3IgKGF1 dG8mIG5hbWUgOiBjb3JlUGFnZS0+cGFnZU92ZXJsYXlDb250cm9sbGVyKCkuY29weUFjY2Vzc2li aWxpdHlBdHRyaWJ1dGVzTmFtZXModHJ1ZSkpCiAgICAgICAgICAgICAgICAgW25hbWVzIGFkZE9i amVjdDooTlNTdHJpbmcgKiluYW1lXTsKICAgICAgICAgfQpAQCAtMTIzLDggKzExNCwxMCBAQCBB TExPV19ERVBSRUNBVEVEX0lNUExFTUVOVEFUSU9OU19FTkQKIAogLSAoTlNQb2ludCljb252ZXJ0 U2NyZWVuUG9pbnRUb1Jvb3RWaWV3OihOU1BvaW50KXBvaW50CiB7Ci0gICAgcmV0dXJuIHJldHJp ZXZlQWNjZXNzaWJpbGl0eVZhbHVlRnJvbU1haW5UaHJlYWQ8TlNQb2ludD4oWyZzZWxmLCAmcG9p bnRdICgpIC0+IE5TUG9pbnQgewotICAgICAgICByZXR1cm4gbV9wYWdlLT5zY3JlZW5Ub1Jvb3RW aWV3KFdlYkNvcmU6OkludFBvaW50KHBvaW50LngsIHBvaW50LnkpKTsKKyAgICByZXR1cm4gYXg6 OnJldHJpZXZlVmFsdWVGcm9tTWFpblRocmVhZDxOU1BvaW50PihbJnBvaW50LCBQUk9URUNURURf U0VMRl0gKCkgLT4gTlNQb2ludCB7CisgICAgICAgIGlmICghcHJvdGVjdGVkU2VsZi0+bV9wYWdl KQorICAgICAgICAgICAgcmV0dXJuIHBvaW50OworICAgICAgICByZXR1cm4gcHJvdGVjdGVkU2Vs Zi0+bV9wYWdlLT5zY3JlZW5Ub1Jvb3RWaWV3KFdlYkNvcmU6OkludFBvaW50KHBvaW50LngsIHBv aW50LnkpKTsKICAgICB9KTsKIH0KIApAQCAtMTg5LDMwICsxODIsMzYgQEAgQUxMT1dfREVQUkVD QVRFRF9JTVBMRU1FTlRBVElPTlNfRU5ECiAKIC0gKE5TVmFsdWUgKilhY2Nlc3NpYmlsaXR5QXR0 cmlidXRlU2l6ZVZhbHVlCiB7Ci0gICAgcmV0dXJuIHJldHJpZXZlQWNjZXNzaWJpbGl0eVZhbHVl RnJvbU1haW5UaHJlYWQ8aWQ+KFsmc2VsZl0gKCkgLT4gaWQgewotICAgICAgICByZXR1cm4gW05T VmFsdWUgdmFsdWVXaXRoU2l6ZTooTlNTaXplKW1fcGFnZS0+c2l6ZSgpXTsKKyAgICByZXR1cm4g YXg6OnJldHJpZXZlVmFsdWVGcm9tTWFpblRocmVhZDxpZD4oW1BST1RFQ1RFRF9TRUxGXSAoKSAt PiBpZCB7CisgICAgICAgIGlmICghcHJvdGVjdGVkU2VsZi0+bV9wYWdlKQorICAgICAgICAgICAg cmV0dXJuIG5pbDsKKyAgICAgICAgcmV0dXJuIFtOU1ZhbHVlIHZhbHVlV2l0aFNpemU6KE5TU2l6 ZSlwcm90ZWN0ZWRTZWxmLT5tX3BhZ2UtPnNpemUoKV07CiAgICAgfSk7CiB9CiAKIC0gKE5TVmFs dWUgKilhY2Nlc3NpYmlsaXR5QXR0cmlidXRlUG9zaXRpb25WYWx1ZQogewotICAgIHJldHVybiBy ZXRyaWV2ZUFjY2Vzc2liaWxpdHlWYWx1ZUZyb21NYWluVGhyZWFkPGlkPihbJnNlbGZdICgpIC0+ IGlkIHsKLSAgICAgICAgcmV0dXJuIFtOU1ZhbHVlIHZhbHVlV2l0aFBvaW50OihOU1BvaW50KW1f cGFnZS0+YWNjZXNzaWJpbGl0eVBvc2l0aW9uKCldOworICAgIHJldHVybiBheDo6cmV0cmlldmVW YWx1ZUZyb21NYWluVGhyZWFkPGlkPihbUFJPVEVDVEVEX1NFTEZdICgpIC0+IGlkIHsKKyAgICAg ICAgaWYgKCFwcm90ZWN0ZWRTZWxmLT5tX3BhZ2UpCisgICAgICAgICAgICByZXR1cm4gbmlsOwor ICAgICAgICByZXR1cm4gW05TVmFsdWUgdmFsdWVXaXRoUG9pbnQ6KE5TUG9pbnQpcHJvdGVjdGVk U2VsZi0+bV9wYWdlLT5hY2Nlc3NpYmlsaXR5UG9zaXRpb24oKV07CiAgICAgfSk7CiB9CiAKIC0g KGlkKWFjY2Vzc2liaWxpdHlEYXRhRGV0ZWN0b3JWYWx1ZTooTlNTdHJpbmcgKilhdHRyaWJ1dGUg cG9pbnQ6KFdlYkNvcmU6OkZsb2F0UG9pbnQmKXBvaW50CiB7Ci0gICAgcmV0dXJuIHJldHJpZXZl QWNjZXNzaWJpbGl0eVZhbHVlRnJvbU1haW5UaHJlYWQ8aWQ+KFsmc2VsZiwgJmF0dHJpYnV0ZSwg JnBvaW50XSAoKSAtPiBpZCB7CisgICAgcmV0dXJuIGF4OjpyZXRyaWV2ZVZhbHVlRnJvbU1haW5U aHJlYWQ8aWQ+KFsmYXR0cmlidXRlLCAmcG9pbnQsIFBST1RFQ1RFRF9TRUxGXSAoKSAtPiBpZCB7 CisgICAgICAgIGlmICghcHJvdGVjdGVkU2VsZi0+bV9wYWdlKQorICAgICAgICAgICAgcmV0dXJu IG5pbDsKICAgICAgICAgaWQgdmFsdWUgPSBuaWw7CiAgICAgICAgIGlmIChbYXR0cmlidXRlIGlz RXF1YWxUb1N0cmluZzpAIkFYRGF0YURldGVjdG9yRXhpc3RzQXRQb2ludCJdIHx8IFthdHRyaWJ1 dGUgaXNFcXVhbFRvU3RyaW5nOkAiQVhEaWRTaG93RGF0YURldGVjdG9yTWVudUF0UG9pbnQiXSkg ewogICAgICAgICAgICAgYm9vbCBib29sVmFsdWU7Ci0gICAgICAgICAgICBpZiAobV9wYWdlLT5j b3JlUGFnZSgpLT5wYWdlT3ZlcmxheUNvbnRyb2xsZXIoKS5jb3B5QWNjZXNzaWJpbGl0eUF0dHJp YnV0ZUJvb2xWYWx1ZUZvclBvaW50KGF0dHJpYnV0ZSwgcG9pbnQsIGJvb2xWYWx1ZSkpCisgICAg ICAgICAgICBpZiAocHJvdGVjdGVkU2VsZi0+bV9wYWdlLT5jb3JlUGFnZSgpLT5wYWdlT3Zlcmxh eUNvbnRyb2xsZXIoKS5jb3B5QWNjZXNzaWJpbGl0eUF0dHJpYnV0ZUJvb2xWYWx1ZUZvclBvaW50 KGF0dHJpYnV0ZSwgcG9pbnQsIGJvb2xWYWx1ZSkpCiAgICAgICAgICAgICAgICAgdmFsdWUgPSBb TlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6Ym9vbFZhbHVlXTsKICAgICAgICAgfQogICAgICAgICBp ZiAoW2F0dHJpYnV0ZSBpc0VxdWFsVG9TdHJpbmc6QCJBWERhdGFEZXRlY3RvclR5cGVBdFBvaW50 Il0pIHsKICAgICAgICAgICAgIFN0cmluZyBzdHJpbmdWYWx1ZTsKLSAgICAgICAgICAgIGlmICht X3BhZ2UtPmNvcmVQYWdlKCktPnBhZ2VPdmVybGF5Q29udHJvbGxlcigpLmNvcHlBY2Nlc3NpYmls aXR5QXR0cmlidXRlU3RyaW5nVmFsdWVGb3JQb2ludChhdHRyaWJ1dGUsIHBvaW50LCBzdHJpbmdW YWx1ZSkpCisgICAgICAgICAgICBpZiAocHJvdGVjdGVkU2VsZi0+bV9wYWdlLT5jb3JlUGFnZSgp LT5wYWdlT3ZlcmxheUNvbnRyb2xsZXIoKS5jb3B5QWNjZXNzaWJpbGl0eUF0dHJpYnV0ZVN0cmlu Z1ZhbHVlRm9yUG9pbnQoYXR0cmlidXRlLCBwb2ludCwgc3RyaW5nVmFsdWUpKQogICAgICAgICAg ICAgICAgIHZhbHVlID0gW05TU3RyaW5nIHN0cmluZ1dpdGhTdHJpbmc6c3RyaW5nVmFsdWVdOwog ICAgICAgICB9CiAgICAgICAgIHJldHVybiB2YWx1ZTsKQEAgLTI0MywxMiArMjQyLDEyIEBAIEFM TE9XX0RFUFJFQ0FURURfSU1QTEVNRU5UQVRJT05TX0VORAogQUxMT1dfREVQUkVDQVRFRF9ERUNM QVJBVElPTlNfQkVHSU4KIC0gKGlkKWFjY2Vzc2liaWxpdHlIaXRUZXN0OihOU1BvaW50KXBvaW50 CiB7Ci0gICAgYXV0byBjb252ZXJ0ZWRQb2ludCA9IHJldHJpZXZlQWNjZXNzaWJpbGl0eVZhbHVl RnJvbU1haW5UaHJlYWQ8V2ViQ29yZTo6SW50UG9pbnQ+KFsmc2VsZiwgJnBvaW50XSAoKSAtPiBX ZWJDb3JlOjpJbnRQb2ludCB7Ci0gICAgICAgIGlmICghbV9wYWdlKQorICAgIGF1dG8gY29udmVy dGVkUG9pbnQgPSBheDo6cmV0cmlldmVWYWx1ZUZyb21NYWluVGhyZWFkPFdlYkNvcmU6OkludFBv aW50PihbJnBvaW50LCBQUk9URUNURURfU0VMRl0gKCkgLT4gV2ViQ29yZTo6SW50UG9pbnQgewor ICAgICAgICBpZiAoIXByb3RlY3RlZFNlbGYtPm1fcGFnZSkKICAgICAgICAgICAgIHJldHVybiBX ZWJDb3JlOjpJbnRQb2ludChwb2ludCk7Ci0gICAgICAgIAotICAgICAgICBhdXRvIGNvbnZlcnRl ZFBvaW50ID0gbV9wYWdlLT5zY3JlZW5Ub1Jvb3RWaWV3KFdlYkNvcmU6OkludFBvaW50KHBvaW50 KSk7Ci0gICAgICAgIAorCisgICAgICAgIGF1dG8gY29udmVydGVkUG9pbnQgPSBwcm90ZWN0ZWRT ZWxmLT5tX3BhZ2UtPnNjcmVlblRvUm9vdFZpZXcoV2ViQ29yZTo6SW50UG9pbnQocG9pbnQpKTsK KwogICAgICAgICAvLyBTb21lIHBsdWdpbnMgbWF5IGJlIGFibGUgdG8gZmlndXJlIG91dCB0aGUg c2Nyb2xsIHBvc2l0aW9uIGFuZCBpbnNldCBvbiB0aGVpciBvd24uCiAgICAgICAgIGJvb2wgYXBw bHlDb250ZW50T2Zmc2V0ID0gdHJ1ZTsKIApAQCAtMjU3LDE1ICsyNTYsMTUgQEAgQUxMT1dfREVQ UkVDQVRFRF9ERUNMQVJBVElPTlNfQkVHSU4KICAgICAgICAgYm9vbCBxdWVyeWluZ0lzb2xhdGVk VHJlZSA9IFdlYkNvcmU6OkFYT2JqZWN0Q2FjaGU6OmNsaWVudFN1cHBvcnRzSXNvbGF0ZWRUcmVl KCkgJiYgX0FYVUlFbGVtZW50UmVxdWVzdFNlcnZpY2VkQnlTZWNvbmRhcnlBWFRocmVhZCgpOwog ICAgICAgICBhcHBseUNvbnRlbnRPZmZzZXQgPSAhcXVlcnlpbmdJc29sYXRlZFRyZWU7CiAjZW5k aWYKLSAgICAgICAgaWYgKGF1dG8gcGx1Z2luVmlldyA9IFdlYktpdDo6V2ViUGFnZTo6cGx1Z2lu Vmlld0ZvckZyYW1lKG1fcGFnZS0+bWFpbkZyYW1lKCkpKQorICAgICAgICBpZiAoYXV0byBwbHVn aW5WaWV3ID0gV2ViS2l0OjpXZWJQYWdlOjpwbHVnaW5WaWV3Rm9yRnJhbWUocHJvdGVjdGVkU2Vs Zi0+bV9wYWdlLT5tYWluRnJhbWUoKSkpCiAgICAgICAgICAgICBhcHBseUNvbnRlbnRPZmZzZXQg PSAhcGx1Z2luVmlldy0+cGx1Z2luKCktPnBsdWdpbkhhbmRsZXNDb250ZW50T2Zmc2V0Rm9yQWNj ZXNzaWJpbGl0eUhpdFRlc3QoKTsKICAgICAgICAgCiAgICAgICAgIGlmICghYXBwbHlDb250ZW50 T2Zmc2V0KQogICAgICAgICAgICAgcmV0dXJuIGNvbnZlcnRlZFBvaW50OwogCi0gICAgICAgIGlm IChXZWJDb3JlOjpGcmFtZVZpZXcqIGZyYW1lVmlldyA9IG1fcGFnZS0+bWFpbkZyYW1lVmlldygp KQorICAgICAgICBpZiAoYXV0byogZnJhbWVWaWV3ID0gcHJvdGVjdGVkU2VsZi0+bV9wYWdlLT5t YWluRnJhbWVWaWV3KCkpCiAgICAgICAgICAgICBjb252ZXJ0ZWRQb2ludC5tb3ZlQnkoZnJhbWVW aWV3LT5zY3JvbGxQb3NpdGlvbigpKTsKLSAgICAgICAgaWYgKFdlYkNvcmU6OlBhZ2UqIHBhZ2Ug PSBtX3BhZ2UtPmNvcmVQYWdlKCkpCisgICAgICAgIGlmIChhdXRvKiBwYWdlID0gcHJvdGVjdGVk U2VsZi0+bV9wYWdlLT5jb3JlUGFnZSgpKQogICAgICAgICAgICAgY29udmVydGVkUG9pbnQubW92 ZSgwLCAtcGFnZS0+dG9wQ29udGVudEluc2V0KCkpOwogICAgICAgICByZXR1cm4gY29udmVydGVk UG9pbnQ7CiAgICAgfSk7Cg== 387244 2020-01-09 10:52:08 -0800 2020-01-09 13:39:50 -0800 Patch bug-206009-20200109135207.patch text/plain 8394 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0MTkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGFiMDA1ZmI2YjE0NWUxN2Ex M2Q0ZGZlZWZmNjJlMjI5ZmEyODk3ZWQuLjhmNmU5MDg5MTI5YTJiZjM5YTA0NTdiOTk4NjMzYzA5 ZjVhYzI0NGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMjAtMDEtMDkgIEFuZHJlcyBH b256YWxleiAgPGFuZHJlc2dfMjJAYXBwbGUuY29tPgorCisgICAgICAgIFdLQWNjZXNzaWJpbGl0 eVdlYlBhZ2VPYmplY3Qgc2hvdWxkIHVzZSBBY2Nlc3NpYmlsaXR5OjpyZXRyaWV2ZVZhbHVlRnJv bU1haW5UaHJlYWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMDYwMDkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAtIFdLQWNjZXNzaWJpbGl0eVdlYlBhZ2VPYmplY3Qgbm93IHVzZXMgQWNjZXNzaWJpbGl0 eTo6cmV0cmlldmVWYWx1ZUZyb21NYWluVGhyZWFkLAorICAgICAgICB3aGljaCBpcyBjb25zaXN0 ZW50IHdpdGggV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIuCisgICAgICAgIC0gSXQgYWxz byB1c2VzIGEgY2FwdHVyZWQgcHJvdGVjdGVkU2VsZiB0byBlbnN1cmUgdGhlIG9iamVjdCBpcyBh bGl2ZQorICAgICAgICB3aGVuIHRoZSBsYW1iZGEgaXMgaW52b2tlZCBvbiB0aGUgbWFpbiB0aHJl YWQuCisgICAgICAgIC0gQWRkZWQgbnVsbGl0eSBjaGVjayBmb3IgbV9wYWdlIGluIGFjY2Vzc2li aWxpdHlBdHRyaWJ1dGVTaXplVmFsdWUsCisgICAgICAgIHdoaWNoIGlzIGEgcG90ZW50aWFsIGNy YXNoZXIgaW4gdGhlIG11bHRpdGhyZWFkZWQgbW9kZS4KKworICAgICAgICAqIFdlYlByb2Nlc3Mv V2ViUGFnZS9tYWMvV0tBY2Nlc3NpYmlsaXR5V2ViUGFnZU9iamVjdE1hYy5tbToKKyAgICAgICAg KC1bV0tBY2Nlc3NpYmlsaXR5V2ViUGFnZU9iamVjdCBBTExPV19ERVBSRUNBVEVEX0lNUExFTUVO VEFUSU9OU19FTkRdKToKKyAgICAgICAgKC1bV0tBY2Nlc3NpYmlsaXR5V2ViUGFnZU9iamVjdCBj b252ZXJ0U2NyZWVuUG9pbnRUb1Jvb3RWaWV3Ol0pOgorICAgICAgICAoLVtXS0FjY2Vzc2liaWxp dHlXZWJQYWdlT2JqZWN0IGFjY2Vzc2liaWxpdHlBdHRyaWJ1dGVTaXplVmFsdWVdKToKKyAgICAg ICAgKC1bV0tBY2Nlc3NpYmlsaXR5V2ViUGFnZU9iamVjdCBhY2Nlc3NpYmlsaXR5QXR0cmlidXRl UG9zaXRpb25WYWx1ZV0pOgorICAgICAgICAoLVtXS0FjY2Vzc2liaWxpdHlXZWJQYWdlT2JqZWN0 IGFjY2Vzc2liaWxpdHlEYXRhRGV0ZWN0b3JWYWx1ZTpwb2ludDpdKToKKyAgICAgICAgKC1bV0tB Y2Nlc3NpYmlsaXR5V2ViUGFnZU9iamVjdCBhY2Nlc3NpYmlsaXR5SGl0VGVzdDpdKToKKyAgICAg ICAgKHJldHJpZXZlQWNjZXNzaWJpbGl0eVZhbHVlRnJvbU1haW5UaHJlYWQpOiBOb3QgbmVlZGVk IHNpbmNlIGl0IHVzZXMgbm93IHRoZSBvbmUgaW4gQWNjZXNzaWJpbGl0eSBuYXNlc3BhY2UuCisK IDIwMjAtMDEtMDggIHlvdWVubiBmYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAg IEltcHJvdmUgbG9nZ2luZyBvZiBjcmVhdGluZyBhIHNlcnZpY2Ugd29ya2VyCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvV0tBY2Nlc3NpYmlsaXR5V2Vi UGFnZU9iamVjdE1hYy5tbSBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9X S0FjY2Vzc2liaWxpdHlXZWJQYWdlT2JqZWN0TWFjLm1tCmluZGV4IDhkMTIxYmNiMzcwMDZiNzQz YjczNjViYjdkZWFmMWY2MzMyN2JlNTAuLjU5MTRlYzQyMjg1N2FmMTE1MTY4ODAxMGVlM2I2MmQy YWQ1MzVkZjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21h Yy9XS0FjY2Vzc2liaWxpdHlXZWJQYWdlT2JqZWN0TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9XS0FjY2Vzc2liaWxpdHlXZWJQYWdlT2JqZWN0TWFjLm1t CkBAIC00OSw5ICs0OSwxMiBAQAogI2ltcG9ydCA8cGFsL3NwaS9jb2NvYS9OU0FjY2Vzc2liaWxp dHlTUEkuaD4KICNpbXBvcnQgPHd0Zi9PYmpDUnVudGltZUV4dHJhcy5oPgogCituYW1lc3BhY2Ug YXggPSBXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5OwogCiBAaW1wbGVtZW50YXRpb24gV0tBY2Nlc3Np YmlsaXR5V2ViUGFnZU9iamVjdAogCisjZGVmaW5lIFBST1RFQ1RFRF9TRUxGIHByb3RlY3RlZFNl bGYgPSBSZXRhaW5QdHI8V0tBY2Nlc3NpYmlsaXR5V2ViUGFnZU9iamVjdD4oc2VsZikKKwogLSAo dm9pZClkZWFsbG9jCiB7CiAgICAgTlNBY2Nlc3NpYmlsaXR5VW5yZWdpc3RlclVuaXF1ZUlkRm9y VUlFbGVtZW50KHNlbGYpOwpAQCAtNzksMjggKzgyLDE2IEBAIEFMTE9XX0RFUFJFQ0FURURfSU1Q TEVNRU5UQVRJT05TX0VORAogICAgIHJldHVybiBtX2F0dHJpYnV0ZU5hbWVzLmdldCgpOwogfQog Ci10ZW1wbGF0ZTx0eXBlbmFtZSBULCB0eXBlbmFtZSBVPiBpbmxpbmUgVCByZXRyaWV2ZUFjY2Vz c2liaWxpdHlWYWx1ZUZyb21NYWluVGhyZWFkKFUmJiBsYW1iZGEpCi17Ci0gICAgaWYgKGlzTWFp blRocmVhZCgpKQotICAgICAgICByZXR1cm4gbGFtYmRhKCk7Ci0KLSAgICBUIHZhbHVlOwotICAg IGNhbGxPbk1haW5UaHJlYWRBbmRXYWl0KFsmdmFsdWUsICZsYW1iZGFdIHsKLSAgICAgICAgdmFs dWUgPSBsYW1iZGEoKTsKLSAgICB9KTsKLSAgICByZXR1cm4gdmFsdWU7Ci19Ci0KIEFMTE9XX0RF UFJFQ0FURURfSU1QTEVNRU5UQVRJT05TX0JFR0lOCiAtIChOU0FycmF5ICopYWNjZXNzaWJpbGl0 eVBhcmFtZXRlcml6ZWRBdHRyaWJ1dGVOYW1lcwogQUxMT1dfREVQUkVDQVRFRF9JTVBMRU1FTlRB VElPTlNfRU5ECiB7Ci0gICAgcmV0dXJuIHJldHJpZXZlQWNjZXNzaWJpbGl0eVZhbHVlRnJvbU1h aW5UaHJlYWQ8aWQ+KFsmc2VsZl0gKCkgLT4gaWQgeworICAgIHJldHVybiBheDo6cmV0cmlldmVW YWx1ZUZyb21NYWluVGhyZWFkPGlkPihbUFJPVEVDVEVEX1NFTEZdICgpIC0+IGlkIHsKICAgICAg ICAgTlNNdXRhYmxlQXJyYXkgKm5hbWVzID0gW05TTXV0YWJsZUFycmF5IGFycmF5XTsKLSAgICAg ICAgaWYgKCFtX3BhZ2UpCisgICAgICAgIGlmICghcHJvdGVjdGVkU2VsZi0+bV9wYWdlKQogICAg ICAgICAgICAgcmV0dXJuIG5hbWVzOwogICAgICAgICAKLSAgICAgICAgaWYgKGF1dG8gY29yZVBh Z2UgPSBtX3BhZ2UtPmNvcmVQYWdlKCkpIHsKKyAgICAgICAgaWYgKGF1dG8gY29yZVBhZ2UgPSBw cm90ZWN0ZWRTZWxmLT5tX3BhZ2UtPmNvcmVQYWdlKCkpIHsKICAgICAgICAgICAgIGZvciAoYXV0 byYgbmFtZSA6IGNvcmVQYWdlLT5wYWdlT3ZlcmxheUNvbnRyb2xsZXIoKS5jb3B5QWNjZXNzaWJp bGl0eUF0dHJpYnV0ZXNOYW1lcyh0cnVlKSkKICAgICAgICAgICAgICAgICBbbmFtZXMgYWRkT2Jq ZWN0OihOU1N0cmluZyAqKW5hbWVdOwogICAgICAgICB9CkBAIC0xMjMsOCArMTE0LDEwIEBAIEFM TE9XX0RFUFJFQ0FURURfSU1QTEVNRU5UQVRJT05TX0VORAogCiAtIChOU1BvaW50KWNvbnZlcnRT Y3JlZW5Qb2ludFRvUm9vdFZpZXc6KE5TUG9pbnQpcG9pbnQKIHsKLSAgICByZXR1cm4gcmV0cmll dmVBY2Nlc3NpYmlsaXR5VmFsdWVGcm9tTWFpblRocmVhZDxOU1BvaW50PihbJnNlbGYsICZwb2lu dF0gKCkgLT4gTlNQb2ludCB7Ci0gICAgICAgIHJldHVybiBtX3BhZ2UtPnNjcmVlblRvUm9vdFZp ZXcoV2ViQ29yZTo6SW50UG9pbnQocG9pbnQueCwgcG9pbnQueSkpOworICAgIHJldHVybiBheDo6 cmV0cmlldmVWYWx1ZUZyb21NYWluVGhyZWFkPE5TUG9pbnQ+KFsmcG9pbnQsIFBST1RFQ1RFRF9T RUxGXSAoKSAtPiBOU1BvaW50IHsKKyAgICAgICAgaWYgKCFwcm90ZWN0ZWRTZWxmLT5tX3BhZ2Up CisgICAgICAgICAgICByZXR1cm4gcG9pbnQ7CisgICAgICAgIHJldHVybiBwcm90ZWN0ZWRTZWxm LT5tX3BhZ2UtPnNjcmVlblRvUm9vdFZpZXcoV2ViQ29yZTo6SW50UG9pbnQocG9pbnQueCwgcG9p bnQueSkpOwogICAgIH0pOwogfQogCkBAIC0xODksMzAgKzE4MiwzNiBAQCBBTExPV19ERVBSRUNB VEVEX0lNUExFTUVOVEFUSU9OU19FTkQKIAogLSAoTlNWYWx1ZSAqKWFjY2Vzc2liaWxpdHlBdHRy aWJ1dGVTaXplVmFsdWUKIHsKLSAgICByZXR1cm4gcmV0cmlldmVBY2Nlc3NpYmlsaXR5VmFsdWVG cm9tTWFpblRocmVhZDxpZD4oWyZzZWxmXSAoKSAtPiBpZCB7Ci0gICAgICAgIHJldHVybiBbTlNW YWx1ZSB2YWx1ZVdpdGhTaXplOihOU1NpemUpbV9wYWdlLT5zaXplKCldOworICAgIHJldHVybiBh eDo6cmV0cmlldmVWYWx1ZUZyb21NYWluVGhyZWFkPGlkPihbUFJPVEVDVEVEX1NFTEZdICgpIC0+ IGlkIHsKKyAgICAgICAgaWYgKCFwcm90ZWN0ZWRTZWxmLT5tX3BhZ2UpCisgICAgICAgICAgICBy ZXR1cm4gbmlsOworICAgICAgICByZXR1cm4gW05TVmFsdWUgdmFsdWVXaXRoU2l6ZTooTlNTaXpl KXByb3RlY3RlZFNlbGYtPm1fcGFnZS0+c2l6ZSgpXTsKICAgICB9KTsKIH0KIAogLSAoTlNWYWx1 ZSAqKWFjY2Vzc2liaWxpdHlBdHRyaWJ1dGVQb3NpdGlvblZhbHVlCiB7Ci0gICAgcmV0dXJuIHJl dHJpZXZlQWNjZXNzaWJpbGl0eVZhbHVlRnJvbU1haW5UaHJlYWQ8aWQ+KFsmc2VsZl0gKCkgLT4g aWQgewotICAgICAgICByZXR1cm4gW05TVmFsdWUgdmFsdWVXaXRoUG9pbnQ6KE5TUG9pbnQpbV9w YWdlLT5hY2Nlc3NpYmlsaXR5UG9zaXRpb24oKV07CisgICAgcmV0dXJuIGF4OjpyZXRyaWV2ZVZh bHVlRnJvbU1haW5UaHJlYWQ8aWQ+KFtQUk9URUNURURfU0VMRl0gKCkgLT4gaWQgeworICAgICAg ICBpZiAoIXByb3RlY3RlZFNlbGYtPm1fcGFnZSkKKyAgICAgICAgICAgIHJldHVybiBuaWw7Cisg ICAgICAgIHJldHVybiBbTlNWYWx1ZSB2YWx1ZVdpdGhQb2ludDooTlNQb2ludClwcm90ZWN0ZWRT ZWxmLT5tX3BhZ2UtPmFjY2Vzc2liaWxpdHlQb3NpdGlvbigpXTsKICAgICB9KTsKIH0KIAogLSAo aWQpYWNjZXNzaWJpbGl0eURhdGFEZXRlY3RvclZhbHVlOihOU1N0cmluZyAqKWF0dHJpYnV0ZSBw b2ludDooV2ViQ29yZTo6RmxvYXRQb2ludCYpcG9pbnQKIHsKLSAgICByZXR1cm4gcmV0cmlldmVB Y2Nlc3NpYmlsaXR5VmFsdWVGcm9tTWFpblRocmVhZDxpZD4oWyZzZWxmLCAmYXR0cmlidXRlLCAm cG9pbnRdICgpIC0+IGlkIHsKKyAgICByZXR1cm4gYXg6OnJldHJpZXZlVmFsdWVGcm9tTWFpblRo cmVhZDxpZD4oWyZhdHRyaWJ1dGUsICZwb2ludCwgUFJPVEVDVEVEX1NFTEZdICgpIC0+IGlkIHsK KyAgICAgICAgaWYgKCFwcm90ZWN0ZWRTZWxmLT5tX3BhZ2UpCisgICAgICAgICAgICByZXR1cm4g bmlsOwogICAgICAgICBpZCB2YWx1ZSA9IG5pbDsKICAgICAgICAgaWYgKFthdHRyaWJ1dGUgaXNF cXVhbFRvU3RyaW5nOkAiQVhEYXRhRGV0ZWN0b3JFeGlzdHNBdFBvaW50Il0gfHwgW2F0dHJpYnV0 ZSBpc0VxdWFsVG9TdHJpbmc6QCJBWERpZFNob3dEYXRhRGV0ZWN0b3JNZW51QXRQb2ludCJdKSB7 CiAgICAgICAgICAgICBib29sIGJvb2xWYWx1ZTsKLSAgICAgICAgICAgIGlmIChtX3BhZ2UtPmNv cmVQYWdlKCktPnBhZ2VPdmVybGF5Q29udHJvbGxlcigpLmNvcHlBY2Nlc3NpYmlsaXR5QXR0cmli dXRlQm9vbFZhbHVlRm9yUG9pbnQoYXR0cmlidXRlLCBwb2ludCwgYm9vbFZhbHVlKSkKKyAgICAg ICAgICAgIGlmIChwcm90ZWN0ZWRTZWxmLT5tX3BhZ2UtPmNvcmVQYWdlKCktPnBhZ2VPdmVybGF5 Q29udHJvbGxlcigpLmNvcHlBY2Nlc3NpYmlsaXR5QXR0cmlidXRlQm9vbFZhbHVlRm9yUG9pbnQo YXR0cmlidXRlLCBwb2ludCwgYm9vbFZhbHVlKSkKICAgICAgICAgICAgICAgICB2YWx1ZSA9IFtO U051bWJlciBudW1iZXJXaXRoQm9vbDpib29sVmFsdWVdOwogICAgICAgICB9CiAgICAgICAgIGlm IChbYXR0cmlidXRlIGlzRXF1YWxUb1N0cmluZzpAIkFYRGF0YURldGVjdG9yVHlwZUF0UG9pbnQi XSkgewogICAgICAgICAgICAgU3RyaW5nIHN0cmluZ1ZhbHVlOwotICAgICAgICAgICAgaWYgKG1f cGFnZS0+Y29yZVBhZ2UoKS0+cGFnZU92ZXJsYXlDb250cm9sbGVyKCkuY29weUFjY2Vzc2liaWxp dHlBdHRyaWJ1dGVTdHJpbmdWYWx1ZUZvclBvaW50KGF0dHJpYnV0ZSwgcG9pbnQsIHN0cmluZ1Zh bHVlKSkKKyAgICAgICAgICAgIGlmIChwcm90ZWN0ZWRTZWxmLT5tX3BhZ2UtPmNvcmVQYWdlKCkt PnBhZ2VPdmVybGF5Q29udHJvbGxlcigpLmNvcHlBY2Nlc3NpYmlsaXR5QXR0cmlidXRlU3RyaW5n VmFsdWVGb3JQb2ludChhdHRyaWJ1dGUsIHBvaW50LCBzdHJpbmdWYWx1ZSkpCiAgICAgICAgICAg ICAgICAgdmFsdWUgPSBbTlNTdHJpbmcgc3RyaW5nV2l0aFN0cmluZzpzdHJpbmdWYWx1ZV07CiAg ICAgICAgIH0KICAgICAgICAgcmV0dXJuIHZhbHVlOwpAQCAtMjQzLDEyICsyNDIsMTIgQEAgQUxM T1dfREVQUkVDQVRFRF9JTVBMRU1FTlRBVElPTlNfRU5ECiBBTExPV19ERVBSRUNBVEVEX0RFQ0xB UkFUSU9OU19CRUdJTgogLSAoaWQpYWNjZXNzaWJpbGl0eUhpdFRlc3Q6KE5TUG9pbnQpcG9pbnQK IHsKLSAgICBhdXRvIGNvbnZlcnRlZFBvaW50ID0gcmV0cmlldmVBY2Nlc3NpYmlsaXR5VmFsdWVG cm9tTWFpblRocmVhZDxXZWJDb3JlOjpJbnRQb2ludD4oWyZzZWxmLCAmcG9pbnRdICgpIC0+IFdl YkNvcmU6OkludFBvaW50IHsKLSAgICAgICAgaWYgKCFtX3BhZ2UpCisgICAgYXV0byBjb252ZXJ0 ZWRQb2ludCA9IGF4OjpyZXRyaWV2ZVZhbHVlRnJvbU1haW5UaHJlYWQ8V2ViQ29yZTo6SW50UG9p bnQ+KFsmcG9pbnQsIFBST1RFQ1RFRF9TRUxGXSAoKSAtPiBXZWJDb3JlOjpJbnRQb2ludCB7Cisg ICAgICAgIGlmICghcHJvdGVjdGVkU2VsZi0+bV9wYWdlKQogICAgICAgICAgICAgcmV0dXJuIFdl YkNvcmU6OkludFBvaW50KHBvaW50KTsKLSAgICAgICAgCi0gICAgICAgIGF1dG8gY29udmVydGVk UG9pbnQgPSBtX3BhZ2UtPnNjcmVlblRvUm9vdFZpZXcoV2ViQ29yZTo6SW50UG9pbnQocG9pbnQp KTsKLSAgICAgICAgCisKKyAgICAgICAgYXV0byBjb252ZXJ0ZWRQb2ludCA9IHByb3RlY3RlZFNl bGYtPm1fcGFnZS0+c2NyZWVuVG9Sb290VmlldyhXZWJDb3JlOjpJbnRQb2ludChwb2ludCkpOwor CiAgICAgICAgIC8vIFNvbWUgcGx1Z2lucyBtYXkgYmUgYWJsZSB0byBmaWd1cmUgb3V0IHRoZSBz Y3JvbGwgcG9zaXRpb24gYW5kIGluc2V0IG9uIHRoZWlyIG93bi4KICAgICAgICAgYm9vbCBhcHBs eUNvbnRlbnRPZmZzZXQgPSB0cnVlOwogCkBAIC0yNTcsMTUgKzI1NiwxNSBAQCBBTExPV19ERVBS RUNBVEVEX0RFQ0xBUkFUSU9OU19CRUdJTgogICAgICAgICBib29sIHF1ZXJ5aW5nSXNvbGF0ZWRU cmVlID0gV2ViQ29yZTo6QVhPYmplY3RDYWNoZTo6Y2xpZW50U3VwcG9ydHNJc29sYXRlZFRyZWUo KSAmJiBfQVhVSUVsZW1lbnRSZXF1ZXN0U2VydmljZWRCeVNlY29uZGFyeUFYVGhyZWFkKCk7CiAg ICAgICAgIGFwcGx5Q29udGVudE9mZnNldCA9ICFxdWVyeWluZ0lzb2xhdGVkVHJlZTsKICNlbmRp ZgotICAgICAgICBpZiAoYXV0byBwbHVnaW5WaWV3ID0gV2ViS2l0OjpXZWJQYWdlOjpwbHVnaW5W aWV3Rm9yRnJhbWUobV9wYWdlLT5tYWluRnJhbWUoKSkpCisgICAgICAgIGlmIChhdXRvIHBsdWdp blZpZXcgPSBXZWJLaXQ6OldlYlBhZ2U6OnBsdWdpblZpZXdGb3JGcmFtZShwcm90ZWN0ZWRTZWxm LT5tX3BhZ2UtPm1haW5GcmFtZSgpKSkKICAgICAgICAgICAgIGFwcGx5Q29udGVudE9mZnNldCA9 ICFwbHVnaW5WaWV3LT5wbHVnaW4oKS0+cGx1Z2luSGFuZGxlc0NvbnRlbnRPZmZzZXRGb3JBY2Nl c3NpYmlsaXR5SGl0VGVzdCgpOwogICAgICAgICAKICAgICAgICAgaWYgKCFhcHBseUNvbnRlbnRP ZmZzZXQpCiAgICAgICAgICAgICByZXR1cm4gY29udmVydGVkUG9pbnQ7CiAKLSAgICAgICAgaWYg KFdlYkNvcmU6OkZyYW1lVmlldyogZnJhbWVWaWV3ID0gbV9wYWdlLT5tYWluRnJhbWVWaWV3KCkp CisgICAgICAgIGlmIChhdXRvKiBmcmFtZVZpZXcgPSBwcm90ZWN0ZWRTZWxmLT5tX3BhZ2UtPm1h aW5GcmFtZVZpZXcoKSkKICAgICAgICAgICAgIGNvbnZlcnRlZFBvaW50Lm1vdmVCeShmcmFtZVZp ZXctPnNjcm9sbFBvc2l0aW9uKCkpOwotICAgICAgICBpZiAoV2ViQ29yZTo6UGFnZSogcGFnZSA9 IG1fcGFnZS0+Y29yZVBhZ2UoKSkKKyAgICAgICAgaWYgKGF1dG8qIHBhZ2UgPSBwcm90ZWN0ZWRT ZWxmLT5tX3BhZ2UtPmNvcmVQYWdlKCkpCiAgICAgICAgICAgICBjb252ZXJ0ZWRQb2ludC5tb3Zl KDAsIC1wYWdlLT50b3BDb250ZW50SW5zZXQoKSk7CiAgICAgICAgIHJldHVybiBjb252ZXJ0ZWRQ b2ludDsKICAgICB9KTsK