213034 2020-06-10 10:34:11 -0700 Suppress compiler warnings 2020-06-15 09:45:17 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 vjaquez vjaquez alecflett aperez beidson cdumez cgarcia darin ews-watchlist fujii ggaren jsbell ross.kirsling webkit-bug-importer oldest_to_newest 1661218 0 vjaquez 2020-06-10 10:34:11 -0700 Suppress some clang++ warnings. This is also an update of https://bugs.webkit.org/show_bug.cgi?id=206235 1661220 1 401555 vjaquez 2020-06-10 10:38:29 -0700 Created attachment 401555 Patch 1661229 2 401555 darin 2020-06-10 10:59:55 -0700 Comment on attachment 401555 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=401555&action=review r=me but please consider moving the cast to size_t and doing a follow-up change to FileSystem. > Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp:781 > + LOG(IndexedDB, "UniqueIDBDatabase::putOrAdd quota check with task size: %" PRIu64 " key size: %" PRIu64 " value size: %" PRIu64 " index size: %" PRIu64, taskSize, keySize, valueSize, indexSize); This is clearly right. > Source/WebKit/NetworkProcess/cache/NetworkCacheData.cpp:154 > + if (static_cast<std::size_t>(bytesRead) == salt.size()) Seems to me that this points to a design mistake, and I am not sure that it’s good to quiet the warning here. Doing the cast here is only safe because we know the number is small enough to fit into size_t. And since the FileSystem::readFromFile function reads data into memory, by definition can’t read a number of bytes that won’t fit into a size_t. But that should be encoded by making the return type of the function be a size_t, not by adding casts. I don’t know what other problems there might be if we made that change. Maybe we should move the static_cast to the line that calls readFromFile and then file a follow-up bug about changing the return type of that function. > Source/WebKit/NetworkProcess/cache/NetworkCacheData.cpp:162 > + bool success = static_cast<std::size_t>(FileSystem::writeToFile(file, reinterpret_cast<char*>(salt.data()), salt.size())) == salt.size(); Ditto: Here it’s better because the cast is right where we call writeToFile, but I think we need that follow-up. 1662665 3 401900 vjaquez 2020-06-15 08:55:03 -0700 Created attachment 401900 Patch 1662675 4 ews-feeder 2020-06-15 09:44:06 -0700 Committed r263041: <https://trac.webkit.org/changeset/263041> All reviewed patches have been landed. Closing bug and clearing flags on attachment 401900. 1662676 5 webkit-bug-importer 2020-06-15 09:45:17 -0700 <rdar://problem/64366435> 401555 2020-06-10 10:38:29 -0700 2020-06-15 08:54:59 -0700 Patch bug-213034-20200610193828.patch text/plain 4003 vjaquez U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyODM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODVlMzIzZmJjOGI4YmIx ZjEzNDRlOGJiM2UxMDRjNWUzMzc0NTRhYi4uZWMwMDhlNWNhZTVjMjc3ODRmMjBmYWFhMjdmZWZh YjM0MjFiMTQzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIwLTA2LTEwICBWw61j dG9yIE1hbnVlbCBKw6FxdWV6IExlYWwgIDx2amFxdWV6QGlnYWxpYS5jb20+CisKKyAgICAgICAg U3VwcHJlc3MgY29tcGlsZXIgd2FybmluZ3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIxMzAzNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFVzZSBQUkl1NjQgZm9ybWF0dGVyIGZvciB1aW50NjRfdCBpbnN0 ZWFkIG9mICVsbHUuCisKKyAgICAgICAgTm8gZnVuY3Rpb25hbCBjaGFuZ2VzLgorCisgICAgICAg ICogTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1VuaXF1ZUlEQkRhdGFiYXNlLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OklEQlNlcnZlcjo6VW5pcXVlSURCRGF0YWJhc2U6OnB1dE9yQWRkKToKKwog MjAyMC0wNS0wNiAgQ2hhcmxpZSBUdXJuZXIgIDxjdHVybmVyQGlnYWxpYS5jb20+CiAKICAgICAg ICAgW0dTdHJlYW1lcl0gTGF6eSBpbml0aWFsaXphdGlvbiBzdXBwb3J0CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDEz NDkyMmZhOWJiZWJkMjFlOTY4NTU2ZWMxMjYwZTMzYjY3YjdkNmIuLjNiMWNhNjczNWI4MzkxZWRl NGIwYTU2MGM3NTdhYTFjZTY5MGJlMDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjAt MDYtMTAgIFbDrWN0b3IgTWFudWVsIErDoXF1ZXogTGVhbCAgPHZqYXF1ZXpAaWdhbGlhLmNvbT4K KworICAgICAgICBTdXBwcmVzcyBjb21waWxlciB3YXJuaW5ncworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEzMDM0CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ29udmVydCB0byBzdGQ6c2l6ZV90IHRvIGNv bXBhcmUgZXF1YWwgZGF0YSB0eXBlcy4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NhY2hl L05ldHdvcmtDYWNoZURhdGEuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6OnJl YWRPck1ha2VTYWx0KToKKwogMjAyMC0wNS0wNiAgQ2hhcmxpZSBUdXJuZXIgIDxjdHVybmVyQGln YWxpYS5jb20+CiAKICAgICAgICAgW0dTdHJlYW1lcl0gTGF6eSBpbml0aWFsaXphdGlvbiBzdXBw b3J0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIv VW5pcXVlSURCRGF0YWJhc2UuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIv c2VydmVyL1VuaXF1ZUlEQkRhdGFiYXNlLmNwcAppbmRleCA5YTU5OGUzOWJhOGQ0MmQ5ZjVmNmEy YzU0MGMxNmUwODM1NWJiOTk3Li43NzdjNjc2MzkyMWEzYWJhZTBlMTU5NzZkNTFkMTJmNTllNjg0 MzQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIv VW5pcXVlSURCRGF0YWJhc2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhl ZGRiL3NlcnZlci9VbmlxdWVJREJEYXRhYmFzZS5jcHAKQEAgLTc3OCw3ICs3NzgsNyBAQCB2b2lk IFVuaXF1ZUlEQkRhdGFiYXNlOjpwdXRPckFkZChjb25zdCBJREJSZXF1ZXN0RGF0YSYgcmVxdWVz dERhdGEsIGNvbnN0IElEQktleQogICAgIGF1dG8gaW5kZXhTaXplID0gZXN0aW1hdGVTaXplKCpv YmplY3RTdG9yZUluZm8sIGluZGV4S2V5cywga2V5U2l6ZSk7CiAgICAgYXV0byB0YXNrU2l6ZSA9 IGRlZmF1bHRXcml0ZU9wZXJhdGlvbkNvc3QgKyBrZXlTaXplICsgdmFsdWVTaXplICsgaW5kZXhT aXplOwogCi0gICAgTE9HKEluZGV4ZWREQiwgIlVuaXF1ZUlEQkRhdGFiYXNlOjpwdXRPckFkZCBx dW90YSBjaGVjayB3aXRoIHRhc2sgc2l6ZTogJWxsdSBrZXkgc2l6ZTogJWxsdSB2YWx1ZSBzaXpl OiAlbGx1IGluZGV4IHNpemU6ICVsbHUiLCB0YXNrU2l6ZSwga2V5U2l6ZSwgdmFsdWVTaXplLCBp bmRleFNpemUpOworICAgIExPRyhJbmRleGVkREIsICJVbmlxdWVJREJEYXRhYmFzZTo6cHV0T3JB ZGQgcXVvdGEgY2hlY2sgd2l0aCB0YXNrIHNpemU6ICUiIFBSSXU2NCAiIGtleSBzaXplOiAlIiBQ Ukl1NjQgIiB2YWx1ZSBzaXplOiAlIiBQUkl1NjQgIiBpbmRleCBzaXplOiAlIiBQUkl1NjQsIHRh c2tTaXplLCBrZXlTaXplLCB2YWx1ZVNpemUsIGluZGV4U2l6ZSk7CiAKICAgICBpZiAobV9zZXJ2 ZXIucmVxdWVzdFNwYWNlKG1faWRlbnRpZmllci5vcmlnaW4oKSwgdGFza1NpemUpID09IFN0b3Jh Z2VRdW90YU1hbmFnZXI6OkRlY2lzaW9uOjpEZW55KSB7CiAgICAgICAgIGNhbGxiYWNrKElEQkVy cm9yIHsgUXVvdGFFeGNlZWRlZEVycm9yLCBxdW90YUVycm9yTWVzc2FnZU5hbWUoIlB1dE9yQWRk IikgfSwgdXNlZEtleSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L2NhY2hlL05ldHdvcmtDYWNoZURhdGEuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9jYWNoZS9OZXR3b3JrQ2FjaGVEYXRhLmNwcAppbmRleCBiNThiYzEyZmM3MDA4MzhhZjYxMmJh ODhmYjgzZjMxNzRlOWFmMTg3Li43ZjM2MmI5YjYxYjU1MmY0OGZhNTlhYzU2MzllOWMyMWE3OGMx MWMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdv cmtDYWNoZURhdGEuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUv TmV0d29ya0NhY2hlRGF0YS5jcHAKQEAgLTE1MSw3ICsxNTEsNyBAQCBPcHRpb25hbDxTYWx0PiBy ZWFkT3JNYWtlU2FsdChjb25zdCBTdHJpbmcmIHBhdGgpCiAgICAgICAgIFNhbHQgc2FsdDsKICAg ICAgICAgYXV0byBieXRlc1JlYWQgPSBGaWxlU3lzdGVtOjpyZWFkRnJvbUZpbGUoZmlsZSwgcmVp bnRlcnByZXRfY2FzdDxjaGFyKj4oc2FsdC5kYXRhKCkpLCBzYWx0LnNpemUoKSk7CiAgICAgICAg IEZpbGVTeXN0ZW06OmNsb3NlRmlsZShmaWxlKTsKLSAgICAgICAgaWYgKGJ5dGVzUmVhZCA9PSBz YWx0LnNpemUoKSkKKyAgICAgICAgaWYgKHN0YXRpY19jYXN0PHN0ZDo6c2l6ZV90PihieXRlc1Jl YWQpID09IHNhbHQuc2l6ZSgpKQogICAgICAgICAgICAgcmV0dXJuIHNhbHQ7CiAKICAgICAgICAg RmlsZVN5c3RlbTo6ZGVsZXRlRmlsZShwYXRoKTsKQEAgLTE1OSw3ICsxNTksNyBAQCBPcHRpb25h bDxTYWx0PiByZWFkT3JNYWtlU2FsdChjb25zdCBTdHJpbmcmIHBhdGgpCiAKICAgICBTYWx0IHNh bHQgPSBtYWtlU2FsdCgpOwogICAgIGF1dG8gZmlsZSA9IEZpbGVTeXN0ZW06Om9wZW5GaWxlKHBh dGgsIEZpbGVTeXN0ZW06OkZpbGVPcGVuTW9kZTo6V3JpdGUsIEZpbGVTeXN0ZW06OkZpbGVBY2Nl c3NQZXJtaXNzaW9uOjpVc2VyKTsKLSAgICBib29sIHN1Y2Nlc3MgPSBGaWxlU3lzdGVtOjp3cml0 ZVRvRmlsZShmaWxlLCByZWludGVycHJldF9jYXN0PGNoYXIqPihzYWx0LmRhdGEoKSksIHNhbHQu c2l6ZSgpKSA9PSBzYWx0LnNpemUoKTsKKyAgICBib29sIHN1Y2Nlc3MgPSBzdGF0aWNfY2FzdDxz dGQ6OnNpemVfdD4oRmlsZVN5c3RlbTo6d3JpdGVUb0ZpbGUoZmlsZSwgcmVpbnRlcnByZXRfY2Fz dDxjaGFyKj4oc2FsdC5kYXRhKCkpLCBzYWx0LnNpemUoKSkpID09IHNhbHQuc2l6ZSgpOwogICAg IEZpbGVTeXN0ZW06OmNsb3NlRmlsZShmaWxlKTsKICAgICBpZiAoIXN1Y2Nlc3MpCiAgICAgICAg IHJldHVybiB7IH07Cg== 401900 2020-06-15 08:55:03 -0700 2020-06-15 09:44:06 -0700 Patch bug-213034-20200615175501.patch text/plain 4245 vjaquez U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMDE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjU1MmQ4MjQ1OWVjODY3 YzFhZTEyYjJkZDBjYmFjNjQ0NjQ3ZjdiYS4uZTEyZDZjMzBmZmZjM2FhNjhkODdjMzAzNGMyZGYx NjgzMTliYzA4YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIwLTA2LTEwICBWw61j dG9yIE1hbnVlbCBKw6FxdWV6IExlYWwgIDx2amFxdWV6QGlnYWxpYS5jb20+CisKKyAgICAgICAg U3VwcHJlc3MgY29tcGlsZXIgd2FybmluZ3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIxMzAzNAorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFk bGVyLgorCisgICAgICAgIFVzZSBQUkl1NjQgZm9ybWF0dGVyIGZvciB1aW50NjRfdCBpbnN0ZWFk IG9mICVsbHUuCisKKyAgICAgICAgTm8gZnVuY3Rpb25hbCBjaGFuZ2VzLgorCisgICAgICAgICog TW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1VuaXF1ZUlEQkRhdGFiYXNlLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OklEQlNlcnZlcjo6VW5pcXVlSURCRGF0YWJhc2U6OnB1dE9yQWRkKToKKwogMjAy MC0wNi0xNCAgU2VyZ2lvIFZpbGxhciBTZW5pbiAgPHN2aWxsYXJAaWdhbGlhLmNvbT4KIAogICAg ICAgICBVbnJldmlld2VkLCByZXZlcnRpbmcgcjI2MjEyNC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggNjE0MWMyZjVm YTA2MGU3OGI0YTExNjlhNDJlYTE2YzkzMzhlMTc0OC4uNTAyYTA0NjViZGMxMGQwNzIzZDk4OTIw NTBlY2FiOTM2NWQwYzM3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAyMC0wNi0xMCAg VsOtY3RvciBNYW51ZWwgSsOhcXVleiBMZWFsICA8dmphcXVlekBpZ2FsaWEuY29tPgorCisgICAg ICAgIFN1cHByZXNzIGNvbXBpbGVyIHdhcm5pbmdzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTMwMzQKKworICAgICAgICBSZXZpZXdlZCBieSBEYXJp biBBZGxlci4KKworICAgICAgICBDb252ZXJ0IHRvIHN0ZDpzaXplX3QgdG8gY29tcGFyZSBlcXVh bCBkYXRhIHR5cGVzLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0Nh Y2hlRGF0YS5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6cmVhZE9yTWFrZVNh bHQpOgorCiAyMDIwLTA2LTE0ICBTYW0gV2VpbmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KIAogICAg ICAgICBbV1BUXSBodG1sL3dlYmFwcGFwaXMvc3lzdGVtLXN0YXRlLWFuZC1jYXBhYmlsaXRpZXMv dGhlLW5hdmlnYXRvci1vYmplY3QvbmF2aWdhdG9yLXBsdWdpbmFycmF5Lmh0bWwgZmFpbHMgZHVl IHRvIGxhY2sgb2YgY2FjaGluZyBvZiBQbHVnaW4gb2JqZWN0cwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1VuaXF1ZUlEQkRhdGFiYXNlLmNwcCBi L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9VbmlxdWVJREJEYXRhYmFz ZS5jcHAKaW5kZXggOWE1OThlMzliYThkNDJkOWY1ZjZhMmM1NDBjMTZlMDgzNTViYjk5Ny4uNzc3 YzY3NjM5MjFhM2FiYWUwZTE1OTc2ZDUxZDEyZjU5ZTY4NDM0OSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1VuaXF1ZUlEQkRhdGFiYXNlLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvVW5pcXVlSURCRGF0 YWJhc2UuY3BwCkBAIC03NzgsNyArNzc4LDcgQEAgdm9pZCBVbmlxdWVJREJEYXRhYmFzZTo6cHV0 T3JBZGQoY29uc3QgSURCUmVxdWVzdERhdGEmIHJlcXVlc3REYXRhLCBjb25zdCBJREJLZXkKICAg ICBhdXRvIGluZGV4U2l6ZSA9IGVzdGltYXRlU2l6ZSgqb2JqZWN0U3RvcmVJbmZvLCBpbmRleEtl eXMsIGtleVNpemUpOwogICAgIGF1dG8gdGFza1NpemUgPSBkZWZhdWx0V3JpdGVPcGVyYXRpb25D b3N0ICsga2V5U2l6ZSArIHZhbHVlU2l6ZSArIGluZGV4U2l6ZTsKIAotICAgIExPRyhJbmRleGVk REIsICJVbmlxdWVJREJEYXRhYmFzZTo6cHV0T3JBZGQgcXVvdGEgY2hlY2sgd2l0aCB0YXNrIHNp emU6ICVsbHUga2V5IHNpemU6ICVsbHUgdmFsdWUgc2l6ZTogJWxsdSBpbmRleCBzaXplOiAlbGx1 IiwgdGFza1NpemUsIGtleVNpemUsIHZhbHVlU2l6ZSwgaW5kZXhTaXplKTsKKyAgICBMT0coSW5k ZXhlZERCLCAiVW5pcXVlSURCRGF0YWJhc2U6OnB1dE9yQWRkIHF1b3RhIGNoZWNrIHdpdGggdGFz ayBzaXplOiAlIiBQUkl1NjQgIiBrZXkgc2l6ZTogJSIgUFJJdTY0ICIgdmFsdWUgc2l6ZTogJSIg UFJJdTY0ICIgaW5kZXggc2l6ZTogJSIgUFJJdTY0LCB0YXNrU2l6ZSwga2V5U2l6ZSwgdmFsdWVT aXplLCBpbmRleFNpemUpOwogCiAgICAgaWYgKG1fc2VydmVyLnJlcXVlc3RTcGFjZShtX2lkZW50 aWZpZXIub3JpZ2luKCksIHRhc2tTaXplKSA9PSBTdG9yYWdlUXVvdGFNYW5hZ2VyOjpEZWNpc2lv bjo6RGVueSkgewogICAgICAgICBjYWxsYmFjayhJREJFcnJvciB7IFF1b3RhRXhjZWVkZWRFcnJv ciwgcXVvdGFFcnJvck1lc3NhZ2VOYW1lKCJQdXRPckFkZCIpIH0sIHVzZWRLZXkpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVEYXRh LmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlRGF0 YS5jcHAKaW5kZXggYjU4YmMxMmZjNzAwODM4YWY2MTJiYTg4ZmI4M2YzMTc0ZTlhZjE4Ny4uMzlk N2JiZDU5ZTgxMDZiZDAzNDM3MWZjM2QzMTUwNmNiZDNkNzQyMCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVEYXRhLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZURhdGEuY3BwCkBA IC0xNDksNyArMTQ5LDcgQEAgT3B0aW9uYWw8U2FsdD4gcmVhZE9yTWFrZVNhbHQoY29uc3QgU3Ry aW5nJiBwYXRoKQogICAgIGlmIChGaWxlU3lzdGVtOjpmaWxlRXhpc3RzKHBhdGgpKSB7CiAgICAg ICAgIGF1dG8gZmlsZSA9IEZpbGVTeXN0ZW06Om9wZW5GaWxlKHBhdGgsIEZpbGVTeXN0ZW06OkZp bGVPcGVuTW9kZTo6UmVhZCk7CiAgICAgICAgIFNhbHQgc2FsdDsKLSAgICAgICAgYXV0byBieXRl c1JlYWQgPSBGaWxlU3lzdGVtOjpyZWFkRnJvbUZpbGUoZmlsZSwgcmVpbnRlcnByZXRfY2FzdDxj aGFyKj4oc2FsdC5kYXRhKCkpLCBzYWx0LnNpemUoKSk7CisgICAgICAgIGF1dG8gYnl0ZXNSZWFk ID0gc3RhdGljX2Nhc3Q8c3RkOjpzaXplX3Q+KEZpbGVTeXN0ZW06OnJlYWRGcm9tRmlsZShmaWxl LCByZWludGVycHJldF9jYXN0PGNoYXIqPihzYWx0LmRhdGEoKSksIHNhbHQuc2l6ZSgpKSk7CiAg ICAgICAgIEZpbGVTeXN0ZW06OmNsb3NlRmlsZShmaWxlKTsKICAgICAgICAgaWYgKGJ5dGVzUmVh ZCA9PSBzYWx0LnNpemUoKSkKICAgICAgICAgICAgIHJldHVybiBzYWx0OwpAQCAtMTU5LDcgKzE1 OSw3IEBAIE9wdGlvbmFsPFNhbHQ+IHJlYWRPck1ha2VTYWx0KGNvbnN0IFN0cmluZyYgcGF0aCkK IAogICAgIFNhbHQgc2FsdCA9IG1ha2VTYWx0KCk7CiAgICAgYXV0byBmaWxlID0gRmlsZVN5c3Rl bTo6b3BlbkZpbGUocGF0aCwgRmlsZVN5c3RlbTo6RmlsZU9wZW5Nb2RlOjpXcml0ZSwgRmlsZVN5 c3RlbTo6RmlsZUFjY2Vzc1Blcm1pc3Npb246OlVzZXIpOwotICAgIGJvb2wgc3VjY2VzcyA9IEZp bGVTeXN0ZW06OndyaXRlVG9GaWxlKGZpbGUsIHJlaW50ZXJwcmV0X2Nhc3Q8Y2hhcio+KHNhbHQu ZGF0YSgpKSwgc2FsdC5zaXplKCkpID09IHNhbHQuc2l6ZSgpOworICAgIGJvb2wgc3VjY2VzcyA9 IHN0YXRpY19jYXN0PHN0ZDo6c2l6ZV90PihGaWxlU3lzdGVtOjp3cml0ZVRvRmlsZShmaWxlLCBy ZWludGVycHJldF9jYXN0PGNoYXIqPihzYWx0LmRhdGEoKSksIHNhbHQuc2l6ZSgpKSkgPT0gc2Fs dC5zaXplKCk7CiAgICAgRmlsZVN5c3RlbTo6Y2xvc2VGaWxlKGZpbGUpOwogICAgIGlmICghc3Vj Y2VzcykKICAgICAgICAgcmV0dXJuIHsgfTsK