219177 2020-11-19 13:32:06 -0800 zero and rename boundingRect pointer in Font::platformBoundsForGlyph() to CTFontGetBoundingRectsForGlyphs() 2021-01-21 14:56:50 -0800 1 1 1 Unclassified WebKit Text WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 julian_a_gonzalez webkit-unassigned darin mmaxfield rniwa oldest_to_newest 1709261 0 julian_a_gonzalez 2020-11-19 13:32:06 -0800 Follow up to 218812 - zero out the CGRect structures on the stack from that change, so as not to pass uninitialized memory to CTFontGetBoundingRectsForGlyphs(). <rdar://problem/71547171> 1709273 1 414618 julian_a_gonzalez 2020-11-19 14:10:35 -0800 Created attachment 414618 Patch 1709299 2 414618 darin 2020-11-19 15:36:25 -0800 Comment on attachment 414618 Patch Good to have the code match what the change log says. And it was my comment that led to this change. But why does this need to be a zero rect rather than uninitialized? And why can’t we pass nullptr instead? A little confused about that. 1709323 3 rniwa 2020-11-19 16:29:34 -0800 (In reply to Darin Adler from comment #2) > Comment on attachment 414618 [details] > Patch > > Good to have the code match what the change log says. And it was my comment > that led to this change. Yeah, we should mention this in the change log. > But why does this need to be a zero rect rather than uninitialized? And why > can’t we pass nullptr instead? So the person who maintains this function told us that passing nullptr will result in heap memory allocation so it's slightly more efficient to pass in a rect. 1719956 4 417721 julian_a_gonzalez 2021-01-15 12:41:23 -0800 Created attachment 417721 Patch 1719966 5 417721 darin 2021-01-15 13:02:20 -0800 Comment on attachment 417721 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=417721&action=review > Source/WebCore/platform/graphics/coretext/FontCoreText.cpp:703 > + CGRect zeroRect = { }; > + boundingBox = CTFontGetBoundingRectsForGlyphs(m_platformData.ctFont(), platformData().orientation() == FontOrientation::Vertical ? kCTFontOrientationVertical : kCTFontOrientationHorizontal, &glyph, &zeroRect, 1); After more research I now realize this is an *out* argument from CTFontGetBoundingRectsForGlyphs. So it must not be named "emptyRect" or "zeroRect", since it will get a value and will not be empty or zero! Instead we should pass nullptr. The CTFontGetBoundingRectsForGlyphs documentation for this arguments says "Can be NULL, in which case only the overall bounding rect is calculated." I suggest we use nullptr. > Source/WebCore/platform/graphics/coretext/FontCoreText.cpp:748 > + CGRect zeroRect = { }; > + if (!CGRectIsEmpty(CTFontGetBoundingRectsForGlyphs(platformFont, kCTFontOrientationDefault, &lowercaseAGlyph, &zeroRect, 1))) Ditto. 1719981 6 julian_a_gonzalez 2021-01-15 13:37:03 -0800 (In reply to Darin Adler from comment #5) > Comment on attachment 417721 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=417721&action=review > > > Source/WebCore/platform/graphics/coretext/FontCoreText.cpp:703 > > + CGRect zeroRect = { }; > > + boundingBox = CTFontGetBoundingRectsForGlyphs(m_platformData.ctFont(), platformData().orientation() == FontOrientation::Vertical ? kCTFontOrientationVertical : kCTFontOrientationHorizontal, &glyph, &zeroRect, 1); > > After more research I now realize this is an *out* argument from > CTFontGetBoundingRectsForGlyphs. So it must not be named "emptyRect" or > "zeroRect", since it will get a value and will not be empty or zero! Instead > we should pass nullptr. The CTFontGetBoundingRectsForGlyphs documentation > for this arguments says "Can be NULL, in which case only the overall > bounding rect is calculated." I suggest we use nullptr. > Darin, the reason for 218812 was that passing nullptr is not as performant as passing stack-allocated memory, because a heap allocation is performed in that case. This is what Ryosuke was getting at when he wrote: "So the person who maintains this function told us that passing nullptr will result in heap memory allocation so it's slightly more efficient to pass in a rect." > > Source/WebCore/platform/graphics/coretext/FontCoreText.cpp:748 > > + CGRect zeroRect = { }; > > + if (!CGRectIsEmpty(CTFontGetBoundingRectsForGlyphs(platformFont, kCTFontOrientationDefault, &lowercaseAGlyph, &zeroRect, 1))) > > Ditto. If we want to ignore the recommendation and just use nullptr, then we should just revert 218812. 1719988 7 417721 darin 2021-01-15 13:48:31 -0800 Comment on attachment 417721 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=417721&action=review >>> Source/WebCore/platform/graphics/coretext/FontCoreText.cpp:703 >>> + boundingBox = CTFontGetBoundingRectsForGlyphs(m_platformData.ctFont(), platformData().orientation() == FontOrientation::Vertical ? kCTFontOrientationVertical : kCTFontOrientationHorizontal, &glyph, &zeroRect, 1); >> >> After more research I now realize this is an *out* argument from CTFontGetBoundingRectsForGlyphs. So it must not be named "emptyRect" or "zeroRect", since it will get a value and will not be empty or zero! Instead we should pass nullptr. The CTFontGetBoundingRectsForGlyphs documentation for this arguments says "Can be NULL, in which case only the overall bounding rect is calculated." I suggest we use nullptr. > > Darin, the reason for 218812 was that passing nullptr is not as performant as passing stack-allocated memory, because a heap allocation is performed in that case. > This is what Ryosuke was getting at when he wrote: > > "So the person who maintains this function told us that passing nullptr will result in heap memory allocation so it's slightly more efficient to pass in a rect." Oops, forgot that. Then we should not name this "zero rect" but otherwise this is great. 1719999 8 julian_a_gonzalez 2021-01-15 13:59:12 -0800 (In reply to Darin Adler from comment #7) > Comment on attachment 417721 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=417721&action=review > > >>> Source/WebCore/platform/graphics/coretext/FontCoreText.cpp:703 > >>> + boundingBox = CTFontGetBoundingRectsForGlyphs(m_platformData.ctFont(), platformData().orientation() == FontOrientation::Vertical ? kCTFontOrientationVertical : kCTFontOrientationHorizontal, &glyph, &zeroRect, 1); > >> > >> After more research I now realize this is an *out* argument from CTFontGetBoundingRectsForGlyphs. So it must not be named "emptyRect" or "zeroRect", since it will get a value and will not be empty or zero! Instead we should pass nullptr. The CTFontGetBoundingRectsForGlyphs documentation for this arguments says "Can be NULL, in which case only the overall bounding rect is calculated." I suggest we use nullptr. > > > > Darin, the reason for 218812 was that passing nullptr is not as performant as passing stack-allocated memory, because a heap allocation is performed in that case. > > This is what Ryosuke was getting at when he wrote: > > > > "So the person who maintains this function told us that passing nullptr will result in heap memory allocation so it's slightly more efficient to pass in a rect." > > Oops, forgot that. Then we should not name this "zero rect" but otherwise > this is great. Sounds good. How does 'dummyRect' sound? (possibly with a comment?) 1720003 9 417721 darin 2021-01-15 14:01:11 -0800 Comment on attachment 417721 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=417721&action=review >>>>> Source/WebCore/platform/graphics/coretext/FontCoreText.cpp:703 >>>>> + boundingBox = CTFontGetBoundingRectsForGlyphs(m_platformData.ctFont(), platformData().orientation() == FontOrientation::Vertical ? kCTFontOrientationVertical : kCTFontOrientationHorizontal, &glyph, &zeroRect, 1); >>>> >>>> After more research I now realize this is an *out* argument from CTFontGetBoundingRectsForGlyphs. So it must not be named "emptyRect" or "zeroRect", since it will get a value and will not be empty or zero! Instead we should pass nullptr. The CTFontGetBoundingRectsForGlyphs documentation for this arguments says "Can be NULL, in which case only the overall bounding rect is calculated." I suggest we use nullptr. >>> >>> Darin, the reason for 218812 was that passing nullptr is not as performant as passing stack-allocated memory, because a heap allocation is performed in that case. >>> This is what Ryosuke was getting at when he wrote: >>> >>> "So the person who maintains this function told us that passing nullptr will result in heap memory allocation so it's slightly more efficient to pass in a rect." >> >> Oops, forgot that. Then we should not name this "zero rect" but otherwise this is great. > > Sounds good. How does 'dummyRect' sound? (possibly with a comment?) That’s fine. I might also suggest "ignoredRect". 1720042 10 417743 julian_a_gonzalez 2021-01-15 14:50:38 -0800 Created attachment 417743 Patch 1720044 11 417743 darin 2021-01-15 14:57:46 -0800 Comment on attachment 417743 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=417743&action=review > Source/WebCore/platform/graphics/coretext/FontCoreText.cpp:702 > + CGRect ignoredRect = { }; No reason for the "= { }". The name emptyRect confused me into thinking it was needed. So the only thing wrong was the name, the code was totally fine. This patch is OK as is, but also one that just ranges would be fine. And the bug could be retitled since this is just naming clarity, no need to zero anything. 1720046 12 417743 darin 2021-01-15 14:58:10 -0800 Comment on attachment 417743 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=417743&action=review >> Source/WebCore/platform/graphics/coretext/FontCoreText.cpp:702 >> + CGRect ignoredRect = { }; > > No reason for the "= { }". The name emptyRect confused me into thinking it was needed. So the only thing wrong was the name, the code was totally fine. This patch is OK as is, but also one that just ranges would be fine. And the bug could be retitled since this is just naming clarity, no need to zero anything. that just *renames*, not that just *ranges* 1720084 13 417743 rniwa 2021-01-15 17:16:22 -0800 Comment on attachment 417743 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=417743&action=review >>> Source/WebCore/platform/graphics/coretext/FontCoreText.cpp:702 >>> + CGRect ignoredRect = { }; >> >> No reason for the "= { }". The name emptyRect confused me into thinking it was needed. So the only thing wrong was the name, the code was totally fine. This patch is OK as is, but also one that just ranges would be fine. And the bug could be retitled since this is just naming clarity, no need to zero anything. > > that just *renames*, not that just *ranges* It's probably still a good practice to zero it out so that there is no ambiguity we won't have indeterministic behavior here. 1721292 14 julian_a_gonzalez 2021-01-21 12:56:29 -0800 OK - I'll rename the variable (keeping the zeroing as requested by Ryosuke) and retitle the bug here slightly to reflect the new plan. Thanks folks. 1721318 15 418080 julian_a_gonzalez 2021-01-21 13:42:17 -0800 Created attachment 418080 Patch 1721355 16 ews-feeder 2021-01-21 14:56:48 -0800 Committed r271715: <https://trac.webkit.org/changeset/271715> All reviewed patches have been landed. Closing bug and clearing flags on attachment 418080. 414618 2020-11-19 14:10:35 -0800 2021-01-15 12:41:20 -0800 Patch bug-219177-20201119141034.patch text/plain 2795 julian_a_gonzalez U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5OTY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmY5YjIzYWM5ZjVlYWI3 ZTU0NmMwMjljMWRmZDYwNTM3YzRmZmFhYS4uNTM3MDFkMmY0NDUzZjQ3NTAxYjRkMGRhMTBlZGFj Y2QzZGUxZTgxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIwLTExLTE5ICBKdWxp YW4gR29uemFsZXogIDxqdWxpYW5fYV9nb256YWxlekBhcHBsZS5jb20+CisKKyAgICAgICAgemVy byBib3VuZGluZ1JlY3QgcG9pbnRlciBpbiBGb250OjpwbGF0Zm9ybUJvdW5kc0ZvckdseXBoKCkg dG8gQ1RGb250R2V0Qm91bmRpbmdSZWN0c0ZvckdseXBocygpCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTkxNzcKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBY3R1YWxseSB6ZXJvIGEgQ0dSZWN0IHN0cnVj dCBpbiB0d28gcGxhY2VzIHdoZXJlIHRoZSBjb3VudCBhcmd1bWVudAorICAgICAgICB0byBDVEZv bnRHZXRCb3VuZGluZ1JlY3RzRm9yR2x5cGhzKCkgaXMgYWxyZWFkeSAxLgorCisgICAgICAgIE5v IG5ldyB0ZXN0cywgbm8gYmVoYXZpb3IgY2hhbmdlcy4KKworICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2NvcmV0ZXh0L0ZvbnRDb3JlVGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGb250 OjpwbGF0Zm9ybUJvdW5kc0ZvckdseXBoIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnQ6 OmlzUHJvYmFibHlPbmx5VXNlZFRvUmVuZGVySWNvbnMgY29uc3QpOgorCiAyMDIwLTExLTE4ICBB bnRvaW5lIFF1aW50ICA8Z3Jhb3V0c0B3ZWJraXQub3JnPgogCiAgICAgICAgIFtXZWIgQW5pbWF0 aW9uc10gRW5zdXJlIHdlIGRvbid0IHNjaGVkdWxlIGFuaW1hdGlvbiB1ZHBhdGVzIHdoZW4gdGhl cmUgYXJlIG5vIHN0eWxlcyB0byB1cGRhdGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2NvcmV0ZXh0L0ZvbnRDb3JlVGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jb3JldGV4dC9Gb250Q29yZVRleHQuY3BwCmluZGV4IDU5NDNh NjFhYzZhMDE4MGU2YzdiNGIwMTFhYzFiOThhNDE1ZjNmMTAuLmUyMWVkNmZjMjNiNGU1NDI4ZjY2 MGQ0ZWMxZDIzMjBiYTM4NWI1N2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2NvcmV0ZXh0L0ZvbnRDb3JlVGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY29yZXRleHQvRm9udENvcmVUZXh0LmNwcApAQCAtNjk5LDggKzY5 OSw4IEBAIHZvaWQgRm9udDo6ZGV0ZXJtaW5lUGl0Y2goKQogRmxvYXRSZWN0IEZvbnQ6OnBsYXRm b3JtQm91bmRzRm9yR2x5cGgoR2x5cGggZ2x5cGgpIGNvbnN0CiB7CiAgICAgRmxvYXRSZWN0IGJv dW5kaW5nQm94OwotICAgIENHUmVjdCBlbXB0eVJlY3Q7Ci0gICAgYm91bmRpbmdCb3ggPSBDVEZv bnRHZXRCb3VuZGluZ1JlY3RzRm9yR2x5cGhzKG1fcGxhdGZvcm1EYXRhLmN0Rm9udCgpLCBwbGF0 Zm9ybURhdGEoKS5vcmllbnRhdGlvbigpID09IEZvbnRPcmllbnRhdGlvbjo6VmVydGljYWwgPyBr Q1RGb250T3JpZW50YXRpb25WZXJ0aWNhbCA6IGtDVEZvbnRPcmllbnRhdGlvbkhvcml6b250YWws ICZnbHlwaCwgJmVtcHR5UmVjdCwgMSk7CisgICAgQ0dSZWN0IHplcm9SZWN0ID0geyB9OworICAg IGJvdW5kaW5nQm94ID0gQ1RGb250R2V0Qm91bmRpbmdSZWN0c0ZvckdseXBocyhtX3BsYXRmb3Jt RGF0YS5jdEZvbnQoKSwgcGxhdGZvcm1EYXRhKCkub3JpZW50YXRpb24oKSA9PSBGb250T3JpZW50 YXRpb246OlZlcnRpY2FsID8ga0NURm9udE9yaWVudGF0aW9uVmVydGljYWwgOiBrQ1RGb250T3Jp ZW50YXRpb25Ib3Jpem9udGFsLCAmZ2x5cGgsICZ6ZXJvUmVjdCwgMSk7CiAgICAgYm91bmRpbmdC b3guc2V0WSgtYm91bmRpbmdCb3gubWF4WSgpKTsKICAgICBpZiAobV9zeW50aGV0aWNCb2xkT2Zm c2V0KQogICAgICAgICBib3VuZGluZ0JveC5zZXRXaWR0aChib3VuZGluZ0JveC53aWR0aCgpICsg bV9zeW50aGV0aWNCb2xkT2Zmc2V0KTsKQEAgLTc0NCw4ICs3NDQsOCBAQCBib29sIEZvbnQ6Omlz UHJvYmFibHlPbmx5VXNlZFRvUmVuZGVySWNvbnMoKSBjb25zdAogICAgIFVuaUNoYXIgbG93ZXJj YXNlQUNoYXJhY3RlciA9ICdhJzsKICAgICBDR0dseXBoIGxvd2VyY2FzZUFHbHlwaDsKICAgICBp ZiAoQ1RGb250R2V0R2x5cGhzRm9yQ2hhcmFjdGVycyhwbGF0Zm9ybUZvbnQsICZsb3dlcmNhc2VB Q2hhcmFjdGVyLCAmbG93ZXJjYXNlQUdseXBoLCAxKSkgewotICAgICAgICBDR1JlY3QgZW1wdHlS ZWN0OwotICAgICAgICBpZiAoIUNHUmVjdElzRW1wdHkoQ1RGb250R2V0Qm91bmRpbmdSZWN0c0Zv ckdseXBocyhwbGF0Zm9ybUZvbnQsIGtDVEZvbnRPcmllbnRhdGlvbkRlZmF1bHQsICZsb3dlcmNh c2VBR2x5cGgsICZlbXB0eVJlY3QsIDEpKSkKKyAgICAgICAgQ0dSZWN0IHplcm9SZWN0ID0geyB9 OworICAgICAgICBpZiAoIUNHUmVjdElzRW1wdHkoQ1RGb250R2V0Qm91bmRpbmdSZWN0c0Zvckds eXBocyhwbGF0Zm9ybUZvbnQsIGtDVEZvbnRPcmllbnRhdGlvbkRlZmF1bHQsICZsb3dlcmNhc2VB R2x5cGgsICZ6ZXJvUmVjdCwgMSkpKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0K IAo= 417721 2021-01-15 12:41:23 -0800 2021-01-15 14:50:28 -0800 Patch bug-219177-20210115124123.patch text/plain 2873 julian_a_gonzalez U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMjU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODA3ZmUyOTg1YTk2YjBl ODVlNjNlNTQwN2I0ZjdiMjU1NjZiMzRmZS4uZmY4YmI0NDBlNzczMWFkYzA3ZmI0YWJhOTc2MjQ2 YjQyZGZjZGQ4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTAxLTE1ICBKdWxp YW4gR29uemFsZXogIDxqdWxpYW5fYV9nb256YWxlekBhcHBsZS5jb20+CisKKyAgICAgICAgemVy byBib3VuZGluZ1JlY3QgcG9pbnRlciBpbiBGb250OjpwbGF0Zm9ybUJvdW5kc0ZvckdseXBoKCkg dG8gQ1RGb250R2V0Qm91bmRpbmdSZWN0c0ZvckdseXBocygpCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTkxNzcKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBY3R1YWxseSB6ZXJvIGEgQ0dSZWN0IHN0cnVj dCBpbiB0d28gcGxhY2VzIHdoZXJlIHRoZSBjb3VudCBhcmd1bWVudAorICAgICAgICB0byBDVEZv bnRHZXRCb3VuZGluZ1JlY3RzRm9yR2x5cGhzKCkgaXMgYWxyZWFkeSAxLgorICAgICAgICBUaGFu a3MgdG8gRGFyaW4gQWRsZXIgZm9yIHBvaW50aW5nIG91dCB0aGF0IGJ1ZyAyMTg4MTIgcHJvdmlk ZWQKKyAgICAgICAgYW4gdW5pbml0aWFsaXplZCBpbnN0ZWFkIG9mIHplcm8gQ0dSZWN0LgorCisg ICAgICAgIE5vIG5ldyB0ZXN0cywgbm8gYmVoYXZpb3IgY2hhbmdlcy4KKworICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2NvcmV0ZXh0L0ZvbnRDb3JlVGV4dC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpGb250OjpwbGF0Zm9ybUJvdW5kc0ZvckdseXBoIGNvbnN0KToKKyAgICAgICAgKFdlYkNv cmU6OkZvbnQ6OmlzUHJvYmFibHlPbmx5VXNlZFRvUmVuZGVySWNvbnMgY29uc3QpOgorCiAyMDIx LTAxLTA3ICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgogCiAgICAg ICAgIFtXaW5DYWlyb10gV2ViR0wgaXNuJ3Qgc2hvd24gaW4gbm9uLUFDIG1vZGUKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvcmV0ZXh0L0ZvbnRDb3JlVGV4 dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb3JldGV4dC9Gb250Q29y ZVRleHQuY3BwCmluZGV4IDU5NDNhNjFhYzZhMDE4MGU2YzdiNGIwMTFhYzFiOThhNDE1ZjNmMTAu LmUyMWVkNmZjMjNiNGU1NDI4ZjY2MGQ0ZWMxZDIzMjBiYTM4NWI1N2YgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvcmV0ZXh0L0ZvbnRDb3JlVGV4dC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29yZXRleHQvRm9udENvcmVU ZXh0LmNwcApAQCAtNjk5LDggKzY5OSw4IEBAIHZvaWQgRm9udDo6ZGV0ZXJtaW5lUGl0Y2goKQog RmxvYXRSZWN0IEZvbnQ6OnBsYXRmb3JtQm91bmRzRm9yR2x5cGgoR2x5cGggZ2x5cGgpIGNvbnN0 CiB7CiAgICAgRmxvYXRSZWN0IGJvdW5kaW5nQm94OwotICAgIENHUmVjdCBlbXB0eVJlY3Q7Ci0g ICAgYm91bmRpbmdCb3ggPSBDVEZvbnRHZXRCb3VuZGluZ1JlY3RzRm9yR2x5cGhzKG1fcGxhdGZv cm1EYXRhLmN0Rm9udCgpLCBwbGF0Zm9ybURhdGEoKS5vcmllbnRhdGlvbigpID09IEZvbnRPcmll bnRhdGlvbjo6VmVydGljYWwgPyBrQ1RGb250T3JpZW50YXRpb25WZXJ0aWNhbCA6IGtDVEZvbnRP cmllbnRhdGlvbkhvcml6b250YWwsICZnbHlwaCwgJmVtcHR5UmVjdCwgMSk7CisgICAgQ0dSZWN0 IHplcm9SZWN0ID0geyB9OworICAgIGJvdW5kaW5nQm94ID0gQ1RGb250R2V0Qm91bmRpbmdSZWN0 c0ZvckdseXBocyhtX3BsYXRmb3JtRGF0YS5jdEZvbnQoKSwgcGxhdGZvcm1EYXRhKCkub3JpZW50 YXRpb24oKSA9PSBGb250T3JpZW50YXRpb246OlZlcnRpY2FsID8ga0NURm9udE9yaWVudGF0aW9u VmVydGljYWwgOiBrQ1RGb250T3JpZW50YXRpb25Ib3Jpem9udGFsLCAmZ2x5cGgsICZ6ZXJvUmVj dCwgMSk7CiAgICAgYm91bmRpbmdCb3guc2V0WSgtYm91bmRpbmdCb3gubWF4WSgpKTsKICAgICBp ZiAobV9zeW50aGV0aWNCb2xkT2Zmc2V0KQogICAgICAgICBib3VuZGluZ0JveC5zZXRXaWR0aChi b3VuZGluZ0JveC53aWR0aCgpICsgbV9zeW50aGV0aWNCb2xkT2Zmc2V0KTsKQEAgLTc0NCw4ICs3 NDQsOCBAQCBib29sIEZvbnQ6OmlzUHJvYmFibHlPbmx5VXNlZFRvUmVuZGVySWNvbnMoKSBjb25z dAogICAgIFVuaUNoYXIgbG93ZXJjYXNlQUNoYXJhY3RlciA9ICdhJzsKICAgICBDR0dseXBoIGxv d2VyY2FzZUFHbHlwaDsKICAgICBpZiAoQ1RGb250R2V0R2x5cGhzRm9yQ2hhcmFjdGVycyhwbGF0 Zm9ybUZvbnQsICZsb3dlcmNhc2VBQ2hhcmFjdGVyLCAmbG93ZXJjYXNlQUdseXBoLCAxKSkgewot ICAgICAgICBDR1JlY3QgZW1wdHlSZWN0OwotICAgICAgICBpZiAoIUNHUmVjdElzRW1wdHkoQ1RG b250R2V0Qm91bmRpbmdSZWN0c0ZvckdseXBocyhwbGF0Zm9ybUZvbnQsIGtDVEZvbnRPcmllbnRh dGlvbkRlZmF1bHQsICZsb3dlcmNhc2VBR2x5cGgsICZlbXB0eVJlY3QsIDEpKSkKKyAgICAgICAg Q0dSZWN0IHplcm9SZWN0ID0geyB9OworICAgICAgICBpZiAoIUNHUmVjdElzRW1wdHkoQ1RGb250 R2V0Qm91bmRpbmdSZWN0c0ZvckdseXBocyhwbGF0Zm9ybUZvbnQsIGtDVEZvbnRPcmllbnRhdGlv bkRlZmF1bHQsICZsb3dlcmNhc2VBR2x5cGgsICZ6ZXJvUmVjdCwgMSkpKQogICAgICAgICAgICAg cmV0dXJuIGZhbHNlOwogICAgIH0KIAo= 417743 2021-01-15 14:50:38 -0800 2021-01-21 13:42:14 -0800 Patch bug-219177-20210115145037.patch text/plain 2885 julian_a_gonzalez U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMjU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODA3ZmUyOTg1YTk2YjBl ODVlNjNlNTQwN2I0ZjdiMjU1NjZiMzRmZS4uZmY4YmI0NDBlNzczMWFkYzA3ZmI0YWJhOTc2MjQ2 YjQyZGZjZGQ4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTAxLTE1ICBKdWxp YW4gR29uemFsZXogIDxqdWxpYW5fYV9nb256YWxlekBhcHBsZS5jb20+CisKKyAgICAgICAgemVy byBib3VuZGluZ1JlY3QgcG9pbnRlciBpbiBGb250OjpwbGF0Zm9ybUJvdW5kc0ZvckdseXBoKCkg dG8gQ1RGb250R2V0Qm91bmRpbmdSZWN0c0ZvckdseXBocygpCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTkxNzcKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBY3R1YWxseSB6ZXJvIGEgQ0dSZWN0IHN0cnVj dCBpbiB0d28gcGxhY2VzIHdoZXJlIHRoZSBjb3VudCBhcmd1bWVudAorICAgICAgICB0byBDVEZv bnRHZXRCb3VuZGluZ1JlY3RzRm9yR2x5cGhzKCkgaXMgYWxyZWFkeSAxLgorICAgICAgICBUaGFu a3MgdG8gRGFyaW4gQWRsZXIgZm9yIHBvaW50aW5nIG91dCB0aGF0IGJ1ZyAyMTg4MTIgcHJvdmlk ZWQKKyAgICAgICAgYW4gdW5pbml0aWFsaXplZCBpbnN0ZWFkIG9mIHplcm8gQ0dSZWN0LgorCisg ICAgICAgIE5vIG5ldyB0ZXN0cywgbm8gYmVoYXZpb3IgY2hhbmdlcy4KKworICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2NvcmV0ZXh0L0ZvbnRDb3JlVGV4dC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpGb250OjpwbGF0Zm9ybUJvdW5kc0ZvckdseXBoIGNvbnN0KToKKyAgICAgICAgKFdlYkNv cmU6OkZvbnQ6OmlzUHJvYmFibHlPbmx5VXNlZFRvUmVuZGVySWNvbnMgY29uc3QpOgorCiAyMDIx LTAxLTA3ICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgogCiAgICAg ICAgIFtXaW5DYWlyb10gV2ViR0wgaXNuJ3Qgc2hvd24gaW4gbm9uLUFDIG1vZGUKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvcmV0ZXh0L0ZvbnRDb3JlVGV4 dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb3JldGV4dC9Gb250Q29y ZVRleHQuY3BwCmluZGV4IDU5NDNhNjFhYzZhMDE4MGU2YzdiNGIwMTFhYzFiOThhNDE1ZjNmMTAu LmQxNzc1ZDQ0ZWU4N2IyNDlhMmQ3NWEzMGUzNTMzNDFhOTczYmIyMmIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvcmV0ZXh0L0ZvbnRDb3JlVGV4dC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29yZXRleHQvRm9udENvcmVU ZXh0LmNwcApAQCAtNjk5LDggKzY5OSw4IEBAIHZvaWQgRm9udDo6ZGV0ZXJtaW5lUGl0Y2goKQog RmxvYXRSZWN0IEZvbnQ6OnBsYXRmb3JtQm91bmRzRm9yR2x5cGgoR2x5cGggZ2x5cGgpIGNvbnN0 CiB7CiAgICAgRmxvYXRSZWN0IGJvdW5kaW5nQm94OwotICAgIENHUmVjdCBlbXB0eVJlY3Q7Ci0g ICAgYm91bmRpbmdCb3ggPSBDVEZvbnRHZXRCb3VuZGluZ1JlY3RzRm9yR2x5cGhzKG1fcGxhdGZv cm1EYXRhLmN0Rm9udCgpLCBwbGF0Zm9ybURhdGEoKS5vcmllbnRhdGlvbigpID09IEZvbnRPcmll bnRhdGlvbjo6VmVydGljYWwgPyBrQ1RGb250T3JpZW50YXRpb25WZXJ0aWNhbCA6IGtDVEZvbnRP cmllbnRhdGlvbkhvcml6b250YWwsICZnbHlwaCwgJmVtcHR5UmVjdCwgMSk7CisgICAgQ0dSZWN0 IGlnbm9yZWRSZWN0ID0geyB9OworICAgIGJvdW5kaW5nQm94ID0gQ1RGb250R2V0Qm91bmRpbmdS ZWN0c0ZvckdseXBocyhtX3BsYXRmb3JtRGF0YS5jdEZvbnQoKSwgcGxhdGZvcm1EYXRhKCkub3Jp ZW50YXRpb24oKSA9PSBGb250T3JpZW50YXRpb246OlZlcnRpY2FsID8ga0NURm9udE9yaWVudGF0 aW9uVmVydGljYWwgOiBrQ1RGb250T3JpZW50YXRpb25Ib3Jpem9udGFsLCAmZ2x5cGgsICZpZ25v cmVkUmVjdCwgMSk7CiAgICAgYm91bmRpbmdCb3guc2V0WSgtYm91bmRpbmdCb3gubWF4WSgpKTsK ICAgICBpZiAobV9zeW50aGV0aWNCb2xkT2Zmc2V0KQogICAgICAgICBib3VuZGluZ0JveC5zZXRX aWR0aChib3VuZGluZ0JveC53aWR0aCgpICsgbV9zeW50aGV0aWNCb2xkT2Zmc2V0KTsKQEAgLTc0 NCw4ICs3NDQsOCBAQCBib29sIEZvbnQ6OmlzUHJvYmFibHlPbmx5VXNlZFRvUmVuZGVySWNvbnMo KSBjb25zdAogICAgIFVuaUNoYXIgbG93ZXJjYXNlQUNoYXJhY3RlciA9ICdhJzsKICAgICBDR0ds eXBoIGxvd2VyY2FzZUFHbHlwaDsKICAgICBpZiAoQ1RGb250R2V0R2x5cGhzRm9yQ2hhcmFjdGVy cyhwbGF0Zm9ybUZvbnQsICZsb3dlcmNhc2VBQ2hhcmFjdGVyLCAmbG93ZXJjYXNlQUdseXBoLCAx KSkgewotICAgICAgICBDR1JlY3QgZW1wdHlSZWN0OwotICAgICAgICBpZiAoIUNHUmVjdElzRW1w dHkoQ1RGb250R2V0Qm91bmRpbmdSZWN0c0ZvckdseXBocyhwbGF0Zm9ybUZvbnQsIGtDVEZvbnRP cmllbnRhdGlvbkRlZmF1bHQsICZsb3dlcmNhc2VBR2x5cGgsICZlbXB0eVJlY3QsIDEpKSkKKyAg ICAgICAgQ0dSZWN0IGlnbm9yZWRSZWN0ID0geyB9OworICAgICAgICBpZiAoIUNHUmVjdElzRW1w dHkoQ1RGb250R2V0Qm91bmRpbmdSZWN0c0ZvckdseXBocyhwbGF0Zm9ybUZvbnQsIGtDVEZvbnRP cmllbnRhdGlvbkRlZmF1bHQsICZsb3dlcmNhc2VBR2x5cGgsICZpZ25vcmVkUmVjdCwgMSkpKQog ICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KIAo= 418080 2021-01-21 13:42:17 -0800 2021-01-21 14:56:49 -0800 Patch bug-219177-20210121134216.patch text/plain 2835 julian_a_gonzalez U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMjU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODA3ZmUyOTg1YTk2YjBl ODVlNjNlNTQwN2I0ZjdiMjU1NjZiMzRmZS4uOGQyMWFhNzBmNDA0MjQ2ZjZlYWNmMjUxNzMyYzBl NmFiNzBlYzFmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTAxLTE1ICBKdWxp YW4gR29uemFsZXogIDxqdWxpYW5fYV9nb256YWxlekBhcHBsZS5jb20+CisKKyAgICAgICAgemVy byBhbmQgcmVuYW1lIGJvdW5kaW5nUmVjdCBwb2ludGVyIGluIEZvbnQ6OnBsYXRmb3JtQm91bmRz Rm9yR2x5cGgoKSB0byBDVEZvbnRHZXRCb3VuZGluZ1JlY3RzRm9yR2x5cGhzKCkKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxOTE3NworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFplcm8gYW5kIHJlbmFtZSBh IENHUmVjdCBzdHJ1Y3QgaW4gdHdvIHBsYWNlcyB3aGVyZSB0aGUgY291bnQgYXJndW1lbnQKKyAg ICAgICAgdG8gQ1RGb250R2V0Qm91bmRpbmdSZWN0c0ZvckdseXBocygpIGlzIGFscmVhZHkgMS4K KyAgICAgICAgVGhhbmtzIHRvIERhcmluIEFkbGVyIGZvciBwb2ludGluZyBvdXQgdGhpcyBpc3N1 ZS4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIGJlaGF2aW9yIGNoYW5nZXMuCisKKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jb3JldGV4dC9Gb250Q29yZVRleHQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6Rm9udDo6cGxhdGZvcm1Cb3VuZHNGb3JHbHlwaCBjb25zdCk6CisgICAgICAg IChXZWJDb3JlOjpGb250Ojppc1Byb2JhYmx5T25seVVzZWRUb1JlbmRlckljb25zIGNvbnN0KToK KwogMjAyMS0wMS0wNyAgRnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBzb255LmNvbT4K IAogICAgICAgICBbV2luQ2Fpcm9dIFdlYkdMIGlzbid0IHNob3duIGluIG5vbi1BQyBtb2RlCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb3JldGV4dC9Gb250 Q29yZVRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29yZXRleHQv Rm9udENvcmVUZXh0LmNwcAppbmRleCA1OTQzYTYxYWM2YTAxODBlNmM3YjRiMDExYWMxYjk4YTQx NWYzZjEwLi5kMTc3NWQ0NGVlODdiMjQ5YTJkNzVhMzBlMzUzMzQxYTk3M2JiMjJiIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb3JldGV4dC9Gb250Q29yZVRl eHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvcmV0ZXh0L0Zv bnRDb3JlVGV4dC5jcHAKQEAgLTY5OSw4ICs2OTksOCBAQCB2b2lkIEZvbnQ6OmRldGVybWluZVBp dGNoKCkKIEZsb2F0UmVjdCBGb250OjpwbGF0Zm9ybUJvdW5kc0ZvckdseXBoKEdseXBoIGdseXBo KSBjb25zdAogewogICAgIEZsb2F0UmVjdCBib3VuZGluZ0JveDsKLSAgICBDR1JlY3QgZW1wdHlS ZWN0OwotICAgIGJvdW5kaW5nQm94ID0gQ1RGb250R2V0Qm91bmRpbmdSZWN0c0ZvckdseXBocyht X3BsYXRmb3JtRGF0YS5jdEZvbnQoKSwgcGxhdGZvcm1EYXRhKCkub3JpZW50YXRpb24oKSA9PSBG b250T3JpZW50YXRpb246OlZlcnRpY2FsID8ga0NURm9udE9yaWVudGF0aW9uVmVydGljYWwgOiBr Q1RGb250T3JpZW50YXRpb25Ib3Jpem9udGFsLCAmZ2x5cGgsICZlbXB0eVJlY3QsIDEpOworICAg IENHUmVjdCBpZ25vcmVkUmVjdCA9IHsgfTsKKyAgICBib3VuZGluZ0JveCA9IENURm9udEdldEJv dW5kaW5nUmVjdHNGb3JHbHlwaHMobV9wbGF0Zm9ybURhdGEuY3RGb250KCksIHBsYXRmb3JtRGF0 YSgpLm9yaWVudGF0aW9uKCkgPT0gRm9udE9yaWVudGF0aW9uOjpWZXJ0aWNhbCA/IGtDVEZvbnRP cmllbnRhdGlvblZlcnRpY2FsIDoga0NURm9udE9yaWVudGF0aW9uSG9yaXpvbnRhbCwgJmdseXBo LCAmaWdub3JlZFJlY3QsIDEpOwogICAgIGJvdW5kaW5nQm94LnNldFkoLWJvdW5kaW5nQm94Lm1h eFkoKSk7CiAgICAgaWYgKG1fc3ludGhldGljQm9sZE9mZnNldCkKICAgICAgICAgYm91bmRpbmdC b3guc2V0V2lkdGgoYm91bmRpbmdCb3gud2lkdGgoKSArIG1fc3ludGhldGljQm9sZE9mZnNldCk7 CkBAIC03NDQsOCArNzQ0LDggQEAgYm9vbCBGb250Ojppc1Byb2JhYmx5T25seVVzZWRUb1JlbmRl ckljb25zKCkgY29uc3QKICAgICBVbmlDaGFyIGxvd2VyY2FzZUFDaGFyYWN0ZXIgPSAnYSc7CiAg ICAgQ0dHbHlwaCBsb3dlcmNhc2VBR2x5cGg7CiAgICAgaWYgKENURm9udEdldEdseXBoc0ZvckNo YXJhY3RlcnMocGxhdGZvcm1Gb250LCAmbG93ZXJjYXNlQUNoYXJhY3RlciwgJmxvd2VyY2FzZUFH bHlwaCwgMSkpIHsKLSAgICAgICAgQ0dSZWN0IGVtcHR5UmVjdDsKLSAgICAgICAgaWYgKCFDR1Jl Y3RJc0VtcHR5KENURm9udEdldEJvdW5kaW5nUmVjdHNGb3JHbHlwaHMocGxhdGZvcm1Gb250LCBr Q1RGb250T3JpZW50YXRpb25EZWZhdWx0LCAmbG93ZXJjYXNlQUdseXBoLCAmZW1wdHlSZWN0LCAx KSkpCisgICAgICAgIENHUmVjdCBpZ25vcmVkUmVjdCA9IHsgfTsKKyAgICAgICAgaWYgKCFDR1Jl Y3RJc0VtcHR5KENURm9udEdldEJvdW5kaW5nUmVjdHNGb3JHbHlwaHMocGxhdGZvcm1Gb250LCBr Q1RGb250T3JpZW50YXRpb25EZWZhdWx0LCAmbG93ZXJjYXNlQUdseXBoLCAmaWdub3JlZFJlY3Qs IDEpKSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAK