236029 2022-02-02 10:38:41 -0800 Remove OriginStorageManager if it's not in use 2022-02-02 16:11:18 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 sihui_liu sihui_liu cdumez darin webkit-bug-importer youennf oldest_to_newest 1836518 0 sihui_liu 2022-02-02 10:38:41 -0800 ... 1836526 1 450674 sihui_liu 2022-02-02 10:47:57 -0800 Created attachment 450674 Patch 1836549 2 450679 sihui_liu 2022-02-02 11:29:55 -0800 Created attachment 450679 Patch 1836623 3 450679 darin 2022-02-02 13:53:00 -0800 Comment on attachment 450679 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=450679&action=review > Source/WebKit/NetworkProcess/storage/NetworkStorageManager.cpp:181 > + HashSet<WebCore::ClientOrigin> originsToRemove; > + for (auto& [origin, manager] : m_localOriginStorageManagers) { > + manager->connectionClosed(connection); > + if (!manager->isActive()) > + originsToRemove.add(origin); > + } > + > + for (auto origin : originsToRemove) > + m_localOriginStorageManagers.remove(origin); HashSet has a removeIf function that can do this sort of thing much more efficiently. We should use it here. 1836664 4 450705 sihui_liu 2022-02-02 15:29:35 -0800 Created attachment 450705 Patch for landing 1836684 5 ews-feeder 2022-02-02 16:10:33 -0800 Committed r289012 (246721@main): <https://commits.webkit.org/246721@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 450705. 1836685 6 webkit-bug-importer 2022-02-02 16:11:18 -0800 <rdar://problem/88406602> 450674 2022-02-02 10:47:57 -0800 2022-02-02 11:37:52 -0800 Patch bug-236029-20220202104756.patch text/plain 5792 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4OTM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDhhMzAzZDA1OTcxMmRkNWIy OTlhNDE4OGZlMjA5ZDE1NzJiZmZmZmMuLjUyNjY4NWRjMWMwNjNkNjIwZGEyODkwNDYzYWZkZjgx MjVkNGIwMTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjItMDItMDIgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIE9yaWdpblN0b3JhZ2VN YW5hZ2VyIGlmIGl0J3Mgbm90IGluIHVzZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjM2MDI5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgV2Ugc2hvdWxkIHJlbW92ZSBPcmlnaW5TdG9yYWdlTWFuYWdlciBp ZiBpdCBkb2VzIG5vdCBjb250YWlucyBpbi1tZW1vcnktb25seSBkYXRhIGFuZCBpdHMgb3JpZ2lu IGRhdGEgaXMgbm90CisgICAgICAgIGJlaW5nIHVzZWQgYnkgYW55IHdlYiBwcm9jZXNzLgorCisg ICAgICAgICogTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9GaWxlU3lzdGVtU3RvcmFnZU1hbmFnZXIu Y3BwOgorICAgICAgICAoV2ViS2l0OjpGaWxlU3lzdGVtU3RvcmFnZU1hbmFnZXI6OmlzQWN0aXZl IGNvbnN0KToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL0ZpbGVTeXN0ZW1TdG9y YWdlTWFuYWdlci5oOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvTmV0d29ya1N0 b3JhZ2VNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1N0b3JhZ2VNYW5hZ2Vy OjpzdG9wUmVjZWl2aW5nTWVzc2FnZUZyb21Db25uZWN0aW9uKToKKyAgICAgICAgKiBOZXR3b3Jr UHJvY2Vzcy9zdG9yYWdlL09yaWdpblN0b3JhZ2VNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYktp dDo6T3JpZ2luU3RvcmFnZU1hbmFnZXI6OlN0b3JhZ2VCdWNrZXQ6OmNvbm5lY3Rpb25DbG9zZWQp OgorICAgICAgICAoV2ViS2l0OjpPcmlnaW5TdG9yYWdlTWFuYWdlcjo6U3RvcmFnZUJ1Y2tldDo6 aXNBY3RpdmUgY29uc3QpOgorCiAyMDIyLTAyLTAxICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBs ZS5jb20+CiAKICAgICAgICAgUmVuYW1lIFNlcnZpY2VXb3JrZXJGZXRjaFJlc3VsdCB0byBXb3Jr ZXJGZXRjaFJlc3VsdCBhbmQgbWFrZSBpdCBtb3JlIGdlbmVyaWMKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9GaWxlU3lzdGVtU3RvcmFnZU1hbmFnZXIu Y3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL0ZpbGVTeXN0ZW1TdG9y YWdlTWFuYWdlci5jcHAKaW5kZXggMDlmODIyMjM5OWQ3N2Y5M2RlOGI2OTkzMWRlZTRhNDNkYTMx MThlOS4uNmNkYjc5NjUzYTY4ZTUxZGU1ZDUxMTQ2MGIzYTVjZTk4ZmZmMDRiMCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL0ZpbGVTeXN0ZW1TdG9yYWdl TWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL0Zp bGVTeXN0ZW1TdG9yYWdlTWFuYWdlci5jcHAKQEAgLTQ2LDYgKzQ2LDExIEBAIEZpbGVTeXN0ZW1T dG9yYWdlTWFuYWdlcjo6fkZpbGVTeXN0ZW1TdG9yYWdlTWFuYWdlcigpCiAgICAgY2xvc2UoKTsK IH0KIAorYm9vbCBGaWxlU3lzdGVtU3RvcmFnZU1hbmFnZXI6OmlzQWN0aXZlKCkgY29uc3QKK3sK KyAgICByZXR1cm4gIW1faGFuZGxlcy5pc0VtcHR5KCk7Cit9CisKIEV4cGVjdGVkPFdlYkNvcmU6 OkZpbGVTeXN0ZW1IYW5kbGVJZGVudGlmaWVyLCBGaWxlU3lzdGVtU3RvcmFnZUVycm9yPiBGaWxl U3lzdGVtU3RvcmFnZU1hbmFnZXI6OmNyZWF0ZUhhbmRsZShJUEM6OkNvbm5lY3Rpb246OlVuaXF1 ZUlEIGNvbm5lY3Rpb24sIEZpbGVTeXN0ZW1TdG9yYWdlSGFuZGxlOjpUeXBlIHR5cGUsIFN0cmlu ZyYmIHBhdGgsIFN0cmluZyYmIG5hbWUsIGJvb2wgY3JlYXRlSWZOZWNlc3NhcnkpCiB7CiAgICAg QVNTRVJUKCFSdW5Mb29wOjppc01haW4oKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL3N0b3JhZ2UvRmlsZVN5c3RlbVN0b3JhZ2VNYW5hZ2VyLmggYi9Tb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvRmlsZVN5c3RlbVN0b3JhZ2VNYW5hZ2VyLmgK aW5kZXggNTM1OTg5NTgxMGQ4NzQ4NTYwOWE0MGNmYTUzNzFjYzY5ZWViMDYzZC4uZWJlMTJjMjZm MjQ3NGJmOTQ3MjNlMzgyMzBjZjMxZGM4OGUzZWE0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL0ZpbGVTeXN0ZW1TdG9yYWdlTWFuYWdlci5oCisrKyBi L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9GaWxlU3lzdGVtU3RvcmFnZU1h bmFnZXIuaApAQCAtMzksNiArMzksNyBAQCBwdWJsaWM6CiAgICAgRmlsZVN5c3RlbVN0b3JhZ2VN YW5hZ2VyKFN0cmluZyYmIHBhdGgsIEZpbGVTeXN0ZW1TdG9yYWdlSGFuZGxlUmVnaXN0cnkmKTsK ICAgICB+RmlsZVN5c3RlbVN0b3JhZ2VNYW5hZ2VyKCk7CiAKKyAgICBib29sIGlzQWN0aXZlKCkg Y29uc3Q7CiAgICAgRXhwZWN0ZWQ8V2ViQ29yZTo6RmlsZVN5c3RlbUhhbmRsZUlkZW50aWZpZXIs IEZpbGVTeXN0ZW1TdG9yYWdlRXJyb3I+IGNyZWF0ZUhhbmRsZShJUEM6OkNvbm5lY3Rpb246OlVu aXF1ZUlELCBGaWxlU3lzdGVtU3RvcmFnZUhhbmRsZTo6VHlwZSwgU3RyaW5nJiYgcGF0aCwgU3Ry aW5nJiYgbmFtZSwgYm9vbCBjcmVhdGVJZk5lY2Vzc2FyeSk7CiAgICAgY29uc3QgU3RyaW5nJiBn ZXRQYXRoKFdlYkNvcmU6OkZpbGVTeXN0ZW1IYW5kbGVJZGVudGlmaWVyKTsKICAgICBGaWxlU3lz dGVtU3RvcmFnZUhhbmRsZTo6VHlwZSBnZXRUeXBlKFdlYkNvcmU6OkZpbGVTeXN0ZW1IYW5kbGVJ ZGVudGlmaWVyKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3Rv cmFnZS9OZXR3b3JrU3RvcmFnZU1hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9zdG9yYWdlL05ldHdvcmtTdG9yYWdlTWFuYWdlci5jcHAKaW5kZXggODczMjZjMWJiYzEz NjIyZGU1NjA0ZGVjNDJhYTNjYTM3ZTM4ZTQxNy4uMjBlZjExNTc2NDZmN2Y4MmRkYmFkYzA4ZGZi OWFhZDFiZTRmODRjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9z dG9yYWdlL05ldHdvcmtTdG9yYWdlTWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9zdG9yYWdlL05ldHdvcmtTdG9yYWdlTWFuYWdlci5jcHAKQEAgLTE3MCw4ICsx NzAsMTUgQEAgdm9pZCBOZXR3b3JrU3RvcmFnZU1hbmFnZXI6OnN0b3BSZWNlaXZpbmdNZXNzYWdl RnJvbUNvbm5lY3Rpb24oSVBDOjpDb25uZWN0aW9uJgogCiAgICAgY29ubmVjdGlvbi5yZW1vdmVX b3JrUXVldWVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6Ok5ldHdvcmtTdG9yYWdlTWFuYWdlcjo6 bWVzc2FnZVJlY2VpdmVyTmFtZSgpKTsKICAgICBtX3F1ZXVlLT5kaXNwYXRjaChbdGhpcywgcHJv dGVjdGVkVGhpcyA9IFJlZiB7ICp0aGlzIH0sIGNvbm5lY3Rpb24gPSBjb25uZWN0aW9uLnVuaXF1 ZUlEKCldKCkgbXV0YWJsZSB7Ci0gICAgICAgIGZvciAoYXV0byYgb3JpZ2luU3RvcmFnZU1hbmFn ZXIgOiBtX2xvY2FsT3JpZ2luU3RvcmFnZU1hbmFnZXJzLnZhbHVlcygpKQotICAgICAgICAgICAg b3JpZ2luU3RvcmFnZU1hbmFnZXItPmNvbm5lY3Rpb25DbG9zZWQoY29ubmVjdGlvbik7CisgICAg ICAgIEhhc2hTZXQ8V2ViQ29yZTo6Q2xpZW50T3JpZ2luPiBvcmlnaW5zVG9SZW1vdmU7CisgICAg ICAgIGZvciAoYXV0byYgW29yaWdpbiwgbWFuYWdlcl0gOiBtX2xvY2FsT3JpZ2luU3RvcmFnZU1h bmFnZXJzKSB7CisgICAgICAgICAgICBtYW5hZ2VyLT5jb25uZWN0aW9uQ2xvc2VkKGNvbm5lY3Rp b24pOworICAgICAgICAgICAgaWYgKCFtYW5hZ2VyLT5pc0FjdGl2ZSgpKQorICAgICAgICAgICAg ICAgIG9yaWdpbnNUb1JlbW92ZS5hZGQob3JpZ2luKTsKKyAgICAgICAgfQorCisgICAgICAgIGZv ciAoYXV0byBvcmlnaW4gOiBvcmlnaW5zVG9SZW1vdmUpCisgICAgICAgICAgICBtX2xvY2FsT3Jp Z2luU3RvcmFnZU1hbmFnZXJzLnJlbW92ZShvcmlnaW4pOwogCiAgICAgICAgIFJ1bkxvb3A6Om1h aW4oKS5kaXNwYXRjaChbcHJvdGVjdGVkVGhpcyA9IFdURk1vdmUocHJvdGVjdGVkVGhpcyldIHsg fSk7CiAgICAgfSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0 b3JhZ2UvT3JpZ2luU3RvcmFnZU1hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy9zdG9yYWdlL09yaWdpblN0b3JhZ2VNYW5hZ2VyLmNwcAppbmRleCAxM2NkNDkyNmQ3Y2Iz MmZkNmJjOTQwNzU5ZDk5Mjc5MjM3NDIxNDNjLi5lMTg1ZWY5N2VkYzRmYjg3NTg5NjE4M2FlOWUz MWUzZTY1YjRhZTQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0 b3JhZ2UvT3JpZ2luU3RvcmFnZU1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3Mvc3RvcmFnZS9PcmlnaW5TdG9yYWdlTWFuYWdlci5jcHAKQEAgLTU4LDYgKzU4LDEy IEBAIHB1YmxpYzoKICAgICB7CiAgICAgICAgIGlmIChtX2ZpbGVTeXN0ZW1TdG9yYWdlTWFuYWdl cikKICAgICAgICAgICAgIG1fZmlsZVN5c3RlbVN0b3JhZ2VNYW5hZ2VyLT5jb25uZWN0aW9uQ2xv c2VkKGNvbm5lY3Rpb24pOworCisgICAgICAgIGlmIChtX2xvY2FsU3RvcmFnZU1hbmFnZXIpCisg ICAgICAgICAgICBtX2xvY2FsU3RvcmFnZU1hbmFnZXItPmNvbm5lY3Rpb25DbG9zZWQoY29ubmVj dGlvbik7CisKKyAgICAgICAgaWYgKG1fc2Vzc2lvblN0b3JhZ2VNYW5hZ2VyKQorICAgICAgICAg ICAgbV9zZXNzaW9uU3RvcmFnZU1hbmFnZXItPmNvbm5lY3Rpb25DbG9zZWQoY29ubmVjdGlvbik7 CiAgICAgfQogCiAgICAgZW51bSBjbGFzcyBTdG9yYWdlVHlwZSA6IHVpbnQ4X3QgewpAQCAtMTM5 LDcgKzE0NSwxMSBAQCBwdWJsaWM6CiAKICAgICBib29sIGlzQWN0aXZlKCkgY29uc3QKICAgICB7 Ci0gICAgICAgIHJldHVybiBtX2ZpbGVTeXN0ZW1TdG9yYWdlTWFuYWdlciB8fCBtX2xvY2FsU3Rv cmFnZU1hbmFnZXIgfHwgbV9zZXNzaW9uU3RvcmFnZU1hbmFnZXI7CisgICAgICAgIC8vIFdlIGNh bm5vdCByZW1vdmUgU2Vzc2lvblN0b3JhZ2VNYW5hZ2VyIGlmIGl0IGhhcyBkYXRhLCBvdGhlcndp c2Ugd2Ugd2lsbAorICAgICAgICAvLyBsb3NlIGluLW1lbW9yeSBkYXRhIGZvciB0aGUgc2Vzc2lv bi4KKyAgICAgICAgcmV0dXJuIChtX2ZpbGVTeXN0ZW1TdG9yYWdlTWFuYWdlciAmJiBtX2ZpbGVT eXN0ZW1TdG9yYWdlTWFuYWdlci0+aXNBY3RpdmUoKSkKKyAgICAgICAgICAgIHx8IChtX2xvY2Fs U3RvcmFnZU1hbmFnZXIgJiYgKG1fbG9jYWxTdG9yYWdlTWFuYWdlci0+aGFzRGF0YUluTWVtb3J5 KCkgfHwgbV9sb2NhbFN0b3JhZ2VNYW5hZ2VyLT5pc0FjdGl2ZSgpKQorICAgICAgICAgICAgfHwg KG1fc2Vzc2lvblN0b3JhZ2VNYW5hZ2VyICYmIChtX3Nlc3Npb25TdG9yYWdlTWFuYWdlci0+aGFz RGF0YUluTWVtb3J5KCkgfHwgbV9zZXNzaW9uU3RvcmFnZU1hbmFnZXItPmlzQWN0aXZlKCkpKTsK ICAgICB9CiAKICAgICBib29sIGlzRW1wdHkoKSBjb25zdAo= 450679 2022-02-02 11:29:55 -0800 2022-02-02 15:29:32 -0800 Patch bug-236029-20220202112954.patch text/plain 5795 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4OTcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDA5M2I4MGJhNjcxYjE4MjVh YjJmY2MzYWNkMmM3NDgyN2ZjZjI3ZjEuLjFjODdmYTRlOGEzNmM5NDRjNGY5YjhkNTBlZGVmNTVl OWM4NTA0YTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjItMDItMDIgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIE9yaWdpblN0b3JhZ2VN YW5hZ2VyIGlmIGl0J3Mgbm90IGluIHVzZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjM2MDI5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgV2Ugc2hvdWxkIHJlbW92ZSBPcmlnaW5TdG9yYWdlTWFuYWdlciBp ZiBpdCBkb2VzIG5vdCBjb250YWlucyBpbi1tZW1vcnktb25seSBkYXRhIGFuZCBpdHMgb3JpZ2lu IGRhdGEgaXMgbm90CisgICAgICAgIGJlaW5nIHVzZWQgYnkgYW55IHdlYiBwcm9jZXNzLgorCisg ICAgICAgICogTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9GaWxlU3lzdGVtU3RvcmFnZU1hbmFnZXIu Y3BwOgorICAgICAgICAoV2ViS2l0OjpGaWxlU3lzdGVtU3RvcmFnZU1hbmFnZXI6OmlzQWN0aXZl IGNvbnN0KToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL0ZpbGVTeXN0ZW1TdG9y YWdlTWFuYWdlci5oOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvTmV0d29ya1N0 b3JhZ2VNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1N0b3JhZ2VNYW5hZ2Vy OjpzdG9wUmVjZWl2aW5nTWVzc2FnZUZyb21Db25uZWN0aW9uKToKKyAgICAgICAgKiBOZXR3b3Jr UHJvY2Vzcy9zdG9yYWdlL09yaWdpblN0b3JhZ2VNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYktp dDo6T3JpZ2luU3RvcmFnZU1hbmFnZXI6OlN0b3JhZ2VCdWNrZXQ6OmNvbm5lY3Rpb25DbG9zZWQp OgorICAgICAgICAoV2ViS2l0OjpPcmlnaW5TdG9yYWdlTWFuYWdlcjo6U3RvcmFnZUJ1Y2tldDo6 aXNBY3RpdmUgY29uc3QpOgorCiAyMDIyLTAyLTAyICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBs ZS5jb20+CiAKICAgICAgICAgTW92ZSBhbmQgcmVuYW1lIFNlcnZpY2VXb3JrZXJGcmFtZUxvYWRl ckNsaWVudCAmIFNlcnZpY2VXb3JrZXJMaWJXZWJSVENQcm92aWRlcgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL0ZpbGVTeXN0ZW1TdG9yYWdlTWFuYWdl ci5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvRmlsZVN5c3RlbVN0 b3JhZ2VNYW5hZ2VyLmNwcAppbmRleCAwOWY4MjIyMzk5ZDc3ZjkzZGU4YjY5OTMxZGVlNGE0M2Rh MzExOGU5Li42Y2RiNzk2NTNhNjhlNTFkZTVkNTExNDYwYjNhNWNlOThmZmYwNGIwIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvRmlsZVN5c3RlbVN0b3Jh Z2VNYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2Uv RmlsZVN5c3RlbVN0b3JhZ2VNYW5hZ2VyLmNwcApAQCAtNDYsNiArNDYsMTEgQEAgRmlsZVN5c3Rl bVN0b3JhZ2VNYW5hZ2VyOjp+RmlsZVN5c3RlbVN0b3JhZ2VNYW5hZ2VyKCkKICAgICBjbG9zZSgp OwogfQogCitib29sIEZpbGVTeXN0ZW1TdG9yYWdlTWFuYWdlcjo6aXNBY3RpdmUoKSBjb25zdAor eworICAgIHJldHVybiAhbV9oYW5kbGVzLmlzRW1wdHkoKTsKK30KKwogRXhwZWN0ZWQ8V2ViQ29y ZTo6RmlsZVN5c3RlbUhhbmRsZUlkZW50aWZpZXIsIEZpbGVTeXN0ZW1TdG9yYWdlRXJyb3I+IEZp bGVTeXN0ZW1TdG9yYWdlTWFuYWdlcjo6Y3JlYXRlSGFuZGxlKElQQzo6Q29ubmVjdGlvbjo6VW5p cXVlSUQgY29ubmVjdGlvbiwgRmlsZVN5c3RlbVN0b3JhZ2VIYW5kbGU6OlR5cGUgdHlwZSwgU3Ry aW5nJiYgcGF0aCwgU3RyaW5nJiYgbmFtZSwgYm9vbCBjcmVhdGVJZk5lY2Vzc2FyeSkKIHsKICAg ICBBU1NFUlQoIVJ1bkxvb3A6OmlzTWFpbigpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9GaWxlU3lzdGVtU3RvcmFnZU1hbmFnZXIuaCBiL1NvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9GaWxlU3lzdGVtU3RvcmFnZU1hbmFnZXIu aAppbmRleCA1MzU5ODk1ODEwZDg3NDg1NjA5YTQwY2ZhNTM3MWNjNjllZWIwNjNkLi5lYmUxMmMy NmYyNDc0YmY5NDcyM2UzODIzMGNmMzFkYzg4ZTNlYTQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvRmlsZVN5c3RlbVN0b3JhZ2VNYW5hZ2VyLmgKKysr IGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL0ZpbGVTeXN0ZW1TdG9yYWdl TWFuYWdlci5oCkBAIC0zOSw2ICszOSw3IEBAIHB1YmxpYzoKICAgICBGaWxlU3lzdGVtU3RvcmFn ZU1hbmFnZXIoU3RyaW5nJiYgcGF0aCwgRmlsZVN5c3RlbVN0b3JhZ2VIYW5kbGVSZWdpc3RyeSYp OwogICAgIH5GaWxlU3lzdGVtU3RvcmFnZU1hbmFnZXIoKTsKIAorICAgIGJvb2wgaXNBY3RpdmUo KSBjb25zdDsKICAgICBFeHBlY3RlZDxXZWJDb3JlOjpGaWxlU3lzdGVtSGFuZGxlSWRlbnRpZmll ciwgRmlsZVN5c3RlbVN0b3JhZ2VFcnJvcj4gY3JlYXRlSGFuZGxlKElQQzo6Q29ubmVjdGlvbjo6 VW5pcXVlSUQsIEZpbGVTeXN0ZW1TdG9yYWdlSGFuZGxlOjpUeXBlLCBTdHJpbmcmJiBwYXRoLCBT dHJpbmcmJiBuYW1lLCBib29sIGNyZWF0ZUlmTmVjZXNzYXJ5KTsKICAgICBjb25zdCBTdHJpbmcm IGdldFBhdGgoV2ViQ29yZTo6RmlsZVN5c3RlbUhhbmRsZUlkZW50aWZpZXIpOwogICAgIEZpbGVT eXN0ZW1TdG9yYWdlSGFuZGxlOjpUeXBlIGdldFR5cGUoV2ViQ29yZTo6RmlsZVN5c3RlbUhhbmRs ZUlkZW50aWZpZXIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9z dG9yYWdlL05ldHdvcmtTdG9yYWdlTWFuYWdlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL3N0b3JhZ2UvTmV0d29ya1N0b3JhZ2VNYW5hZ2VyLmNwcAppbmRleCA4NzMyNmMxYmJj MTM2MjJkZTU2MDRkZWM0MmFhM2NhMzdlMzhlNDE3Li4yMGVmMTE1NzY0NmY3ZjgyZGRiYWRjMDhk ZmI5YWFkMWJlNGY4NGMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L3N0b3JhZ2UvTmV0d29ya1N0b3JhZ2VNYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL3N0b3JhZ2UvTmV0d29ya1N0b3JhZ2VNYW5hZ2VyLmNwcApAQCAtMTcwLDgg KzE3MCwxNSBAQCB2b2lkIE5ldHdvcmtTdG9yYWdlTWFuYWdlcjo6c3RvcFJlY2VpdmluZ01lc3Nh Z2VGcm9tQ29ubmVjdGlvbihJUEM6OkNvbm5lY3Rpb24mCiAKICAgICBjb25uZWN0aW9uLnJlbW92 ZVdvcmtRdWV1ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6TmV0d29ya1N0b3JhZ2VNYW5hZ2Vy OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCkpOwogICAgIG1fcXVldWUtPmRpc3BhdGNoKFt0aGlzLCBw cm90ZWN0ZWRUaGlzID0gUmVmIHsgKnRoaXMgfSwgY29ubmVjdGlvbiA9IGNvbm5lY3Rpb24udW5p cXVlSUQoKV0oKSBtdXRhYmxlIHsKLSAgICAgICAgZm9yIChhdXRvJiBvcmlnaW5TdG9yYWdlTWFu YWdlciA6IG1fbG9jYWxPcmlnaW5TdG9yYWdlTWFuYWdlcnMudmFsdWVzKCkpCi0gICAgICAgICAg ICBvcmlnaW5TdG9yYWdlTWFuYWdlci0+Y29ubmVjdGlvbkNsb3NlZChjb25uZWN0aW9uKTsKKyAg ICAgICAgSGFzaFNldDxXZWJDb3JlOjpDbGllbnRPcmlnaW4+IG9yaWdpbnNUb1JlbW92ZTsKKyAg ICAgICAgZm9yIChhdXRvJiBbb3JpZ2luLCBtYW5hZ2VyXSA6IG1fbG9jYWxPcmlnaW5TdG9yYWdl TWFuYWdlcnMpIHsKKyAgICAgICAgICAgIG1hbmFnZXItPmNvbm5lY3Rpb25DbG9zZWQoY29ubmVj dGlvbik7CisgICAgICAgICAgICBpZiAoIW1hbmFnZXItPmlzQWN0aXZlKCkpCisgICAgICAgICAg ICAgICAgb3JpZ2luc1RvUmVtb3ZlLmFkZChvcmlnaW4pOworICAgICAgICB9CisKKyAgICAgICAg Zm9yIChhdXRvIG9yaWdpbiA6IG9yaWdpbnNUb1JlbW92ZSkKKyAgICAgICAgICAgIG1fbG9jYWxP cmlnaW5TdG9yYWdlTWFuYWdlcnMucmVtb3ZlKG9yaWdpbik7CiAKICAgICAgICAgUnVuTG9vcDo6 bWFpbigpLmRpc3BhdGNoKFtwcm90ZWN0ZWRUaGlzID0gV1RGTW92ZShwcm90ZWN0ZWRUaGlzKV0g eyB9KTsKICAgICB9KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv c3RvcmFnZS9PcmlnaW5TdG9yYWdlTWFuYWdlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL3N0b3JhZ2UvT3JpZ2luU3RvcmFnZU1hbmFnZXIuY3BwCmluZGV4IDEzY2Q0OTI2ZDdj YjMyZmQ2YmM5NDA3NTlkOTkyNzkyMzc0MjE0M2MuLjBhM2I5ZWJhYzI5YTk2YjRjMjc5Y2VjMTNi NGVhMmQ1ZmU4ZjhmNzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv c3RvcmFnZS9PcmlnaW5TdG9yYWdlTWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9zdG9yYWdlL09yaWdpblN0b3JhZ2VNYW5hZ2VyLmNwcApAQCAtNTgsNiArNTgs MTIgQEAgcHVibGljOgogICAgIHsKICAgICAgICAgaWYgKG1fZmlsZVN5c3RlbVN0b3JhZ2VNYW5h Z2VyKQogICAgICAgICAgICAgbV9maWxlU3lzdGVtU3RvcmFnZU1hbmFnZXItPmNvbm5lY3Rpb25D bG9zZWQoY29ubmVjdGlvbik7CisKKyAgICAgICAgaWYgKG1fbG9jYWxTdG9yYWdlTWFuYWdlcikK KyAgICAgICAgICAgIG1fbG9jYWxTdG9yYWdlTWFuYWdlci0+Y29ubmVjdGlvbkNsb3NlZChjb25u ZWN0aW9uKTsKKworICAgICAgICBpZiAobV9zZXNzaW9uU3RvcmFnZU1hbmFnZXIpCisgICAgICAg ICAgICBtX3Nlc3Npb25TdG9yYWdlTWFuYWdlci0+Y29ubmVjdGlvbkNsb3NlZChjb25uZWN0aW9u KTsKICAgICB9CiAKICAgICBlbnVtIGNsYXNzIFN0b3JhZ2VUeXBlIDogdWludDhfdCB7CkBAIC0x MzksNyArMTQ1LDExIEBAIHB1YmxpYzoKIAogICAgIGJvb2wgaXNBY3RpdmUoKSBjb25zdAogICAg IHsKLSAgICAgICAgcmV0dXJuIG1fZmlsZVN5c3RlbVN0b3JhZ2VNYW5hZ2VyIHx8IG1fbG9jYWxT dG9yYWdlTWFuYWdlciB8fCBtX3Nlc3Npb25TdG9yYWdlTWFuYWdlcjsKKyAgICAgICAgLy8gV2Ug Y2Fubm90IHJlbW92ZSBTZXNzaW9uU3RvcmFnZU1hbmFnZXIgaWYgaXQgaGFzIGRhdGEsIG90aGVy d2lzZSB3ZSB3aWxsCisgICAgICAgIC8vIGxvc2UgaW4tbWVtb3J5IGRhdGEgZm9yIHRoZSBzZXNz aW9uLgorICAgICAgICByZXR1cm4gKG1fZmlsZVN5c3RlbVN0b3JhZ2VNYW5hZ2VyICYmIG1fZmls ZVN5c3RlbVN0b3JhZ2VNYW5hZ2VyLT5pc0FjdGl2ZSgpKQorICAgICAgICAgICAgfHwgKG1fbG9j YWxTdG9yYWdlTWFuYWdlciAmJiAobV9sb2NhbFN0b3JhZ2VNYW5hZ2VyLT5oYXNEYXRhSW5NZW1v cnkoKSB8fCBtX2xvY2FsU3RvcmFnZU1hbmFnZXItPmlzQWN0aXZlKCkpKQorICAgICAgICAgICAg fHwgKG1fc2Vzc2lvblN0b3JhZ2VNYW5hZ2VyICYmIChtX3Nlc3Npb25TdG9yYWdlTWFuYWdlci0+ aGFzRGF0YUluTWVtb3J5KCkgfHwgbV9zZXNzaW9uU3RvcmFnZU1hbmFnZXItPmlzQWN0aXZlKCkp KTsKICAgICB9CiAKICAgICBib29sIGlzRW1wdHkoKSBjb25zdAo= 450705 2022-02-02 15:29:35 -0800 2022-02-02 16:10:34 -0800 Patch for landing bug-236029-20220202152934.patch text/plain 5601 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4OTcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDA5M2I4MGJhNjcxYjE4MjVh YjJmY2MzYWNkMmM3NDgyN2ZjZjI3ZjEuLmQ2ZDg4NWZkNjc1MTJlNDE3ZTNiNTVhNWQ2OTdhMGYy OWMzNjBkYmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjItMDItMDIgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIE9yaWdpblN0b3JhZ2VN YW5hZ2VyIGlmIGl0J3Mgbm90IGluIHVzZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjM2MDI5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRs ZXIuCisKKyAgICAgICAgV2Ugc2hvdWxkIHJlbW92ZSBPcmlnaW5TdG9yYWdlTWFuYWdlciBpZiBp dCBkb2VzIG5vdCBjb250YWlucyBpbi1tZW1vcnkgZGF0YSBhbmQgaXRzIG9yaWdpbiBkYXRhIGlz IG5vdCBiZWluZyAKKyAgICAgICAgdXNlZCBieSBhbnkgd2ViIHByb2Nlc3MuCisKKyAgICAgICAg KiBOZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL0ZpbGVTeXN0ZW1TdG9yYWdlTWFuYWdlci5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OkZpbGVTeXN0ZW1TdG9yYWdlTWFuYWdlcjo6aXNBY3RpdmUgY29uc3Qp OgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvRmlsZVN5c3RlbVN0b3JhZ2VNYW5h Z2VyLmg6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9OZXR3b3JrU3RvcmFnZU1h bmFnZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrU3RvcmFnZU1hbmFnZXI6OnN0b3BS ZWNlaXZpbmdNZXNzYWdlRnJvbUNvbm5lY3Rpb24pOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNz L3N0b3JhZ2UvT3JpZ2luU3RvcmFnZU1hbmFnZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpPcmln aW5TdG9yYWdlTWFuYWdlcjo6U3RvcmFnZUJ1Y2tldDo6Y29ubmVjdGlvbkNsb3NlZCk6CisgICAg ICAgIChXZWJLaXQ6Ok9yaWdpblN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlQnVja2V0Ojppc0FjdGl2 ZSBjb25zdCk6CisKIDIwMjItMDItMDIgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4K IAogICAgICAgICBNb3ZlIGFuZCByZW5hbWUgU2VydmljZVdvcmtlckZyYW1lTG9hZGVyQ2xpZW50 ICYgU2VydmljZVdvcmtlckxpYldlYlJUQ1Byb3ZpZGVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvRmlsZVN5c3RlbVN0b3JhZ2VNYW5hZ2VyLmNwcCBi L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9GaWxlU3lzdGVtU3RvcmFnZU1h bmFnZXIuY3BwCmluZGV4IDA5ZjgyMjIzOTlkNzdmOTNkZThiNjk5MzFkZWU0YTQzZGEzMTE4ZTku LjZjZGI3OTY1M2E2OGU1MWRlNWQ1MTE0NjBiM2E1Y2U5OGZmZjA0YjAgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9GaWxlU3lzdGVtU3RvcmFnZU1hbmFn ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9GaWxlU3lz dGVtU3RvcmFnZU1hbmFnZXIuY3BwCkBAIC00Niw2ICs0NiwxMSBAQCBGaWxlU3lzdGVtU3RvcmFn ZU1hbmFnZXI6On5GaWxlU3lzdGVtU3RvcmFnZU1hbmFnZXIoKQogICAgIGNsb3NlKCk7CiB9CiAK K2Jvb2wgRmlsZVN5c3RlbVN0b3JhZ2VNYW5hZ2VyOjppc0FjdGl2ZSgpIGNvbnN0Cit7CisgICAg cmV0dXJuICFtX2hhbmRsZXMuaXNFbXB0eSgpOworfQorCiBFeHBlY3RlZDxXZWJDb3JlOjpGaWxl U3lzdGVtSGFuZGxlSWRlbnRpZmllciwgRmlsZVN5c3RlbVN0b3JhZ2VFcnJvcj4gRmlsZVN5c3Rl bVN0b3JhZ2VNYW5hZ2VyOjpjcmVhdGVIYW5kbGUoSVBDOjpDb25uZWN0aW9uOjpVbmlxdWVJRCBj b25uZWN0aW9uLCBGaWxlU3lzdGVtU3RvcmFnZUhhbmRsZTo6VHlwZSB0eXBlLCBTdHJpbmcmJiBw YXRoLCBTdHJpbmcmJiBuYW1lLCBib29sIGNyZWF0ZUlmTmVjZXNzYXJ5KQogewogICAgIEFTU0VS VCghUnVuTG9vcDo6aXNNYWluKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9zdG9yYWdlL0ZpbGVTeXN0ZW1TdG9yYWdlTWFuYWdlci5oIGIvU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL0ZpbGVTeXN0ZW1TdG9yYWdlTWFuYWdlci5oCmluZGV4 IDUzNTk4OTU4MTBkODc0ODU2MDlhNDBjZmE1MzcxY2M2OWVlYjA2M2QuLmViZTEyYzI2ZjI0NzRi Zjk0NzIzZTM4MjMwY2YzMWRjODhlM2VhNDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0 d29ya1Byb2Nlc3Mvc3RvcmFnZS9GaWxlU3lzdGVtU3RvcmFnZU1hbmFnZXIuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvRmlsZVN5c3RlbVN0b3JhZ2VNYW5hZ2Vy LmgKQEAgLTM5LDYgKzM5LDcgQEAgcHVibGljOgogICAgIEZpbGVTeXN0ZW1TdG9yYWdlTWFuYWdl cihTdHJpbmcmJiBwYXRoLCBGaWxlU3lzdGVtU3RvcmFnZUhhbmRsZVJlZ2lzdHJ5Jik7CiAgICAg fkZpbGVTeXN0ZW1TdG9yYWdlTWFuYWdlcigpOwogCisgICAgYm9vbCBpc0FjdGl2ZSgpIGNvbnN0 OwogICAgIEV4cGVjdGVkPFdlYkNvcmU6OkZpbGVTeXN0ZW1IYW5kbGVJZGVudGlmaWVyLCBGaWxl U3lzdGVtU3RvcmFnZUVycm9yPiBjcmVhdGVIYW5kbGUoSVBDOjpDb25uZWN0aW9uOjpVbmlxdWVJ RCwgRmlsZVN5c3RlbVN0b3JhZ2VIYW5kbGU6OlR5cGUsIFN0cmluZyYmIHBhdGgsIFN0cmluZyYm IG5hbWUsIGJvb2wgY3JlYXRlSWZOZWNlc3NhcnkpOwogICAgIGNvbnN0IFN0cmluZyYgZ2V0UGF0 aChXZWJDb3JlOjpGaWxlU3lzdGVtSGFuZGxlSWRlbnRpZmllcik7CiAgICAgRmlsZVN5c3RlbVN0 b3JhZ2VIYW5kbGU6OlR5cGUgZ2V0VHlwZShXZWJDb3JlOjpGaWxlU3lzdGVtSGFuZGxlSWRlbnRp Zmllcik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2Uv TmV0d29ya1N0b3JhZ2VNYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv c3RvcmFnZS9OZXR3b3JrU3RvcmFnZU1hbmFnZXIuY3BwCmluZGV4IDg3MzI2YzFiYmMxMzYyMmRl NTYwNGRlYzQyYWEzY2EzN2UzOGU0MTcuLjllNjA2YmQyOWExYjkwMDAyODJiOTY0NzcxODAyMDM1 ZWVkOTc4YzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFn ZS9OZXR3b3JrU3RvcmFnZU1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3Mvc3RvcmFnZS9OZXR3b3JrU3RvcmFnZU1hbmFnZXIuY3BwCkBAIC0xNzAsOCArMTcwLDEx IEBAIHZvaWQgTmV0d29ya1N0b3JhZ2VNYW5hZ2VyOjpzdG9wUmVjZWl2aW5nTWVzc2FnZUZyb21D b25uZWN0aW9uKElQQzo6Q29ubmVjdGlvbiYKIAogICAgIGNvbm5lY3Rpb24ucmVtb3ZlV29ya1F1 ZXVlTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpOZXR3b3JrU3RvcmFnZU1hbmFnZXI6Om1lc3Nh Z2VSZWNlaXZlck5hbWUoKSk7CiAgICAgbV9xdWV1ZS0+ZGlzcGF0Y2goW3RoaXMsIHByb3RlY3Rl ZFRoaXMgPSBSZWYgeyAqdGhpcyB9LCBjb25uZWN0aW9uID0gY29ubmVjdGlvbi51bmlxdWVJRCgp XSgpIG11dGFibGUgewotICAgICAgICBmb3IgKGF1dG8mIG9yaWdpblN0b3JhZ2VNYW5hZ2VyIDog bV9sb2NhbE9yaWdpblN0b3JhZ2VNYW5hZ2Vycy52YWx1ZXMoKSkKLSAgICAgICAgICAgIG9yaWdp blN0b3JhZ2VNYW5hZ2VyLT5jb25uZWN0aW9uQ2xvc2VkKGNvbm5lY3Rpb24pOworICAgICAgICBt X2xvY2FsT3JpZ2luU3RvcmFnZU1hbmFnZXJzLnJlbW92ZUlmKFsmXShhdXRvJiBlbnRyeSkgewor ICAgICAgICAgICAgYXV0byYgbWFuYWdlciA9IGVudHJ5LnZhbHVlOworICAgICAgICAgICAgbWFu YWdlci0+Y29ubmVjdGlvbkNsb3NlZChjb25uZWN0aW9uKTsKKyAgICAgICAgICAgIHJldHVybiAh bWFuYWdlci0+aXNBY3RpdmUoKTsKKyAgICAgICAgfSk7CiAKICAgICAgICAgUnVuTG9vcDo6bWFp bigpLmRpc3BhdGNoKFtwcm90ZWN0ZWRUaGlzID0gV1RGTW92ZShwcm90ZWN0ZWRUaGlzKV0geyB9 KTsKICAgICB9KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3Rv cmFnZS9PcmlnaW5TdG9yYWdlTWFuYWdlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL3N0b3JhZ2UvT3JpZ2luU3RvcmFnZU1hbmFnZXIuY3BwCmluZGV4IDEzY2Q0OTI2ZDdjYjMy ZmQ2YmM5NDA3NTlkOTkyNzkyMzc0MjE0M2MuLmQ5NWZiYjdkZTM3M2I0MGU2NTY2MzUyOTYwYTA4 NTY2YzZiNzIyYTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3Rv cmFnZS9PcmlnaW5TdG9yYWdlTWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9zdG9yYWdlL09yaWdpblN0b3JhZ2VNYW5hZ2VyLmNwcApAQCAtNTgsNiArNTgsMTIg QEAgcHVibGljOgogICAgIHsKICAgICAgICAgaWYgKG1fZmlsZVN5c3RlbVN0b3JhZ2VNYW5hZ2Vy KQogICAgICAgICAgICAgbV9maWxlU3lzdGVtU3RvcmFnZU1hbmFnZXItPmNvbm5lY3Rpb25DbG9z ZWQoY29ubmVjdGlvbik7CisKKyAgICAgICAgaWYgKG1fbG9jYWxTdG9yYWdlTWFuYWdlcikKKyAg ICAgICAgICAgIG1fbG9jYWxTdG9yYWdlTWFuYWdlci0+Y29ubmVjdGlvbkNsb3NlZChjb25uZWN0 aW9uKTsKKworICAgICAgICBpZiAobV9zZXNzaW9uU3RvcmFnZU1hbmFnZXIpCisgICAgICAgICAg ICBtX3Nlc3Npb25TdG9yYWdlTWFuYWdlci0+Y29ubmVjdGlvbkNsb3NlZChjb25uZWN0aW9uKTsK ICAgICB9CiAKICAgICBlbnVtIGNsYXNzIFN0b3JhZ2VUeXBlIDogdWludDhfdCB7CkBAIC0xMzks NyArMTQ1LDExIEBAIHB1YmxpYzoKIAogICAgIGJvb2wgaXNBY3RpdmUoKSBjb25zdAogICAgIHsK LSAgICAgICAgcmV0dXJuIG1fZmlsZVN5c3RlbVN0b3JhZ2VNYW5hZ2VyIHx8IG1fbG9jYWxTdG9y YWdlTWFuYWdlciB8fCBtX3Nlc3Npb25TdG9yYWdlTWFuYWdlcjsKKyAgICAgICAgLy8gV2UgY2Fu bm90IHJlbW92ZSB0aGUgYnVja2V0IGlmIGl0IGhhcyBpbi1tZW1vcnkgZGF0YSwgb3RoZXJ3aXNl IHNlc3Npb24KKyAgICAgICAgLy8gZGF0YSBtYXkgYmUgbG9zdC4KKyAgICAgICAgcmV0dXJuICht X2ZpbGVTeXN0ZW1TdG9yYWdlTWFuYWdlciAmJiBtX2ZpbGVTeXN0ZW1TdG9yYWdlTWFuYWdlci0+ aXNBY3RpdmUoKSkKKyAgICAgICAgICAgIHx8IChtX2xvY2FsU3RvcmFnZU1hbmFnZXIgJiYgKG1f bG9jYWxTdG9yYWdlTWFuYWdlci0+aGFzRGF0YUluTWVtb3J5KCkgfHwgbV9sb2NhbFN0b3JhZ2VN YW5hZ2VyLT5pc0FjdGl2ZSgpKSkKKyAgICAgICAgICAgIHx8IChtX3Nlc3Npb25TdG9yYWdlTWFu YWdlciAmJiAobV9zZXNzaW9uU3RvcmFnZU1hbmFnZXItPmhhc0RhdGFJbk1lbW9yeSgpIHx8IG1f c2Vzc2lvblN0b3JhZ2VNYW5hZ2VyLT5pc0FjdGl2ZSgpKSk7CiAgICAgfQogCiAgICAgYm9vbCBp c0VtcHR5KCkgY29uc3QK