207676 2020-02-12 19:45:22 -0800 Dark Mode: In Notes, list item becomes invisible in dark mode after outdenting 2020-02-13 18:56:34 -0800 1 1 1 Unclassified WebKit HTML Editing WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rniwa rniwa ews-watchlist mifenton simon.fraser timothy wenson_hsieh oldest_to_newest 1618375 0 rniwa 2020-02-12 19:45:22 -0800 Steps To Reproduce: 1. System Preferences —> General —> Appearance = Dark 2. Sign in with an IMAP account with HTML notes (i.e. Gmail) 3. Launch Notes 4. Create a new HTML note 5. Start a numbered list (i.e. type “1.” followed by text) 6. Outdent the list item Result: The test becomes invisible <rdar://problem/56682679> 1618383 1 390612 rniwa 2020-02-12 20:48:07 -0800 Created attachment 390612 Fixes the bug 1618400 2 390612 rniwa 2020-02-12 22:15:30 -0800 Comment on attachment 390612 Fixes the bug Hm... looks like PasteRTFD.TransformColorsOfDarkContent is failing on iOS. 1618405 3 390612 rniwa 2020-02-12 23:02:32 -0800 Comment on attachment 390612 Fixes the bug View in context: https://bugs.webkit.org/attachment.cgi?id=390612&action=review > Source/WebCore/editing/ReplaceSelectionCommand.cpp:579 > - return true; > + return hasVisibleNonSemanticColor; Alright, this doesn't work :( Reverting this. 1618406 4 390620 rniwa 2020-02-12 23:07:58 -0800 Created attachment 390620 Fixes the bug 1618648 5 rniwa 2020-02-13 12:21:01 -0800 Oh, looks like iOS just needs platform specific result for the test due to auto size propert as usual but that should not block the code review. 1618737 6 390620 timothy 2020-02-13 15:16:55 -0800 Comment on attachment 390620 Fixes the bug View in context: https://bugs.webkit.org/attachment.cgi?id=390620&action=review > Source/WebCore/editing/EditingStyle.cpp:1385 > + m_mutableStyle->setProperty(CSSPropertyColor, computedValue); This should use id, otherwise CSSPropertyBackgroundColor and CSSPropertyCaretColor will overwrite CSSPropertyColor. 1618791 7 390705 rniwa 2020-02-13 17:03:15 -0800 Created attachment 390705 Fixed the bug 1618836 8 rniwa 2020-02-13 18:56:34 -0800 Committed r256580: <https://trac.webkit.org/changeset/256580> 390612 2020-02-12 20:48:07 -0800 2020-02-12 23:07:57 -0800 Fixes the bug bug-207676-20200212204807.patch text/plain 10205 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI1NjA4NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM2IEBACisyMDIwLTAyLTEyICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIERhcmsgTW9kZTogSW4gTm90ZXMs IGxpc3QgaXRlbSBiZWNvbWVzIGludmlzaWJsZSBpbiBkYXJrIG1vZGUgYWZ0ZXIgb3V0ZGVudGlu ZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA3Njc2 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGJ1 ZyB3YXMgY2F1c2VkIGJ5IEVkaXRpbmdTdHlsZTo6aW52ZXJzZVRyYW5zZm9ybUNvbG9ySWZOZWVk ZWQgY29udmVydGluZyAtYXBwbGUtc3lzdGVtLWxhYmVsIHRvCisgICAgICAgIHRyYW5zcGFyZW50 IGNvbG9yIGluIFJlcGxhY2VTZWxlY3Rpb25Db21tYW5kIHdoZW4gSW5zZXJ0TGlzdENvbW1hbmQg aW52b2tlcyBtb3ZlUGFyYWdyYXBocy4KKworICAgICAgICBJbiB0aGlzIHNjZW5hcmlvLCB0aGVy ZSBpcyBubyBuZWVkIHRvIGFwcGx5IGludmVyc2UgdHJhbnNmb3JtIGNvbG9ycyBzaW5jZSB3ZSdy ZSBtb3ZpbmcgcGFyYWdyYXBocworICAgICAgICB3aXRoaW4gYSBzaW5nbGUgZG9jdW1lbnQsIGFu ZCBvbmx5IGNvbG9yIHdlIHNlZSBpcyAtYXBwbGUtc3lzdGVtLWxhYmVsLCB3aGljaCBkb2Vzbid0 IGdldCBhZmZlY3RlZAorICAgICAgICBieSB0aGUgcHJlc2VuY2Ugb2YgY29sb3IgZmlsdGVyLgor CisgICAgICAgIFRoaXMgcGF0Y2ggZml4ZXMgdGhlIGJ1ZyBpbiBFZGl0aW5nU3R5bGU6OmludmVy c2VUcmFuc2Zvcm1Db2xvcklmTmVlZGVkIGJ5IHRyZWF0aW5nIGFueSBzZW1hbnRpYyBjb2xvcgor ICAgICAgICBuYW1lIG9yIHNlbWFudGljIFJHQiBjb2xvciB2YWx1ZSBhcyBpZiB0aGUgY29sb3Ig d2FzIG5vdCBzcGVjaWZpZWQuIEl0IGFsc28gZml4ZXMgdGhlIGJ1ZyB0aGF0CisgICAgICAgIGZy YWdtZW50TmVlZHNDb2xvclRyYW5zZm9ybWVkIHJldHVybnMgdHJ1ZSBldmVuIHdoZW4gaXQgb2Jz ZXJ2ZWQgbm8gY29sb3IgdG8gaW52ZXJzZSB0cmFuc2Zvcm0uCisKKyAgICAgICAgRmluYWxseSwg dGhpcyBwYXRjaCBmaXhlcyB0aGUgYnVnIHRoYXQgcmVtb3ZlU3R5bGVGcm9tUnVsZXNBbmRDb250 ZXh0IHdhcyBub3QgYWJsZSB0byByZW1vdmUgc3VwZXJmbG91cworICAgICAgICBzZW1hbnRpYyBj b2xvciBuYW1lcyB0aGF0IGFwcGVhciBpbiB0aGUgaW5saW5lIHNpbmNlIHRoZSBjb250ZXh0J3Mg Y29tcHV0ZWQgc3R5bGUgb25seSBjb250YWluCisgICAgICAgIFJHQiB2YWx1ZXMgYnkgcmVwbGFj aW5nIHRoZSBpbmxpbmUgc3R5bGUncyBjb2xvciB2YWx1ZXMgd2l0aCB0aGF0IG9mIHRoZSBjb21w dXRlZCBzdHlsZS4gVGhpcyBmaXggaXMKKyAgICAgICAgbmVjZXNzYXJ5IGluIG9yZGVyIHRvIGF2 b2lkIC1hcHBsZS1zeXN0ZW0tbGFiZWwgdG8gYmUgc3BlY2lmaWVkIGluIHRoZSBwYXN0ZWQgY29u dGVudCwgd2hpY2ggY2FuIGNhdXNlCisgICAgICAgIGlzc3VlcyB3aGVuIG5vdGVzIGFyZSBzeW5j J2VkIHRvIG90aGVyIGRldmljZXMuCisKKyAgICAgICAgVGVzdHM6IFBhc3RlSFRNTC5UcmFuc2Zv cm1Db2xvcnNPZkRhcmtDb250ZW50QnV0Tm90U2VtYW50aWNDb2xvcgorICAgICAgICAgICAgICAg UGFzdGVIVE1MLkRvZXNOb3RUcmFuc2Zvcm1Db2xvcnNPZkxpZ2h0Q29udGVudER1cmluZ091dGRl bnQKKworICAgICAgICAqIGVkaXRpbmcvRWRpdGluZ1N0eWxlLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkVkaXRpbmdTdHlsZTo6cmVtb3ZlU3R5bGVGcm9tUnVsZXNBbmRDb250ZXh0KToKKyAgICAg ICAgKFdlYkNvcmU6OkVkaXRpbmdTdHlsZTo6aW52ZXJzZVRyYW5zZm9ybUNvbG9ySWZOZWVkZWQp OgorICAgICAgICAqIGVkaXRpbmcvUmVwbGFjZVNlbGVjdGlvbkNvbW1hbmQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6ZnJhZ21lbnROZWVkc0NvbG9yVHJhbnNmb3JtZWQpOgorCiAyMDIwLTAyLTA3 ICBKYWNrIExlZSAgPHNoaWhjaGllaF9sZWVAYXBwbGUuY29tPgogCiAgICAgICAgIE51bGxwdHIg Y3Jhc2ggaW4gV2ViQ29yZTo6Rm9udEZhbWlseVNwZWNpZmljYXRpb25Db3JlVGV4dDo6Zm9udFJh bmdlcwpJbmRleDogU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0aW5nU3R5bGUuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdGluZ1N0eWxlLmNwcAkocmV2aXNp b24gMjU2MDg1KQorKysgU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0aW5nU3R5bGUuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0xMzY2LDYgKzEzNjYsMzAgQEAgdm9pZCBFZGl0aW5nU3R5bGU6OnJl bW92ZVN0eWxlRnJvbVJ1bGVzQQogICAgICAgICBpZiAoIWNvbXB1dGVkU3R5bGUtPm1fbXV0YWJs ZVN0eWxlLT5nZXRQcm9wZXJ0eUNTU1ZhbHVlKENTU1Byb3BlcnR5QmFja2dyb3VuZENvbG9yKSkK ICAgICAgICAgICAgIGNvbXB1dGVkU3R5bGUtPm1fbXV0YWJsZVN0eWxlLT5zZXRQcm9wZXJ0eShD U1NQcm9wZXJ0eUJhY2tncm91bmRDb2xvciwgQ1NTVmFsdWVUcmFuc3BhcmVudCk7CiAKKyAgICAg ICAgUmVmUHRyPEVkaXRpbmdTdHlsZT4gY29tcHV0ZWRTdHlsZU9mRWxlbWVudDsKKyAgICAgICAg YXV0byByZXBsYWNlU2VtYW50aWNDb2xvcldpdGhDb21wdXRlZFZhbHVlID0gWyZdKGNvbnN0IENT U1Byb3BlcnR5SUQgaWQpIHsKKyAgICAgICAgICAgIGF1dG8gY29sb3IgPSBtX211dGFibGVTdHls ZS0+cHJvcGVydHlBc0NvbG9yKGlkKTsKKyAgICAgICAgICAgIGlmICghY29sb3IgfHwgKGNvbG9y LT5pc1Zpc2libGUoKSAmJiAhY29sb3ItPmlzU2VtYW50aWMoKSkpCisgICAgICAgICAgICAgICAg cmV0dXJuOworCisgICAgICAgICAgICBpZiAoIWNvbXB1dGVkU3R5bGVPZkVsZW1lbnQpCisgICAg ICAgICAgICAgICAgY29tcHV0ZWRTdHlsZU9mRWxlbWVudCA9IEVkaXRpbmdTdHlsZTo6Y3JlYXRl KCZlbGVtZW50LCBFZGl0aW5nUHJvcGVydGllc0luRWZmZWN0KTsKKworICAgICAgICAgICAgaWYg KCFjb21wdXRlZFN0eWxlT2ZFbGVtZW50LT5tX211dGFibGVTdHlsZSkKKyAgICAgICAgICAgICAg ICByZXR1cm47CisKKyAgICAgICAgICAgIGF1dG8gY29tcHV0ZWRWYWx1ZSA9IGNvbXB1dGVkU3R5 bGVPZkVsZW1lbnQtPm1fbXV0YWJsZVN0eWxlLT5nZXRQcm9wZXJ0eVZhbHVlKGlkKTsKKyAgICAg ICAgICAgIGlmICghY29tcHV0ZWRWYWx1ZSkKKyAgICAgICAgICAgICAgICByZXR1cm47CisKKyAg ICAgICAgICAgIG1fbXV0YWJsZVN0eWxlLT5zZXRQcm9wZXJ0eShDU1NQcm9wZXJ0eUNvbG9yLCBj b21wdXRlZFZhbHVlKTsKKyAgICAgICAgfTsKKworICAgICAgICAvLyBSZXBsYWNlIHNlbWFudGlj IGNvbG9yIGlkZW50aWZpZXJzIGxpa2UgLWFwcGxlLXN5c3RlbS1sYWJlbCB3aXRoIFJHQiB2YWx1 ZXMgc28gdGhhdCBjb21wYXJzaW9ucyBpbiBnZXRQcm9wZXJ0aWVzTm90SW4gYmVsb3cgd291bGQg d29yay4KKyAgICAgICAgcmVwbGFjZVNlbWFudGljQ29sb3JXaXRoQ29tcHV0ZWRWYWx1ZShDU1NQ cm9wZXJ0eUNvbG9yKTsKKyAgICAgICAgcmVwbGFjZVNlbWFudGljQ29sb3JXaXRoQ29tcHV0ZWRW YWx1ZShDU1NQcm9wZXJ0eUNhcmV0Q29sb3IpOworICAgICAgICByZXBsYWNlU2VtYW50aWNDb2xv cldpdGhDb21wdXRlZFZhbHVlKENTU1Byb3BlcnR5QmFja2dyb3VuZENvbG9yKTsKKwogICAgICAg ICByZW1vdmVQcm9wZXJ0aWVzSW5TdHlsZShjb21wdXRlZFN0eWxlLT5tX211dGFibGVTdHlsZS5n ZXQoKSwgc3R5bGVGcm9tTWF0Y2hlZFJ1bGVzLmdldCgpKTsKICAgICAgICAgbV9tdXRhYmxlU3R5 bGUgPSBnZXRQcm9wZXJ0aWVzTm90SW4oKm1fbXV0YWJsZVN0eWxlLCAqY29tcHV0ZWRTdHlsZS0+ bV9tdXRhYmxlU3R5bGUpOwogICAgIH0KQEAgLTE1ODcsMTAgKzE2MTEsMTcgQEAgUmVmPEVkaXRp bmdTdHlsZT4gRWRpdGluZ1N0eWxlOjppbnZlcnNlVAogICAgIGlmICghbV9tdXRhYmxlU3R5bGUg fHwgIXJlbmRlcmVyIHx8ICFyZW5kZXJlci0+c3R5bGUoKS5oYXNBcHBsZUNvbG9yRmlsdGVyKCkp CiAgICAgICAgIHJldHVybiAqdGhpczsKIAotICAgIGJvb2wgaGFzQ29sb3IgPSBtX211dGFibGVT dHlsZS0+Z2V0UHJvcGVydHlDU1NWYWx1ZShDU1NQcm9wZXJ0eUNvbG9yKTsKLSAgICBib29sIGhh c0NhcmV0Q29sb3IgPSBtX211dGFibGVTdHlsZS0+Z2V0UHJvcGVydHlDU1NWYWx1ZShDU1NQcm9w ZXJ0eUNhcmV0Q29sb3IpOwotICAgIGJvb2wgaGFzQmFja2dyb3VuZENvbG9yID0gbV9tdXRhYmxl U3R5bGUtPmdldFByb3BlcnR5Q1NTVmFsdWUoQ1NTUHJvcGVydHlCYWNrZ3JvdW5kQ29sb3IpOwot ICAgIGlmICghaGFzQ29sb3IgJiYgIWhhc0NhcmV0Q29sb3IgJiYgIWhhc0JhY2tncm91bmRDb2xv cikKKyAgICBhdXRvIGNvbG9yRm9yUHJvcGVydHlJZkludmVydGlibGUgPSBbJl0oQ1NTUHJvcGVy dHlJRCBpZCkgLT4gT3B0aW9uYWw8Q29sb3I+IHsKKyAgICAgICAgYXV0byBjb2xvciA9IG1fbXV0 YWJsZVN0eWxlLT5wcm9wZXJ0eUFzQ29sb3IoaWQpOworICAgICAgICBpZiAoIWNvbG9yIHx8ICFj b2xvci0+aXNWaXNpYmxlKCkgfHwgY29sb3ItPmlzU2VtYW50aWMoKSkKKyAgICAgICAgICAgIHJl dHVybiBXVEY6Om51bGxvcHQ7CisgICAgICAgIHJldHVybiBjb2xvcjsKKyAgICB9OworCisgICAg YXV0byBjb2xvciA9IGNvbG9yRm9yUHJvcGVydHlJZkludmVydGlibGUoQ1NTUHJvcGVydHlDb2xv cik7CisgICAgYXV0byBjYXJldENvbG9yID0gY29sb3JGb3JQcm9wZXJ0eUlmSW52ZXJ0aWJsZShD U1NQcm9wZXJ0eUNhcmV0Q29sb3IpOworICAgIGF1dG8gYmFja2dyb3VuZENvbG9yID0gY29sb3JG b3JQcm9wZXJ0eUlmSW52ZXJ0aWJsZShDU1NQcm9wZXJ0eUJhY2tncm91bmRDb2xvcik7CisgICAg aWYgKCFjb2xvciAmJiAhY2FyZXRDb2xvciAmJiAhYmFja2dyb3VuZENvbG9yKQogICAgICAgICBy ZXR1cm4gKnRoaXM7CiAKICAgICBhdXRvIHN0eWxlV2l0aEludmVydGVkQ29sb3JzID0gY29weSgp OwpAQCAtMTYwMywxMyArMTYzNCwxMyBAQCBSZWY8RWRpdGluZ1N0eWxlPiBFZGl0aW5nU3R5bGU6 OmludmVyc2VUCiAgICAgICAgIHN0eWxlV2l0aEludmVydGVkQ29sb3JzLT5tX211dGFibGVTdHls ZS0+c2V0UHJvcGVydHkocHJvcGVydHlJRCwgbmV3Q29sb3IuY3NzVGV4dCgpKTsKICAgICB9Owog Ci0gICAgaWYgKGhhc0NvbG9yKQorICAgIGlmIChjb2xvcikKICAgICAgICAgaW52ZXJ0ZWRDb2xv cihDU1NQcm9wZXJ0eUNvbG9yKTsKIAotICAgIGlmIChoYXNDYXJldENvbG9yKQorICAgIGlmIChj YXJldENvbG9yKQogICAgICAgICBpbnZlcnRlZENvbG9yKENTU1Byb3BlcnR5Q2FyZXRDb2xvcik7 CiAKLSAgICBpZiAoaGFzQmFja2dyb3VuZENvbG9yKQorICAgIGlmIChiYWNrZ3JvdW5kQ29sb3Ip CiAgICAgICAgIGludmVydGVkQ29sb3IoQ1NTUHJvcGVydHlCYWNrZ3JvdW5kQ29sb3IpOwogCiAg ICAgcmV0dXJuIHN0eWxlV2l0aEludmVydGVkQ29sb3JzOwpJbmRleDogU291cmNlL1dlYkNvcmUv ZWRpdGluZy9SZXBsYWNlU2VsZWN0aW9uQ29tbWFuZC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvZWRpdGluZy9SZXBsYWNlU2VsZWN0aW9uQ29tbWFuZC5jcHAJKHJldmlzaW9uIDI1 NjA4NSkKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvUmVwbGFjZVNlbGVjdGlvbkNvbW1hbmQu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC01NTUsNiArNTU1LDcgQEAgc3RhdGljIGJvb2wgZnJhZ21l bnROZWVkc0NvbG9yVHJhbnNmb3JtZQogICAgIGNvbnN0IGRvdWJsZSBsaWdodG5lc3NEYXJrRW5v dWdoRm9yVGV4dCA9IDAuNDsKICAgICBjb25zdCBkb3VibGUgbGlnaHRuZXNzTGlnaHRFbm91Z2hG b3JCYWNrZ3JvdW5kID0gMC42OwogCisgICAgYm9vbCBoYXNWaXNpYmxlTm9uU2VtYW50aWNDb2xv ciA9IGZhbHNlOwogICAgIGZvciAoUmVmUHRyPE5vZGU+IG5vZGUgPSBmcmFnbWVudC5maXJzdENo aWxkKCk7IG5vZGU7IG5vZGUgPSBOb2RlVHJhdmVyc2FsOjpuZXh0KCpub2RlKSkgewogICAgICAg ICBpZiAoIWlzPFN0eWxlZEVsZW1lbnQ+KCpub2RlKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwpA QCAtNTcxLDkgKzU3MiwxMSBAQCBzdGF0aWMgYm9vbCBmcmFnbWVudE5lZWRzQ29sb3JUcmFuc2Zv cm1lCiAgICAgICAgIGF1dG8gYmFja2dyb3VuZExpZ2h0bmVzcyA9IHByb3BlcnR5TGlnaHRuZXNz KCppbmxpbmVTdHlsZSwgQ1NTUHJvcGVydHlCYWNrZ3JvdW5kQ29sb3IpOwogICAgICAgICBpZiAo YmFja2dyb3VuZExpZ2h0bmVzcyAmJiAqYmFja2dyb3VuZExpZ2h0bmVzcyA+IGxpZ2h0bmVzc0xp Z2h0RW5vdWdoRm9yQmFja2dyb3VuZCkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKworICAg ICAgICBoYXNWaXNpYmxlTm9uU2VtYW50aWNDb2xvciA9IHRleHRMaWdodG5lc3MgfHwgYmFja2dy b3VuZExpZ2h0bmVzczsKICAgICB9CiAKLSAgICByZXR1cm4gdHJ1ZTsKKyAgICByZXR1cm4gaGFz VmlzaWJsZU5vblNlbWFudGljQ29sb3I7CiB9CiAKIHZvaWQgUmVwbGFjZVNlbGVjdGlvbkNvbW1h bmQ6OmludmVyc2VUcmFuc2Zvcm1Db2xvcihJbnNlcnRlZE5vZGVzJiBpbnNlcnRlZE5vZGVzKQpJ bmRleDogVG9vbHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2 aXNpb24gMjU2NTAwKQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMTYgQEAKKzIwMjAtMDItMTIgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisK KyAgICAgICAgRGFyayBNb2RlOiBJbiBOb3RlcywgbGlzdCBpdGVtIGJlY29tZXMgaW52aXNpYmxl IGluIGRhcmsgbW9kZSBhZnRlciBvdXRkZW50aW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDc2NzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBBZGRlZCByZWdyZXNzaW9uIHRlc3RzIGZvciBwYXN0aW5n IGNvbnRlbnQgd2l0aCAtYXBwbGUtc3lzdGVtLWxhYmVsIGFuZCBvdXRkZW50aW5nIGNvbnRlbnQu CisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Bhc3RlSFRNTC5t bToKKyAgICAgICAgKFBhc3RlSFRNTC5UcmFuc2Zvcm1Db2xvcnNPZkRhcmtDb250ZW50QnV0Tm90 U2VtYW50aWNDb2xvcik6CisgICAgICAgIChQYXN0ZUhUTUwuRG9lc05vdFRyYW5zZm9ybUNvbG9y c09mTGlnaHRDb250ZW50RHVyaW5nT3V0ZGVudCk6CisKIDIwMjAtMDItMTIgIEpvbmF0aGFuIEJl ZGFyZCAgPGpiZWRhcmRAYXBwbGUuY29tPgogCiAgICAgICAgIHJ1bi1qYXZhc2NyaXB0Y29yZS10 ZXN0czogQWxsb3cgaW5zZWN1cmUgcmVxdWVzdHMgb24gdXBsb2FkCkluZGV4OiBUb29scy9UZXN0 V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Bhc3RlSFRNTC5tbQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Bhc3RlSFRNTC5tbQkocmV2aXNp b24gMjU2MDg1KQorKysgVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9QYXN0 ZUhUTUwubW0JKHdvcmtpbmcgY29weSkKQEAgLTQyMCw2ICs0MjAsMzcgQEAgVEVTVChQYXN0ZUhU TUwsIERvZXNOb3RUcmFuc2Zvcm1Db2xvcnNPZgogICAgIEVYUEVDVF9XS19TVFJFUShbd2ViVmll dyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAicmljaC5xdWVyeVNlbGVjdG9yKCdzcGFu Jykuc3R5bGUuY29sb3IiXSwgQCJyZ2IoMTAxLCAxMDEsIDEwMSkiKTsKIH0KIAorVEVTVChQYXN0 ZUhUTUwsIFRyYW5zZm9ybUNvbG9yc09mRGFya0NvbnRlbnRCdXROb3RTZW1hbnRpY0NvbG9yKQor eworICAgIGF1dG8gd2ViVmlldyA9IGNyZWF0ZVdlYlZpZXdXaXRoQ3VzdG9tUGFzdGVib2FyZERh dGFTZXR0aW5nKHRydWUsIHRydWUpOworICAgIFt3ZWJWaWV3IGZvcmNlRGFya01vZGVdOworCisg ICAgW3dlYlZpZXcgc3luY2hyb25vdXNseUxvYWRUZXN0UGFnZU5hbWVkOkAicmljaC1jb2xvci1m aWx0ZXJlZCJdOworCisgICAgW3dlYlZpZXcgc3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlwdDpA ImRvY3VtZW50LmJvZHkuc3R5bGUuY29sb3IgPSAnLWFwcGxlLXN5c3RlbS1sYWJlbCc7Il07Cisg ICAgd3JpdGVIVE1MVG9QYXN0ZWJvYXJkKEAiPHNwYW4gc3R5bGU9J2NvbG9yOiAtYXBwbGUtc3lz dGVtLWxhYmVsJz5oZWxsbzwvc3Bhbj48YiBzdHlsZT0nY29sb3I6ICNlZWUnPndvcmxkPC9iPiIp OworCisgICAgW3dlYlZpZXcgc3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlwdDpAInNlbGVjdFJp Y2hUZXh0KCkiXTsKKyAgICBbd2ViVmlldyBwYXN0ZTpuaWxdOworCisgICAgRVhQRUNUX1dLX1NU UkVRKFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJyaWNoLmlubmVySFRN TCJdLCBAImhlbGxvPGIgc3R5bGU9XCJjb2xvcjogcmdiKDIxLCAyMSwgMjEpO1wiPndvcmxkPC9i PiIpOworfQorCitURVNUKFBhc3RlSFRNTCwgRG9lc05vdFRyYW5zZm9ybUNvbG9yc09mTGlnaHRD b250ZW50RHVyaW5nT3V0ZGVudCkKK3sKKyAgICBhdXRvIHdlYlZpZXcgPSBjcmVhdGVXZWJWaWV3 V2l0aEN1c3RvbVBhc3RlYm9hcmREYXRhU2V0dGluZyh0cnVlLCB0cnVlKTsKKyAgICBbd2ViVmll dyBmb3JjZURhcmtNb2RlXTsKKworICAgIFt3ZWJWaWV3IHN5bmNocm9ub3VzbHlMb2FkVGVzdFBh Z2VOYW1lZDpAInJpY2gtY29sb3ItZmlsdGVyZWQiXTsKKworICAgIFt3ZWJWaWV3IHN0cmluZ0J5 RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJkb2N1bWVudC5ib2R5LnN0eWxlID0gYGNvbG9yOiAtYXBw bGUtc3lzdGVtLWxhYmVsYDsiXTsKKyAgICBbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZh U2NyaXB0OkAicmljaC5pbm5lckhUTUwgPSBgPHVsPjxsaT5oZWxsbzwvbGk+PHVsPjxsaSBpZD0n dGFyZ2V0Jz53b3JsZDwvbGk+PC91bD48L3VsPmA7Il07CisKKyAgICBbd2ViVmlldyBzdHJpbmdC eUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAiZ2V0U2VsZWN0aW9uKCkuc2V0UG9zaXRpb24odGFyZ2V0 LCAwKTsgZG9jdW1lbnQuZXhlY0NvbW1hbmQoJ291dGRlbnQnKTsiXTsKKworICAgIEVYUEVDVF9X S19TVFJFUShbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAicmljaC5pbm5l ckhUTUwiXSwgQCI8dWw+PGxpPmhlbGxvPC9saT48bGk+d29ybGQ8L2xpPjwvdWw+Iik7Cit9CisK ICNlbmRpZiAvLyBFTkFCTEUoREFSS19NT0RFX0NTUykgJiYgSEFWRShPU19EQVJLX01PREVfU1VQ UE9SVCkKIAogI2VuZGlmIC8vIFBMQVRGT1JNKENPQ09BKQpJbmRleDogV2ViS2l0Lnhjd29ya3Nw YWNlL3hjc2hhcmVkZGF0YS9Xb3Jrc3BhY2VTZXR0aW5ncy54Y3NldHRpbmdzCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdC54Y3dvcmtzcGFjZS94Y3NoYXJlZGRhdGEvV29ya3NwYWNlU2V0dGluZ3MueGNz ZXR0aW5ncwkocmV2aXNpb24gMjU2MDg1KQorKysgV2ViS2l0Lnhjd29ya3NwYWNlL3hjc2hhcmVk ZGF0YS9Xb3Jrc3BhY2VTZXR0aW5ncy54Y3NldHRpbmdzCSh3b3JraW5nIGNvcHkpCkBAIC02LDUg KzYsNyBAQAogCTxzdHJpbmc+T3JpZ2luYWw8L3N0cmluZz4KIAk8a2V5PklERVdvcmtzcGFjZVNo YXJlZFNldHRpbmdzX0F1dG9jcmVhdGVDb250ZXh0c0lmTmVlZGVkPC9rZXk+CiAJPGZhbHNlLz4K Kwk8a2V5PlByZXZpZXdzRW5hYmxlZDwva2V5PgorCTxmYWxzZS8+CiA8L2RpY3Q+CiA8L3BsaXN0 Pgo= 390620 2020-02-12 23:07:58 -0800 2020-02-13 17:03:13 -0800 Fixes the bug bug-207676-20200212230757.patch text/plain 8360 rniwa U3VidmVyc2lvbiBSZXZpc2lvbjogMjU2NTAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjVjNGEyNWU0YjcwNzkw NzdkZmJlMjIyYWQxNTkxYjgyZjY2NzliMS4uZWI0ZGJiYzAxNWRmZDdmMDVmYmRlYjgzM2QyNzcx YzQyZGM3OTA3YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIwLTAyLTEyICBSeW9z dWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIERhcmsgTW9kZTogSW4gTm90 ZXMsIGxpc3QgaXRlbSBiZWNvbWVzIGludmlzaWJsZSBpbiBkYXJrIG1vZGUgYWZ0ZXIgb3V0ZGVu dGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA3 Njc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhl IGJ1ZyB3YXMgY2F1c2VkIGJ5IEVkaXRpbmdTdHlsZTo6aW52ZXJzZVRyYW5zZm9ybUNvbG9ySWZO ZWVkZWQgY29udmVydGluZyAtYXBwbGUtc3lzdGVtLWxhYmVsIHRvCisgICAgICAgIHRyYW5zcGFy ZW50IGNvbG9yIGluIFJlcGxhY2VTZWxlY3Rpb25Db21tYW5kIHdoZW4gSW5zZXJ0TGlzdENvbW1h bmQgaW52b2tlcyBtb3ZlUGFyYWdyYXBocy4KKworICAgICAgICBUaGlzIHBhdGNoIGZpeGVzIHRo ZSBidWcgaW4gRWRpdGluZ1N0eWxlOjppbnZlcnNlVHJhbnNmb3JtQ29sb3JJZk5lZWRlZCBieSB0 cmVhdGluZyBhbnkgc2VtYW50aWMgY29sb3IKKyAgICAgICAgbmFtZSBvciBzZW1hbnRpYyBSR0Ig Y29sb3IgdmFsdWUgYXMgaWYgdGhlIGNvbG9yIHdhcyBub3Qgc3BlY2lmaWVkLgorCisgICAgICAg IEl0IGFsc28gZml4ZXMgdGhlIGJ1ZyB0aGF0IHJlbW92ZVN0eWxlRnJvbVJ1bGVzQW5kQ29udGV4 dCB3YXMgaW5jYXBhYmxlIG9mIHJlbW92aW5nIHN1cGVyZmxvdXMgc2VtYW50aWMKKyAgICAgICAg Y29sb3IgbmFtZXMgdGhhdCBhcHBlYXIgaW4gdGhlIGlubGluZSBzaW5jZSB0aGUgY29udGV4dCdz IGNvbXB1dGVkIHN0eWxlIG9ubHkgY29udGFpbiBSR0IgdmFsdWVzIGJ5CisgICAgICAgIHJlcGxh Y2luZyB0aGUgaW5saW5lIHN0eWxlJ3MgY29sb3IgdmFsdWVzIHdpdGggdGhhdCBvZiB0aGUgY29t cHV0ZWQgc3R5bGUuIFRoaXMgZml4IGlzIG5lY2Vzc2FyeSB0bworICAgICAgICBlbGltaW5hdGUg LWFwcGxlLXN5c3RlbS1sYWJlbCBpbiB0aGUgcGFzdGVkIGNvbnRlbnQsIHdoaWNoIGNhbiBjYXVz ZSBpc3N1ZXMgd2hlbiBzdWNoIGEgY29udGVudCBpcworICAgICAgICBzeW5jJ2VkIHRvIG90aGVy IGRldmljZXMgdmlhIGlDbG91ZCwgZXRjLi4uCisKKyAgICAgICAgVGVzdHM6IFBhc3RlSFRNTC5U cmFuc2Zvcm1Db2xvcnNPZkRhcmtDb250ZW50QnV0Tm90U2VtYW50aWNDb2xvcgorICAgICAgICAg ICAgICAgUGFzdGVIVE1MLkRvZXNOb3RUcmFuc2Zvcm1Db2xvcnNPZkxpZ2h0Q29udGVudER1cmlu Z091dGRlbnQKKworICAgICAgICAqIGVkaXRpbmcvRWRpdGluZ1N0eWxlLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkVkaXRpbmdTdHlsZTo6cmVtb3ZlU3R5bGVGcm9tUnVsZXNBbmRDb250ZXh0KToK KyAgICAgICAgKFdlYkNvcmU6OkVkaXRpbmdTdHlsZTo6aW52ZXJzZVRyYW5zZm9ybUNvbG9ySWZO ZWVkZWQpOgorCiAyMDIwLTAyLTEyICBTYWlkIEFib3UtSGFsbGF3YSAgPHNhYm91aGFsbGF3YUBh cHBsZS5jb20+CiAKICAgICAgICAgV2ViUCBpbWFnZSBmb3JtYXQgaXMgbm90IHN1cHBvcnRlZApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0aW5nU3R5bGUuY3BwIGIvU291 cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0aW5nU3R5bGUuY3BwCmluZGV4IDk5OTA5MTI3MWUwMzkz YjE0NzhlNjk3OTVkYzEyOGFjMmY4OTAzZmEuLjNiYTIyYmI3NDIyYTYyNGUwMjFlMTMyMjQ5Y2Ix NjVkYWMzYTkwZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdGluZ1N0 eWxlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRpbmdTdHlsZS5jcHAKQEAg LTEzNjYsNiArMTM2NiwzMCBAQCB2b2lkIEVkaXRpbmdTdHlsZTo6cmVtb3ZlU3R5bGVGcm9tUnVs ZXNBbmRDb250ZXh0KFN0eWxlZEVsZW1lbnQmIGVsZW1lbnQsIE5vZGUqCiAgICAgICAgIGlmICgh Y29tcHV0ZWRTdHlsZS0+bV9tdXRhYmxlU3R5bGUtPmdldFByb3BlcnR5Q1NTVmFsdWUoQ1NTUHJv cGVydHlCYWNrZ3JvdW5kQ29sb3IpKQogICAgICAgICAgICAgY29tcHV0ZWRTdHlsZS0+bV9tdXRh YmxlU3R5bGUtPnNldFByb3BlcnR5KENTU1Byb3BlcnR5QmFja2dyb3VuZENvbG9yLCBDU1NWYWx1 ZVRyYW5zcGFyZW50KTsKIAorICAgICAgICBSZWZQdHI8RWRpdGluZ1N0eWxlPiBjb21wdXRlZFN0 eWxlT2ZFbGVtZW50OworICAgICAgICBhdXRvIHJlcGxhY2VTZW1hbnRpY0NvbG9yV2l0aENvbXB1 dGVkVmFsdWUgPSBbJl0oY29uc3QgQ1NTUHJvcGVydHlJRCBpZCkgeworICAgICAgICAgICAgYXV0 byBjb2xvciA9IG1fbXV0YWJsZVN0eWxlLT5wcm9wZXJ0eUFzQ29sb3IoaWQpOworICAgICAgICAg ICAgaWYgKCFjb2xvciB8fCAoY29sb3ItPmlzVmlzaWJsZSgpICYmICFjb2xvci0+aXNTZW1hbnRp YygpKSkKKyAgICAgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgICAgIGlmICghY29tcHV0 ZWRTdHlsZU9mRWxlbWVudCkKKyAgICAgICAgICAgICAgICBjb21wdXRlZFN0eWxlT2ZFbGVtZW50 ID0gRWRpdGluZ1N0eWxlOjpjcmVhdGUoJmVsZW1lbnQsIEVkaXRpbmdQcm9wZXJ0aWVzSW5FZmZl Y3QpOworCisgICAgICAgICAgICBpZiAoIWNvbXB1dGVkU3R5bGVPZkVsZW1lbnQtPm1fbXV0YWJs ZVN0eWxlKQorICAgICAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICAgICAgYXV0byBjb21w dXRlZFZhbHVlID0gY29tcHV0ZWRTdHlsZU9mRWxlbWVudC0+bV9tdXRhYmxlU3R5bGUtPmdldFBy b3BlcnR5VmFsdWUoaWQpOworICAgICAgICAgICAgaWYgKCFjb21wdXRlZFZhbHVlKQorICAgICAg ICAgICAgICAgIHJldHVybjsKKworICAgICAgICAgICAgbV9tdXRhYmxlU3R5bGUtPnNldFByb3Bl cnR5KENTU1Byb3BlcnR5Q29sb3IsIGNvbXB1dGVkVmFsdWUpOworICAgICAgICB9OworCisgICAg ICAgIC8vIFJlcGxhY2Ugc2VtYW50aWMgY29sb3IgaWRlbnRpZmllcnMgbGlrZSAtYXBwbGUtc3lz dGVtLWxhYmVsIHdpdGggUkdCIHZhbHVlcyBzbyB0aGF0IGNvbXBhcnNpb25zIGluIGdldFByb3Bl cnRpZXNOb3RJbiBiZWxvdyB3b3VsZCB3b3JrLgorICAgICAgICByZXBsYWNlU2VtYW50aWNDb2xv cldpdGhDb21wdXRlZFZhbHVlKENTU1Byb3BlcnR5Q29sb3IpOworICAgICAgICByZXBsYWNlU2Vt YW50aWNDb2xvcldpdGhDb21wdXRlZFZhbHVlKENTU1Byb3BlcnR5Q2FyZXRDb2xvcik7CisgICAg ICAgIHJlcGxhY2VTZW1hbnRpY0NvbG9yV2l0aENvbXB1dGVkVmFsdWUoQ1NTUHJvcGVydHlCYWNr Z3JvdW5kQ29sb3IpOworCiAgICAgICAgIHJlbW92ZVByb3BlcnRpZXNJblN0eWxlKGNvbXB1dGVk U3R5bGUtPm1fbXV0YWJsZVN0eWxlLmdldCgpLCBzdHlsZUZyb21NYXRjaGVkUnVsZXMuZ2V0KCkp OwogICAgICAgICBtX211dGFibGVTdHlsZSA9IGdldFByb3BlcnRpZXNOb3RJbigqbV9tdXRhYmxl U3R5bGUsICpjb21wdXRlZFN0eWxlLT5tX211dGFibGVTdHlsZSk7CiAgICAgfQpAQCAtMTU4Nywx MCArMTYxMSwxNyBAQCBSZWY8RWRpdGluZ1N0eWxlPiBFZGl0aW5nU3R5bGU6OmludmVyc2VUcmFu c2Zvcm1Db2xvcklmTmVlZGVkKEVsZW1lbnQmIGVsZW1lbnQpCiAgICAgaWYgKCFtX211dGFibGVT dHlsZSB8fCAhcmVuZGVyZXIgfHwgIXJlbmRlcmVyLT5zdHlsZSgpLmhhc0FwcGxlQ29sb3JGaWx0 ZXIoKSkKICAgICAgICAgcmV0dXJuICp0aGlzOwogCi0gICAgYm9vbCBoYXNDb2xvciA9IG1fbXV0 YWJsZVN0eWxlLT5nZXRQcm9wZXJ0eUNTU1ZhbHVlKENTU1Byb3BlcnR5Q29sb3IpOwotICAgIGJv b2wgaGFzQ2FyZXRDb2xvciA9IG1fbXV0YWJsZVN0eWxlLT5nZXRQcm9wZXJ0eUNTU1ZhbHVlKENT U1Byb3BlcnR5Q2FyZXRDb2xvcik7Ci0gICAgYm9vbCBoYXNCYWNrZ3JvdW5kQ29sb3IgPSBtX211 dGFibGVTdHlsZS0+Z2V0UHJvcGVydHlDU1NWYWx1ZShDU1NQcm9wZXJ0eUJhY2tncm91bmRDb2xv cik7Ci0gICAgaWYgKCFoYXNDb2xvciAmJiAhaGFzQ2FyZXRDb2xvciAmJiAhaGFzQmFja2dyb3Vu ZENvbG9yKQorICAgIGF1dG8gY29sb3JGb3JQcm9wZXJ0eUlmSW52ZXJ0aWJsZSA9IFsmXShDU1NQ cm9wZXJ0eUlEIGlkKSAtPiBPcHRpb25hbDxDb2xvcj4geworICAgICAgICBhdXRvIGNvbG9yID0g bV9tdXRhYmxlU3R5bGUtPnByb3BlcnR5QXNDb2xvcihpZCk7CisgICAgICAgIGlmICghY29sb3Ig fHwgIWNvbG9yLT5pc1Zpc2libGUoKSB8fCBjb2xvci0+aXNTZW1hbnRpYygpKQorICAgICAgICAg ICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKKyAgICAgICAgcmV0dXJuIGNvbG9yOworICAgIH07CisK KyAgICBhdXRvIGNvbG9yID0gY29sb3JGb3JQcm9wZXJ0eUlmSW52ZXJ0aWJsZShDU1NQcm9wZXJ0 eUNvbG9yKTsKKyAgICBhdXRvIGNhcmV0Q29sb3IgPSBjb2xvckZvclByb3BlcnR5SWZJbnZlcnRp YmxlKENTU1Byb3BlcnR5Q2FyZXRDb2xvcik7CisgICAgYXV0byBiYWNrZ3JvdW5kQ29sb3IgPSBj b2xvckZvclByb3BlcnR5SWZJbnZlcnRpYmxlKENTU1Byb3BlcnR5QmFja2dyb3VuZENvbG9yKTsK KyAgICBpZiAoIWNvbG9yICYmICFjYXJldENvbG9yICYmICFiYWNrZ3JvdW5kQ29sb3IpCiAgICAg ICAgIHJldHVybiAqdGhpczsKIAogICAgIGF1dG8gc3R5bGVXaXRoSW52ZXJ0ZWRDb2xvcnMgPSBj b3B5KCk7CkBAIC0xNjAzLDEzICsxNjM0LDEzIEBAIFJlZjxFZGl0aW5nU3R5bGU+IEVkaXRpbmdT dHlsZTo6aW52ZXJzZVRyYW5zZm9ybUNvbG9ySWZOZWVkZWQoRWxlbWVudCYgZWxlbWVudCkKICAg ICAgICAgc3R5bGVXaXRoSW52ZXJ0ZWRDb2xvcnMtPm1fbXV0YWJsZVN0eWxlLT5zZXRQcm9wZXJ0 eShwcm9wZXJ0eUlELCBuZXdDb2xvci5jc3NUZXh0KCkpOwogICAgIH07CiAKLSAgICBpZiAoaGFz Q29sb3IpCisgICAgaWYgKGNvbG9yKQogICAgICAgICBpbnZlcnRlZENvbG9yKENTU1Byb3BlcnR5 Q29sb3IpOwogCi0gICAgaWYgKGhhc0NhcmV0Q29sb3IpCisgICAgaWYgKGNhcmV0Q29sb3IpCiAg ICAgICAgIGludmVydGVkQ29sb3IoQ1NTUHJvcGVydHlDYXJldENvbG9yKTsKIAotICAgIGlmICho YXNCYWNrZ3JvdW5kQ29sb3IpCisgICAgaWYgKGJhY2tncm91bmRDb2xvcikKICAgICAgICAgaW52 ZXJ0ZWRDb2xvcihDU1NQcm9wZXJ0eUJhY2tncm91bmRDb2xvcik7CiAKICAgICByZXR1cm4gc3R5 bGVXaXRoSW52ZXJ0ZWRDb2xvcnM7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29s cy9DaGFuZ2VMb2cKaW5kZXggNGNmYTZmM2ZlNThkNGNhMjliM2UyZmRhMGFhNzIxMWVlYTY1MDE2 OS4uY2FiZjU5NzBhMmEyNDRmMzViZTNjOGFhY2I4OWM2MjlmZGZlYWQ4MSAxMDA2NDQKLS0tIGEv VG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisy MDIwLTAyLTEyICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIERh cmsgTW9kZTogSW4gTm90ZXMsIGxpc3QgaXRlbSBiZWNvbWVzIGludmlzaWJsZSBpbiBkYXJrIG1v ZGUgYWZ0ZXIgb3V0ZGVudGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjA3Njc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQWRkZWQgcmVncmVzc2lvbiB0ZXN0cyBmb3IgcGFzdGluZyBjb250ZW50IHdp dGggLWFwcGxlLXN5c3RlbS1sYWJlbCBhbmQgb3V0ZGVudGluZyBjb250ZW50LgorCisgICAgICAg ICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9QYXN0ZUhUTUwubW06CisgICAgICAg IChQYXN0ZUhUTUwuVHJhbnNmb3JtQ29sb3JzT2ZEYXJrQ29udGVudEJ1dE5vdFNlbWFudGljQ29s b3IpOgorICAgICAgICAoUGFzdGVIVE1MLkRvZXNOb3RUcmFuc2Zvcm1Db2xvcnNPZkxpZ2h0Q29u dGVudER1cmluZ091dGRlbnQpOgorCiAyMDIwLTAyLTEyICBKb25hdGhhbiBCZWRhcmQgIDxqYmVk YXJkQGFwcGxlLmNvbT4KIAogICAgICAgICBydW4tamF2YXNjcmlwdGNvcmUtdGVzdHM6IEFsbG93 IGluc2VjdXJlIHJlcXVlc3RzIG9uIHVwbG9hZApkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktp dEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9QYXN0ZUhUTUwubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdENvY29hL1Bhc3RlSFRNTC5tbQppbmRleCBiOTQzZDAwMWRkMzMwNTQwMjhk YmQwOWE3N2M2OGMxOWE4YzYzNGQyLi4xMjZiOTVlMDMxMzBjNzBlNGQ5ODBmNGRkMzQ1ODM4ODA5 NWU0ZjEzIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29h L1Bhc3RlSFRNTC5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29h L1Bhc3RlSFRNTC5tbQpAQCAtNDIwLDYgKzQyMCwzNyBAQCBURVNUKFBhc3RlSFRNTCwgRG9lc05v dFRyYW5zZm9ybUNvbG9yc09mTGlnaHRDb250ZW50KQogICAgIEVYUEVDVF9XS19TVFJFUShbd2Vi VmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAicmljaC5xdWVyeVNlbGVjdG9yKCdz cGFuJykuc3R5bGUuY29sb3IiXSwgQCJyZ2IoMTAxLCAxMDEsIDEwMSkiKTsKIH0KIAorVEVTVChQ YXN0ZUhUTUwsIFRyYW5zZm9ybUNvbG9yc09mRGFya0NvbnRlbnRCdXROb3RTZW1hbnRpY0NvbG9y KQoreworICAgIGF1dG8gd2ViVmlldyA9IGNyZWF0ZVdlYlZpZXdXaXRoQ3VzdG9tUGFzdGVib2Fy ZERhdGFTZXR0aW5nKHRydWUsIHRydWUpOworICAgIFt3ZWJWaWV3IGZvcmNlRGFya01vZGVdOwor CisgICAgW3dlYlZpZXcgc3luY2hyb25vdXNseUxvYWRUZXN0UGFnZU5hbWVkOkAicmljaC1jb2xv ci1maWx0ZXJlZCJdOworCisgICAgW3dlYlZpZXcgc3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlw dDpAImRvY3VtZW50LmJvZHkuc3R5bGUuY29sb3IgPSAnLWFwcGxlLXN5c3RlbS1sYWJlbCc7Il07 CisgICAgd3JpdGVIVE1MVG9QYXN0ZWJvYXJkKEAiPHNwYW4gc3R5bGU9J2NvbG9yOiAtYXBwbGUt c3lzdGVtLWxhYmVsJz5oZWxsbzwvc3Bhbj48YiBzdHlsZT0nY29sb3I6ICNlZWUnPndvcmxkPC9i PiIpOworCisgICAgW3dlYlZpZXcgc3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlwdDpAInNlbGVj dFJpY2hUZXh0KCkiXTsKKyAgICBbd2ViVmlldyBwYXN0ZTpuaWxdOworCisgICAgRVhQRUNUX1dL X1NUUkVRKFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJyaWNoLmlubmVy SFRNTCJdLCBAImhlbGxvPGIgc3R5bGU9XCJjb2xvcjogcmdiKDIxLCAyMSwgMjEpO1wiPndvcmxk PC9iPiIpOworfQorCitURVNUKFBhc3RlSFRNTCwgRG9lc05vdFRyYW5zZm9ybUNvbG9yc09mTGln aHRDb250ZW50RHVyaW5nT3V0ZGVudCkKK3sKKyAgICBhdXRvIHdlYlZpZXcgPSBjcmVhdGVXZWJW aWV3V2l0aEN1c3RvbVBhc3RlYm9hcmREYXRhU2V0dGluZyh0cnVlLCB0cnVlKTsKKyAgICBbd2Vi VmlldyBmb3JjZURhcmtNb2RlXTsKKworICAgIFt3ZWJWaWV3IHN5bmNocm9ub3VzbHlMb2FkVGVz dFBhZ2VOYW1lZDpAInJpY2gtY29sb3ItZmlsdGVyZWQiXTsKKworICAgIFt3ZWJWaWV3IHN0cmlu Z0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJkb2N1bWVudC5ib2R5LnN0eWxlID0gYGNvbG9yOiAt YXBwbGUtc3lzdGVtLWxhYmVsYDsiXTsKKyAgICBbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdK YXZhU2NyaXB0OkAicmljaC5pbm5lckhUTUwgPSBgPHVsPjxsaT5oZWxsbzwvbGk+PHVsPjxsaSBp ZD0ndGFyZ2V0Jz53b3JsZDwvbGk+PC91bD48L3VsPmA7Il07CisKKyAgICBbd2ViVmlldyBzdHJp bmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAiZ2V0U2VsZWN0aW9uKCkuc2V0UG9zaXRpb24odGFy Z2V0LCAwKTsgZG9jdW1lbnQuZXhlY0NvbW1hbmQoJ291dGRlbnQnKTsiXTsKKworICAgIEVYUEVD VF9XS19TVFJFUShbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAicmljaC5p bm5lckhUTUwiXSwgQCI8dWw+PGxpPmhlbGxvPC9saT48bGk+d29ybGQ8L2xpPjwvdWw+Iik7Cit9 CisKICNlbmRpZiAvLyBFTkFCTEUoREFSS19NT0RFX0NTUykgJiYgSEFWRShPU19EQVJLX01PREVf U1VQUE9SVCkKIAogI2VuZGlmIC8vIFBMQVRGT1JNKENPQ09BKQo= 390705 2020-02-13 17:03:15 -0800 2020-02-13 17:04:02 -0800 Fixed the bug bug-207676-20200213170314.patch text/plain 8704 rniwa U3VidmVyc2lvbiBSZXZpc2lvbjogMjU2NTAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjVjNGEyNWU0YjcwNzkw NzdkZmJlMjIyYWQxNTkxYjgyZjY2NzliMS4uZWI0ZGJiYzAxNWRmZDdmMDVmYmRlYjgzM2QyNzcx YzQyZGM3OTA3YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIwLTAyLTEyICBSeW9z dWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIERhcmsgTW9kZTogSW4gTm90 ZXMsIGxpc3QgaXRlbSBiZWNvbWVzIGludmlzaWJsZSBpbiBkYXJrIG1vZGUgYWZ0ZXIgb3V0ZGVu dGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA3 Njc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhl IGJ1ZyB3YXMgY2F1c2VkIGJ5IEVkaXRpbmdTdHlsZTo6aW52ZXJzZVRyYW5zZm9ybUNvbG9ySWZO ZWVkZWQgY29udmVydGluZyAtYXBwbGUtc3lzdGVtLWxhYmVsIHRvCisgICAgICAgIHRyYW5zcGFy ZW50IGNvbG9yIGluIFJlcGxhY2VTZWxlY3Rpb25Db21tYW5kIHdoZW4gSW5zZXJ0TGlzdENvbW1h bmQgaW52b2tlcyBtb3ZlUGFyYWdyYXBocy4KKworICAgICAgICBUaGlzIHBhdGNoIGZpeGVzIHRo ZSBidWcgaW4gRWRpdGluZ1N0eWxlOjppbnZlcnNlVHJhbnNmb3JtQ29sb3JJZk5lZWRlZCBieSB0 cmVhdGluZyBhbnkgc2VtYW50aWMgY29sb3IKKyAgICAgICAgbmFtZSBvciBzZW1hbnRpYyBSR0Ig Y29sb3IgdmFsdWUgYXMgaWYgdGhlIGNvbG9yIHdhcyBub3Qgc3BlY2lmaWVkLgorCisgICAgICAg IEl0IGFsc28gZml4ZXMgdGhlIGJ1ZyB0aGF0IHJlbW92ZVN0eWxlRnJvbVJ1bGVzQW5kQ29udGV4 dCB3YXMgaW5jYXBhYmxlIG9mIHJlbW92aW5nIHN1cGVyZmxvdXMgc2VtYW50aWMKKyAgICAgICAg Y29sb3IgbmFtZXMgdGhhdCBhcHBlYXIgaW4gdGhlIGlubGluZSBzaW5jZSB0aGUgY29udGV4dCdz IGNvbXB1dGVkIHN0eWxlIG9ubHkgY29udGFpbiBSR0IgdmFsdWVzIGJ5CisgICAgICAgIHJlcGxh Y2luZyB0aGUgaW5saW5lIHN0eWxlJ3MgY29sb3IgdmFsdWVzIHdpdGggdGhhdCBvZiB0aGUgY29t cHV0ZWQgc3R5bGUuIFRoaXMgZml4IGlzIG5lY2Vzc2FyeSB0bworICAgICAgICBlbGltaW5hdGUg LWFwcGxlLXN5c3RlbS1sYWJlbCBpbiB0aGUgcGFzdGVkIGNvbnRlbnQsIHdoaWNoIGNhbiBjYXVz ZSBpc3N1ZXMgd2hlbiBzdWNoIGEgY29udGVudCBpcworICAgICAgICBzeW5jJ2VkIHRvIG90aGVy IGRldmljZXMgdmlhIGlDbG91ZCwgZXRjLi4uCisKKyAgICAgICAgVGVzdHM6IFBhc3RlSFRNTC5U cmFuc2Zvcm1Db2xvcnNPZkRhcmtDb250ZW50QnV0Tm90U2VtYW50aWNDb2xvcgorICAgICAgICAg ICAgICAgUGFzdGVIVE1MLkRvZXNOb3RUcmFuc2Zvcm1Db2xvcnNPZkxpZ2h0Q29udGVudER1cmlu Z091dGRlbnQKKworICAgICAgICAqIGVkaXRpbmcvRWRpdGluZ1N0eWxlLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkVkaXRpbmdTdHlsZTo6cmVtb3ZlU3R5bGVGcm9tUnVsZXNBbmRDb250ZXh0KToK KyAgICAgICAgKFdlYkNvcmU6OkVkaXRpbmdTdHlsZTo6aW52ZXJzZVRyYW5zZm9ybUNvbG9ySWZO ZWVkZWQpOgorCiAyMDIwLTAyLTEyICBTYWlkIEFib3UtSGFsbGF3YSAgPHNhYm91aGFsbGF3YUBh cHBsZS5jb20+CiAKICAgICAgICAgV2ViUCBpbWFnZSBmb3JtYXQgaXMgbm90IHN1cHBvcnRlZApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0aW5nU3R5bGUuY3BwIGIvU291 cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0aW5nU3R5bGUuY3BwCmluZGV4IDk5OTA5MTI3MWUwMzkz YjE0NzhlNjk3OTVkYzEyOGFjMmY4OTAzZmEuLjdmZjFjMzI1NTFhNmEyODU3MDkzNjIwNzUyZTcz NGQzYTk2YmU4ZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdGluZ1N0 eWxlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRpbmdTdHlsZS5jcHAKQEAg LTEzNjYsNiArMTM2NiwzMCBAQCB2b2lkIEVkaXRpbmdTdHlsZTo6cmVtb3ZlU3R5bGVGcm9tUnVs ZXNBbmRDb250ZXh0KFN0eWxlZEVsZW1lbnQmIGVsZW1lbnQsIE5vZGUqCiAgICAgICAgIGlmICgh Y29tcHV0ZWRTdHlsZS0+bV9tdXRhYmxlU3R5bGUtPmdldFByb3BlcnR5Q1NTVmFsdWUoQ1NTUHJv cGVydHlCYWNrZ3JvdW5kQ29sb3IpKQogICAgICAgICAgICAgY29tcHV0ZWRTdHlsZS0+bV9tdXRh YmxlU3R5bGUtPnNldFByb3BlcnR5KENTU1Byb3BlcnR5QmFja2dyb3VuZENvbG9yLCBDU1NWYWx1 ZVRyYW5zcGFyZW50KTsKIAorICAgICAgICBSZWZQdHI8RWRpdGluZ1N0eWxlPiBjb21wdXRlZFN0 eWxlT2ZFbGVtZW50OworICAgICAgICBhdXRvIHJlcGxhY2VTZW1hbnRpY0NvbG9yV2l0aENvbXB1 dGVkVmFsdWUgPSBbJl0oY29uc3QgQ1NTUHJvcGVydHlJRCBpZCkgeworICAgICAgICAgICAgYXV0 byBjb2xvciA9IG1fbXV0YWJsZVN0eWxlLT5wcm9wZXJ0eUFzQ29sb3IoaWQpOworICAgICAgICAg ICAgaWYgKCFjb2xvciB8fCAoY29sb3ItPmlzVmlzaWJsZSgpICYmICFjb2xvci0+aXNTZW1hbnRp YygpKSkKKyAgICAgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgICAgIGlmICghY29tcHV0 ZWRTdHlsZU9mRWxlbWVudCkKKyAgICAgICAgICAgICAgICBjb21wdXRlZFN0eWxlT2ZFbGVtZW50 ID0gRWRpdGluZ1N0eWxlOjpjcmVhdGUoJmVsZW1lbnQsIEVkaXRpbmdQcm9wZXJ0aWVzSW5FZmZl Y3QpOworCisgICAgICAgICAgICBpZiAoIWNvbXB1dGVkU3R5bGVPZkVsZW1lbnQtPm1fbXV0YWJs ZVN0eWxlKQorICAgICAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICAgICAgYXV0byBjb21w dXRlZFZhbHVlID0gY29tcHV0ZWRTdHlsZU9mRWxlbWVudC0+bV9tdXRhYmxlU3R5bGUtPmdldFBy b3BlcnR5VmFsdWUoaWQpOworICAgICAgICAgICAgaWYgKCFjb21wdXRlZFZhbHVlKQorICAgICAg ICAgICAgICAgIHJldHVybjsKKworICAgICAgICAgICAgbV9tdXRhYmxlU3R5bGUtPnNldFByb3Bl cnR5KGlkLCBjb21wdXRlZFZhbHVlKTsKKyAgICAgICAgfTsKKworICAgICAgICAvLyBSZXBsYWNl IHNlbWFudGljIGNvbG9yIGlkZW50aWZpZXJzIGxpa2UgLWFwcGxlLXN5c3RlbS1sYWJlbCB3aXRo IFJHQiB2YWx1ZXMgc28gdGhhdCBjb21wYXJzaW9ucyBpbiBnZXRQcm9wZXJ0aWVzTm90SW4gYmVs b3cgd291bGQgd29yay4KKyAgICAgICAgcmVwbGFjZVNlbWFudGljQ29sb3JXaXRoQ29tcHV0ZWRW YWx1ZShDU1NQcm9wZXJ0eUNvbG9yKTsKKyAgICAgICAgcmVwbGFjZVNlbWFudGljQ29sb3JXaXRo Q29tcHV0ZWRWYWx1ZShDU1NQcm9wZXJ0eUNhcmV0Q29sb3IpOworICAgICAgICByZXBsYWNlU2Vt YW50aWNDb2xvcldpdGhDb21wdXRlZFZhbHVlKENTU1Byb3BlcnR5QmFja2dyb3VuZENvbG9yKTsK KwogICAgICAgICByZW1vdmVQcm9wZXJ0aWVzSW5TdHlsZShjb21wdXRlZFN0eWxlLT5tX211dGFi bGVTdHlsZS5nZXQoKSwgc3R5bGVGcm9tTWF0Y2hlZFJ1bGVzLmdldCgpKTsKICAgICAgICAgbV9t dXRhYmxlU3R5bGUgPSBnZXRQcm9wZXJ0aWVzTm90SW4oKm1fbXV0YWJsZVN0eWxlLCAqY29tcHV0 ZWRTdHlsZS0+bV9tdXRhYmxlU3R5bGUpOwogICAgIH0KQEAgLTE1ODcsMTAgKzE2MTEsMTcgQEAg UmVmPEVkaXRpbmdTdHlsZT4gRWRpdGluZ1N0eWxlOjppbnZlcnNlVHJhbnNmb3JtQ29sb3JJZk5l ZWRlZChFbGVtZW50JiBlbGVtZW50KQogICAgIGlmICghbV9tdXRhYmxlU3R5bGUgfHwgIXJlbmRl cmVyIHx8ICFyZW5kZXJlci0+c3R5bGUoKS5oYXNBcHBsZUNvbG9yRmlsdGVyKCkpCiAgICAgICAg IHJldHVybiAqdGhpczsKIAotICAgIGJvb2wgaGFzQ29sb3IgPSBtX211dGFibGVTdHlsZS0+Z2V0 UHJvcGVydHlDU1NWYWx1ZShDU1NQcm9wZXJ0eUNvbG9yKTsKLSAgICBib29sIGhhc0NhcmV0Q29s b3IgPSBtX211dGFibGVTdHlsZS0+Z2V0UHJvcGVydHlDU1NWYWx1ZShDU1NQcm9wZXJ0eUNhcmV0 Q29sb3IpOwotICAgIGJvb2wgaGFzQmFja2dyb3VuZENvbG9yID0gbV9tdXRhYmxlU3R5bGUtPmdl dFByb3BlcnR5Q1NTVmFsdWUoQ1NTUHJvcGVydHlCYWNrZ3JvdW5kQ29sb3IpOwotICAgIGlmICgh aGFzQ29sb3IgJiYgIWhhc0NhcmV0Q29sb3IgJiYgIWhhc0JhY2tncm91bmRDb2xvcikKKyAgICBh dXRvIGNvbG9yRm9yUHJvcGVydHlJZkludmVydGlibGUgPSBbJl0oQ1NTUHJvcGVydHlJRCBpZCkg LT4gT3B0aW9uYWw8Q29sb3I+IHsKKyAgICAgICAgYXV0byBjb2xvciA9IG1fbXV0YWJsZVN0eWxl LT5wcm9wZXJ0eUFzQ29sb3IoaWQpOworICAgICAgICBpZiAoIWNvbG9yIHx8ICFjb2xvci0+aXNW aXNpYmxlKCkgfHwgY29sb3ItPmlzU2VtYW50aWMoKSkKKyAgICAgICAgICAgIHJldHVybiBXVEY6 Om51bGxvcHQ7CisgICAgICAgIHJldHVybiBjb2xvcjsKKyAgICB9OworCisgICAgYXV0byBjb2xv ciA9IGNvbG9yRm9yUHJvcGVydHlJZkludmVydGlibGUoQ1NTUHJvcGVydHlDb2xvcik7CisgICAg YXV0byBjYXJldENvbG9yID0gY29sb3JGb3JQcm9wZXJ0eUlmSW52ZXJ0aWJsZShDU1NQcm9wZXJ0 eUNhcmV0Q29sb3IpOworICAgIGF1dG8gYmFja2dyb3VuZENvbG9yID0gY29sb3JGb3JQcm9wZXJ0 eUlmSW52ZXJ0aWJsZShDU1NQcm9wZXJ0eUJhY2tncm91bmRDb2xvcik7CisgICAgaWYgKCFjb2xv ciAmJiAhY2FyZXRDb2xvciAmJiAhYmFja2dyb3VuZENvbG9yKQogICAgICAgICByZXR1cm4gKnRo aXM7CiAKICAgICBhdXRvIHN0eWxlV2l0aEludmVydGVkQ29sb3JzID0gY29weSgpOwpAQCAtMTYw MywxMyArMTYzNCwxMyBAQCBSZWY8RWRpdGluZ1N0eWxlPiBFZGl0aW5nU3R5bGU6OmludmVyc2VU cmFuc2Zvcm1Db2xvcklmTmVlZGVkKEVsZW1lbnQmIGVsZW1lbnQpCiAgICAgICAgIHN0eWxlV2l0 aEludmVydGVkQ29sb3JzLT5tX211dGFibGVTdHlsZS0+c2V0UHJvcGVydHkocHJvcGVydHlJRCwg bmV3Q29sb3IuY3NzVGV4dCgpKTsKICAgICB9OwogCi0gICAgaWYgKGhhc0NvbG9yKQorICAgIGlm IChjb2xvcikKICAgICAgICAgaW52ZXJ0ZWRDb2xvcihDU1NQcm9wZXJ0eUNvbG9yKTsKIAotICAg IGlmIChoYXNDYXJldENvbG9yKQorICAgIGlmIChjYXJldENvbG9yKQogICAgICAgICBpbnZlcnRl ZENvbG9yKENTU1Byb3BlcnR5Q2FyZXRDb2xvcik7CiAKLSAgICBpZiAoaGFzQmFja2dyb3VuZENv bG9yKQorICAgIGlmIChiYWNrZ3JvdW5kQ29sb3IpCiAgICAgICAgIGludmVydGVkQ29sb3IoQ1NT UHJvcGVydHlCYWNrZ3JvdW5kQ29sb3IpOwogCiAgICAgcmV0dXJuIHN0eWxlV2l0aEludmVydGVk Q29sb3JzOwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmlu ZGV4IDRjZmE2ZjNmZTU4ZDRjYTI5YjNlMmZkYTBhYTcyMTFlZWE2NTAxNjkuLmNhYmY1OTcwYTJh MjQ0ZjM1YmUzYzhhYWNiODljNjI5ZmRmZWFkODEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxv ZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAyMC0wMi0xMiAgUnlv c3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KKworICAgICAgICBEYXJrIE1vZGU6IEluIE5v dGVzLCBsaXN0IGl0ZW0gYmVjb21lcyBpbnZpc2libGUgaW4gZGFyayBtb2RlIGFmdGVyIG91dGRl bnRpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIw NzY3NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFk ZGVkIHJlZ3Jlc3Npb24gdGVzdHMgZm9yIHBhc3RpbmcgY29udGVudCB3aXRoIC1hcHBsZS1zeXN0 ZW0tbGFiZWwgYW5kIG91dGRlbnRpbmcgY29udGVudC4KKworICAgICAgICAqIFRlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0Q29jb2EvUGFzdGVIVE1MLm1tOgorICAgICAgICAoUGFzdGVIVE1MLlRy YW5zZm9ybUNvbG9yc09mRGFya0NvbnRlbnRCdXROb3RTZW1hbnRpY0NvbG9yKToKKyAgICAgICAg KFBhc3RlSFRNTC5Eb2VzTm90VHJhbnNmb3JtQ29sb3JzT2ZMaWdodENvbnRlbnREdXJpbmdPdXRk ZW50KToKKwogMjAyMC0wMi0xMiAgSm9uYXRoYW4gQmVkYXJkICA8amJlZGFyZEBhcHBsZS5jb20+ CiAKICAgICAgICAgcnVuLWphdmFzY3JpcHRjb3JlLXRlc3RzOiBBbGxvdyBpbnNlY3VyZSByZXF1 ZXN0cyBvbiB1cGxvYWQKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0Q29jb2EvUGFzdGVIVE1MLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRD b2NvYS9QYXN0ZUhUTUwubW0KaW5kZXggYjk0M2QwMDFkZDMzMDU0MDI4ZGJkMDlhNzdjNjhjMTlh OGM2MzRkMi4uNThhNDcxZWQ5N2UxMWQyMjQ4OTAyMTRlODcyMDlmNzlmNGJhNDg0NCAxMDA2NDQK LS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9QYXN0ZUhUTUwubW0K KysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9QYXN0ZUhUTUwubW0K QEAgLTQyMCw2ICs0MjAsNDIgQEAgVEVTVChQYXN0ZUhUTUwsIERvZXNOb3RUcmFuc2Zvcm1Db2xv cnNPZkxpZ2h0Q29udGVudCkKICAgICBFWFBFQ1RfV0tfU1RSRVEoW3dlYlZpZXcgc3RyaW5nQnlF dmFsdWF0aW5nSmF2YVNjcmlwdDpAInJpY2gucXVlcnlTZWxlY3Rvcignc3BhbicpLnN0eWxlLmNv bG9yIl0sIEAicmdiKDEwMSwgMTAxLCAxMDEpIik7CiB9CiAKK1RFU1QoUGFzdGVIVE1MLCBUcmFu c2Zvcm1Db2xvcnNPZkRhcmtDb250ZW50QnV0Tm90U2VtYW50aWNDb2xvcikKK3sKKyAgICBhdXRv IHdlYlZpZXcgPSBjcmVhdGVXZWJWaWV3V2l0aEN1c3RvbVBhc3RlYm9hcmREYXRhU2V0dGluZyh0 cnVlLCB0cnVlKTsKKyAgICBbd2ViVmlldyBmb3JjZURhcmtNb2RlXTsKKworICAgIFt3ZWJWaWV3 IHN5bmNocm9ub3VzbHlMb2FkVGVzdFBhZ2VOYW1lZDpAInJpY2gtY29sb3ItZmlsdGVyZWQiXTsK KworICAgIFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJkb2N1bWVudC5i b2R5LnN0eWxlLmNvbG9yID0gJy1hcHBsZS1zeXN0ZW0tbGFiZWwnOyJdOworICAgIHdyaXRlSFRN TFRvUGFzdGVib2FyZChAIjxzcGFuIHN0eWxlPSdjb2xvcjogLWFwcGxlLXN5c3RlbS1sYWJlbCc+ aGVsbG88L3NwYW4+PGIgc3R5bGU9J2NvbG9yOiAjZWVlJz53b3JsZDwvYj4iKTsKKworICAgIFt3 ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJzZWxlY3RSaWNoVGV4dCgpIl07 CisgICAgW3dlYlZpZXcgcGFzdGU6bmlsXTsKKworI2lmIFVTRShBUFBLSVQpCisgICAgRVhQRUNU X1dLX1NUUkVRKFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJyaWNoLmlu bmVySFRNTCJdLCBAImhlbGxvPGIgc3R5bGU9XCJjb2xvcjogcmdiKDIxLCAyMSwgMjEpO1wiPndv cmxkPC9iPiIpOworI2Vsc2UKKyAgICBFWFBFQ1RfV0tfU1RSRVEoW3dlYlZpZXcgc3RyaW5nQnlF dmFsdWF0aW5nSmF2YVNjcmlwdDpAInJpY2guaW5uZXJIVE1MIl0sCisgICAgICAgIEAiPHNwYW4g c3R5bGU9XCItd2Via2l0LXRleHQtc2l6ZS1hZGp1c3Q6IGF1dG87XCI+aGVsbG88L3NwYW4+PGIg c3R5bGU9XCItd2Via2l0LXRleHQtc2l6ZS1hZGp1c3Q6IGF1dG87IGNvbG9yOiByZ2IoMjEsIDIx LCAyMSk7XCI+d29ybGQ8L2I+Iik7CisjZW5kaWYKK30KKworVEVTVChQYXN0ZUhUTUwsIERvZXNO b3RUcmFuc2Zvcm1Db2xvcnNPZkxpZ2h0Q29udGVudER1cmluZ091dGRlbnQpCit7CisgICAgYXV0 byB3ZWJWaWV3ID0gY3JlYXRlV2ViVmlld1dpdGhDdXN0b21QYXN0ZWJvYXJkRGF0YVNldHRpbmco dHJ1ZSwgdHJ1ZSk7CisgICAgW3dlYlZpZXcgZm9yY2VEYXJrTW9kZV07CisKKyAgICBbd2ViVmll dyBzeW5jaHJvbm91c2x5TG9hZFRlc3RQYWdlTmFtZWQ6QCJyaWNoLWNvbG9yLWZpbHRlcmVkIl07 CisKKyAgICBbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAiZG9jdW1lbnQu Ym9keS5zdHlsZSA9IGBjb2xvcjogLWFwcGxlLXN5c3RlbS1sYWJlbDsgY2FyZXQtY29sb3I6IC1h cHBsZS1zeXN0ZW0tc2Vjb25kYXJ5LWxhYmVsOyBiYWNrZ3JvdW5kLWNvbG9yOiAtYXBwbGUtc3lz dGVtLXRleHQtYmFja2dyb3VuZDtgOyJdOworICAgIFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGlu Z0phdmFTY3JpcHQ6QCJyaWNoLmlubmVySFRNTCA9IGA8dWw+PGxpPmhlbGxvPC9saT48dWw+PGxp IGlkPSd0YXJnZXQnPndvcmxkPC9saT48L3VsPjwvdWw+YDsiXTsKKworICAgIFt3ZWJWaWV3IHN0 cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJnZXRTZWxlY3Rpb24oKS5zZXRQb3NpdGlvbih0 YXJnZXQsIDApOyBkb2N1bWVudC5leGVjQ29tbWFuZCgnb3V0ZGVudCcpOyJdOworCisgICAgRVhQ RUNUX1dLX1NUUkVRKFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJyaWNo LmlubmVySFRNTCJdLCBAIjx1bD48bGk+aGVsbG88L2xpPjxsaT53b3JsZDwvbGk+PC91bD4iKTsK K30KKwogI2VuZGlmIC8vIEVOQUJMRShEQVJLX01PREVfQ1NTKSAmJiBIQVZFKE9TX0RBUktfTU9E RV9TVVBQT1JUKQogCiAjZW5kaWYgLy8gUExBVEZPUk0oQ09DT0EpCg==