239255 2022-04-12 14:53:52 -0700 StorageMap::importItems may update currentSize wrongly in release build 2022-04-13 15:46:16 -0700 1 1 1 Unclassified WebKit Website Storage WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 sihui_liu sihui_liu cdumez sihui_liu webkit-bug-importer oldest_to_newest 1860909 0 sihui_liu 2022-04-12 14:53:52 -0700 ... 1860932 1 457482 sihui_liu 2022-04-12 15:21:35 -0700 Created attachment 457482 Patch 1860956 2 457486 sihui_liu 2022-04-12 15:58:19 -0700 Created attachment 457486 Patch 1860960 3 457486 cdumez 2022-04-12 16:01:37 -0700 Comment on attachment 457486 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=457486&action=review > Source/WebCore/storage/StorageMap.cpp:166 > + RELEASE_LOG_ERROR(Storage, "StorageMap::importItems failed to import because map is not empty"); Why is it OK to ignore the items in this case? If that's not supposed to happen, should we ASSERT? 1861147 4 sihui_liu 2022-04-13 09:54:41 -0700 (In reply to Chris Dumez from comment #3) > Comment on attachment 457486 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=457486&action=review > > > Source/WebCore/storage/StorageMap.cpp:166 > > + RELEASE_LOG_ERROR(Storage, "StorageMap::importItems failed to import because map is not empty"); > > Why is it OK to ignore the items in this case? If that's not supposed to > happen, should we ASSERT? Yes, we can turn it into assertion 1861149 5 457539 sihui_liu 2022-04-13 10:00:33 -0700 Created attachment 457539 Patch 1861152 6 457539 cdumez 2022-04-13 10:08:51 -0700 Comment on attachment 457539 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=457539&action=review > Source/WebCore/storage/StorageMap.cpp:166 > + CheckedUint32 newSize = m_impl->currentSize; why `= m_impl->currentSize`? I thought the map was empty? Can we assert that m_impl->currentSize is 0 and then just use `CheckedUint32 newSize;` here? 1861154 7 457542 sihui_liu 2022-04-13 10:14:47 -0700 Created attachment 457542 Patch 1861156 8 457542 cdumez 2022-04-13 10:16:32 -0700 Comment on attachment 457542 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=457542&action=review r=me assuming the bots are happy. > Source/WebCore/storage/StorageMap.cpp:164 > + RELEASE_ASSERT(!m_impl->currentSize); Why did you drop the `RELEASE_ASSERT(m_impl->map.isEmpty());` ? I feel it'd be good to check that both there is no item in the map and the size is indeed 0. 1861157 9 457542 sihui_liu 2022-04-13 10:27:49 -0700 Comment on attachment 457542 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=457542&action=review >> Source/WebCore/storage/StorageMap.cpp:164 >> + RELEASE_ASSERT(!m_impl->currentSize); > > Why did you drop the `RELEASE_ASSERT(m_impl->map.isEmpty());` ? > > I feel it'd be good to check that both there is no item in the map and the size is indeed 0. I thought you mean replacing RELEASE_ASSERT with this... will update. 1861158 10 457543 sihui_liu 2022-04-13 10:29:03 -0700 Created attachment 457543 Patch 1861293 11 ews-feeder 2022-04-13 15:45:13 -0700 Committed r292836 (249609@main): <https://commits.webkit.org/249609@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 457543. 1861295 12 webkit-bug-importer 2022-04-13 15:46:16 -0700 <rdar://problem/91719712> 457482 2022-04-12 15:21:35 -0700 2022-04-12 16:42:11 -0700 Patch bug-239255-20220412152134.patch text/plain 2737 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyNzc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjE0NTFiODk1NDk2YWY4 NmQ5YWNiMzJiMDE1MTE0ODFiYzkyNDU2Zi4uYzAyOWNkNzBmNTFiMTY0ZTEzNTVmNzIwMjJiZmEx NjMwYWVjZTEzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIyLTA0LTEyICBTaWh1 aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIFN0b3JhZ2VNYXA6OmltcG9y dEl0ZW1zIG1heSB1cGRhdGUgY3VycmVudFNpemUgd3JvbmdseSBpbiByZWxlYXNlIGJ1aWxkCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzkyNTUKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTdG9yYWdlTWFw OjppbXBvcnRJdGVtcygpIGhhcyBhIGRlYnVnIGFzc2VydGlvbiB0aGF0IGtleXMgb2YgaW1wb3J0 ZWQgaXRlbXMgZG8gbm90IGV4aXN0IGluIG1hcCwgYnV0IHRoYXQgZG9lcyAKKyAgICAgICAgbm90 IHByZXZlbnQgdGhpcyBmcm9tIGhhcHBlbmluZyBpbiByZWxlYXNlIGJ1aWxkLiBXaXRoIG91ciBj dXJyZW50IGltcGxlbWVudGF0aW9uLCBpZiB0aGlzIGhhcHBlbnMgaW4gcmVsZWFzZSAKKyAgICAg ICAgYnVpbGQsIHdlIGluY3JlYXNlIGN1cnJlbnRTaXplIHdpdGhvdXQgdXBkYXRpbmcgdGhlIG1h cCwgd2hpY2ggbWF5IGxlYWQgdG8gb3ZlcmZsb3cuCisKKyAgICAgICAgVG8gbWFrZSBTdG9yYWdl TWFwIG1vcmUgc2FmZSB0byB1c2UsIHdlIGNhbiBjYWxjdWxhdGUgdGhlIGNvcnJlY3QgY3VycmVu dFNpemUgYmFzZWQgb24gc2l6ZSBvZiBleHNpdGluZyBpdGVtLCBhcyAKKyAgICAgICAgaW4gU3Rv cmFnZU1hcDo6c2V0SXRlbSgpLCBvciB3ZSBqdXN0IGRvbid0IHVwZGF0ZSBjdXJyZW50U2l6ZSBv ciBtYXAgaWYga2V5IGFscmVhZHkgZXhpc3RzLiBTaW5jZSBjdXJyZW50IHVzZXJzCisgICAgICAg IG9mIFN0b3JhZ2VNYXAgc2hvdWxkIG9ubHkgY2FsbCBpbXBvcnRJdGVtcygpIHdoZW4gdGhlIG1h cCBpcyBlbXB0eSwgd2UgY2FuIGFkZCBhbiBlYXJseSByZXR1cm4gaWYgbWFwIGlzIG5vdCAKKyAg ICAgICAgZW1wdHkuCisKKyAgICAgICAgKiBzdG9yYWdlL1N0b3JhZ2VNYXAuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6U3RvcmFnZU1hcDo6aW1wb3J0SXRlbXMpOgorCiAyMDIyLTA0LTEyICBHYWJy aWVsIE5hdmEgTWFyaW5vICA8Z25hdmFtYXJpbm9AYXBwbGUuY29tPgogCiAgICAgICAgIFJlamVj dGVkUHJvbWlzZVRyYWNrZXIgY2FuIGJlIHJlY3JlYXRlZCBpZiB3ZSBhcmUgaW4gYSB3b3JrZXIg LyB3b3JrbGV0IHdob3NlIGV4ZWN1dGlvbiBpcyB0ZXJtaW5hdGluZwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlTWFwLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N0b3Jh Z2UvU3RvcmFnZU1hcC5jcHAKaW5kZXggY2Y5ODVhZWE4OGZiYWMyMDNiZjQ1NzY5OTU3OWNiNTJm NzJmY2Q1ZS4uZjg0MDg1MzI5MGZhZmJjNzIxZWJlMThkOTA3MTY3NzA2YzQxOGUwYyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlTWFwLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VNYXAuY3BwCkBAIC0xNjEsMjMgKzE2MSwxOCBAQCBib29s IFN0b3JhZ2VNYXA6OmNvbnRhaW5zKGNvbnN0IFN0cmluZyYga2V5KSBjb25zdAogCiB2b2lkIFN0 b3JhZ2VNYXA6OmltcG9ydEl0ZW1zKEhhc2hNYXA8U3RyaW5nLCBTdHJpbmc+JiYgaXRlbXMpCiB7 Ci0gICAgQ2hlY2tlZFVpbnQzMiBuZXdTaXplID0gbV9pbXBsLT5jdXJyZW50U2l6ZTsKLSAgICBp ZiAobV9pbXBsLT5tYXAuaXNFbXB0eSgpKSB7Ci0gICAgICAgIG1faW1wbC0+bWFwID0gV1RGTW92 ZShpdGVtcyk7Ci0gICAgICAgIGZvciAoYXV0byYgW2tleSwgdmFsdWVdIDogbV9pbXBsLT5tYXAp IHsKLSAgICAgICAgICAgIG5ld1NpemUgKz0ga2V5LnNpemVJbkJ5dGVzKCk7Ci0gICAgICAgICAg ICBuZXdTaXplICs9IHZhbHVlLnNpemVJbkJ5dGVzKCk7Ci0gICAgICAgIH0KLSAgICAgICAgbV9p bXBsLT5jdXJyZW50U2l6ZSA9IG5ld1NpemU7CisgICAgaWYgKCFtX2ltcGwtPm1hcC5pc0VtcHR5 KCkpIHsKKyAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IoU3RvcmFnZSwgIlN0b3JhZ2VNYXA6Omlt cG9ydEl0ZW1zIGZhaWxlZCB0byBpbXBvcnQgYmVjYXVzZSBtYXAgaXMgbm90IGVtcHR5Iik7CiAg ICAgICAgIHJldHVybjsKICAgICB9CiAKKyAgICBDaGVja2VkVWludDMyIG5ld1NpemUgPSBtX2lt cGwtPmN1cnJlbnRTaXplOwogICAgIGZvciAoYXV0byYgW2tleSwgdmFsdWVdIDogaXRlbXMpIHsK ICAgICAgICAgbmV3U2l6ZSArPSBrZXkuc2l6ZUluQnl0ZXMoKTsKICAgICAgICAgbmV3U2l6ZSAr PSB2YWx1ZS5zaXplSW5CeXRlcygpOwotICAgICAgICBhdXRvIHJlc3VsdCA9IG1faW1wbC0+bWFw LmFkZChXVEZNb3ZlKGtleSksIFdURk1vdmUodmFsdWUpKTsKLSAgICAgICAgQVNTRVJUX1VOVVNF RChyZXN1bHQsIHJlc3VsdC5pc05ld0VudHJ5KTsKICAgICB9CisKKyAgICBtX2ltcGwtPm1hcCA9 IFdURk1vdmUoaXRlbXMpOwogICAgIG1faW1wbC0+Y3VycmVudFNpemUgPSBuZXdTaXplOwogfQog Cg== 457486 2022-04-12 15:58:19 -0700 2022-04-13 10:00:31 -0700 Patch bug-239255-20220412155818.patch text/plain 2839 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyNzkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGIzYzJhZGNjOTRiOGM1 ZDJiZWNiNzAwNjk3ZGM3ZTI4YTQ3MDBkNS4uMDgwYmNmNzNiZDUxYmY5ZmM1YzlhYjYyZTE0ODc4 ZGVkY2EwNWEyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIyLTA0LTEyICBTaWh1 aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIFN0b3JhZ2VNYXA6OmltcG9y dEl0ZW1zIG1heSB1cGRhdGUgY3VycmVudFNpemUgd3JvbmdseSBpbiByZWxlYXNlIGJ1aWxkCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzkyNTUKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTdG9yYWdlTWFw OjppbXBvcnRJdGVtcygpIGhhcyBhIGRlYnVnIGFzc2VydGlvbiB0aGF0IGtleXMgb2YgaW1wb3J0 ZWQgaXRlbXMgZG8gbm90IGV4aXN0IGluIG1hcCwgYnV0IHRoYXQgZG9lcyAKKyAgICAgICAgbm90 IHByZXZlbnQgdGhpcyBmcm9tIGhhcHBlbmluZyBpbiByZWxlYXNlIGJ1aWxkLiBXaXRoIG91ciBj dXJyZW50IGltcGxlbWVudGF0aW9uLCBpZiB0aGlzIGhhcHBlbnMgaW4gcmVsZWFzZSAKKyAgICAg ICAgYnVpbGQsIHdlIGluY3JlYXNlIGN1cnJlbnRTaXplIHdpdGhvdXQgdXBkYXRpbmcgdGhlIG1h cCwgd2hpY2ggbWF5IGxlYWQgdG8gb3ZlcmZsb3cuCisKKyAgICAgICAgVG8gbWFrZSBTdG9yYWdl TWFwIG1vcmUgc2FmZSB0byB1c2UsIHdlIGNhbiBjYWxjdWxhdGUgdGhlIGNvcnJlY3QgY3VycmVu dFNpemUgYmFzZWQgb24gc2l6ZSBvZiBleHNpdGluZyBpdGVtLCBhcyAKKyAgICAgICAgaW4gU3Rv cmFnZU1hcDo6c2V0SXRlbSgpLCBvciB3ZSBqdXN0IGRvbid0IHVwZGF0ZSBjdXJyZW50U2l6ZSBv ciBtYXAgaWYga2V5IGFscmVhZHkgZXhpc3RzLiBTaW5jZSBjdXJyZW50IHVzZXJzCisgICAgICAg IG9mIFN0b3JhZ2VNYXAgc2hvdWxkIG9ubHkgY2FsbCBpbXBvcnRJdGVtcygpIHdoZW4gdGhlIG1h cCBpcyBlbXB0eSwgd2UgY2FuIGFkZCBhbiBlYXJseSByZXR1cm4gaWYgbWFwIGlzIG5vdCAKKyAg ICAgICAgZW1wdHkuCisKKyAgICAgICAgKiBzdG9yYWdlL1N0b3JhZ2VNYXAuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6U3RvcmFnZU1hcDo6aW1wb3J0SXRlbXMpOgorCiAyMDIyLTA0LTEyICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAgIExlYWsgb2YgTWVkaWFTb3Vy Y2VQcml2YXRlQVZGT2JqQyBhbmQgUmVtb3RlTWVkaWFTb3VyY2VQcm94eQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlTWFwLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N0 b3JhZ2UvU3RvcmFnZU1hcC5jcHAKaW5kZXggY2Y5ODVhZWE4OGZiYWMyMDNiZjQ1NzY5OTU3OWNi NTJmNzJmY2Q1ZS4uZmFjNzY0MWMyN2RmZDQ1M2JhMDZlOTcyYjBlOWE2MzkzMTk4MTk4MSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlTWFwLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VNYXAuY3BwCkBAIC0yNiw2ICsyNiw3IEBACiAjaW5j bHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiU3RvcmFnZU1hcC5oIgogCisjaW5jbHVkZSAiTG9n Z2luZy5oIgogI2luY2x1ZGUgPHd0Zi9DaGVja2VkQXJpdGhtZXRpYy5oPgogI2luY2x1ZGUgPHd0 Zi9TZXRGb3JTY29wZS5oPgogCkBAIC0xNjEsMjMgKzE2MiwxOCBAQCBib29sIFN0b3JhZ2VNYXA6 OmNvbnRhaW5zKGNvbnN0IFN0cmluZyYga2V5KSBjb25zdAogCiB2b2lkIFN0b3JhZ2VNYXA6Omlt cG9ydEl0ZW1zKEhhc2hNYXA8U3RyaW5nLCBTdHJpbmc+JiYgaXRlbXMpCiB7Ci0gICAgQ2hlY2tl ZFVpbnQzMiBuZXdTaXplID0gbV9pbXBsLT5jdXJyZW50U2l6ZTsKLSAgICBpZiAobV9pbXBsLT5t YXAuaXNFbXB0eSgpKSB7Ci0gICAgICAgIG1faW1wbC0+bWFwID0gV1RGTW92ZShpdGVtcyk7Ci0g ICAgICAgIGZvciAoYXV0byYgW2tleSwgdmFsdWVdIDogbV9pbXBsLT5tYXApIHsKLSAgICAgICAg ICAgIG5ld1NpemUgKz0ga2V5LnNpemVJbkJ5dGVzKCk7Ci0gICAgICAgICAgICBuZXdTaXplICs9 IHZhbHVlLnNpemVJbkJ5dGVzKCk7Ci0gICAgICAgIH0KLSAgICAgICAgbV9pbXBsLT5jdXJyZW50 U2l6ZSA9IG5ld1NpemU7CisgICAgaWYgKCFtX2ltcGwtPm1hcC5pc0VtcHR5KCkpIHsKKyAgICAg ICAgUkVMRUFTRV9MT0dfRVJST1IoU3RvcmFnZSwgIlN0b3JhZ2VNYXA6OmltcG9ydEl0ZW1zIGZh aWxlZCB0byBpbXBvcnQgYmVjYXVzZSBtYXAgaXMgbm90IGVtcHR5Iik7CiAgICAgICAgIHJldHVy bjsKICAgICB9CiAKKyAgICBDaGVja2VkVWludDMyIG5ld1NpemUgPSBtX2ltcGwtPmN1cnJlbnRT aXplOwogICAgIGZvciAoYXV0byYgW2tleSwgdmFsdWVdIDogaXRlbXMpIHsKICAgICAgICAgbmV3 U2l6ZSArPSBrZXkuc2l6ZUluQnl0ZXMoKTsKICAgICAgICAgbmV3U2l6ZSArPSB2YWx1ZS5zaXpl SW5CeXRlcygpOwotICAgICAgICBhdXRvIHJlc3VsdCA9IG1faW1wbC0+bWFwLmFkZChXVEZNb3Zl KGtleSksIFdURk1vdmUodmFsdWUpKTsKLSAgICAgICAgQVNTRVJUX1VOVVNFRChyZXN1bHQsIHJl c3VsdC5pc05ld0VudHJ5KTsKICAgICB9CisKKyAgICBtX2ltcGwtPm1hcCA9IFdURk1vdmUoaXRl bXMpOwogICAgIG1faW1wbC0+Y3VycmVudFNpemUgPSBuZXdTaXplOwogfQogCg== 457539 2022-04-13 10:00:33 -0700 2022-04-13 10:14:45 -0700 Patch bug-239255-20220413100032.patch text/plain 2601 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyODEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTUxZmFkNzE1NTcyNjYz NDE2ZDc0NjZjN2FlODI5NTU5OTZlNmU2ZS4uMzA3ZDM2ZWI1YTQ0MmEyNzkxOTAwMjkwYWZmMWYx ODY2MDk0ZTc1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIyLTA0LTEzICBTaWh1 aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIFN0b3JhZ2VNYXA6OmltcG9y dEl0ZW1zIG1heSB1cGRhdGUgY3VycmVudFNpemUgd3JvbmdseSBpbiByZWxlYXNlIGJ1aWxkCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzkyNTUKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTdG9yYWdlTWFw OjppbXBvcnRJdGVtcygpIGhhcyBhIGRlYnVnIGFzc2VydGlvbiB0aGF0IGtleXMgb2YgaW1wb3J0 ZWQgaXRlbXMgZG8gbm90IGV4aXN0IGluIG1hcCwgYnV0IHRoYXQgZG9lcyAKKyAgICAgICAgbm90 IHByZXZlbnQgdGhpcyBmcm9tIGhhcHBlbmluZyBpbiByZWxlYXNlIGJ1aWxkLiBXaXRoIG91ciBj dXJyZW50IGltcGxlbWVudGF0aW9uLCBpZiB0aGlzIGhhcHBlbnMgaW4gcmVsZWFzZSAKKyAgICAg ICAgYnVpbGQsIHdlIGluY3JlYXNlIGN1cnJlbnRTaXplIHdpdGhvdXQgdXBkYXRpbmcgdGhlIG1h cCwgd2hpY2ggbWF5IGxlYWQgdG8gb3ZlcmZsb3cuCisKKyAgICAgICAgVG8gbWFrZSBTdG9yYWdl TWFwIG1vcmUgc2FmZSB0byB1c2UsIHdlIGNhbiBjYWxjdWxhdGUgdGhlIGNvcnJlY3QgY3VycmVu dFNpemUgYmFzZWQgb24gc2l6ZSBvZiBleHNpdGluZyBpdGVtLCBhcyAKKyAgICAgICAgaW4gU3Rv cmFnZU1hcDo6c2V0SXRlbSgpLCBvciB3ZSBqdXN0IGRvbid0IHVwZGF0ZSBjdXJyZW50U2l6ZSBv ciBtYXAgaWYga2V5IGFscmVhZHkgZXhpc3RzLiBTaW5jZSBjdXJyZW50IHVzZXJzCisgICAgICAg IG9mIFN0b3JhZ2VNYXAgc2hvdWxkIG9ubHkgY2FsbCBpbXBvcnRJdGVtcygpIHdoZW4gdGhlIG1h cCBpcyBlbXB0eSwgd2UgY2FuIGFkZCBhbiBlYXJseSByZXR1cm4gaWYgbWFwIGlzIG5vdCAKKyAg ICAgICAgZW1wdHkuCisKKyAgICAgICAgKiBzdG9yYWdlL1N0b3JhZ2VNYXAuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6U3RvcmFnZU1hcDo6aW1wb3J0SXRlbXMpOgorCiAyMDIyLTA0LTEzICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFtjc3Mtc2Nyb2xs LXNuYXBdIHNjcm9sbEludG9WaWV3IGZhaWxzIHdpdGggc2Nyb2xsLXNuYXAtdHlwZSBvbiA6cm9v dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlTWFwLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZU1hcC5jcHAKaW5kZXggY2Y5ODVhZWE4OGZiYWMy MDNiZjQ1NzY5OTU3OWNiNTJmNzJmY2Q1ZS4uNGI1N2VhOTI1ZWM2MDcwZDgyOGQyYTY2YTFhODc0 ZjZmM2ZmNDg4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlTWFw LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VNYXAuY3BwCkBAIC0xNjEs MjMgKzE2MSwxNSBAQCBib29sIFN0b3JhZ2VNYXA6OmNvbnRhaW5zKGNvbnN0IFN0cmluZyYga2V5 KSBjb25zdAogCiB2b2lkIFN0b3JhZ2VNYXA6OmltcG9ydEl0ZW1zKEhhc2hNYXA8U3RyaW5nLCBT dHJpbmc+JiYgaXRlbXMpCiB7Ci0gICAgQ2hlY2tlZFVpbnQzMiBuZXdTaXplID0gbV9pbXBsLT5j dXJyZW50U2l6ZTsKLSAgICBpZiAobV9pbXBsLT5tYXAuaXNFbXB0eSgpKSB7Ci0gICAgICAgIG1f aW1wbC0+bWFwID0gV1RGTW92ZShpdGVtcyk7Ci0gICAgICAgIGZvciAoYXV0byYgW2tleSwgdmFs dWVdIDogbV9pbXBsLT5tYXApIHsKLSAgICAgICAgICAgIG5ld1NpemUgKz0ga2V5LnNpemVJbkJ5 dGVzKCk7Ci0gICAgICAgICAgICBuZXdTaXplICs9IHZhbHVlLnNpemVJbkJ5dGVzKCk7Ci0gICAg ICAgIH0KLSAgICAgICAgbV9pbXBsLT5jdXJyZW50U2l6ZSA9IG5ld1NpemU7Ci0gICAgICAgIHJl dHVybjsKLSAgICB9CisgICAgUkVMRUFTRV9BU1NFUlQobV9pbXBsLT5tYXAuaXNFbXB0eSgpKTsK IAorICAgIENoZWNrZWRVaW50MzIgbmV3U2l6ZSA9IG1faW1wbC0+Y3VycmVudFNpemU7CiAgICAg Zm9yIChhdXRvJiBba2V5LCB2YWx1ZV0gOiBpdGVtcykgewogICAgICAgICBuZXdTaXplICs9IGtl eS5zaXplSW5CeXRlcygpOwogICAgICAgICBuZXdTaXplICs9IHZhbHVlLnNpemVJbkJ5dGVzKCk7 Ci0gICAgICAgIGF1dG8gcmVzdWx0ID0gbV9pbXBsLT5tYXAuYWRkKFdURk1vdmUoa2V5KSwgV1RG TW92ZSh2YWx1ZSkpOwotICAgICAgICBBU1NFUlRfVU5VU0VEKHJlc3VsdCwgcmVzdWx0LmlzTmV3 RW50cnkpOwogICAgIH0KKworICAgIG1faW1wbC0+bWFwID0gV1RGTW92ZShpdGVtcyk7CiAgICAg bV9pbXBsLT5jdXJyZW50U2l6ZSA9IG5ld1NpemU7CiB9CiAK 457542 2022-04-13 10:14:47 -0700 2022-04-13 10:29:01 -0700 Patch bug-239255-20220413101446.patch text/plain 2578 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyODEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTUxZmFkNzE1NTcyNjYz NDE2ZDc0NjZjN2FlODI5NTU5OTZlNmU2ZS4uMzA3ZDM2ZWI1YTQ0MmEyNzkxOTAwMjkwYWZmMWYx ODY2MDk0ZTc1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIyLTA0LTEzICBTaWh1 aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIFN0b3JhZ2VNYXA6OmltcG9y dEl0ZW1zIG1heSB1cGRhdGUgY3VycmVudFNpemUgd3JvbmdseSBpbiByZWxlYXNlIGJ1aWxkCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzkyNTUKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTdG9yYWdlTWFw OjppbXBvcnRJdGVtcygpIGhhcyBhIGRlYnVnIGFzc2VydGlvbiB0aGF0IGtleXMgb2YgaW1wb3J0 ZWQgaXRlbXMgZG8gbm90IGV4aXN0IGluIG1hcCwgYnV0IHRoYXQgZG9lcyAKKyAgICAgICAgbm90 IHByZXZlbnQgdGhpcyBmcm9tIGhhcHBlbmluZyBpbiByZWxlYXNlIGJ1aWxkLiBXaXRoIG91ciBj dXJyZW50IGltcGxlbWVudGF0aW9uLCBpZiB0aGlzIGhhcHBlbnMgaW4gcmVsZWFzZSAKKyAgICAg ICAgYnVpbGQsIHdlIGluY3JlYXNlIGN1cnJlbnRTaXplIHdpdGhvdXQgdXBkYXRpbmcgdGhlIG1h cCwgd2hpY2ggbWF5IGxlYWQgdG8gb3ZlcmZsb3cuCisKKyAgICAgICAgVG8gbWFrZSBTdG9yYWdl TWFwIG1vcmUgc2FmZSB0byB1c2UsIHdlIGNhbiBjYWxjdWxhdGUgdGhlIGNvcnJlY3QgY3VycmVu dFNpemUgYmFzZWQgb24gc2l6ZSBvZiBleHNpdGluZyBpdGVtLCBhcyAKKyAgICAgICAgaW4gU3Rv cmFnZU1hcDo6c2V0SXRlbSgpLCBvciB3ZSBqdXN0IGRvbid0IHVwZGF0ZSBjdXJyZW50U2l6ZSBv ciBtYXAgaWYga2V5IGFscmVhZHkgZXhpc3RzLiBTaW5jZSBjdXJyZW50IHVzZXJzCisgICAgICAg IG9mIFN0b3JhZ2VNYXAgc2hvdWxkIG9ubHkgY2FsbCBpbXBvcnRJdGVtcygpIHdoZW4gdGhlIG1h cCBpcyBlbXB0eSwgd2UgY2FuIGFkZCBhbiBlYXJseSByZXR1cm4gaWYgbWFwIGlzIG5vdCAKKyAg ICAgICAgZW1wdHkuCisKKyAgICAgICAgKiBzdG9yYWdlL1N0b3JhZ2VNYXAuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6U3RvcmFnZU1hcDo6aW1wb3J0SXRlbXMpOgorCiAyMDIyLTA0LTEzICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFtjc3Mtc2Nyb2xs LXNuYXBdIHNjcm9sbEludG9WaWV3IGZhaWxzIHdpdGggc2Nyb2xsLXNuYXAtdHlwZSBvbiA6cm9v dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlTWFwLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZU1hcC5jcHAKaW5kZXggY2Y5ODVhZWE4OGZiYWMy MDNiZjQ1NzY5OTU3OWNiNTJmNzJmY2Q1ZS4uMjY0NDM5MjhiM2Q4ZTdhYTMyNmQ3NTVlNDRlZDM4 MzQzMzhkNDkwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlTWFw LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VNYXAuY3BwCkBAIC0xNjEs MjMgKzE2MSwxNSBAQCBib29sIFN0b3JhZ2VNYXA6OmNvbnRhaW5zKGNvbnN0IFN0cmluZyYga2V5 KSBjb25zdAogCiB2b2lkIFN0b3JhZ2VNYXA6OmltcG9ydEl0ZW1zKEhhc2hNYXA8U3RyaW5nLCBT dHJpbmc+JiYgaXRlbXMpCiB7Ci0gICAgQ2hlY2tlZFVpbnQzMiBuZXdTaXplID0gbV9pbXBsLT5j dXJyZW50U2l6ZTsKLSAgICBpZiAobV9pbXBsLT5tYXAuaXNFbXB0eSgpKSB7Ci0gICAgICAgIG1f aW1wbC0+bWFwID0gV1RGTW92ZShpdGVtcyk7Ci0gICAgICAgIGZvciAoYXV0byYgW2tleSwgdmFs dWVdIDogbV9pbXBsLT5tYXApIHsKLSAgICAgICAgICAgIG5ld1NpemUgKz0ga2V5LnNpemVJbkJ5 dGVzKCk7Ci0gICAgICAgICAgICBuZXdTaXplICs9IHZhbHVlLnNpemVJbkJ5dGVzKCk7Ci0gICAg ICAgIH0KLSAgICAgICAgbV9pbXBsLT5jdXJyZW50U2l6ZSA9IG5ld1NpemU7Ci0gICAgICAgIHJl dHVybjsKLSAgICB9CisgICAgUkVMRUFTRV9BU1NFUlQoIW1faW1wbC0+Y3VycmVudFNpemUpOwog CisgICAgQ2hlY2tlZFVpbnQzMiBuZXdTaXplOwogICAgIGZvciAoYXV0byYgW2tleSwgdmFsdWVd IDogaXRlbXMpIHsKICAgICAgICAgbmV3U2l6ZSArPSBrZXkuc2l6ZUluQnl0ZXMoKTsKICAgICAg ICAgbmV3U2l6ZSArPSB2YWx1ZS5zaXplSW5CeXRlcygpOwotICAgICAgICBhdXRvIHJlc3VsdCA9 IG1faW1wbC0+bWFwLmFkZChXVEZNb3ZlKGtleSksIFdURk1vdmUodmFsdWUpKTsKLSAgICAgICAg QVNTRVJUX1VOVVNFRChyZXN1bHQsIHJlc3VsdC5pc05ld0VudHJ5KTsKICAgICB9CisKKyAgICBt X2ltcGwtPm1hcCA9IFdURk1vdmUoaXRlbXMpOwogICAgIG1faW1wbC0+Y3VycmVudFNpemUgPSBu ZXdTaXplOwogfQogCg== 457543 2022-04-13 10:29:03 -0700 2022-04-13 15:45:14 -0700 Patch bug-239255-20220413102902.patch text/plain 2619 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyODEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTUxZmFkNzE1NTcyNjYz NDE2ZDc0NjZjN2FlODI5NTU5OTZlNmU2ZS4uMDNjMDU4ZDdhNTlmYTdlMmZiY2UzNGZlYTUxODVl YmY2MzE1OGU0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIyLTA0LTEzICBTaWh1 aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIFN0b3JhZ2VNYXA6OmltcG9y dEl0ZW1zIG1heSB1cGRhdGUgY3VycmVudFNpemUgd3JvbmdseSBpbiByZWxlYXNlIGJ1aWxkCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzkyNTUKKwor ICAgICAgICBSZXZpZXdlZCBieSBDaHJpcyBEdW1lei4KKworICAgICAgICBTdG9yYWdlTWFwOjpp bXBvcnRJdGVtcygpIGhhcyBhIGRlYnVnIGFzc2VydGlvbiB0aGF0IGtleXMgb2YgaW1wb3J0ZWQg aXRlbXMgZG8gbm90IGV4aXN0IGluIG1hcCwgYnV0IHRoYXQgZG9lcyAKKyAgICAgICAgbm90IHBy ZXZlbnQgdGhpcyBmcm9tIGhhcHBlbmluZyBpbiByZWxlYXNlIGJ1aWxkLiBXaXRoIG91ciBjdXJy ZW50IGltcGxlbWVudGF0aW9uLCBpZiB0aGlzIGhhcHBlbnMgaW4gcmVsZWFzZSAKKyAgICAgICAg YnVpbGQsIHdlIGluY3JlYXNlIGN1cnJlbnRTaXplIHdpdGhvdXQgdXBkYXRpbmcgdGhlIG1hcCwg d2hpY2ggbWF5IGxlYWQgdG8gb3ZlcmZsb3cuCisKKyAgICAgICAgVG8gbWFrZSBTdG9yYWdlTWFw IG1vcmUgc2FmZSB0byB1c2UsIHdlIGNhbiBjYWxjdWxhdGUgdGhlIGNvcnJlY3QgY3VycmVudFNp emUgYmFzZWQgb24gc2l6ZSBvZiBleHNpdGluZyBpdGVtLCBhcyAKKyAgICAgICAgaW4gU3RvcmFn ZU1hcDo6c2V0SXRlbSgpLCBvciB3ZSBqdXN0IGRvbid0IHVwZGF0ZSBjdXJyZW50U2l6ZSBvciBt YXAgaWYga2V5IGFscmVhZHkgZXhpc3RzLiBTaW5jZSBjdXJyZW50IHVzZXJzCisgICAgICAgIG9m IFN0b3JhZ2VNYXAgc2hvdWxkIG9ubHkgY2FsbCBpbXBvcnRJdGVtcygpIHdoZW4gdGhlIG1hcCBp cyBlbXB0eSwgd2UgY2FuIGFkZCBhbiBlYXJseSByZXR1cm4gaWYgbWFwIGlzIG5vdCAKKyAgICAg ICAgZW1wdHkuCisKKyAgICAgICAgKiBzdG9yYWdlL1N0b3JhZ2VNYXAuY3BwOgorICAgICAgICAo V2ViQ29yZTo6U3RvcmFnZU1hcDo6aW1wb3J0SXRlbXMpOgorCiAyMDIyLTA0LTEzICBTaW1vbiBG cmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFtjc3Mtc2Nyb2xsLXNu YXBdIHNjcm9sbEludG9WaWV3IGZhaWxzIHdpdGggc2Nyb2xsLXNuYXAtdHlwZSBvbiA6cm9vdApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlTWFwLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZU1hcC5jcHAKaW5kZXggY2Y5ODVhZWE4OGZiYWMyMDNi ZjQ1NzY5OTU3OWNiNTJmNzJmY2Q1ZS4uYTNjNjg2NTczODlmY2FkYzc1YTc0YjkwZDQ3NzhmZmRh ZTU4YTdlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlTWFwLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VNYXAuY3BwCkBAIC0xNjEsMjMg KzE2MSwxNiBAQCBib29sIFN0b3JhZ2VNYXA6OmNvbnRhaW5zKGNvbnN0IFN0cmluZyYga2V5KSBj b25zdAogCiB2b2lkIFN0b3JhZ2VNYXA6OmltcG9ydEl0ZW1zKEhhc2hNYXA8U3RyaW5nLCBTdHJp bmc+JiYgaXRlbXMpCiB7Ci0gICAgQ2hlY2tlZFVpbnQzMiBuZXdTaXplID0gbV9pbXBsLT5jdXJy ZW50U2l6ZTsKLSAgICBpZiAobV9pbXBsLT5tYXAuaXNFbXB0eSgpKSB7Ci0gICAgICAgIG1faW1w bC0+bWFwID0gV1RGTW92ZShpdGVtcyk7Ci0gICAgICAgIGZvciAoYXV0byYgW2tleSwgdmFsdWVd IDogbV9pbXBsLT5tYXApIHsKLSAgICAgICAgICAgIG5ld1NpemUgKz0ga2V5LnNpemVJbkJ5dGVz KCk7Ci0gICAgICAgICAgICBuZXdTaXplICs9IHZhbHVlLnNpemVJbkJ5dGVzKCk7Ci0gICAgICAg IH0KLSAgICAgICAgbV9pbXBsLT5jdXJyZW50U2l6ZSA9IG5ld1NpemU7Ci0gICAgICAgIHJldHVy bjsKLSAgICB9CisgICAgUkVMRUFTRV9BU1NFUlQobV9pbXBsLT5tYXAuaXNFbXB0eSgpKTsKKyAg ICBSRUxFQVNFX0FTU0VSVCghbV9pbXBsLT5jdXJyZW50U2l6ZSk7CiAKKyAgICBDaGVja2VkVWlu dDMyIG5ld1NpemU7CiAgICAgZm9yIChhdXRvJiBba2V5LCB2YWx1ZV0gOiBpdGVtcykgewogICAg ICAgICBuZXdTaXplICs9IGtleS5zaXplSW5CeXRlcygpOwogICAgICAgICBuZXdTaXplICs9IHZh bHVlLnNpemVJbkJ5dGVzKCk7Ci0gICAgICAgIGF1dG8gcmVzdWx0ID0gbV9pbXBsLT5tYXAuYWRk KFdURk1vdmUoa2V5KSwgV1RGTW92ZSh2YWx1ZSkpOwotICAgICAgICBBU1NFUlRfVU5VU0VEKHJl c3VsdCwgcmVzdWx0LmlzTmV3RW50cnkpOwogICAgIH0KKworICAgIG1faW1wbC0+bWFwID0gV1RG TW92ZShpdGVtcyk7CiAgICAgbV9pbXBsLT5jdXJyZW50U2l6ZSA9IG5ld1NpemU7CiB9CiAK