228097 2021-07-19 19:19:20 -0700 Characters with no fonts that support them are drawn as two .notdef glyphs in the fast text codepath 2021-07-22 10:59:07 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mmaxfield mmaxfield dino jonlee simon.fraser thorton webkit-bug-importer zalan oldest_to_newest 1778084 0 mmaxfield 2021-07-19 19:19:20 -0700 Characters with no fonts that support them are drawn as two .notdef glyphs in the fast text codepath 1778085 1 433844 mmaxfield 2021-07-19 19:20:07 -0700 Created attachment 433844 Patch 1778086 2 mmaxfield 2021-07-19 19:20:10 -0700 <rdar://problem/80798113> 1778087 3 433844 mmaxfield 2021-07-19 19:21:44 -0700 Comment on attachment 433844 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=433844&action=review > Source/WebCore/platform/graphics/WidthIterator.cpp:274 > + if (!U_IS_BMP(character) && glyph) I'm not sure this is correct. Shaping expects the number of glyphs to equal the length of the string. 1778093 4 433847 mmaxfield 2021-07-19 21:05:56 -0700 Created attachment 433847 Patch 1778094 5 433848 mmaxfield 2021-07-19 21:07:33 -0700 Created attachment 433848 Patch 1778095 6 433848 mmaxfield 2021-07-19 21:45:27 -0700 Comment on attachment 433848 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=433848&action=review > Source/WebCore/ChangeLog:3 > + Characters with no fonts that support them are drawn as two .notdef glyphs in the fast text codepath REGRESSION(r272379): > LayoutTests/ChangeLog:3 > + Characters with no fonts that support them are drawn as two .notdef glyphs in the fast text codepath REGRESSION(r272379): 1778097 7 433849 mmaxfield 2021-07-19 22:16:23 -0700 Created attachment 433849 Patch 1778166 8 433849 zalan 2021-07-20 07:00:02 -0700 Comment on attachment 433849 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=433849&action=review > Source/WebCore/platform/graphics/WidthIterator.cpp:115 > + if (!glyphBuffer.glyphAt(i) && !glyphBuffer.glyphAt(i + 1)) { I assume these surrogates come in pairs and the i + 1 derefs are safe. 1778189 9 433849 simon.fraser 2021-07-20 09:34:29 -0700 Comment on attachment 433849 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=433849&action=review > Source/WebCore/platform/graphics/WidthIterator.cpp:121 > + continue; This continue does nothing. 1778273 10 mmaxfield 2021-07-20 13:47:46 -0700 Committed r280103 (239820@main): <https://commits.webkit.org/239820@main> 1778274 11 433849 mmaxfield 2021-07-20 13:48:48 -0700 Comment on attachment 433849 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=433849&action=review >> Source/WebCore/platform/graphics/WidthIterator.cpp:115 >> + if (!glyphBuffer.glyphAt(i) && !glyphBuffer.glyphAt(i + 1)) { > > I assume these surrogates come in pairs and the i + 1 derefs are safe. The for loop has "i < glyphBuffer.size() - 1" They're not guaranteed to come in pairs, but when they do, that's the case where we get the double .notdef glyphs. If they don't come in pairs, we don't need to strip them out. 1778759 12 mmaxfield 2021-07-22 10:59:07 -0700 *** Bug 223308 has been marked as a duplicate of this bug. *** 433844 2021-07-19 19:20:07 -0700 2021-07-19 21:05:55 -0700 Patch bug-228097-20210719192006.patch text/plain 4320 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwMDA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGQ2OTdlY2I3ZDZiMzhk YzBiNjE1MTFiYWZkMzc2MWI5ODI3ZDVjNC4uOTAxNzMzNTA1YmIxMThlYzc3ODNhZmFkMThmNjRi Njk0ZTM0MTFkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTA3LTE5ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgQ2hhcmFjdGVy cyB3aXRoIG5vIGZvbnRzIHRoYXQgc3VwcG9ydCB0aGVtIGFyZSBkcmF3biBhcyB0d28gLm5vdGRl ZiBnbHlwaHMgaW4gdGhlIGZhc3QgdGV4dCBjb2RlcGF0aAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI4MDk3CisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS84MDc5ODExMz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBUZXN0OiBmYXN0L3RleHQvZG91YmxlLW5vdGRlZi1zaW1wbGUtdGV4dC1jb2RlcGF0aC5o dG1sCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9XaWR0aEl0ZXJhdG9yLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OldpZHRoSXRlcmF0b3I6OmFkdmFuY2VJbnRlcm5hbCk6CisKIDIwMjEt MDctMTYgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KIAogICAgICAg ICBGaXggQXBwbGUgaW50ZXJuYWwgYnVpbGQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL1dpZHRoSXRlcmF0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvV2lkdGhJdGVyYXRvci5jcHAKaW5kZXggMjIwYjBlYjEyOWYyYzBmMzg4YWMz OGZjMWQ4MDQ0ZGIxNjc3M2E4NC4uNmJjZmFkM2I1NDMzNjFiZGEwZWQ0MjY0ODI3OGE1OWRkNTMx MzFiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvV2lkdGhJ dGVyYXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvV2lkdGhJ dGVyYXRvci5jcHAKQEAgLTI3MSw3ICsyNzEsNyBAQCBpbmxpbmUgdm9pZCBXaWR0aEl0ZXJhdG9y OjphZHZhbmNlSW50ZXJuYWwoVGV4dEl0ZXJhdG9yJiB0ZXh0SXRlcmF0b3IsIEdseXBoQnVmZgog ICAgICAgICAvLyBIb3dldmVyLCBDVEZvbnRUcmFuc2Zvcm1HbHlwaHMoKSBjYW4ndCBkZWxldGUg dGhlc2UgMCBnbHlwaHMgZnJvbSB0aGUgc2hhcGVkIHRleHQsCiAgICAgICAgIC8vIHNvIHdlIHNo b3VsZG4ndCBhZGQgdGhlbSBpbiB0aGUgZmlyc3QgcGxhY2UgaWYgd2UncmUgdXNpbmcgdGhhdCBz aGFwaW5nIHJvdXRpbmUuCiAgICAgICAgIC8vIEFueSBvdGhlciBzaGFwaW5nIHJvdXRpbmUgc2hv dWxkIGRlbGV0ZSB0aGVzZSBnbHlwaHMgZnJvbSB0aGUgc2hhcGVkIHRleHQuCi0gICAgICAgIGlm ICghVV9JU19CTVAoY2hhcmFjdGVyKSkKKyAgICAgICAgaWYgKCFVX0lTX0JNUChjaGFyYWN0ZXIp ICYmIGdseXBoKQogICAgICAgICAgICAgZ2x5cGhCdWZmZXIuYWRkKDAsICpmb250LCAwLCBjdXJy ZW50Q2hhcmFjdGVySW5kZXggKyAxKTsKICNlbmRpZgogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMDQyZDExNzY1Mjk1MjVl NTI3OTQ5YjQyZDQ5NTY1NTFhZTRlYTMwOC4uNzkwZDJkYzk4OWZiNGRhOTkxMTc3NmI0OTQ3NDk3 MGE1MTY2YTRiYyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91 dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTA3LTE5ICBNeWxlcyBDLiBN YXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgQ2hhcmFjdGVycyB3aXRo IG5vIGZvbnRzIHRoYXQgc3VwcG9ydCB0aGVtIGFyZSBkcmF3biBhcyB0d28gLm5vdGRlZiBnbHlw aHMgaW4gdGhlIGZhc3QgdGV4dCBjb2RlcGF0aAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI4MDk3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84MDc5 ODExMz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IGZhc3QvdGV4dC9kb3VibGUtbm90ZGVmLXNpbXBsZS10ZXh0LWNvZGVwYXRoLWV4cGVjdGVkLmh0 bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3QvdGV4dC9kb3VibGUtbm90ZGVmLXNpbXBsZS10ZXh0 LWNvZGVwYXRoLmh0bWw6IEFkZGVkLgorCiAyMDIxLTA3LTE2ICBUcnVpdHQgU2F2ZWxsICA8dHNh dmVsbEBhcHBsZS5jb20+CiAKICAgICAgICAgYWNjZXNzaWJpbGl0eS9sb2FkaW5nLWlmcmFtZS1z ZW5kcy1ub3RpZmljYXRpb24uaHRtbCBpcyBhIGZsYWt5IHRpbWVvdXQKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2Zhc3QvdGV4dC9kb3VibGUtbm90ZGVmLXNpbXBsZS10ZXh0LWNvZGVwYXRoLWV4 cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3RleHQvZG91YmxlLW5vdGRlZi1zaW1wbGUt dGV4dC1jb2RlcGF0aC1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmVjMDM4MDg4MGZiMWUzYTBj NGZjZDg5N2EyMjZiZTk5NzZkYzQwYmUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9m YXN0L3RleHQvZG91YmxlLW5vdGRlZi1zaW1wbGUtdGV4dC1jb2RlcGF0aC1leHBlY3RlZC5odG1s CkBAIC0wLDAgKzEsOSBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPG1ldGEg Y2hhcnNldD0idXRmLTgiPgorPC9oZWFkPgorPGJvZHk+CitUaGlzIHRlc3QgbWFrZXMgc3VyZSB0 aGF0IC5ub3RkZWYgZG9lcyBub3QgZHJhdyB0d2ljZSBmb3IgYSBzaW5nbGUgY2hhcmFjdGVyIGlu IHRoZSBzaW1wbGUgdGV4dCBjb2RlcGF0aC4gVGhlIHRlc3QgcGFzc2VzIGlmIHRoaXMgdGV4dCB5 b3UncmUgcmVhZGluZyByaWdodCBub3cgaXMgdGhlIG9ubHkgdGhpbmcgeW91IGNhbiBzZWUgb24g dGhlIHBhZ2UuCis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0 L3RleHQvZG91YmxlLW5vdGRlZi1zaW1wbGUtdGV4dC1jb2RlcGF0aC5odG1sIGIvTGF5b3V0VGVz dHMvZmFzdC90ZXh0L2RvdWJsZS1ub3RkZWYtc2ltcGxlLXRleHQtY29kZXBhdGguaHRtbApuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwLi44YzIxMDIwZWEyMmIwZWFmODU1NmYyYjhjOTg4ZWNiNGI5NTY2YWQwCi0tLSAvZGV2 L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2RvdWJsZS1ub3RkZWYtc2ltcGxlLXRl eHQtY29kZXBhdGguaHRtbApAQCAtMCwwICsxLDE5IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1s PgorPGhlYWQ+Cis8bWV0YSBjaGFyc2V0PSJ1dGYtOCI+Cis8L2hlYWQ+Cis8Ym9keT4KK1RoaXMg dGVzdCBtYWtlcyBzdXJlIHRoYXQgLm5vdGRlZiBkb2VzIG5vdCBkcmF3IHR3aWNlIGZvciBhIHNp bmdsZSBjaGFyYWN0ZXIgaW4gdGhlIHNpbXBsZSB0ZXh0IGNvZGVwYXRoLiBUaGUgdGVzdCBwYXNz ZXMgaWYgdGhpcyB0ZXh0IHlvdSdyZSByZWFkaW5nIHJpZ2h0IG5vdyBpcyB0aGUgb25seSB0aGlu ZyB5b3UgY2FuIHNlZSBvbiB0aGUgcGFnZS4KKzxkaXYgc3R5bGU9InBvc2l0aW9uOiByZWxhdGl2 ZTsiPgorPGRpdiBpZD0idGFyZ2V0IiBzdHlsZT0icG9zaXRpb246IGFic29sdXRlOyB0b3A6IDBw eDsgbGVmdDogMHB4OyBmb250LWZhbWlseTogJ0hpcmFnaW5vIEtha3UgR290aGljIFBybyc7Ij4m I3gyMjRDQTs8L2Rpdj4KKzxkaXYgaWQ9ImNvdmVyIiBzdHlsZT0icG9zaXRpb246IGFic29sdXRl OyB0b3A6IDBweDsgbGVmdDogMHB4OyB3aWR0aDogMTAwcHg7IGhlaWdodDogMTAwcHg7IGJhY2tn cm91bmQ6IHdoaXRlOyI+PC9kaXY+Cis8L2Rpdj4KKzxzY3JpcHQ+Cit2YXIgdGFyZ2V0ID0gZG9j dW1lbnQuZ2V0RWxlbWVudEJ5SWQoInRhcmdldCIpOwordmFyIGNvdmVyID0gZG9jdW1lbnQuZ2V0 RWxlbWVudEJ5SWQoImNvdmVyIik7Citjb3Zlci5zdHlsZS53aWR0aCA9ICIiICsgdGFyZ2V0Lm9m ZnNldFdpZHRoICsgInB4IjsKK2NvdmVyLnN0eWxlLmhlaWdodCA9ICIiICsgdGFyZ2V0Lm9mZnNl dEhlaWdodCArICJweCI7Cis8L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4K 433847 2021-07-19 21:05:56 -0700 2021-07-19 21:07:31 -0700 Patch bug-228097-20210719210555.patch text/plain 5676 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwMDA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGQ2OTdlY2I3ZDZiMzhk YzBiNjE1MTFiYWZkMzc2MWI5ODI3ZDVjNC4uNDVkYTNmYzJmMzIyNDBlMGUzODE5ZTUzMTE5MWNl ODVkYmJkZDc3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTA3LTE5ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgQ2hhcmFjdGVy cyB3aXRoIG5vIGZvbnRzIHRoYXQgc3VwcG9ydCB0aGVtIGFyZSBkcmF3biBhcyB0d28gLm5vdGRl ZiBnbHlwaHMgaW4gdGhlIGZhc3QgdGV4dCBjb2RlcGF0aAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI4MDk3CisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS84MDc5ODExMz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBJZiBhIGNoYXJhY3RlciBpcyBub3QgaW4gQk1QLCBhbmQgd2UgZG9uJ3QgaGF2ZSBhIGds eXBoIGZvciBpdCwKKyAgICAgICAgd2UnbGwgZW5kIHVwIHdpdGggdHdvIDAgZ2x5cGhzIGluIGEg cm93IGZvciB0aGUgdHdvIHN1cnJvZ2F0ZXMgb2YgdGhlIGNoYXJhY3Rlci4KKyAgICAgICAgV2Ug bmVlZCB0byBtYWtlIHN1cmUgdGhhdCwgYWZ0ZXIgc2hhcGluZywgdGhlc2UgZG91YmxlLTAtZ2x5 cGhzIGFyZW4ndCBwcmVzZXJ2ZWQuCisKKyAgICAgICAgVGVzdDogZmFzdC90ZXh0L2RvdWJsZS1u b3RkZWYtc2ltcGxlLXRleHQtY29kZXBhdGguaHRtbAorCisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvV2lkdGhJdGVyYXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXaWR0aEl0ZXJhdG9y OjphcHBseUZvbnRUcmFuc2Zvcm1zKToKKwogMjAyMS0wNy0xNiAgTXlsZXMgQy4gTWF4ZmllbGQg IDxtbWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBBcHBsZSBpbnRlcm5hbCBidWls ZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvV2lkdGhJdGVy YXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9XaWR0aEl0ZXJhdG9y LmNwcAppbmRleCAyMjBiMGViMTI5ZjJjMGYzODhhYzM4ZmMxZDgwNDRkYjE2NzczYTg0Li44YWI4 MDVlYTBhMmRhNmEwZDUzNTQzOTUzNWFkYWQ1OTZjMGU3ODlhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9XaWR0aEl0ZXJhdG9yLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9XaWR0aEl0ZXJhdG9yLmNwcApAQCAtMTA2LDYgKzEw NiwyOCBAQCBpbmxpbmUgZmxvYXQgV2lkdGhJdGVyYXRvcjo6YXBwbHlGb250VHJhbnNmb3JtcyhH bHlwaEJ1ZmZlciYgZ2x5cGhCdWZmZXIsIHVuc2lnbgogICAgIEFTU0VSVChsYXN0R2x5cGhDb3Vu dCA8PSBnbHlwaEJ1ZmZlclNpemUpOwogCiAgICAgZm9udC5hcHBseVRyYW5zZm9ybXMoZ2x5cGhC dWZmZXIsIGxhc3RHbHlwaENvdW50LCBtX2N1cnJlbnRDaGFyYWN0ZXJJbmRleCwgbV9lbmFibGVL ZXJuaW5nLCBtX3JlcXVpcmVzU2hhcGluZywgbV9mb250LmZvbnREZXNjcmlwdGlvbigpLmNvbXB1 dGVkTG9jYWxlKCksIG1fcnVuLnRleHQoKSwgbV9ydW4uZGlyZWN0aW9uKCkpOworCisgICAgLy8g PHJkYXI6Ly9wcm9ibGVtLzgwNzk4MTEzPjogSWYgYSBjaGFyYWN0ZXIgaXMgbm90IGluIEJNUCwg YW5kIHdlIGRvbid0IGhhdmUgYSBnbHlwaCBmb3IgaXQsCisgICAgLy8gd2UnbGwgZW5kIHVwIHdp dGggdHdvIDAgZ2x5cGhzIGluIGEgcm93IGZvciB0aGUgdHdvIHN1cnJvZ2F0ZXMgb2YgdGhlIGNo YXJhY3Rlci4KKyAgICAvLyBXZSBuZWVkIHRvIG1ha2Ugc3VyZSB0aGF0LCBhZnRlciBzaGFwaW5n LCB0aGVzZSBkb3VibGUtMC1nbHlwaHMgYXJlbid0IHByZXNlcnZlZC4KKyAgICBpZiAoJmZvbnQg PT0gJm1fZm9udC5wcmltYXJ5Rm9udCgpICYmICFtX3J1bi50ZXh0KCkuaXM4Qml0KCkpIHsKKyAg ICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGdseXBoQnVmZmVyLnNpemUoKSAtIDE7KSB7 CisgICAgICAgICAgICBpZiAoIWdseXBoQnVmZmVyLmdseXBoQXQoaSkgJiYgIWdseXBoQnVmZmVy LmdseXBoQXQoaSArIDEpKSB7CisgICAgICAgICAgICAgICAgaWYgKGNvbnN0IGF1dG8mIGZpcnN0 U3RyaW5nT2Zmc2V0ID0gZ2x5cGhCdWZmZXIuY2hlY2tlZFN0cmluZ09mZnNldEF0KGksIG1fcnVu Lmxlbmd0aCgpKSkgeworICAgICAgICAgICAgICAgICAgICBpZiAoY29uc3QgYXV0byYgc2Vjb25k U3RyaW5nT2Zmc2V0ID0gZ2x5cGhCdWZmZXIuY2hlY2tlZFN0cmluZ09mZnNldEF0KGkgKyAxLCBt X3J1bi5sZW5ndGgoKSkpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIGlmIChzZWNvbmRTdHJp bmdPZmZzZXQudmFsdWUoKSA9PSBmaXJzdFN0cmluZ09mZnNldC52YWx1ZSgpICsgMQorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICYmIFVfSVNfTEVBRChtX3J1bi50ZXh0KClbZmlyc3RTdHJp bmdPZmZzZXQudmFsdWUoKV0pICYmIFVfSVNfVFJBSUwobV9ydW4udGV4dCgpW3NlY29uZFN0cmlu Z09mZnNldC52YWx1ZSgpXSkpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBnbHlwaEJ1 ZmZlci5yZW1vdmUoaSArIDEsIDEpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICsraTsK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgICAgICAg ICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIH0KKyAgICAg ICAgICAgIH0KKyAgICAgICAgICAgIGkgKz0gMjsKKyAgICAgICAgfQorICAgIH0KKwogICAgIGds eXBoQnVmZmVyU2l6ZSA9IGdseXBoQnVmZmVyLnNpemUoKTsKICAgICBhZHZhbmNlcyA9IGdseXBo QnVmZmVyLmFkdmFuY2VzKDApOwogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cg Yi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMDQyZDExNzY1Mjk1MjVlNTI3OTQ5YjQyZDQ5 NTY1NTFhZTRlYTMwOC4uNzkwZDJkYzk4OWZiNGRhOTkxMTc3NmI0OTQ3NDk3MGE1MTY2YTRiYyAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTA3LTE5ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1t YXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgQ2hhcmFjdGVycyB3aXRoIG5vIGZvbnRzIHRo YXQgc3VwcG9ydCB0aGVtIGFyZSBkcmF3biBhcyB0d28gLm5vdGRlZiBnbHlwaHMgaW4gdGhlIGZh c3QgdGV4dCBjb2RlcGF0aAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjI4MDk3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84MDc5ODExMz4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvdGV4dC9k b3VibGUtbm90ZGVmLXNpbXBsZS10ZXh0LWNvZGVwYXRoLWV4cGVjdGVkLmh0bWw6IEFkZGVkLgor ICAgICAgICAqIGZhc3QvdGV4dC9kb3VibGUtbm90ZGVmLXNpbXBsZS10ZXh0LWNvZGVwYXRoLmh0 bWw6IEFkZGVkLgorCiAyMDIxLTA3LTE2ICBUcnVpdHQgU2F2ZWxsICA8dHNhdmVsbEBhcHBsZS5j b20+CiAKICAgICAgICAgYWNjZXNzaWJpbGl0eS9sb2FkaW5nLWlmcmFtZS1zZW5kcy1ub3RpZmlj YXRpb24uaHRtbCBpcyBhIGZsYWt5IHRpbWVvdXQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zh c3QvdGV4dC9kb3VibGUtbm90ZGVmLXNpbXBsZS10ZXh0LWNvZGVwYXRoLWV4cGVjdGVkLmh0bWwg Yi9MYXlvdXRUZXN0cy9mYXN0L3RleHQvZG91YmxlLW5vdGRlZi1zaW1wbGUtdGV4dC1jb2RlcGF0 aC1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmVjMDM4MDg4MGZiMWUzYTBjNGZjZDg5N2EyMjZi ZTk5NzZkYzQwYmUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3RleHQvZG91 YmxlLW5vdGRlZi1zaW1wbGUtdGV4dC1jb2RlcGF0aC1leHBlY3RlZC5odG1sCkBAIC0wLDAgKzEs OSBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPG1ldGEgY2hhcnNldD0idXRm LTgiPgorPC9oZWFkPgorPGJvZHk+CitUaGlzIHRlc3QgbWFrZXMgc3VyZSB0aGF0IC5ub3RkZWYg ZG9lcyBub3QgZHJhdyB0d2ljZSBmb3IgYSBzaW5nbGUgY2hhcmFjdGVyIGluIHRoZSBzaW1wbGUg dGV4dCBjb2RlcGF0aC4gVGhlIHRlc3QgcGFzc2VzIGlmIHRoaXMgdGV4dCB5b3UncmUgcmVhZGlu ZyByaWdodCBub3cgaXMgdGhlIG9ubHkgdGhpbmcgeW91IGNhbiBzZWUgb24gdGhlIHBhZ2UuCis8 L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3RleHQvZG91Ymxl LW5vdGRlZi1zaW1wbGUtdGV4dC1jb2RlcGF0aC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC90ZXh0 L2RvdWJsZS1ub3RkZWYtc2ltcGxlLXRleHQtY29kZXBhdGguaHRtbApuZXcgZmlsZSBtb2RlIDEw MDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi44YzIx MDIwZWEyMmIwZWFmODU1NmYyYjhjOTg4ZWNiNGI5NTY2YWQwCi0tLSAvZGV2L251bGwKKysrIGIv TGF5b3V0VGVzdHMvZmFzdC90ZXh0L2RvdWJsZS1ub3RkZWYtc2ltcGxlLXRleHQtY29kZXBhdGgu aHRtbApAQCAtMCwwICsxLDE5IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+Cis8 bWV0YSBjaGFyc2V0PSJ1dGYtOCI+Cis8L2hlYWQ+Cis8Ym9keT4KK1RoaXMgdGVzdCBtYWtlcyBz dXJlIHRoYXQgLm5vdGRlZiBkb2VzIG5vdCBkcmF3IHR3aWNlIGZvciBhIHNpbmdsZSBjaGFyYWN0 ZXIgaW4gdGhlIHNpbXBsZSB0ZXh0IGNvZGVwYXRoLiBUaGUgdGVzdCBwYXNzZXMgaWYgdGhpcyB0 ZXh0IHlvdSdyZSByZWFkaW5nIHJpZ2h0IG5vdyBpcyB0aGUgb25seSB0aGluZyB5b3UgY2FuIHNl ZSBvbiB0aGUgcGFnZS4KKzxkaXYgc3R5bGU9InBvc2l0aW9uOiByZWxhdGl2ZTsiPgorPGRpdiBp ZD0idGFyZ2V0IiBzdHlsZT0icG9zaXRpb246IGFic29sdXRlOyB0b3A6IDBweDsgbGVmdDogMHB4 OyBmb250LWZhbWlseTogJ0hpcmFnaW5vIEtha3UgR290aGljIFBybyc7Ij4mI3gyMjRDQTs8L2Rp dj4KKzxkaXYgaWQ9ImNvdmVyIiBzdHlsZT0icG9zaXRpb246IGFic29sdXRlOyB0b3A6IDBweDsg bGVmdDogMHB4OyB3aWR0aDogMTAwcHg7IGhlaWdodDogMTAwcHg7IGJhY2tncm91bmQ6IHdoaXRl OyI+PC9kaXY+Cis8L2Rpdj4KKzxzY3JpcHQ+Cit2YXIgdGFyZ2V0ID0gZG9jdW1lbnQuZ2V0RWxl bWVudEJ5SWQoInRhcmdldCIpOwordmFyIGNvdmVyID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQo ImNvdmVyIik7Citjb3Zlci5zdHlsZS53aWR0aCA9ICIiICsgdGFyZ2V0Lm9mZnNldFdpZHRoICsg InB4IjsKK2NvdmVyLnN0eWxlLmhlaWdodCA9ICIiICsgdGFyZ2V0Lm9mZnNldEhlaWdodCArICJw eCI7Cis8L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4K 433848 2021-07-19 21:07:33 -0700 2021-07-19 22:16:21 -0700 Patch bug-228097-20210719210732.patch text/plain 5625 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwMDA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGQ2OTdlY2I3ZDZiMzhk YzBiNjE1MTFiYWZkMzc2MWI5ODI3ZDVjNC4uNDVkYTNmYzJmMzIyNDBlMGUzODE5ZTUzMTE5MWNl ODVkYmJkZDc3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTA3LTE5ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgQ2hhcmFjdGVy cyB3aXRoIG5vIGZvbnRzIHRoYXQgc3VwcG9ydCB0aGVtIGFyZSBkcmF3biBhcyB0d28gLm5vdGRl ZiBnbHlwaHMgaW4gdGhlIGZhc3QgdGV4dCBjb2RlcGF0aAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI4MDk3CisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS84MDc5ODExMz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBJZiBhIGNoYXJhY3RlciBpcyBub3QgaW4gQk1QLCBhbmQgd2UgZG9uJ3QgaGF2ZSBhIGds eXBoIGZvciBpdCwKKyAgICAgICAgd2UnbGwgZW5kIHVwIHdpdGggdHdvIDAgZ2x5cGhzIGluIGEg cm93IGZvciB0aGUgdHdvIHN1cnJvZ2F0ZXMgb2YgdGhlIGNoYXJhY3Rlci4KKyAgICAgICAgV2Ug bmVlZCB0byBtYWtlIHN1cmUgdGhhdCwgYWZ0ZXIgc2hhcGluZywgdGhlc2UgZG91YmxlLTAtZ2x5 cGhzIGFyZW4ndCBwcmVzZXJ2ZWQuCisKKyAgICAgICAgVGVzdDogZmFzdC90ZXh0L2RvdWJsZS1u b3RkZWYtc2ltcGxlLXRleHQtY29kZXBhdGguaHRtbAorCisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvV2lkdGhJdGVyYXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXaWR0aEl0ZXJhdG9y OjphcHBseUZvbnRUcmFuc2Zvcm1zKToKKwogMjAyMS0wNy0xNiAgTXlsZXMgQy4gTWF4ZmllbGQg IDxtbWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBBcHBsZSBpbnRlcm5hbCBidWls ZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvV2lkdGhJdGVy YXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9XaWR0aEl0ZXJhdG9y LmNwcAppbmRleCAyMjBiMGViMTI5ZjJjMGYzODhhYzM4ZmMxZDgwNDRkYjE2NzczYTg0Li5hMTI2 YWMxNmFiNDMxNjY4ZjJkNDY0YjQyZDQwZWExZTlmN2UxYzg3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9XaWR0aEl0ZXJhdG9yLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9XaWR0aEl0ZXJhdG9yLmNwcApAQCAtMTA2LDYgKzEw NiwyNiBAQCBpbmxpbmUgZmxvYXQgV2lkdGhJdGVyYXRvcjo6YXBwbHlGb250VHJhbnNmb3JtcyhH bHlwaEJ1ZmZlciYgZ2x5cGhCdWZmZXIsIHVuc2lnbgogICAgIEFTU0VSVChsYXN0R2x5cGhDb3Vu dCA8PSBnbHlwaEJ1ZmZlclNpemUpOwogCiAgICAgZm9udC5hcHBseVRyYW5zZm9ybXMoZ2x5cGhC dWZmZXIsIGxhc3RHbHlwaENvdW50LCBtX2N1cnJlbnRDaGFyYWN0ZXJJbmRleCwgbV9lbmFibGVL ZXJuaW5nLCBtX3JlcXVpcmVzU2hhcGluZywgbV9mb250LmZvbnREZXNjcmlwdGlvbigpLmNvbXB1 dGVkTG9jYWxlKCksIG1fcnVuLnRleHQoKSwgbV9ydW4uZGlyZWN0aW9uKCkpOworCisgICAgLy8g PHJkYXI6Ly9wcm9ibGVtLzgwNzk4MTEzPjogSWYgYSBjaGFyYWN0ZXIgaXMgbm90IGluIEJNUCwg YW5kIHdlIGRvbid0IGhhdmUgYSBnbHlwaCBmb3IgaXQsCisgICAgLy8gd2UnbGwgZW5kIHVwIHdp dGggdHdvIDAgZ2x5cGhzIGluIGEgcm93IGZvciB0aGUgdHdvIHN1cnJvZ2F0ZXMgb2YgdGhlIGNo YXJhY3Rlci4KKyAgICAvLyBXZSBuZWVkIHRvIG1ha2Ugc3VyZSB0aGF0LCBhZnRlciBzaGFwaW5n LCB0aGVzZSBkb3VibGUtMC1nbHlwaHMgYXJlbid0IHByZXNlcnZlZC4KKyAgICBpZiAoJmZvbnQg PT0gJm1fZm9udC5wcmltYXJ5Rm9udCgpICYmICFtX3J1bi50ZXh0KCkuaXM4Qml0KCkpIHsKKyAg ICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGdseXBoQnVmZmVyLnNpemUoKSAtIDE7ICsr aSkgeworICAgICAgICAgICAgaWYgKCFnbHlwaEJ1ZmZlci5nbHlwaEF0KGkpICYmICFnbHlwaEJ1 ZmZlci5nbHlwaEF0KGkgKyAxKSkgeworICAgICAgICAgICAgICAgIGlmIChjb25zdCBhdXRvJiBm aXJzdFN0cmluZ09mZnNldCA9IGdseXBoQnVmZmVyLmNoZWNrZWRTdHJpbmdPZmZzZXRBdChpLCBt X3J1bi5sZW5ndGgoKSkpIHsKKyAgICAgICAgICAgICAgICAgICAgaWYgKGNvbnN0IGF1dG8mIHNl Y29uZFN0cmluZ09mZnNldCA9IGdseXBoQnVmZmVyLmNoZWNrZWRTdHJpbmdPZmZzZXRBdChpICsg MSwgbV9ydW4ubGVuZ3RoKCkpKSB7CisgICAgICAgICAgICAgICAgICAgICAgICBpZiAoc2Vjb25k U3RyaW5nT2Zmc2V0LnZhbHVlKCkgPT0gZmlyc3RTdHJpbmdPZmZzZXQudmFsdWUoKSArIDEKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAmJiBVX0lTX0xFQUQobV9ydW4udGV4dCgpW2ZpcnN0 U3RyaW5nT2Zmc2V0LnZhbHVlKCldKSAmJiBVX0lTX1RSQUlMKG1fcnVuLnRleHQoKVtzZWNvbmRT dHJpbmdPZmZzZXQudmFsdWUoKV0pKSB7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ2x5 cGhCdWZmZXIucmVtb3ZlKGkgKyAxLCAxKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBj b250aW51ZTsKKyAgICAgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAg fQorICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAgIH0KKwog ICAgIGdseXBoQnVmZmVyU2l6ZSA9IGdseXBoQnVmZmVyLnNpemUoKTsKICAgICBhZHZhbmNlcyA9 IGdseXBoQnVmZmVyLmFkdmFuY2VzKDApOwogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMDQyZDExNzY1Mjk1MjVlNTI3OTQ5 YjQyZDQ5NTY1NTFhZTRlYTMwOC4uNzkwZDJkYzk4OWZiNGRhOTkxMTc3NmI0OTQ3NDk3MGE1MTY2 YTRiYyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTA3LTE5ICBNeWxlcyBDLiBNYXhmaWVs ZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgQ2hhcmFjdGVycyB3aXRoIG5vIGZv bnRzIHRoYXQgc3VwcG9ydCB0aGVtIGFyZSBkcmF3biBhcyB0d28gLm5vdGRlZiBnbHlwaHMgaW4g dGhlIGZhc3QgdGV4dCBjb2RlcGF0aAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjI4MDk3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84MDc5ODExMz4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3Qv dGV4dC9kb3VibGUtbm90ZGVmLXNpbXBsZS10ZXh0LWNvZGVwYXRoLWV4cGVjdGVkLmh0bWw6IEFk ZGVkLgorICAgICAgICAqIGZhc3QvdGV4dC9kb3VibGUtbm90ZGVmLXNpbXBsZS10ZXh0LWNvZGVw YXRoLmh0bWw6IEFkZGVkLgorCiAyMDIxLTA3LTE2ICBUcnVpdHQgU2F2ZWxsICA8dHNhdmVsbEBh cHBsZS5jb20+CiAKICAgICAgICAgYWNjZXNzaWJpbGl0eS9sb2FkaW5nLWlmcmFtZS1zZW5kcy1u b3RpZmljYXRpb24uaHRtbCBpcyBhIGZsYWt5IHRpbWVvdXQKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2Zhc3QvdGV4dC9kb3VibGUtbm90ZGVmLXNpbXBsZS10ZXh0LWNvZGVwYXRoLWV4cGVjdGVk Lmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3RleHQvZG91YmxlLW5vdGRlZi1zaW1wbGUtdGV4dC1j b2RlcGF0aC1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmVjMDM4MDg4MGZiMWUzYTBjNGZjZDg5 N2EyMjZiZTk5NzZkYzQwYmUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3Rl eHQvZG91YmxlLW5vdGRlZi1zaW1wbGUtdGV4dC1jb2RlcGF0aC1leHBlY3RlZC5odG1sCkBAIC0w LDAgKzEsOSBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPG1ldGEgY2hhcnNl dD0idXRmLTgiPgorPC9oZWFkPgorPGJvZHk+CitUaGlzIHRlc3QgbWFrZXMgc3VyZSB0aGF0IC5u b3RkZWYgZG9lcyBub3QgZHJhdyB0d2ljZSBmb3IgYSBzaW5nbGUgY2hhcmFjdGVyIGluIHRoZSBz aW1wbGUgdGV4dCBjb2RlcGF0aC4gVGhlIHRlc3QgcGFzc2VzIGlmIHRoaXMgdGV4dCB5b3UncmUg cmVhZGluZyByaWdodCBub3cgaXMgdGhlIG9ubHkgdGhpbmcgeW91IGNhbiBzZWUgb24gdGhlIHBh Z2UuCis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3RleHQv ZG91YmxlLW5vdGRlZi1zaW1wbGUtdGV4dC1jb2RlcGF0aC5odG1sIGIvTGF5b3V0VGVzdHMvZmFz dC90ZXh0L2RvdWJsZS1ub3RkZWYtc2ltcGxlLXRleHQtY29kZXBhdGguaHRtbApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw Li44YzIxMDIwZWEyMmIwZWFmODU1NmYyYjhjOTg4ZWNiNGI5NTY2YWQwCi0tLSAvZGV2L251bGwK KysrIGIvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2RvdWJsZS1ub3RkZWYtc2ltcGxlLXRleHQtY29k ZXBhdGguaHRtbApAQCAtMCwwICsxLDE5IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhl YWQ+Cis8bWV0YSBjaGFyc2V0PSJ1dGYtOCI+Cis8L2hlYWQ+Cis8Ym9keT4KK1RoaXMgdGVzdCBt YWtlcyBzdXJlIHRoYXQgLm5vdGRlZiBkb2VzIG5vdCBkcmF3IHR3aWNlIGZvciBhIHNpbmdsZSBj aGFyYWN0ZXIgaW4gdGhlIHNpbXBsZSB0ZXh0IGNvZGVwYXRoLiBUaGUgdGVzdCBwYXNzZXMgaWYg dGhpcyB0ZXh0IHlvdSdyZSByZWFkaW5nIHJpZ2h0IG5vdyBpcyB0aGUgb25seSB0aGluZyB5b3Ug Y2FuIHNlZSBvbiB0aGUgcGFnZS4KKzxkaXYgc3R5bGU9InBvc2l0aW9uOiByZWxhdGl2ZTsiPgor PGRpdiBpZD0idGFyZ2V0IiBzdHlsZT0icG9zaXRpb246IGFic29sdXRlOyB0b3A6IDBweDsgbGVm dDogMHB4OyBmb250LWZhbWlseTogJ0hpcmFnaW5vIEtha3UgR290aGljIFBybyc7Ij4mI3gyMjRD QTs8L2Rpdj4KKzxkaXYgaWQ9ImNvdmVyIiBzdHlsZT0icG9zaXRpb246IGFic29sdXRlOyB0b3A6 IDBweDsgbGVmdDogMHB4OyB3aWR0aDogMTAwcHg7IGhlaWdodDogMTAwcHg7IGJhY2tncm91bmQ6 IHdoaXRlOyI+PC9kaXY+Cis8L2Rpdj4KKzxzY3JpcHQ+Cit2YXIgdGFyZ2V0ID0gZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoInRhcmdldCIpOwordmFyIGNvdmVyID0gZG9jdW1lbnQuZ2V0RWxlbWVu dEJ5SWQoImNvdmVyIik7Citjb3Zlci5zdHlsZS53aWR0aCA9ICIiICsgdGFyZ2V0Lm9mZnNldFdp ZHRoICsgInB4IjsKK2NvdmVyLnN0eWxlLmhlaWdodCA9ICIiICsgdGFyZ2V0Lm9mZnNldEhlaWdo dCArICJweCI7Cis8L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4K 433849 2021-07-19 22:16:23 -0700 2021-07-20 07:00:02 -0700 Patch bug-228097-20210719221623.patch text/plain 5691 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwMDY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzIwN2NhNmNmZDcxMTc0 ZWJhNzFkNTg1MTk5MzRmMDcxOGFiMDZmMC4uZTUyMTU4ZGQ2ZTVlZmM5NzkxMmU5NTk5ZmYyNjA0 ZTllN2RlMTQyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTA3LTE5ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lP TihyMjcyMzc5KTogQ2hhcmFjdGVycyB3aXRoIG5vIGZvbnRzIHRoYXQgc3VwcG9ydCB0aGVtIGFy ZSBkcmF3biBhcyB0d28gLm5vdGRlZiBnbHlwaHMgaW4gdGhlIGZhc3QgdGV4dCBjb2RlcGF0aAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI4MDk3Cisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS84MDc5ODExMz4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJZiBhIGNoYXJhY3RlciBpcyBub3QgaW4gQk1QLCBh bmQgd2UgZG9uJ3QgaGF2ZSBhIGdseXBoIGZvciBpdCwKKyAgICAgICAgd2UnbGwgZW5kIHVwIHdp dGggdHdvIDAgZ2x5cGhzIGluIGEgcm93IGZvciB0aGUgdHdvIHN1cnJvZ2F0ZXMgb2YgdGhlIGNo YXJhY3Rlci4KKyAgICAgICAgV2UgbmVlZCB0byBtYWtlIHN1cmUgdGhhdCwgYWZ0ZXIgc2hhcGlu ZywgdGhlc2UgZG91YmxlLTAtZ2x5cGhzIGFyZW4ndCBwcmVzZXJ2ZWQuCisKKyAgICAgICAgVGVz dDogZmFzdC90ZXh0L2RvdWJsZS1ub3RkZWYtc2ltcGxlLXRleHQtY29kZXBhdGguaHRtbAorCisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvV2lkdGhJdGVyYXRvci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpXaWR0aEl0ZXJhdG9yOjphcHBseUZvbnRUcmFuc2Zvcm1zKToKKwogMjAyMS0wNy0x OSAgU2lodWkgTGl1ICA8c2lodWlfbGl1QGFwcGxlLmNvbT4KIAogICAgICAgICBJbXBsZW1lbnQg SURCVHJhbnNhY3Rpb24uY29tbWl0KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL1dpZHRoSXRlcmF0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvV2lkdGhJdGVyYXRvci5jcHAKaW5kZXggMjIwYjBlYjEyOWYyYzBmMzg4YWMzOGZj MWQ4MDQ0ZGIxNjc3M2E4NC4uYTEyNmFjMTZhYjQzMTY2OGYyZDQ2NGI0MmQ0MGVhMWU5ZjdlMWM4 NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvV2lkdGhJdGVy YXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvV2lkdGhJdGVy YXRvci5jcHAKQEAgLTEwNiw2ICsxMDYsMjYgQEAgaW5saW5lIGZsb2F0IFdpZHRoSXRlcmF0b3I6 OmFwcGx5Rm9udFRyYW5zZm9ybXMoR2x5cGhCdWZmZXImIGdseXBoQnVmZmVyLCB1bnNpZ24KICAg ICBBU1NFUlQobGFzdEdseXBoQ291bnQgPD0gZ2x5cGhCdWZmZXJTaXplKTsKIAogICAgIGZvbnQu YXBwbHlUcmFuc2Zvcm1zKGdseXBoQnVmZmVyLCBsYXN0R2x5cGhDb3VudCwgbV9jdXJyZW50Q2hh cmFjdGVySW5kZXgsIG1fZW5hYmxlS2VybmluZywgbV9yZXF1aXJlc1NoYXBpbmcsIG1fZm9udC5m b250RGVzY3JpcHRpb24oKS5jb21wdXRlZExvY2FsZSgpLCBtX3J1bi50ZXh0KCksIG1fcnVuLmRp cmVjdGlvbigpKTsKKworICAgIC8vIDxyZGFyOi8vcHJvYmxlbS84MDc5ODExMz46IElmIGEgY2hh cmFjdGVyIGlzIG5vdCBpbiBCTVAsIGFuZCB3ZSBkb24ndCBoYXZlIGEgZ2x5cGggZm9yIGl0LAor ICAgIC8vIHdlJ2xsIGVuZCB1cCB3aXRoIHR3byAwIGdseXBocyBpbiBhIHJvdyBmb3IgdGhlIHR3 byBzdXJyb2dhdGVzIG9mIHRoZSBjaGFyYWN0ZXIuCisgICAgLy8gV2UgbmVlZCB0byBtYWtlIHN1 cmUgdGhhdCwgYWZ0ZXIgc2hhcGluZywgdGhlc2UgZG91YmxlLTAtZ2x5cGhzIGFyZW4ndCBwcmVz ZXJ2ZWQuCisgICAgaWYgKCZmb250ID09ICZtX2ZvbnQucHJpbWFyeUZvbnQoKSAmJiAhbV9ydW4u dGV4dCgpLmlzOEJpdCgpKSB7CisgICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBnbHlw aEJ1ZmZlci5zaXplKCkgLSAxOyArK2kpIHsKKyAgICAgICAgICAgIGlmICghZ2x5cGhCdWZmZXIu Z2x5cGhBdChpKSAmJiAhZ2x5cGhCdWZmZXIuZ2x5cGhBdChpICsgMSkpIHsKKyAgICAgICAgICAg ICAgICBpZiAoY29uc3QgYXV0byYgZmlyc3RTdHJpbmdPZmZzZXQgPSBnbHlwaEJ1ZmZlci5jaGVj a2VkU3RyaW5nT2Zmc2V0QXQoaSwgbV9ydW4ubGVuZ3RoKCkpKSB7CisgICAgICAgICAgICAgICAg ICAgIGlmIChjb25zdCBhdXRvJiBzZWNvbmRTdHJpbmdPZmZzZXQgPSBnbHlwaEJ1ZmZlci5jaGVj a2VkU3RyaW5nT2Zmc2V0QXQoaSArIDEsIG1fcnVuLmxlbmd0aCgpKSkgeworICAgICAgICAgICAg ICAgICAgICAgICAgaWYgKHNlY29uZFN0cmluZ09mZnNldC52YWx1ZSgpID09IGZpcnN0U3RyaW5n T2Zmc2V0LnZhbHVlKCkgKyAxCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgJiYgVV9JU19M RUFEKG1fcnVuLnRleHQoKVtmaXJzdFN0cmluZ09mZnNldC52YWx1ZSgpXSkgJiYgVV9JU19UUkFJ TChtX3J1bi50ZXh0KClbc2Vjb25kU3RyaW5nT2Zmc2V0LnZhbHVlKCldKSkgeworICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGdseXBoQnVmZmVyLnJlbW92ZShpICsgMSwgMSk7CisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICAgICAgICAgICAgICB9 CisgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICB9 CisgICAgICAgIH0KKyAgICB9CisKICAgICBnbHlwaEJ1ZmZlclNpemUgPSBnbHlwaEJ1ZmZlci5z aXplKCk7CiAgICAgYWR2YW5jZXMgPSBnbHlwaEJ1ZmZlci5hZHZhbmNlcygwKTsKIApkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4 IGIzMDYyYzcxNTFiOThlNzJkZTlmMzBhMzA0NzE4N2RlNDE3NjNmZGUuLjdkOGY0Njc4ZjRlYWQ4 ODRlNjk2NzRkNGEyNjk0MmY4NzkzYTUyNzkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMS0w Ny0xOSAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgorCisgICAgICAg IFJFR1JFU1NJT04ocjI3MjM3OSk6IENoYXJhY3RlcnMgd2l0aCBubyBmb250cyB0aGF0IHN1cHBv cnQgdGhlbSBhcmUgZHJhd24gYXMgdHdvIC5ub3RkZWYgZ2x5cGhzIGluIHRoZSBmYXN0IHRleHQg Y29kZXBhdGgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIyODA5NworICAgICAgICA8cmRhcjovL3Byb2JsZW0vODA3OTgxMTM+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBmYXN0L3RleHQvZG91YmxlLW5v dGRlZi1zaW1wbGUtdGV4dC1jb2RlcGF0aC1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAg KiBmYXN0L3RleHQvZG91YmxlLW5vdGRlZi1zaW1wbGUtdGV4dC1jb2RlcGF0aC5odG1sOiBBZGRl ZC4KKwogMjAyMS0wNy0xOSAgUm9iZXJ0IEplbm5lciAgPEplbm5lckBhcHBsZS5jb20+CiAKICAg ICAgICAgW0JpZ1N1ciBSZWxlYXNlIFdrMiBBcm02NF0gaW5zcGVjdG9yL2Nzcy9ub2RlLXN0eWxl cy1yZWZyZXNoZWQuaHRtbCBpcyBhIGZsYWt5IGZhaWx1cmUgKDIyNDc4OCkKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2Zhc3QvdGV4dC9kb3VibGUtbm90ZGVmLXNpbXBsZS10ZXh0LWNvZGVwYXRo LWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3RleHQvZG91YmxlLW5vdGRlZi1zaW1w bGUtdGV4dC1jb2RlcGF0aC1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmVjMDM4MDg4MGZiMWUz YTBjNGZjZDg5N2EyMjZiZTk5NzZkYzQwYmUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0 cy9mYXN0L3RleHQvZG91YmxlLW5vdGRlZi1zaW1wbGUtdGV4dC1jb2RlcGF0aC1leHBlY3RlZC5o dG1sCkBAIC0wLDAgKzEsOSBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPG1l dGEgY2hhcnNldD0idXRmLTgiPgorPC9oZWFkPgorPGJvZHk+CitUaGlzIHRlc3QgbWFrZXMgc3Vy ZSB0aGF0IC5ub3RkZWYgZG9lcyBub3QgZHJhdyB0d2ljZSBmb3IgYSBzaW5nbGUgY2hhcmFjdGVy IGluIHRoZSBzaW1wbGUgdGV4dCBjb2RlcGF0aC4gVGhlIHRlc3QgcGFzc2VzIGlmIHRoaXMgdGV4 dCB5b3UncmUgcmVhZGluZyByaWdodCBub3cgaXMgdGhlIG9ubHkgdGhpbmcgeW91IGNhbiBzZWUg b24gdGhlIHBhZ2UuCis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9m YXN0L3RleHQvZG91YmxlLW5vdGRlZi1zaW1wbGUtdGV4dC1jb2RlcGF0aC5odG1sIGIvTGF5b3V0 VGVzdHMvZmFzdC90ZXh0L2RvdWJsZS1ub3RkZWYtc2ltcGxlLXRleHQtY29kZXBhdGguaHRtbApu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwLi44YzIxMDIwZWEyMmIwZWFmODU1NmYyYjhjOTg4ZWNiNGI5NTY2YWQwCi0tLSAv ZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2RvdWJsZS1ub3RkZWYtc2ltcGxl LXRleHQtY29kZXBhdGguaHRtbApAQCAtMCwwICsxLDE5IEBACis8IURPQ1RZUEUgaHRtbD4KKzxo dG1sPgorPGhlYWQ+Cis8bWV0YSBjaGFyc2V0PSJ1dGYtOCI+Cis8L2hlYWQ+Cis8Ym9keT4KK1Ro aXMgdGVzdCBtYWtlcyBzdXJlIHRoYXQgLm5vdGRlZiBkb2VzIG5vdCBkcmF3IHR3aWNlIGZvciBh IHNpbmdsZSBjaGFyYWN0ZXIgaW4gdGhlIHNpbXBsZSB0ZXh0IGNvZGVwYXRoLiBUaGUgdGVzdCBw YXNzZXMgaWYgdGhpcyB0ZXh0IHlvdSdyZSByZWFkaW5nIHJpZ2h0IG5vdyBpcyB0aGUgb25seSB0 aGluZyB5b3UgY2FuIHNlZSBvbiB0aGUgcGFnZS4KKzxkaXYgc3R5bGU9InBvc2l0aW9uOiByZWxh dGl2ZTsiPgorPGRpdiBpZD0idGFyZ2V0IiBzdHlsZT0icG9zaXRpb246IGFic29sdXRlOyB0b3A6 IDBweDsgbGVmdDogMHB4OyBmb250LWZhbWlseTogJ0hpcmFnaW5vIEtha3UgR290aGljIFBybyc7 Ij4mI3gyMjRDQTs8L2Rpdj4KKzxkaXYgaWQ9ImNvdmVyIiBzdHlsZT0icG9zaXRpb246IGFic29s dXRlOyB0b3A6IDBweDsgbGVmdDogMHB4OyB3aWR0aDogMTAwcHg7IGhlaWdodDogMTAwcHg7IGJh Y2tncm91bmQ6IHdoaXRlOyI+PC9kaXY+Cis8L2Rpdj4KKzxzY3JpcHQ+Cit2YXIgdGFyZ2V0ID0g ZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInRhcmdldCIpOwordmFyIGNvdmVyID0gZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoImNvdmVyIik7Citjb3Zlci5zdHlsZS53aWR0aCA9ICIiICsgdGFyZ2V0 Lm9mZnNldFdpZHRoICsgInB4IjsKK2NvdmVyLnN0eWxlLmhlaWdodCA9ICIiICsgdGFyZ2V0Lm9m ZnNldEhlaWdodCArICJweCI7Cis8L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4K