223701 2021-03-24 10:44:31 -0700 Port FontDescriptionKey::computeHash() from legacy IntegerHasher to Hasher 2021-03-28 17:18:10 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=176131 https://bugs.webkit.org/show_bug.cgi?id=223858 InRadar P2 Normal --- 1 cdumez cdumez ap benjamin cmarcelo darin ddkilzer ews-watchlist ggaren mmaxfield rniwa sam webkit-bug-importer oldest_to_newest 1743405 0 cdumez 2021-03-24 10:44:31 -0700 Silence UBSan warning in FontDescriptionKey::computeHash(): - Source/WebCore/platform/graphics/FontCache.h:115:20: runtime error: -5 is outside the range of representable values of type 'unsigned int' - Source/WebCore/platform/graphics/FontCache.h:115:20: runtime error: -45 is outside the range of representable values of type 'unsigned int' - Source/WebCore/platform/graphics/FontCache.h:114:20: runtime error: -100 is outside the range of representable values of type 'unsigned int' 1743406 1 424155 cdumez 2021-03-24 10:47:01 -0700 Created attachment 424155 Patch 1743418 2 424155 ap 2021-03-24 11:07:09 -0700 Comment on attachment 424155 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=424155&action=review > Source/WebCore/ChangeLog:13 > + Since we're merely computing a hash here, I think the undefined behavior is acceptable here. Are you saying that even though it's undefined, all compilers we use will always do a sane thing here? Officially, undefined behavior can erase my SSD, which I wouldn't like a hash function to do :) 1743419 3 424155 darin 2021-03-24 11:08:09 -0700 Comment on attachment 424155 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=424155&action=review > Source/WebCore/platform/graphics/FontCache.h:109 > + NO_SANITIZE("undefined") inline unsigned computeHash() const I guess this is OK, because IntegerHasher is deprecated and our stated direction is to move to Hasher instead. If IntegerHasher was not deprecated, I would say that instead we need to do more overloading of the add function in IntegerHasher rather than writing NO_SANITIZE. Maybe we should port this function to use Hasher instead? 1743423 4 424155 darin 2021-03-24 11:11:40 -0700 Comment on attachment 424155 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=424155&action=review >> Source/WebCore/ChangeLog:13 >> + Since we're merely computing a hash here, I think the undefined behavior is acceptable here. > > Are you saying that even though it's undefined, all compilers we use will always do a sane thing here? Officially, undefined behavior can erase my SSD, which I wouldn't like a hash function to do :) That’s right. Converting an int to unsigned without a cast works the same on all compilers, reinterpreting it, even though it’s technically "undefined behavior". This is a problem with UBSan: there are important kinds of problems that are undefined behavior, and there are things that are really no problem at all like this. 1743424 5 424155 darin 2021-03-24 11:12:14 -0700 Comment on attachment 424155 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=424155&action=review >> Source/WebCore/platform/graphics/FontCache.h:109 >> + NO_SANITIZE("undefined") inline unsigned computeHash() const > > I guess this is OK, because IntegerHasher is deprecated and our stated direction is to move to Hasher instead. > > If IntegerHasher was not deprecated, I would say that instead we need to do more overloading of the add function in IntegerHasher rather than writing NO_SANITIZE. > > Maybe we should port this function to use Hasher instead? Or we could just add one explicit cast to unsigned. 1743433 6 cdumez 2021-03-24 11:37:00 -0700 (In reply to Darin Adler from comment #5) > Comment on attachment 424155 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=424155&action=review > > >> Source/WebCore/platform/graphics/FontCache.h:109 > >> + NO_SANITIZE("undefined") inline unsigned computeHash() const > > > > I guess this is OK, because IntegerHasher is deprecated and our stated direction is to move to Hasher instead. > > > > If IntegerHasher was not deprecated, I would say that instead we need to do more overloading of the add function in IntegerHasher rather than writing NO_SANITIZE. > > > > Maybe we should port this function to use Hasher instead? > > Or we could just add one explicit cast to unsigned. I guess we could port the function to Hasher but all it does is force the caller to static cast to an unsigned integer type before calling Hasher::add(). Will the static_cast<> really silence the UBSan warning? Seems to me that casting a negative int to an unsigned is undefined behavior no matter what. 1743441 7 darin 2021-03-24 11:49:16 -0700 (In reply to Chris Dumez from comment #6) > casting a negative int to an unsigned is undefined behavior > no matter what. There has to be some way to do the conversion that does not rely on undefined behavior. Whether it’s static_cast or a new function we have to write. 1743442 8 cdumez 2021-03-24 11:51:17 -0700 (In reply to Darin Adler from comment #7) > (In reply to Chris Dumez from comment #6) > > casting a negative int to an unsigned is undefined behavior > > no matter what. > > There has to be some way to do the conversion that does not rely on > undefined behavior. Whether it’s static_cast or a new function we have to > write. Yes, so I initially tried to write such a function. Then I figured it was probably not worth the cost (I think it will involve extra branching) since this is only used for hashing. 1743446 9 darin 2021-03-24 11:53:10 -0700 We don’t want to be required to sprinkle NO_SANITIZE("undefined") calls into our sources every place we hash an int. 1743447 10 cdumez 2021-03-24 11:53:48 -0700 (In reply to Darin Adler from comment #9) > We don’t want to be required to sprinkle NO_SANITIZE("undefined") calls into > our sources every place we hash an int. Fair point. Let me rethink the approach then. 1743448 11 darin 2021-03-24 11:54:17 -0700 Instead we can have that in a single function inside the Hasher class. It might be harder to do that for IntegerHasher because overloading for int would lead to having to do more overloading now that there is ambiguity. 1743463 12 424165 cdumez 2021-03-24 12:14:38 -0700 Created attachment 424165 Patch 1743598 13 cdumez 2021-03-24 16:42:50 -0700 I updated the patch to port the code to Hasher as suggested. Set review flag again. 1743620 14 424165 darin 2021-03-24 17:35:07 -0700 Comment on attachment 424165 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=424165&action=review Some nice features of Hasher that this does not take advantage of, that I would like you to be aware of for the future: 1) Can pass an entire collection, like a std::array, and Hasher knows how to hash all the items. Works for any object that has a begin function and that works with a range-based for loop. 2) Can list more than one item in a single call to add, rather than using separate calls to add each thing. 3) Can handle Optional, so no need to write valueOr. 4) Can pass a tuple and it will hash all the items in the tuple. 5) Can hash whole objects, not just integers, so can avoid doing hashes of hashes in most cases. 6) Can write add function overloads for use in combination with the above. > Source/WebCore/platform/graphics/FontCache.h:115 > + add(hasher, m_fontSelectionRequest.weight); > + add(hasher, m_fontSelectionRequest.width); > + add(hasher, m_fontSelectionRequest.slope.valueOr(normalItalicValue())); Could just write this: add(hasher, m_fontSelectionRequest.tied()); > Source/WebCore/platform/graphics/FontCache.h:116 > + add(hasher, m_locale.existingHash()); Could just write this: add(hasher, m_locale); > Source/WebCore/platform/graphics/FontCache.h:117 > for (unsigned flagItem : m_flags) Could just write this: add(hasher, m_flags); Instead of the loop. > Source/WebCore/platform/graphics/FontCache.h:120 > + add(hasher, m_featureSettings.hash()); > + add(hasher, m_variationSettings.hash()); With very little work we could refactor so this doesn’t make a hash out of hashes. Likely just need to make an add(Hasher&, x) overload for FontTaggedSetting. No need to do that now. 1743625 15 424209 cdumez 2021-03-24 17:44:34 -0700 Created attachment 424209 Patch 1743631 16 ews-feeder 2021-03-24 18:28:51 -0700 Committed r274992: <https://commits.webkit.org/r274992> All reviewed patches have been landed. Closing bug and clearing flags on attachment 424209. 1743632 17 webkit-bug-importer 2021-03-24 18:29:14 -0700 <rdar://problem/75815864> 1744662 18 rniwa 2021-03-28 17:18:10 -0700 This patch caused the bug 223858. 424155 2021-03-24 10:47:01 -0700 2021-03-24 12:14:36 -0700 Patch bug-223701-20210324104701.patch text/plain 3143 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0OTQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGMyMmUwOTYyMzQ4MzA2Mjg0ZjViYzVl YzU0ZGExNmZhMWEzNWM0MDIuLjYxZTQ4NTVjNGM4YzNmMWYzMjNlYjI1ZDMwN2NkZDRiYjczMTA5 OTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDMtMjQgIENocmlzIER1bWV6ICA8Y2R1bWV6 QGFwcGxlLmNvbT4KKworICAgICAgICBTaWxlbmNlIFVCU2FuIHdhcm5pbmcgaW4gRm9udERlc2Ny aXB0aW9uS2V5Ojpjb21wdXRlSGFzaCgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMjM3MDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBBZGQgTk9fU0FOSVRJWkUoKSBtYWNybyB0byBkaXNhYmxlIFVCU2Fu IGZvciBhIHNwZWNpZmljIGZ1bmN0aW9uIHdoZW4gbmVjZXNzYXJ5LgorCisgICAgICAgICogd3Rm L0NvbXBpbGVyLmg6CisKIDIwMjEtMDMtMjMgIERlYW4gSmFja3NvbiAgPHlvbG9AYXBwbGUuY29t PgogCiAgICAgICAgIEVuYWJsZSBNZXRhbCBBTkdMRSBiYWNrZW5kIGZvciBXZWJHTApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n CmluZGV4IGI0MDFkNzM2YmVmNjNjOWMzZTg0NTdhN2Y3YjQ5YjAwOTkwY2YzYTEuLmRiNjEwMTY0 YmJkMzc1NzFiYTZlZWM2NzdlZTc5YTgyMjFjYWI5OTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwy MCBAQAorMjAyMS0wMy0yNCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCisgICAg ICAgIFNpbGVuY2UgVUJTYW4gd2FybmluZyBpbiBGb250RGVzY3JpcHRpb25LZXk6OmNvbXB1dGVI YXNoKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy MzcwMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNp bGVuY2UgVUJTYW4gd2FybmluZyBpbiBGb250RGVzY3JpcHRpb25LZXk6OmNvbXB1dGVIYXNoKCk6 CisgICAgICAgIC0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmg6 MTE1OjIwOiBydW50aW1lIGVycm9yOiAtNSBpcyBvdXRzaWRlIHRoZSByYW5nZSBvZiByZXByZXNl bnRhYmxlIHZhbHVlcyBvZiB0eXBlICd1bnNpZ25lZCBpbnQnCisgICAgICAgIC0gU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmg6MTE1OjIwOiBydW50aW1lIGVycm9y OiAtNDUgaXMgb3V0c2lkZSB0aGUgcmFuZ2Ugb2YgcmVwcmVzZW50YWJsZSB2YWx1ZXMgb2YgdHlw ZSAndW5zaWduZWQgaW50JworICAgICAgICAtIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL0ZvbnRDYWNoZS5oOjExNDoyMDogcnVudGltZSBlcnJvcjogLTEwMCBpcyBvdXRzaWRlIHRo ZSByYW5nZSBvZiByZXByZXNlbnRhYmxlIHZhbHVlcyBvZiB0eXBlICd1bnNpZ25lZCBpbnQnCisK KyAgICAgICAgU2luY2Ugd2UncmUgbWVyZWx5IGNvbXB1dGluZyBhIGhhc2ggaGVyZSwgSSB0aGlu ayB0aGUgdW5kZWZpbmVkIGJlaGF2aW9yIGlzIGFjY2VwdGFibGUgaGVyZS4KKworICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5oOgorICAgICAgICAoV2ViQ29yZTo6Rm9udERl c2NyaXB0aW9uS2V5Ojpjb21wdXRlSGFzaCBjb25zdCk6CisKIDIwMjEtMDMtMjQgIEFudG9pbmUg UXVpbnQgIDxncmFvdXRzQHdlYmtpdC5vcmc+CiAKICAgICAgICAgU3VwcG9ydCBhbmltYXRpb24g b2YgdGhlIHRhYi1zaXplIENTUyBwcm9wZXJ0eQpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYv Q29tcGlsZXIuaCBiL1NvdXJjZS9XVEYvd3RmL0NvbXBpbGVyLmgKaW5kZXggZWZjYzc0Mzk1YmE2 MjU5ODdkMjlhOGZmZDlhOWI5NTIwZTYwMTM5OS4uMjNjYmIyZDE4NTc3MTFhNzJiN2M3MWVjZWFi N2UyNzAyZjVmMDYzMyAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvQ29tcGlsZXIuaAorKysg Yi9Tb3VyY2UvV1RGL3d0Zi9Db21waWxlci5oCkBAIC0yNjksNiArMjY5LDE2IEBACiAjZGVmaW5l IE5PX1JFVFVSTgogI2VuZGlmCiAKKy8qIE5PX1NBTklUSVpFICovCisKKyNpZiAhZGVmaW5lZChO T19TQU5JVElaRSkgJiYgQ09NUElMRVIoQ0xBTkcpCisjZGVmaW5lIE5PX1NBTklUSVpFKGNhdGVn b3J5KSBfX2F0dHJpYnV0ZV9fKChub19zYW5pdGl6ZShjYXRlZ29yeSkpKQorI2VuZGlmCisKKyNp ZiAhZGVmaW5lZChOT19TQU5JVElaRSkKKyNkZWZpbmUgTk9fU0FOSVRJWkUoY2F0ZWdvcnkpCisj ZW5kaWYKKwogLyogTk9UX1RBSUxfQ0FMTEVEICovCiAKICNpZiAhZGVmaW5lZChOT1RfVEFJTF9D QUxMRUQpICYmIGRlZmluZWQoX19oYXNfYXR0cmlidXRlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUuaAppbmRleCBkZWNkNjdlZGFkNjhjNzcxZjA4MmQ4ZmNi NTc4YzMxMjNkNTdmZjJlLi5kMjBhMzFhNmIzZGQ0N2M1OGI5MzJlODhhZGRhMzE4MzUwNDA4Njg5 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUuaApAQCAt MTA2LDcgKzEwNiw3IEBAIHN0cnVjdCBGb250RGVzY3JpcHRpb25LZXkgewogCiAgICAgYm9vbCBp c0hhc2hUYWJsZURlbGV0ZWRWYWx1ZSgpIGNvbnN0IHsgcmV0dXJuIG1faXNEZWxldGVkVmFsdWU7 IH0KIAotICAgIGlubGluZSB1bnNpZ25lZCBjb21wdXRlSGFzaCgpIGNvbnN0CisgICAgTk9fU0FO SVRJWkUoInVuZGVmaW5lZCIpIGlubGluZSB1bnNpZ25lZCBjb21wdXRlSGFzaCgpIGNvbnN0CiAg ICAgewogICAgICAgICBJbnRlZ2VySGFzaGVyIGhhc2hlcjsKICAgICAgICAgaGFzaGVyLmFkZCht X3NpemUpOwo= 424165 2021-03-24 12:14:38 -0700 2021-03-24 17:44:32 -0700 Patch bug-223701-20210324121438.patch text/plain 2238 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0OTUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmVmYWRjMDBlMGM3YThl YTRkM2FhNzYxNDZlMTVmNjY0NDg3MTFkZi4uNWIzNzlhMmRlYzkwMWU0MWE3Y2UyYzQ2NGQ1MWQz ZGE3MjdmZjU4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTAzLTI0ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUG9ydCBGb250RGVzY3JpcHRp b25LZXk6OmNvbXB1dGVIYXNoKCkgZnJvbSBsZWdhY3kgSW50ZWdlckhhc2hlciB0byBIYXNoZXIK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzcwMQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBvcnQgRm9u dERlc2NyaXB0aW9uS2V5Ojpjb21wdXRlSGFzaCgpIGZyb20gbGVnYWN5IEludGVnZXJIYXNoZXIg dG8gSGFzaGVyLiBIYXNoZXIKKyAgICAgICAgaGFzIHRoZSBiZW5lZml0IG9mIGhhdmluZyBhZGQo KSBvdmVybG9hZHMgdGhhdCB0YWtlIGluIHNpZ25lZCBpbnRlZ2VyIHR5cGVzLgorCisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmg6CisgICAgICAgIChXZWJDb3JlOjpGb250 RGVzY3JpcHRpb25LZXk6OmNvbXB1dGVIYXNoIGNvbnN0KToKKwogMjAyMS0wMy0yNCAgU2FtIFdl aW5pZyAgPHdlaW5pZ0BhcHBsZS5jb20+CiAKICAgICAgICAgVXBkYXRlIENTUyBDb2xvciA1IGNv bG9yLW1peCgpIGltcGxlbWVudGF0aW9uIHRvIG1hdGNoIHRoZSBsYXRlc3QgZHJhZnQgc3BlYwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmgg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUuaAppbmRleCBkZWNk NjdlZGFkNjhjNzcxZjA4MmQ4ZmNiNTc4YzMxMjNkNTdmZjJlLi4xZjJiZmJlMWY0ODAzMTYyZGFi NmJkODlmYzU4MmQ4MTQyYWI4NTM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9Gb250Q2FjaGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9Gb250Q2FjaGUuaApAQCAtMTA4LDE2ICsxMDgsMTYgQEAgc3RydWN0IEZvbnREZXNjcmlw dGlvbktleSB7CiAKICAgICBpbmxpbmUgdW5zaWduZWQgY29tcHV0ZUhhc2goKSBjb25zdAogICAg IHsKLSAgICAgICAgSW50ZWdlckhhc2hlciBoYXNoZXI7Ci0gICAgICAgIGhhc2hlci5hZGQobV9z aXplKTsKLSAgICAgICAgaGFzaGVyLmFkZChtX2ZvbnRTZWxlY3Rpb25SZXF1ZXN0LndlaWdodCk7 Ci0gICAgICAgIGhhc2hlci5hZGQobV9mb250U2VsZWN0aW9uUmVxdWVzdC53aWR0aCk7Ci0gICAg ICAgIGhhc2hlci5hZGQobV9mb250U2VsZWN0aW9uUmVxdWVzdC5zbG9wZS52YWx1ZU9yKG5vcm1h bEl0YWxpY1ZhbHVlKCkpKTsKLSAgICAgICAgaGFzaGVyLmFkZChtX2xvY2FsZS5leGlzdGluZ0hh c2goKSk7CisgICAgICAgIEhhc2hlciBoYXNoZXI7CisgICAgICAgIGFkZChoYXNoZXIsIG1fc2l6 ZSk7CisgICAgICAgIGFkZChoYXNoZXIsIG1fZm9udFNlbGVjdGlvblJlcXVlc3Qud2VpZ2h0KTsK KyAgICAgICAgYWRkKGhhc2hlciwgbV9mb250U2VsZWN0aW9uUmVxdWVzdC53aWR0aCk7CisgICAg ICAgIGFkZChoYXNoZXIsIG1fZm9udFNlbGVjdGlvblJlcXVlc3Quc2xvcGUudmFsdWVPcihub3Jt YWxJdGFsaWNWYWx1ZSgpKSk7CisgICAgICAgIGFkZChoYXNoZXIsIG1fbG9jYWxlLmV4aXN0aW5n SGFzaCgpKTsKICAgICAgICAgZm9yICh1bnNpZ25lZCBmbGFnSXRlbSA6IG1fZmxhZ3MpCi0gICAg ICAgICAgICBoYXNoZXIuYWRkKGZsYWdJdGVtKTsKLSAgICAgICAgaGFzaGVyLmFkZChtX2ZlYXR1 cmVTZXR0aW5ncy5oYXNoKCkpOwotICAgICAgICBoYXNoZXIuYWRkKG1fdmFyaWF0aW9uU2V0dGlu Z3MuaGFzaCgpKTsKKyAgICAgICAgICAgIGFkZChoYXNoZXIsIGZsYWdJdGVtKTsKKyAgICAgICAg YWRkKGhhc2hlciwgbV9mZWF0dXJlU2V0dGluZ3MuaGFzaCgpKTsKKyAgICAgICAgYWRkKGhhc2hl ciwgbV92YXJpYXRpb25TZXR0aW5ncy5oYXNoKCkpOwogICAgICAgICByZXR1cm4gaGFzaGVyLmhh c2goKTsKICAgICB9CiAK 424209 2021-03-24 17:44:34 -0700 2021-03-24 18:28:52 -0700 Patch bug-223701-20210324174433.patch text/plain 2057 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0OTg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzQ1MmI5OTdlMDAyNjNh ZGI5MGY3MDQ3MmNkZTdlZTU0NDc2ZDVmOC4uODZlNjlkZTAwYWY4ZTY0NmMxNmYzODg1MDIwYzI0 ZGE2MTMyMmNmNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTAzLTI0ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUG9ydCBGb250RGVzY3JpcHRp b25LZXk6OmNvbXB1dGVIYXNoKCkgZnJvbSBsZWdhY3kgSW50ZWdlckhhc2hlciB0byBIYXNoZXIK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzcwMQor CisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgIFBvcnQgRm9udERl c2NyaXB0aW9uS2V5Ojpjb21wdXRlSGFzaCgpIGZyb20gbGVnYWN5IEludGVnZXJIYXNoZXIgdG8g SGFzaGVyLiBIYXNoZXIKKyAgICAgICAgaGFzIHRoZSBiZW5lZml0IG9mIGhhdmluZyBhZGQoKSBv dmVybG9hZHMgdGhhdCB0YWtlIGluIHNpZ25lZCBpbnRlZ2VyIHR5cGVzLgorCisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmg6CisgICAgICAgIChXZWJDb3JlOjpGb250RGVz Y3JpcHRpb25LZXk6OmNvbXB1dGVIYXNoIGNvbnN0KToKKwogMjAyMS0wMy0yNCAgQ2hyaXMgRHVt ZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgYnVpbGQgZml4IGFm dGVyIHIyNzQ5ODMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9Gb250Q2FjaGUuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNo ZS5oCmluZGV4IGRlY2Q2N2VkYWQ2OGM3NzFmMDgyZDhmY2I1NzhjMzEyM2Q1N2ZmMmUuLmQxOThm MTBhZjlhYTVkMjczNDZmODU0ZTlmYzkxZjQ2NzNlMDg0Y2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5oCkBAIC0xMDgsMTYgKzEwOCwxMyBAQCBzdHJ1 Y3QgRm9udERlc2NyaXB0aW9uS2V5IHsKIAogICAgIGlubGluZSB1bnNpZ25lZCBjb21wdXRlSGFz aCgpIGNvbnN0CiAgICAgewotICAgICAgICBJbnRlZ2VySGFzaGVyIGhhc2hlcjsKLSAgICAgICAg aGFzaGVyLmFkZChtX3NpemUpOwotICAgICAgICBoYXNoZXIuYWRkKG1fZm9udFNlbGVjdGlvblJl cXVlc3Qud2VpZ2h0KTsKLSAgICAgICAgaGFzaGVyLmFkZChtX2ZvbnRTZWxlY3Rpb25SZXF1ZXN0 LndpZHRoKTsKLSAgICAgICAgaGFzaGVyLmFkZChtX2ZvbnRTZWxlY3Rpb25SZXF1ZXN0LnNsb3Bl LnZhbHVlT3Iobm9ybWFsSXRhbGljVmFsdWUoKSkpOwotICAgICAgICBoYXNoZXIuYWRkKG1fbG9j YWxlLmV4aXN0aW5nSGFzaCgpKTsKLSAgICAgICAgZm9yICh1bnNpZ25lZCBmbGFnSXRlbSA6IG1f ZmxhZ3MpCi0gICAgICAgICAgICBoYXNoZXIuYWRkKGZsYWdJdGVtKTsKLSAgICAgICAgaGFzaGVy LmFkZChtX2ZlYXR1cmVTZXR0aW5ncy5oYXNoKCkpOwotICAgICAgICBoYXNoZXIuYWRkKG1fdmFy aWF0aW9uU2V0dGluZ3MuaGFzaCgpKTsKKyAgICAgICAgSGFzaGVyIGhhc2hlcjsKKyAgICAgICAg YWRkKGhhc2hlciwgbV9zaXplKTsKKyAgICAgICAgYWRkKGhhc2hlciwgbV9mb250U2VsZWN0aW9u UmVxdWVzdC50aWVkKCkpOworICAgICAgICBhZGQoaGFzaGVyLCBtX2xvY2FsZS5leGlzdGluZ0hh c2goKSk7CisgICAgICAgIGFkZChoYXNoZXIsIG1fZmxhZ3MpOworICAgICAgICBhZGQoaGFzaGVy LCBtX2ZlYXR1cmVTZXR0aW5ncy5oYXNoKCkpOworICAgICAgICBhZGQoaGFzaGVyLCBtX3Zhcmlh dGlvblNldHRpbmdzLmhhc2goKSk7CiAgICAgICAgIHJldHVybiBoYXNoZXIuaGFzaCgpOwogICAg IH0KIAo=