236901 2022-02-19 20:24:26 -0800 Origin file may not be created after migrating data to general storage directory 2022-02-20 15:12:19 -0800 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 1843946 0 sihui_liu 2022-02-19 20:24:26 -0800 ... 1843960 1 452673 sihui_liu 2022-02-19 21:05:57 -0800 Created attachment 452673 Patch 1843966 2 452676 sihui_liu 2022-02-19 21:24:14 -0800 Created attachment 452676 Patch 1844030 3 452676 cdumez 2022-02-19 23:31:23 -0800 Comment on attachment 452676 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=452676&action=review R=me > Source/WebKit/ChangeLog:18 > + old behavior that synchronouly writes origin file at creation of OriginStorageManager. To sovle the delay issue, Typo: solve > Source/WebKit/ChangeLog:19 > + in the sync message handler (NetworkStorageManager::connectToStorageArea), we specifically asks to not write Typo: ask > Source/WebKit/NetworkProcess/storage/NetworkStorageManager.cpp:726 > + // Avoid delay in replying sync message by delay writing origin to file. By delaying 1844076 4 452698 sihui_liu 2022-02-20 13:12:24 -0800 Created attachment 452698 Patch for landing 1844077 5 452699 sihui_liu 2022-02-20 13:12:51 -0800 Created attachment 452699 Patch for landing 1844083 6 ews-feeder 2022-02-20 15:11:08 -0800 Committed r290233 (247558@main): <https://commits.webkit.org/247558@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 452699. 1844084 7 webkit-bug-importer 2022-02-20 15:12:19 -0800 <rdar://problem/89209181> 452673 2022-02-19 21:05:57 -0800 2022-02-19 21:26:54 -0800 Patch bug-236901-20220219210556.patch text/plain 10333 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMjAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDRmOTg4MzRmYTMyNjdlNDk1 OTJkZjU3NDIzYWVjMmZiZTZlMjQyY2QuLjgzY2YwMTgwMGUyMjA3ZmY0Y2EzNmE2NzM5NjdhZmNm OTkyNzljM2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMjItMDItMTkgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgT3JpZ2luIGZpbGUgbWF5IG5vdCBi ZSBjcmVhdGVkIGFmdGVyIG1pZ3JhdGluZyBkYXRhIHRvIGdlbmVyYWwgc3RvcmFnZSBkaXJlY3Rv cnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjkw MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIHIy ODkwODEsIHdlIHN0YXJ0ZWQgd3JpdGluZyBvcmlnaW4gZmlsZSBhc3luY2hyb25vdWx5ICh3ZSB1 c2VkIHRvIHdyaXRlIGl0IGF0IGNyZWF0aW9uIG9mIAorICAgICAgICBPcmlnaW5TdG9yYWdlTWFu YWdlciksIHRvIGF2b2lkIGRlbGF5IGluIHJlcGx5aW5nIHN5bmMgV2ViU3RvcmFnZSBtZXNzYWdl LiBJbiB0aGUgYXN5bmMgdGFzaywgd2UgY2hlY2sgaWYgdGhlCisgICAgICAgIE9yaWdpblN0b3Jh Z2VNYW5hZ2VyIHN0aWxsIGV4aXN0cy4gSWYgaXQgZG9lcyBub3QsIHdlIHdpbGwgbm90IHdyaXRl IG9yaWdpbiBmaWxlLCBiZWNhdXNlIHRoZSAKKyAgICAgICAgT3JpZ2luU3RvcmFnZU1hbmFnZXIg bWF5IGJlIHJlbW92ZWQgYWZ0ZXIgb3JpZ2luIGRhdGEgZ2V0cyBkZWxldGVkLCBhbmQgdGhlcmUn cyBubyBuZWVkIHRvIGFkZCBuZXcgb3JpZ2luIGZpbGUuCisgICAgICAgIEl0J3MgYWxzbyBwb3Nz aWJsZSB0aGF0IHRoZSBPcmlnaW5TdG9yYWdlTWFuYWdlciBpcyBjcmVhdGVkIGZvciB3ZWJzaXRl IGRhdGEgZmV0Y2gsIGFuZCByZW1vdmVkIGltbWVkaWF0ZWx5IAorICAgICAgICBhZnRlciB0aGUg ZmV0Y2ggdGFzayBpcyBkb25lIChzZWUgTmV0d29ya1N0b3JhZ2VNYW5hZ2VyOjpmZXRjaERhdGFG cm9tRGlzaykuIFdlIHVzZWQgdG8gbm90IHN0b3JlIAorICAgICAgICBuZXcgZGF0YSBpbiBnZW5l cmFsIHN0b3JhZ2UgZGlyZWN0b3J5IGR1cmluZyBkYXRhIGZldGNoLCBzbyBpdCdzIGZpbmUgdG8g bm90IHdyaXRlIG9yaWdpbiBmaWxlIGluIHRoaXMgY2FzZS4gCisKKyAgICAgICAgV2l0aCByMjg5 ODc4LCBleGlzdGluZyBkYXRhIGNhbiBiZSBtaWdyYXRlZCB0byBnZW5lcmFsIHN0b3JhZ2UgZGly ZWN0b3J5IGF0IGRhdGEgZmV0Y2gsIHNvIGl0IGlzIGltcG9ydGFudCB0byAKKyAgICAgICAgZW5z dXJlIHdlIHdyaXRlIG9yaWdpbiB0byBmaWxlOyBvdGhlcndpc2UsIHdlIHdpbGwgbG9zZSB0cmFj ayBvZiB0aGUgb3JpZ2luLiBUbyBzb2x2ZSB0aGlzLCBsZXQncyByZXN0b3JlIHRoZQorICAgICAg ICBvbGQgYmVoYXZpb3IgdGhhdCBzeW5jaHJvbm91bHkgd3JpdGVzIG9yaWdpbiBmaWxlIGF0IGNy ZWF0aW9uIG9mIE9yaWdpblN0b3JhZ2VNYW5hZ2VyLiBUbyBzb3ZsZSB0aGUgZGVsYXkgaXNzdWUs CisgICAgICAgIGluIHRoZSBzeW5jIG1lc3NhZ2UgaGFuZGxlciAoTmV0d29ya1N0b3JhZ2VNYW5h Z2VyOjpjb25uZWN0VG9TdG9yYWdlQXJlYSksIHdlIHNwZWNpZmljYWxseSBhc2tzIHRvIG5vdCB3 cml0ZSAKKyAgICAgICAgb3JpZ2luIGZpbGUsIGFuZCBtYW51YWxseSB3cml0ZSBvcmlnaW4gZmls ZSBhZnRlciBtZXNzYWdlIGlzIHJlcGxpZWQuIAorCisgICAgICAgIFVwZGF0ZWQgZXhpc3Rpbmcg QVBJIHRlc3QgdG8gY292ZXIgdGhlIGNhc2UuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9z dG9yYWdlL05ldHdvcmtTdG9yYWdlTWFuYWdlci5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdv cmtTdG9yYWdlTWFuYWdlcjo6bG9jYWxPcmlnaW5TdG9yYWdlTWFuYWdlcik6CisgICAgICAgIChX ZWJLaXQ6Ok5ldHdvcmtTdG9yYWdlTWFuYWdlcjo6Y29ubmVjdFRvU3RvcmFnZUFyZWEpOgorICAg ICAgICAqIE5ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvTmV0d29ya1N0b3JhZ2VNYW5hZ2VyLmg6CisK IDIwMjItMDItMTggIFNpaHVpIExpdSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CiAKICAgICAgICAg QVNTRVJUSU9OIEZBSUxFRDogIWhhc0FueU9wZW5Db25uZWN0aW9ucygpIGluIFVuaXF1ZUlEQkRh dGFiYXNlOjp+VW5pcXVlSURCRGF0YWJhc2UoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL05ldHdvcmtTdG9yYWdlTWFuYWdlci5jcHAgYi9Tb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvTmV0d29ya1N0b3JhZ2VNYW5hZ2VyLmNwcApp bmRleCBiM2M4N2I5ZTYzZTIyZTI4NmYwZWJlMjkxYzUxNDM5NGVmZTcwNDhjLi5lOTllNzY0Y2Nk OGE1OGIyNTQ4YzQ2OTY1ZTczMmNjZDEzZWRmYjRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvTmV0d29ya1N0b3JhZ2VNYW5hZ2VyLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvTmV0d29ya1N0b3JhZ2VNYW5hZ2Vy LmNwcApAQCAtMjQyLDIxICsyNDIsMTQgQEAgc3RhdGljIFN0cmluZyBvcmlnaW5GaWxlUGF0aChj b25zdCBTdHJpbmcmIGRpcmVjdG9yeSkKICAgICByZXR1cm4gRmlsZVN5c3RlbTo6cGF0aEJ5QXBw ZW5kaW5nQ29tcG9uZW50KGRpcmVjdG9yeSwgT3JpZ2luU3RvcmFnZU1hbmFnZXI6Om9yaWdpbkZp bGVJZGVudGlmaWVyKCkpOwogfQogCi1PcmlnaW5TdG9yYWdlTWFuYWdlciYgTmV0d29ya1N0b3Jh Z2VNYW5hZ2VyOjpsb2NhbE9yaWdpblN0b3JhZ2VNYW5hZ2VyKGNvbnN0IFdlYkNvcmU6OkNsaWVu dE9yaWdpbiYgb3JpZ2luKQorT3JpZ2luU3RvcmFnZU1hbmFnZXImIE5ldHdvcmtTdG9yYWdlTWFu YWdlcjo6bG9jYWxPcmlnaW5TdG9yYWdlTWFuYWdlcihjb25zdCBXZWJDb3JlOjpDbGllbnRPcmln aW4mIG9yaWdpbiwgU2hvdWxkV3JpdGVPcmlnaW5GaWxlIHNob3VsZFdyaXRlT3JpZ2luRmlsZSkK IHsKICAgICBBU1NFUlQoIVJ1bkxvb3A6OmlzTWFpbigpKTsKIAogICAgIHJldHVybiAqbV9sb2Nh bE9yaWdpblN0b3JhZ2VNYW5hZ2Vycy5lbnN1cmUob3JpZ2luLCBbJl0gewogICAgICAgICBhdXRv IG9yaWdpbkRpcmVjdG9yeSA9IG9yaWdpbkRpcmVjdG9yeVBhdGgobV9wYXRoLCBvcmlnaW4sIG1f c2FsdCk7Ci0gICAgICAgIC8vIFdyaXRlIG9yaWdpbiBmaWxlIGFzeW5jaHJvbm91c2x5IHRvIGF2 b2lkIGRlbGF5IGluIHJlcGx5aW5nIHN5bmMgbWVzc2FnZXMgZm9yIFdlYiBTdG9yYWdlIEFQSS4K LSAgICAgICAgaWYgKCFvcmlnaW5EaXJlY3RvcnkuaXNFbXB0eSgpKSB7Ci0gICAgICAgICAgICBt X3F1ZXVlLT5kaXNwYXRjaChbdGhpcywgcHJvdGVjdGVkVGhpcyA9IFJlZiB7ICp0aGlzIH0sIG9y aWdpbiwgb3JpZ2luRGlyZWN0b3J5XSgpIG11dGFibGUgewotICAgICAgICAgICAgICAgIGlmICgh bV9sb2NhbE9yaWdpblN0b3JhZ2VNYW5hZ2Vycy5jb250YWlucyhvcmlnaW4pKQotICAgICAgICAg ICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgICAgICAgICB3cml0ZU9yaWdpblRvRmlsZUlm TmVjZXNzYXJ5KG9yaWdpbkZpbGVQYXRoKG9yaWdpbkRpcmVjdG9yeSksIG9yaWdpbik7Ci0gICAg ICAgICAgICB9KTsKLSAgICAgICAgfQorICAgICAgICBpZiAoIW9yaWdpbkRpcmVjdG9yeS5pc0Vt cHR5KCkgJiYgc2hvdWxkV3JpdGVPcmlnaW5GaWxlID09IFNob3VsZFdyaXRlT3JpZ2luRmlsZTo6 WWVzKQorICAgICAgICAgICAgd3JpdGVPcmlnaW5Ub0ZpbGVJZk5lY2Vzc2FyeShvcmlnaW5GaWxl UGF0aChvcmlnaW5EaXJlY3RvcnkpLCBvcmlnaW4pOwogICAgICAgICBhdXRvIGxvY2FsU3RvcmFn ZVBhdGggPSBMb2NhbFN0b3JhZ2VNYW5hZ2VyOjpsb2NhbFN0b3JhZ2VGaWxlUGF0aChtX2N1c3Rv bUxvY2FsU3RvcmFnZVBhdGgsIG9yaWdpbik7CiAgICAgICAgIGF1dG8gaWRiU3RvcmFnZVBhdGgg PSBJREJTdG9yYWdlTWFuYWdlcjo6aWRiU3RvcmFnZU9yaWdpbkRpcmVjdG9yeShtX2N1c3RvbUlE QlN0b3JhZ2VQYXRoLCBvcmlnaW4pOwogICAgICAgICBhdXRvIGNhY2hlU3RvcmFnZVBhdGggPSBD YWNoZVN0b3JhZ2U6OkVuZ2luZTo6c3RvcmFnZVBhdGgobV9jdXN0b21DYWNoZVN0b3JhZ2VQYXRo LCBvcmlnaW4pOwpAQCAtNzQ0LDcgKzczNywxNyBAQCB2b2lkIE5ldHdvcmtTdG9yYWdlTWFuYWdl cjo6Y29ubmVjdFRvU3RvcmFnZUFyZWEoSVBDOjpDb25uZWN0aW9uJiBjb25uZWN0aW9uLCBXZQog ICAgIEFTU0VSVCghUnVuTG9vcDo6aXNNYWluKCkpOwogCiAgICAgYXV0byBjb25uZWN0aW9uSWRl bnRpZmllciA9IGNvbm5lY3Rpb24udW5pcXVlSUQoKTsKLSAgICBhdXRvJiBvcmlnaW5TdG9yYWdl TWFuYWdlciA9IGxvY2FsT3JpZ2luU3RvcmFnZU1hbmFnZXIob3JpZ2luKTsKKyAgICBib29sIHdp bGxDcmVhdGVPcmlnaW5TdG9yYWdlTWFuYWdlciA9ICFtX2xvY2FsT3JpZ2luU3RvcmFnZU1hbmFn ZXJzLmNvbnRhaW5zKG9yaWdpbik7CisgICAgLy8gQXZvaWQgZGVsYXkgaW4gcmVwbHlpbmcgc3lu YyBtZXNzYWdlIGJ5IGRlbGF5IHdyaXRpbmcgb3JpZ2luIHRvIGZpbGUuCisgICAgYXV0byYgb3Jp Z2luU3RvcmFnZU1hbmFnZXIgPSBsb2NhbE9yaWdpblN0b3JhZ2VNYW5hZ2VyKG9yaWdpbiwgU2hv dWxkV3JpdGVPcmlnaW5GaWxlOjpObyk7CisgICAgYXV0byB3cml0ZU9yaWdpbkZpbGUgPSBtYWtl U2NvcGVFeGl0KFsmXSB7CisgICAgICAgIGlmICghd2lsbENyZWF0ZU9yaWdpblN0b3JhZ2VNYW5h Z2VyKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIGlmIChhdXRvIG9yaWdpbkRpcmVj dG9yeSA9IG9yaWdpbkRpcmVjdG9yeVBhdGgobV9wYXRoLCBvcmlnaW4sIG1fc2FsdCk7ICFvcmln aW5EaXJlY3RvcnkuaXNFbXB0eSgpKQorICAgICAgICAgICAgd3JpdGVPcmlnaW5Ub0ZpbGVJZk5l Y2Vzc2FyeShvcmlnaW5GaWxlUGF0aChvcmlnaW5EaXJlY3RvcnkpLCBvcmlnaW4pOworICAgIH0p OworCiAgICAgU3RvcmFnZUFyZWFJZGVudGlmaWVyIHJlc3VsdElkZW50aWZpZXI7CiAgICAgc3dp dGNoICh0eXBlKSB7CiAgICAgY2FzZSBXZWJDb3JlOjpTdG9yYWdlVHlwZTo6TG9jYWw6CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvTmV0d29ya1N0b3Jh Z2VNYW5hZ2VyLmggYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvTmV0d29y a1N0b3JhZ2VNYW5hZ2VyLmgKaW5kZXggMGU1YmJhNzYwOWNhZmUxMjQyZTA4ZWQ2YWNmMzZjMjMz ZDgzMDFjNy4uMjJmY2QxMDcxMDIzNmUzM2IzYTllNTI3YjExYWQwM2E5ZWNiZWYyZCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL05ldHdvcmtTdG9yYWdl TWFuYWdlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9OZXR3 b3JrU3RvcmFnZU1hbmFnZXIuaApAQCAtOTcsNyArOTcsOCBAQCBwdWJsaWM6CiBwcml2YXRlOgog ICAgIE5ldHdvcmtTdG9yYWdlTWFuYWdlcihQQUw6OlNlc3Npb25JRCwgSVBDOjpDb25uZWN0aW9u OjpVbmlxdWVJRCwgY29uc3QgU3RyaW5nJiBwYXRoLCBjb25zdCBTdHJpbmcmIGN1c3RvbUxvY2Fs U3RvcmFnZVBhdGgsIGNvbnN0IFN0cmluZyYgY3VzdG9tSURCU3RvcmFnZVBhdGgsIGNvbnN0IFN0 cmluZyYgY3VzdG9tQ2FjaGVTdG9yYWdlUGF0aCwgdWludDY0X3QgZGVmYXVsdE9yaWdpblF1b3Rh LCB1aW50NjRfdCBkZWZhdWx0VGhpcmRQYXJ0eU9yaWdpblF1b3RhLCBib29sIHNob3VsZFVzZUN1 c3RvbVBhdGhzKTsKICAgICB+TmV0d29ya1N0b3JhZ2VNYW5hZ2VyKCk7Ci0gICAgT3JpZ2luU3Rv cmFnZU1hbmFnZXImIGxvY2FsT3JpZ2luU3RvcmFnZU1hbmFnZXIoY29uc3QgV2ViQ29yZTo6Q2xp ZW50T3JpZ2luJik7CisgICAgZW51bSBjbGFzcyBTaG91bGRXcml0ZU9yaWdpbkZpbGUgOiBib29s IHsgTm8sIFllcyB9OworICAgIE9yaWdpblN0b3JhZ2VNYW5hZ2VyJiBsb2NhbE9yaWdpblN0b3Jh Z2VNYW5hZ2VyKGNvbnN0IFdlYkNvcmU6OkNsaWVudE9yaWdpbiYsIFNob3VsZFdyaXRlT3JpZ2lu RmlsZSA9IFNob3VsZFdyaXRlT3JpZ2luRmlsZTo6WWVzKTsKICAgICBib29sIHJlbW92ZU9yaWdp blN0b3JhZ2VNYW5hZ2VySWZQb3NzaWJsZShjb25zdCBXZWJDb3JlOjpDbGllbnRPcmlnaW4mKTsK ICAgICB2b2lkIGRlbGV0ZU9yaWdpbkRpcmVjdG9yeUlmUG9zc2libGUoY29uc3QgV2ViQ29yZTo6 Q2xpZW50T3JpZ2luJik7CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0No YW5nZUxvZwppbmRleCBlMDEwY2M0NTExMjAyMDA2OWM2NGQ3Y2JkMGY0MjlkODdjYTM0NzM2Li44 OTZjMTBhZTA5YzBiNGI4YjMyYTZkZjljOWYyZTY0YmNjMTBmMzgxIDEwMDY0NAotLS0gYS9Ub29s cy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjIt MDItMTkgIFNpaHVpIExpdSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgT3JpZ2lu IGZpbGUgbWF5IG5vdCBiZSBjcmVhdGVkIGFmdGVyIG1pZ3JhdGluZyBkYXRhIHRvIGdlbmVyYWwg c3RvcmFnZSBkaXJlY3RvcnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIzNjkwMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XZWJzaXRlRGF0YVN0 b3JlQ3VzdG9tUGF0aHMubW06CisgICAgICAgIChURVNUKToKKwogMjAyMi0wMi0xOCAgRGF2aWQg S2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFtUb29sc10gU2FuaXRpemVy IGJ1aWxkcyBzaG91bGQgb2JleSBgc2V0LXdlYmtpdC1jb25maWd1cmF0aW9uIC0tZm9yY2Utb3B0 aW1pemF0aW9uLWxldmVsYApkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXRDb2NvYS9XZWJzaXRlRGF0YVN0b3JlQ3VzdG9tUGF0aHMubW0gYi9Ub29scy9UZXN0V2Vi S2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dlYnNpdGVEYXRhU3RvcmVDdXN0b21QYXRocy5tbQpp bmRleCAwZDczOTMzZjk2Y2ZiYWYwZThmOGVmMjY4ZjMyYzc1Mjg0NjQwOTRjLi5jMzgzMTU5NDM1 MzAzOGRkYzY1MGVmMWJlNTE4Y2EzNDEzZTYyYjE1IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2Vi S2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dlYnNpdGVEYXRhU3RvcmVDdXN0b21QYXRocy5tbQor KysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dlYnNpdGVEYXRhU3Rv cmVDdXN0b21QYXRocy5tbQpAQCAtOTYyLDggKzk2MiwxMCBAQCBURVNUKFdlYktpdCwgRmV0Y2hE YXRhQWZ0ZXJFbmFibGluZ0dlbmVyYWxTdG9yYWdlRGlyZWN0b3J5KQogICAgIE5TVVJMICp3ZWJr aXRHZW5lcmFsU3RvcmFnZURpcmVjdG9yeSA9IFtnZW5lcmFsU3RvcmFnZURpcmVjdG9yeSBVUkxC eUFwcGVuZGluZ1BhdGhDb21wb25lbnQ6QCJZVW5fd2dSNTFWTFZvOWxjNXhpaXZBelo4VE1tb2pv YTBJYlczMjNxaWJzL1lVbl93Z1I1MVZMVm85bGM1eGlpdkF6WjhUTW1vam9hMEliVzMyM3FpYnMi XTsKICAgICBOU1VSTCAqd2Via2l0R2VuZXJhbExvY2FsU3RvcmFnZURpcmVjdG9yeSA9IFt3ZWJr aXRHZW5lcmFsU3RvcmFnZURpcmVjdG9yeSBVUkxCeUFwcGVuZGluZ1BhdGhDb21wb25lbnQ6QCJM b2NhbFN0b3JhZ2UiXTsKICAgICBOU1VSTCAqd2ViS2l0R2VuZXJhbExvY2FsU3RvcmFnZUZpbGUg PSBbd2Via2l0R2VuZXJhbExvY2FsU3RvcmFnZURpcmVjdG9yeSBVUkxCeUFwcGVuZGluZ1BhdGhD b21wb25lbnQ6QCJsb2NhbHN0b3JhZ2Uuc3FsaXRlMyJdOwotICAgIE5TVVJMICphcHBsZUdlbmVy YWxMb2NhbFN0b3JhZ2VGaWxlID0gW2dlbmVyYWxTdG9yYWdlRGlyZWN0b3J5IFVSTEJ5QXBwZW5k aW5nUGF0aENvbXBvbmVudDpAInhLSzhYUWVIZWJ4aFN6TXlvdE9PdE5LcDJqV1o0bF9DRU40V2dn WVlYYkkveEtLOFhRZUhlYnhoU3pNeW90T090TktwMmpXWjRsX0NFTjRXZ2dZWVhiSS9Mb2NhbFN0 b3JhZ2UvbG9jYWxzdG9yYWdlLnNxbGl0ZTMiXTsKLSAgICBOU1VSTCAqYXBwbGVHZW5lcmFsSW5k ZXhlZERCRGF0YWJhc2VGaWxlID0gW2dlbmVyYWxTdG9yYWdlRGlyZWN0b3J5IFVSTEJ5QXBwZW5k aW5nUGF0aENvbXBvbmVudDpAInhLSzhYUWVIZWJ4aFN6TXlvdE9PdE5LcDJqV1o0bF9DRU40V2dn WVlYYkkveEtLOFhRZUhlYnhoU3pNeW90T090TktwMmpXWjRsX0NFTjRXZ2dZWVhiSS9JbmRleGVk REIvNjIwQUQ1NDgwMDBCMEE0OUMwMkQyRThENzVDMzJFMEY4NTY5N0I1NERGODYxNDZFQ0FFMzYw REUxMDRBQjNGOS9JbmRleGVkREIuc3FsaXRlMyJdOworICAgIE5TVVJMICphcHBsZUdlbmVyYWxT dG9yYWdlRGlyZWN0b3J5ID0gW2dlbmVyYWxTdG9yYWdlRGlyZWN0b3J5IFVSTEJ5QXBwZW5kaW5n UGF0aENvbXBvbmVudDpAInhLSzhYUWVIZWJ4aFN6TXlvdE9PdE5LcDJqV1o0bF9DRU40V2dnWVlY YkkveEtLOFhRZUhlYnhoU3pNeW90T090TktwMmpXWjRsX0NFTjRXZ2dZWVhiSSJdOworICAgIE5T VVJMICphcHBsZUdlbmVyYWxPcmlnaW5GaWxlID0gW2FwcGxlR2VuZXJhbFN0b3JhZ2VEaXJlY3Rv cnkgVVJMQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAib3JpZ2luIl07CisgICAgTlNVUkwgKmFw cGxlR2VuZXJhbExvY2FsU3RvcmFnZUZpbGUgPSBbYXBwbGVHZW5lcmFsU3RvcmFnZURpcmVjdG9y eSBVUkxCeUFwcGVuZGluZ1BhdGhDb21wb25lbnQ6QCJMb2NhbFN0b3JhZ2UvbG9jYWxzdG9yYWdl LnNxbGl0ZTMiXTsKKyAgICBOU1VSTCAqYXBwbGVHZW5lcmFsSW5kZXhlZERCRGF0YWJhc2VGaWxl ID0gW2FwcGxlR2VuZXJhbFN0b3JhZ2VEaXJlY3RvcnkgVVJMQnlBcHBlbmRpbmdQYXRoQ29tcG9u ZW50OkAiSW5kZXhlZERCLzYyMEFENTQ4MDAwQjBBNDlDMDJEMkU4RDc1QzMyRTBGODU2OTdCNTRE Rjg2MTQ2RUNBRTM2MERFMTA0QUIzRjkvSW5kZXhlZERCLnNxbGl0ZTMiXTsKIAogICAgIC8vIENv cHkgYXBwbGUuY29tIGZpbGVzIHRvIGN1c3RvbSBwYXRoLgogICAgIE5TRmlsZU1hbmFnZXIgKmZp bGVNYW5hZ2VyID0gW05TRmlsZU1hbmFnZXIgZGVmYXVsdE1hbmFnZXJdOwpAQCAtMTAwOSw4ICsx MDExLDE4IEBAIFRFU1QoV2ViS2l0LCBGZXRjaERhdGFBZnRlckVuYWJsaW5nR2VuZXJhbFN0b3Jh Z2VEaXJlY3RvcnkpCiAgICAgLy8gRW5zdXJlIGFwcGxlLmNvbSBkYXRhIGlzIG1vdmVkIHRvIG5l dyBwYXRoIGFmdGVyIGZldGNoLgogICAgIEVYUEVDVF9GQUxTRShbZmlsZU1hbmFnZXIgZmlsZUV4 aXN0c0F0UGF0aDphcHBsZUN1c3RvbUxvY2FsU3RvcmFnZUZpbGUucGF0aF0pOwogICAgIEVYUEVD VF9GQUxTRShbZmlsZU1hbmFnZXIgZmlsZUV4aXN0c0F0UGF0aDphcHBsZUN1c3RvbUluZGV4ZWRE QkRhdGFiYXNlRmlsZS5wYXRoXSk7CisgICAgRVhQRUNUX1RSVUUoW2ZpbGVNYW5hZ2VyIGZpbGVF eGlzdHNBdFBhdGg6YXBwbGVHZW5lcmFsT3JpZ2luRmlsZS5wYXRoXSk7CiAgICAgRVhQRUNUX1RS VUUoW2ZpbGVNYW5hZ2VyIGZpbGVFeGlzdHNBdFBhdGg6YXBwbGVHZW5lcmFsTG9jYWxTdG9yYWdl RmlsZS5wYXRoXSk7CiAgICAgRVhQRUNUX1RSVUUoW2ZpbGVNYW5hZ2VyIGZpbGVFeGlzdHNBdFBh dGg6YXBwbGVHZW5lcmFsSW5kZXhlZERCRGF0YWJhc2VGaWxlLnBhdGhdKTsKKworICAgIGRvbmUg PSBmYWxzZTsKKyAgICBbd2Vic2l0ZURhdGFTdG9yZSBmZXRjaERhdGFSZWNvcmRzT2ZUeXBlczpk YXRhVHlwZXMgY29tcGxldGlvbkhhbmRsZXI6XihOU0FycmF5PFdLV2Vic2l0ZURhdGFSZWNvcmQg Kj4gKnJlY29yZHMpIHsKKyAgICAgICAgRVhQRUNUX0VRKHJlY29yZHMuY291bnQsIDJ1KTsKKyAg ICAgICAgYXV0byBzb3J0ZWRSZWNvcmRzID0gW3JlY29yZHMgc29ydGVkQXJyYXlVc2luZ0NvbXBh cmF0b3I6c29ydEZ1bmN0aW9uXTsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAiYXBwbGUuY29t IiwgW1tzb3J0ZWRSZWNvcmRzIG9iamVjdEF0SW5kZXg6MF0gZGlzcGxheU5hbWVdKTsKKyAgICAg ICAgZG9uZSA9IHRydWU7CisgICAgfV07CisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZk b25lKTsKIH0KIAogVEVTVChXZWJLaXQsIERlbGV0ZURhdGFBZnRlckVuYWJsaW5nR2VuZXJhbFN0 b3JhZ2VEaXJlY3RvcnkpCg== 452676 2022-02-19 21:24:14 -0800 2022-02-20 13:12:21 -0800 Patch bug-236901-20220219212413.patch text/plain 11305 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMjIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGNjNGJmYTU0YWE3MzEyZGZk OWJkNzBlNGM3MmVlMTNjMjU5MjU1YmEuLmMzYTRkNzEyMzc0YjY4OTQwZmIxZDljNDUyZjIyMmNl ZDRkZDgwYjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMjItMDItMTkgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgT3JpZ2luIGZpbGUgbWF5IG5vdCBi ZSBjcmVhdGVkIGFmdGVyIG1pZ3JhdGluZyBkYXRhIHRvIGdlbmVyYWwgc3RvcmFnZSBkaXJlY3Rv cnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjkw MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIHIy ODkwODEsIHdlIHN0YXJ0ZWQgd3JpdGluZyBvcmlnaW4gZmlsZSBhc3luY2hyb25vdWx5ICh3ZSB1 c2VkIHRvIHdyaXRlIGl0IGF0IGNyZWF0aW9uIG9mIAorICAgICAgICBPcmlnaW5TdG9yYWdlTWFu YWdlciksIHRvIGF2b2lkIGRlbGF5IGluIHJlcGx5aW5nIHN5bmMgV2ViU3RvcmFnZSBtZXNzYWdl LiBJbiB0aGUgYXN5bmMgdGFzaywgd2UgY2hlY2sgaWYgdGhlCisgICAgICAgIE9yaWdpblN0b3Jh Z2VNYW5hZ2VyIHN0aWxsIGV4aXN0cy4gSWYgaXQgZG9lcyBub3QsIHdlIHdpbGwgbm90IHdyaXRl IG9yaWdpbiBmaWxlLCBiZWNhdXNlIHRoZSAKKyAgICAgICAgT3JpZ2luU3RvcmFnZU1hbmFnZXIg bWF5IGJlIHJlbW92ZWQgYWZ0ZXIgb3JpZ2luIGRhdGEgZ2V0cyBkZWxldGVkLCBhbmQgdGhlcmUn cyBubyBuZWVkIHRvIGFkZCBuZXcgb3JpZ2luIGZpbGUuCisgICAgICAgIEl0J3MgYWxzbyBwb3Nz aWJsZSB0aGF0IHRoZSBPcmlnaW5TdG9yYWdlTWFuYWdlciBpcyBjcmVhdGVkIGZvciB3ZWJzaXRl IGRhdGEgZmV0Y2gsIGFuZCByZW1vdmVkIGltbWVkaWF0ZWx5IAorICAgICAgICBhZnRlciB0aGUg ZmV0Y2ggdGFzayBpcyBkb25lIChzZWUgTmV0d29ya1N0b3JhZ2VNYW5hZ2VyOjpmZXRjaERhdGFG cm9tRGlzaykuIFdlIHVzZWQgdG8gbm90IHN0b3JlIAorICAgICAgICBuZXcgZGF0YSBpbiBnZW5l cmFsIHN0b3JhZ2UgZGlyZWN0b3J5IGR1cmluZyBkYXRhIGZldGNoLCBzbyBpdCdzIGZpbmUgdG8g bm90IHdyaXRlIG9yaWdpbiBmaWxlIGluIHRoaXMgY2FzZS4gCisKKyAgICAgICAgV2l0aCByMjg5 ODc4LCBleGlzdGluZyBkYXRhIGNhbiBiZSBtaWdyYXRlZCB0byBnZW5lcmFsIHN0b3JhZ2UgZGly ZWN0b3J5IGF0IGRhdGEgZmV0Y2gsIHNvIGl0IGlzIGltcG9ydGFudCB0byAKKyAgICAgICAgZW5z dXJlIHdlIHdyaXRlIG9yaWdpbiB0byBmaWxlOyBvdGhlcndpc2UsIHdlIHdpbGwgbG9zZSB0cmFj ayBvZiB0aGUgb3JpZ2luLiBUbyBzb2x2ZSB0aGlzLCBsZXQncyByZXN0b3JlIHRoZQorICAgICAg ICBvbGQgYmVoYXZpb3IgdGhhdCBzeW5jaHJvbm91bHkgd3JpdGVzIG9yaWdpbiBmaWxlIGF0IGNy ZWF0aW9uIG9mIE9yaWdpblN0b3JhZ2VNYW5hZ2VyLiBUbyBzb3ZsZSB0aGUgZGVsYXkgaXNzdWUs CisgICAgICAgIGluIHRoZSBzeW5jIG1lc3NhZ2UgaGFuZGxlciAoTmV0d29ya1N0b3JhZ2VNYW5h Z2VyOjpjb25uZWN0VG9TdG9yYWdlQXJlYSksIHdlIHNwZWNpZmljYWxseSBhc2tzIHRvIG5vdCB3 cml0ZSAKKyAgICAgICAgb3JpZ2luIGZpbGUsIGFuZCBtYW51YWxseSB3cml0ZSBvcmlnaW4gZmls ZSBhZnRlciBtZXNzYWdlIGlzIHJlcGxpZWQuIAorCisgICAgICAgIFVwZGF0ZWQgZXhpc3Rpbmcg QVBJIHRlc3QgdG8gYWRkIHRlc3QgY292ZXJhZ2UuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vz cy9zdG9yYWdlL05ldHdvcmtTdG9yYWdlTWFuYWdlci5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5l dHdvcmtTdG9yYWdlTWFuYWdlcjo6bG9jYWxPcmlnaW5TdG9yYWdlTWFuYWdlcik6CisgICAgICAg IChXZWJLaXQ6Ok5ldHdvcmtTdG9yYWdlTWFuYWdlcjo6Y29ubmVjdFRvU3RvcmFnZUFyZWEpOgor ICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvTmV0d29ya1N0b3JhZ2VNYW5hZ2VyLmg6 CisKIDIwMjItMDItMTkgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAK ICAgICAgICAgbWFjQ2F0YWx5c3Q6IFdLV2ViVmlldyBjcmFzaGVzIHdoZW5ldmVyIHRoZSB2aWV3 IGZyYW1lIGNoYW5nZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv c3RvcmFnZS9OZXR3b3JrU3RvcmFnZU1hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9zdG9yYWdlL05ldHdvcmtTdG9yYWdlTWFuYWdlci5jcHAKaW5kZXggOTIxZTRjOGRi NmNmNWI1NjQ5Nzc4MzU0NDRhNjc2YWYyM2IyMGVmNi4uMTc2N2EwM2MwNzg4YmI1ODEzNDAzOGI4 ZjZkNGYzZDkwNTQ2NmVjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9zdG9yYWdlL05ldHdvcmtTdG9yYWdlTWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL05ldHdvcmtTdG9yYWdlTWFuYWdlci5jcHAKQEAgLTIyNywy MSArMjI3LDE0IEBAIHN0YXRpYyBTdHJpbmcgb3JpZ2luRmlsZVBhdGgoY29uc3QgU3RyaW5nJiBk aXJlY3RvcnkpCiAgICAgcmV0dXJuIEZpbGVTeXN0ZW06OnBhdGhCeUFwcGVuZGluZ0NvbXBvbmVu dChkaXJlY3RvcnksIE9yaWdpblN0b3JhZ2VNYW5hZ2VyOjpvcmlnaW5GaWxlSWRlbnRpZmllcigp KTsKIH0KIAotT3JpZ2luU3RvcmFnZU1hbmFnZXImIE5ldHdvcmtTdG9yYWdlTWFuYWdlcjo6bG9j YWxPcmlnaW5TdG9yYWdlTWFuYWdlcihjb25zdCBXZWJDb3JlOjpDbGllbnRPcmlnaW4mIG9yaWdp bikKK09yaWdpblN0b3JhZ2VNYW5hZ2VyJiBOZXR3b3JrU3RvcmFnZU1hbmFnZXI6OmxvY2FsT3Jp Z2luU3RvcmFnZU1hbmFnZXIoY29uc3QgV2ViQ29yZTo6Q2xpZW50T3JpZ2luJiBvcmlnaW4sIFNo b3VsZFdyaXRlT3JpZ2luRmlsZSBzaG91bGRXcml0ZU9yaWdpbkZpbGUpCiB7CiAgICAgQVNTRVJU KCFSdW5Mb29wOjppc01haW4oKSk7CiAKICAgICByZXR1cm4gKm1fbG9jYWxPcmlnaW5TdG9yYWdl TWFuYWdlcnMuZW5zdXJlKG9yaWdpbiwgWyZdIHsKICAgICAgICAgYXV0byBvcmlnaW5EaXJlY3Rv cnkgPSBvcmlnaW5EaXJlY3RvcnlQYXRoKG1fcGF0aCwgb3JpZ2luLCBtX3NhbHQpOwotICAgICAg ICAvLyBXcml0ZSBvcmlnaW4gZmlsZSBhc3luY2hyb25vdXNseSB0byBhdm9pZCBkZWxheSBpbiBy ZXBseWluZyBzeW5jIG1lc3NhZ2VzIGZvciBXZWIgU3RvcmFnZSBBUEkuCi0gICAgICAgIGlmICgh b3JpZ2luRGlyZWN0b3J5LmlzRW1wdHkoKSkgewotICAgICAgICAgICAgbV9xdWV1ZS0+ZGlzcGF0 Y2goW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBSZWYgeyAqdGhpcyB9LCBvcmlnaW4sIG9yaWdpbkRp cmVjdG9yeV0oKSBtdXRhYmxlIHsKLSAgICAgICAgICAgICAgICBpZiAoIW1fbG9jYWxPcmlnaW5T dG9yYWdlTWFuYWdlcnMuY29udGFpbnMob3JpZ2luKSkKLSAgICAgICAgICAgICAgICAgICAgcmV0 dXJuOwotCi0gICAgICAgICAgICAgICAgd3JpdGVPcmlnaW5Ub0ZpbGVJZk5lY2Vzc2FyeShvcmln aW5GaWxlUGF0aChvcmlnaW5EaXJlY3RvcnkpLCBvcmlnaW4pOwotICAgICAgICAgICAgfSk7Ci0g ICAgICAgIH0KKyAgICAgICAgaWYgKCFvcmlnaW5EaXJlY3RvcnkuaXNFbXB0eSgpICYmIHNob3Vs ZFdyaXRlT3JpZ2luRmlsZSA9PSBTaG91bGRXcml0ZU9yaWdpbkZpbGU6OlllcykKKyAgICAgICAg ICAgIHdyaXRlT3JpZ2luVG9GaWxlSWZOZWNlc3Nhcnkob3JpZ2luRmlsZVBhdGgob3JpZ2luRGly ZWN0b3J5KSwgb3JpZ2luKTsKICAgICAgICAgYXV0byBsb2NhbFN0b3JhZ2VQYXRoID0gTG9jYWxT dG9yYWdlTWFuYWdlcjo6bG9jYWxTdG9yYWdlRmlsZVBhdGgobV9jdXN0b21Mb2NhbFN0b3JhZ2VQ YXRoLCBvcmlnaW4pOwogICAgICAgICBhdXRvIGlkYlN0b3JhZ2VQYXRoID0gSURCU3RvcmFnZU1h bmFnZXI6OmlkYlN0b3JhZ2VPcmlnaW5EaXJlY3RvcnkobV9jdXN0b21JREJTdG9yYWdlUGF0aCwg b3JpZ2luKTsKICAgICAgICAgYXV0byBjYWNoZVN0b3JhZ2VQYXRoID0gQ2FjaGVTdG9yYWdlOjpF bmdpbmU6OnN0b3JhZ2VQYXRoKG1fY3VzdG9tQ2FjaGVTdG9yYWdlUGF0aCwgb3JpZ2luKTsKQEAg LTcyOSw3ICs3MjIsMTcgQEAgdm9pZCBOZXR3b3JrU3RvcmFnZU1hbmFnZXI6OmNvbm5lY3RUb1N0 b3JhZ2VBcmVhKElQQzo6Q29ubmVjdGlvbiYgY29ubmVjdGlvbiwgV2UKICAgICBBU1NFUlQoIVJ1 bkxvb3A6OmlzTWFpbigpKTsKIAogICAgIGF1dG8gY29ubmVjdGlvbklkZW50aWZpZXIgPSBjb25u ZWN0aW9uLnVuaXF1ZUlEKCk7Ci0gICAgYXV0byYgb3JpZ2luU3RvcmFnZU1hbmFnZXIgPSBsb2Nh bE9yaWdpblN0b3JhZ2VNYW5hZ2VyKG9yaWdpbik7CisgICAgYm9vbCB3aWxsQ3JlYXRlT3JpZ2lu U3RvcmFnZU1hbmFnZXIgPSAhbV9sb2NhbE9yaWdpblN0b3JhZ2VNYW5hZ2Vycy5jb250YWlucyhv cmlnaW4pOworICAgIC8vIEF2b2lkIGRlbGF5IGluIHJlcGx5aW5nIHN5bmMgbWVzc2FnZSBieSBk ZWxheSB3cml0aW5nIG9yaWdpbiB0byBmaWxlLgorICAgIGF1dG8mIG9yaWdpblN0b3JhZ2VNYW5h Z2VyID0gbG9jYWxPcmlnaW5TdG9yYWdlTWFuYWdlcihvcmlnaW4sIFNob3VsZFdyaXRlT3JpZ2lu RmlsZTo6Tm8pOworICAgIGF1dG8gd3JpdGVPcmlnaW5GaWxlID0gbWFrZVNjb3BlRXhpdChbJl0g eworICAgICAgICBpZiAoIXdpbGxDcmVhdGVPcmlnaW5TdG9yYWdlTWFuYWdlcikKKyAgICAgICAg ICAgIHJldHVybjsKKworICAgICAgICBpZiAoYXV0byBvcmlnaW5EaXJlY3RvcnkgPSBvcmlnaW5E aXJlY3RvcnlQYXRoKG1fcGF0aCwgb3JpZ2luLCBtX3NhbHQpOyAhb3JpZ2luRGlyZWN0b3J5Lmlz RW1wdHkoKSkKKyAgICAgICAgICAgIHdyaXRlT3JpZ2luVG9GaWxlSWZOZWNlc3Nhcnkob3JpZ2lu RmlsZVBhdGgob3JpZ2luRGlyZWN0b3J5KSwgb3JpZ2luKTsKKyAgICB9KTsKKwogICAgIFN0b3Jh Z2VBcmVhSWRlbnRpZmllciByZXN1bHRJZGVudGlmaWVyOwogICAgIHN3aXRjaCAodHlwZSkgewog ICAgIGNhc2UgV2ViQ29yZTo6U3RvcmFnZVR5cGU6OkxvY2FsOgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL05ldHdvcmtTdG9yYWdlTWFuYWdlci5oIGIv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL05ldHdvcmtTdG9yYWdlTWFuYWdl ci5oCmluZGV4IDBlNWJiYTc2MDljYWZlMTI0MmUwOGVkNmFjZjM2YzIzM2Q4MzAxYzcuLjIyZmNk MTA3MTAyMzZlMzNiM2E5ZTUyN2IxMWFkMDNhOWVjYmVmMmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9OZXR3b3JrU3RvcmFnZU1hbmFnZXIuaAorKysg Yi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvTmV0d29ya1N0b3JhZ2VNYW5h Z2VyLmgKQEAgLTk3LDcgKzk3LDggQEAgcHVibGljOgogcHJpdmF0ZToKICAgICBOZXR3b3JrU3Rv cmFnZU1hbmFnZXIoUEFMOjpTZXNzaW9uSUQsIElQQzo6Q29ubmVjdGlvbjo6VW5pcXVlSUQsIGNv bnN0IFN0cmluZyYgcGF0aCwgY29uc3QgU3RyaW5nJiBjdXN0b21Mb2NhbFN0b3JhZ2VQYXRoLCBj b25zdCBTdHJpbmcmIGN1c3RvbUlEQlN0b3JhZ2VQYXRoLCBjb25zdCBTdHJpbmcmIGN1c3RvbUNh Y2hlU3RvcmFnZVBhdGgsIHVpbnQ2NF90IGRlZmF1bHRPcmlnaW5RdW90YSwgdWludDY0X3QgZGVm YXVsdFRoaXJkUGFydHlPcmlnaW5RdW90YSwgYm9vbCBzaG91bGRVc2VDdXN0b21QYXRocyk7CiAg ICAgfk5ldHdvcmtTdG9yYWdlTWFuYWdlcigpOwotICAgIE9yaWdpblN0b3JhZ2VNYW5hZ2VyJiBs b2NhbE9yaWdpblN0b3JhZ2VNYW5hZ2VyKGNvbnN0IFdlYkNvcmU6OkNsaWVudE9yaWdpbiYpOwor ICAgIGVudW0gY2xhc3MgU2hvdWxkV3JpdGVPcmlnaW5GaWxlIDogYm9vbCB7IE5vLCBZZXMgfTsK KyAgICBPcmlnaW5TdG9yYWdlTWFuYWdlciYgbG9jYWxPcmlnaW5TdG9yYWdlTWFuYWdlcihjb25z dCBXZWJDb3JlOjpDbGllbnRPcmlnaW4mLCBTaG91bGRXcml0ZU9yaWdpbkZpbGUgPSBTaG91bGRX cml0ZU9yaWdpbkZpbGU6Olllcyk7CiAgICAgYm9vbCByZW1vdmVPcmlnaW5TdG9yYWdlTWFuYWdl cklmUG9zc2libGUoY29uc3QgV2ViQ29yZTo6Q2xpZW50T3JpZ2luJik7CiAgICAgdm9pZCBkZWxl dGVPcmlnaW5EaXJlY3RvcnlJZlBvc3NpYmxlKGNvbnN0IFdlYkNvcmU6OkNsaWVudE9yaWdpbiYp OwogCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXgg ZjI2NDAyZTA4OGNlZmRmYWUxOGJmN2I1OGVkY2E5NWIxNGJiZDk0Ni4uZjRiY2ZkODZkNWIyOTc0 Y2NkZmM3MWRmMzA2OTFhYmQ1ZDJkNjE2NCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisr KyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIyLTAyLTE5ICBTaWh1aSBM aXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIE9yaWdpbiBmaWxlIG1heSBub3Qg YmUgY3JlYXRlZCBhZnRlciBtaWdyYXRpbmcgZGF0YSB0byBnZW5lcmFsIHN0b3JhZ2UgZGlyZWN0 b3J5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzY5 MDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRl c3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV2Vic2l0ZURhdGFTdG9yZUN1c3RvbVBhdGhz Lm1tOgorICAgICAgICAoVEVTVCk6CisKIDIwMjItMDItMTkgIFNpaHVpIExpdSAgPHNpaHVpX2xp dUBhcHBsZS5jb20+CiAKICAgICAgICAgU2V0IGN1c3RvbSBnZW5lcmFsIHN0b3JhZ2UgZGlyZWN0 b3J5IGZvciBjdXN0b20gV2Vic2l0ZURhdGFTdG9yZSBpbiBUZXN0Q29udHJvbGxlcgpkaWZmIC0t Z2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XZWJzaXRlRGF0YVN0 b3JlQ3VzdG9tUGF0aHMubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29h L1dlYnNpdGVEYXRhU3RvcmVDdXN0b21QYXRocy5tbQppbmRleCAwZDczOTMzZjk2Y2ZiYWYwZThm OGVmMjY4ZjMyYzc1Mjg0NjQwOTRjLi5lM2QwMGMxNDY3MTI4YTllMjRiNWRkYTdjOGE0NjUwMGEx Zjk2NjJmIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29h L1dlYnNpdGVEYXRhU3RvcmVDdXN0b21QYXRocy5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdENvY29hL1dlYnNpdGVEYXRhU3RvcmVDdXN0b21QYXRocy5tbQpAQCAtOTYy LDggKzk2MiwxMCBAQCBURVNUKFdlYktpdCwgRmV0Y2hEYXRhQWZ0ZXJFbmFibGluZ0dlbmVyYWxT dG9yYWdlRGlyZWN0b3J5KQogICAgIE5TVVJMICp3ZWJraXRHZW5lcmFsU3RvcmFnZURpcmVjdG9y eSA9IFtnZW5lcmFsU3RvcmFnZURpcmVjdG9yeSBVUkxCeUFwcGVuZGluZ1BhdGhDb21wb25lbnQ6 QCJZVW5fd2dSNTFWTFZvOWxjNXhpaXZBelo4VE1tb2pvYTBJYlczMjNxaWJzL1lVbl93Z1I1MVZM Vm85bGM1eGlpdkF6WjhUTW1vam9hMEliVzMyM3FpYnMiXTsKICAgICBOU1VSTCAqd2Via2l0R2Vu ZXJhbExvY2FsU3RvcmFnZURpcmVjdG9yeSA9IFt3ZWJraXRHZW5lcmFsU3RvcmFnZURpcmVjdG9y eSBVUkxCeUFwcGVuZGluZ1BhdGhDb21wb25lbnQ6QCJMb2NhbFN0b3JhZ2UiXTsKICAgICBOU1VS TCAqd2ViS2l0R2VuZXJhbExvY2FsU3RvcmFnZUZpbGUgPSBbd2Via2l0R2VuZXJhbExvY2FsU3Rv cmFnZURpcmVjdG9yeSBVUkxCeUFwcGVuZGluZ1BhdGhDb21wb25lbnQ6QCJsb2NhbHN0b3JhZ2Uu c3FsaXRlMyJdOwotICAgIE5TVVJMICphcHBsZUdlbmVyYWxMb2NhbFN0b3JhZ2VGaWxlID0gW2dl bmVyYWxTdG9yYWdlRGlyZWN0b3J5IFVSTEJ5QXBwZW5kaW5nUGF0aENvbXBvbmVudDpAInhLSzhY UWVIZWJ4aFN6TXlvdE9PdE5LcDJqV1o0bF9DRU40V2dnWVlYYkkveEtLOFhRZUhlYnhoU3pNeW90 T090TktwMmpXWjRsX0NFTjRXZ2dZWVhiSS9Mb2NhbFN0b3JhZ2UvbG9jYWxzdG9yYWdlLnNxbGl0 ZTMiXTsKLSAgICBOU1VSTCAqYXBwbGVHZW5lcmFsSW5kZXhlZERCRGF0YWJhc2VGaWxlID0gW2dl bmVyYWxTdG9yYWdlRGlyZWN0b3J5IFVSTEJ5QXBwZW5kaW5nUGF0aENvbXBvbmVudDpAInhLSzhY UWVIZWJ4aFN6TXlvdE9PdE5LcDJqV1o0bF9DRU40V2dnWVlYYkkveEtLOFhRZUhlYnhoU3pNeW90 T090TktwMmpXWjRsX0NFTjRXZ2dZWVhiSS9JbmRleGVkREIvNjIwQUQ1NDgwMDBCMEE0OUMwMkQy RThENzVDMzJFMEY4NTY5N0I1NERGODYxNDZFQ0FFMzYwREUxMDRBQjNGOS9JbmRleGVkREIuc3Fs aXRlMyJdOworICAgIE5TVVJMICphcHBsZUdlbmVyYWxTdG9yYWdlRGlyZWN0b3J5ID0gW2dlbmVy YWxTdG9yYWdlRGlyZWN0b3J5IFVSTEJ5QXBwZW5kaW5nUGF0aENvbXBvbmVudDpAInhLSzhYUWVI ZWJ4aFN6TXlvdE9PdE5LcDJqV1o0bF9DRU40V2dnWVlYYkkveEtLOFhRZUhlYnhoU3pNeW90T090 TktwMmpXWjRsX0NFTjRXZ2dZWVhiSSJdOworICAgIE5TVVJMICphcHBsZUdlbmVyYWxPcmlnaW5G aWxlID0gW2FwcGxlR2VuZXJhbFN0b3JhZ2VEaXJlY3RvcnkgVVJMQnlBcHBlbmRpbmdQYXRoQ29t cG9uZW50OkAib3JpZ2luIl07CisgICAgTlNVUkwgKmFwcGxlR2VuZXJhbExvY2FsU3RvcmFnZUZp bGUgPSBbYXBwbGVHZW5lcmFsU3RvcmFnZURpcmVjdG9yeSBVUkxCeUFwcGVuZGluZ1BhdGhDb21w b25lbnQ6QCJMb2NhbFN0b3JhZ2UvbG9jYWxzdG9yYWdlLnNxbGl0ZTMiXTsKKyAgICBOU1VSTCAq YXBwbGVHZW5lcmFsSW5kZXhlZERCRGF0YWJhc2VGaWxlID0gW2FwcGxlR2VuZXJhbFN0b3JhZ2VE aXJlY3RvcnkgVVJMQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiSW5kZXhlZERCLzYyMEFENTQ4 MDAwQjBBNDlDMDJEMkU4RDc1QzMyRTBGODU2OTdCNTRERjg2MTQ2RUNBRTM2MERFMTA0QUIzRjkv SW5kZXhlZERCLnNxbGl0ZTMiXTsKIAogICAgIC8vIENvcHkgYXBwbGUuY29tIGZpbGVzIHRvIGN1 c3RvbSBwYXRoLgogICAgIE5TRmlsZU1hbmFnZXIgKmZpbGVNYW5hZ2VyID0gW05TRmlsZU1hbmFn ZXIgZGVmYXVsdE1hbmFnZXJdOwpAQCAtOTg5LDEyICs5OTEsMTIgQEAgVEVTVChXZWJLaXQsIEZl dGNoRGF0YUFmdGVyRW5hYmxpbmdHZW5lcmFsU3RvcmFnZURpcmVjdG9yeSkKIAogICAgIC8vIEVu c3VyZSBkYXRhIGlzIGZldGNoZWQgZnJvbSBib3RoIGN1c3RvbSBwYXRoIGFuZCBuZXcgcGF0aC4K ICAgICBhdXRvIGRhdGFUeXBlcyA9IFtOU1NldCBzZXRXaXRoT2JqZWN0czpXS1dlYnNpdGVEYXRh VHlwZUxvY2FsU3RvcmFnZSwgV0tXZWJzaXRlRGF0YVR5cGVJbmRleGVkREJEYXRhYmFzZXMsIG5p bF07CisgICAgYXV0byBzb3J0RnVuY3Rpb24gPSBeKFdLV2Vic2l0ZURhdGFSZWNvcmQgKnJlY29y ZDEsIFdLV2Vic2l0ZURhdGFSZWNvcmQgKnJlY29yZDIpIHsKKyAgICAgICAgcmV0dXJuIFtyZWNv cmQxLmRpc3BsYXlOYW1lIGNvbXBhcmU6cmVjb3JkMi5kaXNwbGF5TmFtZV07CisgICAgfTsKICAg ICBkb25lID0gZmFsc2U7CiAgICAgW3dlYnNpdGVEYXRhU3RvcmUgZmV0Y2hEYXRhUmVjb3Jkc09m VHlwZXM6ZGF0YVR5cGVzIGNvbXBsZXRpb25IYW5kbGVyOl4oTlNBcnJheTxXS1dlYnNpdGVEYXRh UmVjb3JkICo+ICpyZWNvcmRzKSB7CiAgICAgICAgIEVYUEVDVF9FUShyZWNvcmRzLmNvdW50LCAy dSk7Ci0gICAgICAgIGF1dG8gc29ydEZ1bmN0aW9uID0gXihXS1dlYnNpdGVEYXRhUmVjb3JkICpy ZWNvcmQxLCBXS1dlYnNpdGVEYXRhUmVjb3JkICpyZWNvcmQyKSB7Ci0gICAgICAgICAgICByZXR1 cm4gW3JlY29yZDEuZGlzcGxheU5hbWUgY29tcGFyZTpyZWNvcmQyLmRpc3BsYXlOYW1lXTsKLSAg ICAgICAgfTsKICAgICAgICAgYXV0byBzb3J0ZWRSZWNvcmRzID0gW3JlY29yZHMgc29ydGVkQXJy YXlVc2luZ0NvbXBhcmF0b3I6c29ydEZ1bmN0aW9uXTsKICAgICAgICAgYXV0byBhcHBsZVJlY29y ZCA9IFtzb3J0ZWRSZWNvcmRzIG9iamVjdEF0SW5kZXg6MF07CiAgICAgICAgIEVYUEVDVF9XS19T VFJFUShAImFwcGxlLmNvbSIsIFthcHBsZVJlY29yZCBkaXNwbGF5TmFtZV0pOwpAQCAtMTAwOSw4 ICsxMDExLDE4IEBAIFRFU1QoV2ViS2l0LCBGZXRjaERhdGFBZnRlckVuYWJsaW5nR2VuZXJhbFN0 b3JhZ2VEaXJlY3RvcnkpCiAgICAgLy8gRW5zdXJlIGFwcGxlLmNvbSBkYXRhIGlzIG1vdmVkIHRv IG5ldyBwYXRoIGFmdGVyIGZldGNoLgogICAgIEVYUEVDVF9GQUxTRShbZmlsZU1hbmFnZXIgZmls ZUV4aXN0c0F0UGF0aDphcHBsZUN1c3RvbUxvY2FsU3RvcmFnZUZpbGUucGF0aF0pOwogICAgIEVY UEVDVF9GQUxTRShbZmlsZU1hbmFnZXIgZmlsZUV4aXN0c0F0UGF0aDphcHBsZUN1c3RvbUluZGV4 ZWREQkRhdGFiYXNlRmlsZS5wYXRoXSk7CisgICAgRVhQRUNUX1RSVUUoW2ZpbGVNYW5hZ2VyIGZp bGVFeGlzdHNBdFBhdGg6YXBwbGVHZW5lcmFsT3JpZ2luRmlsZS5wYXRoXSk7CiAgICAgRVhQRUNU X1RSVUUoW2ZpbGVNYW5hZ2VyIGZpbGVFeGlzdHNBdFBhdGg6YXBwbGVHZW5lcmFsTG9jYWxTdG9y YWdlRmlsZS5wYXRoXSk7CiAgICAgRVhQRUNUX1RSVUUoW2ZpbGVNYW5hZ2VyIGZpbGVFeGlzdHNB dFBhdGg6YXBwbGVHZW5lcmFsSW5kZXhlZERCRGF0YWJhc2VGaWxlLnBhdGhdKTsKKworICAgIGRv bmUgPSBmYWxzZTsKKyAgICBbd2Vic2l0ZURhdGFTdG9yZSBmZXRjaERhdGFSZWNvcmRzT2ZUeXBl czpkYXRhVHlwZXMgY29tcGxldGlvbkhhbmRsZXI6XihOU0FycmF5PFdLV2Vic2l0ZURhdGFSZWNv cmQgKj4gKnJlY29yZHMpIHsKKyAgICAgICAgRVhQRUNUX0VRKHJlY29yZHMuY291bnQsIDJ1KTsK KyAgICAgICAgYXV0byBzb3J0ZWRSZWNvcmRzID0gW3JlY29yZHMgc29ydGVkQXJyYXlVc2luZ0Nv bXBhcmF0b3I6c29ydEZ1bmN0aW9uXTsKKyAgICAgICAgRVhQRUNUX1dLX1NUUkVRKEAiYXBwbGUu Y29tIiwgW1tzb3J0ZWRSZWNvcmRzIG9iamVjdEF0SW5kZXg6MF0gZGlzcGxheU5hbWVdKTsKKyAg ICAgICAgZG9uZSA9IHRydWU7CisgICAgfV07CisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVu KCZkb25lKTsKIH0KIAogVEVTVChXZWJLaXQsIERlbGV0ZURhdGFBZnRlckVuYWJsaW5nR2VuZXJh bFN0b3JhZ2VEaXJlY3RvcnkpCg== 452698 2022-02-20 13:12:24 -0800 2022-02-20 13:12:49 -0800 Patch for landing bug-236901-20220220131220.patch text/plain 11312 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMjMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDVmZjRiOTYxYTJkMzIxZDFk MzNkY2ZmODcyNzMwZGZlMzVmNmNlZmMuLjEyNjE0YmQzYThlYTEyYTEyZDZkYTFjY2FjZmExY2Ix ZjAwMjliYWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMgQEAKKzIwMjItMDItMjAgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgT3JpZ2luIGZpbGUgbWF5IG5vdCBi ZSBjcmVhdGVkIGFmdGVyIG1pZ3JhdGluZyBkYXRhIHRvIGdlbmVyYWwgc3RvcmFnZSBkaXJlY3Rv cnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjkw MQorCisgICAgICAgIFJldmlld2VkIGJ5IENocmlzIER1bWV6LgorCisgICAgICAgIFJldmlld2Vk IGJ5IENocmlzIER1bWV6LgorCisgICAgICAgIEluIHIyODkwODEsIHdlIHN0YXJ0ZWQgd3JpdGlu ZyBvcmlnaW4gZmlsZSBhc3luY2hyb25vdWx5ICh3ZSB1c2VkIHRvIHdyaXRlIGl0IGF0IGNyZWF0 aW9uIG9mIAorICAgICAgICBPcmlnaW5TdG9yYWdlTWFuYWdlciksIHRvIGF2b2lkIGRlbGF5IGlu IHJlcGx5aW5nIHN5bmMgV2ViU3RvcmFnZSBtZXNzYWdlLiBJbiB0aGUgYXN5bmMgdGFzaywgd2Ug Y2hlY2sgaWYgdGhlCisgICAgICAgIE9yaWdpblN0b3JhZ2VNYW5hZ2VyIHN0aWxsIGV4aXN0cy4g SWYgaXQgZG9lcyBub3QsIHdlIHdpbGwgbm90IHdyaXRlIG9yaWdpbiBmaWxlLCBiZWNhdXNlIHRo ZSAKKyAgICAgICAgT3JpZ2luU3RvcmFnZU1hbmFnZXIgbWF5IGJlIHJlbW92ZWQgYWZ0ZXIgb3Jp Z2luIGRhdGEgZ2V0cyBkZWxldGVkLCBhbmQgdGhlcmUncyBubyBuZWVkIHRvIGFkZCBuZXcgb3Jp Z2luIGZpbGUuCisgICAgICAgIEl0J3MgYWxzbyBwb3NzaWJsZSB0aGF0IHRoZSBPcmlnaW5TdG9y YWdlTWFuYWdlciBpcyBjcmVhdGVkIGZvciB3ZWJzaXRlIGRhdGEgZmV0Y2gsIGFuZCByZW1vdmVk IGltbWVkaWF0ZWx5IAorICAgICAgICBhZnRlciB0aGUgZmV0Y2ggdGFzayBpcyBkb25lIChzZWUg TmV0d29ya1N0b3JhZ2VNYW5hZ2VyOjpmZXRjaERhdGFGcm9tRGlzaykuIFdlIHVzZWQgdG8gbm90 IHN0b3JlIAorICAgICAgICBuZXcgZGF0YSBpbiBnZW5lcmFsIHN0b3JhZ2UgZGlyZWN0b3J5IGR1 cmluZyBkYXRhIGZldGNoLCBzbyBpdCdzIGZpbmUgdG8gbm90IHdyaXRlIG9yaWdpbiBmaWxlIGlu IHRoaXMgY2FzZS4gCisKKyAgICAgICAgV2l0aCByMjg5ODc4LCBleGlzdGluZyBkYXRhIGNhbiBi ZSBtaWdyYXRlZCB0byBnZW5lcmFsIHN0b3JhZ2UgZGlyZWN0b3J5IGF0IGRhdGEgZmV0Y2gsIHNv IGl0IGlzIGltcG9ydGFudCB0byAKKyAgICAgICAgZW5zdXJlIHdlIHdyaXRlIG9yaWdpbiB0byBm aWxlOyBvdGhlcndpc2UsIHdlIHdpbGwgbG9zZSB0cmFjayBvZiB0aGUgb3JpZ2luLiBUbyBzb2x2 ZSB0aGlzLCBsZXQncyByZXN0b3JlIHRoZQorICAgICAgICBvbGQgYmVoYXZpb3IgdGhhdCBzeW5j aHJvbm91bHkgd3JpdGVzIG9yaWdpbiBmaWxlIGF0IGNyZWF0aW9uIG9mIE9yaWdpblN0b3JhZ2VN YW5hZ2VyLiBUbyBzb2x2ZSB0aGUgZGVsYXkgaXNzdWUsCisgICAgICAgIGluIHRoZSBzeW5jIG1l c3NhZ2UgaGFuZGxlciAoTmV0d29ya1N0b3JhZ2VNYW5hZ2VyOjpjb25uZWN0VG9TdG9yYWdlQXJl YSksIHdlIHNwZWNpZmljYWxseSBhc2sgdG8gbm90IHdyaXRlIAorICAgICAgICBvcmlnaW4gZmls ZSwgYW5kIG1hbnVhbGx5IHdyaXRlIG9yaWdpbiBmaWxlIGFmdGVyIG1lc3NhZ2UgaXMgcmVwbGll ZC4gCisKKyAgICAgICAgVXBkYXRlZCBleGlzdGluZyBBUEkgdGVzdCB0byBhZGQgdGVzdCBjb3Zl cmFnZS4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvTmV0d29ya1N0b3JhZ2VN YW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1N0b3JhZ2VNYW5hZ2VyOjpsb2Nh bE9yaWdpblN0b3JhZ2VNYW5hZ2VyKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1N0b3JhZ2VN YW5hZ2VyOjpjb25uZWN0VG9TdG9yYWdlQXJlYSk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3Mv c3RvcmFnZS9OZXR3b3JrU3RvcmFnZU1hbmFnZXIuaDoKKwogMjAyMi0wMi0yMCAgQnJhbmRvbiBT dGV3YXJ0ICA8YnJhbmRvbnN0ZXdhcnRAYXBwbGUuY29tPgogCiAgICAgICAgIEdlbmVyYXRlIGNv bXBpbGVfY29tbWFuZHMuanNvbiBvbiBtYWNPUyBCdWlsZHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9OZXR3b3JrU3RvcmFnZU1hbmFnZXIuY3BwIGIv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL05ldHdvcmtTdG9yYWdlTWFuYWdl ci5jcHAKaW5kZXggOTIxZTRjOGRiNmNmNWI1NjQ5Nzc4MzU0NDRhNjc2YWYyM2IyMGVmNi4uNzM5 YzE1MjE0MWJhMjk4OWZhZDU5NzJlN2MzYjc5Y2I5ZGNhMjI5YyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL05ldHdvcmtTdG9yYWdlTWFuYWdlci5jcHAK KysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL05ldHdvcmtTdG9yYWdl TWFuYWdlci5jcHAKQEAgLTIyNywyMSArMjI3LDE0IEBAIHN0YXRpYyBTdHJpbmcgb3JpZ2luRmls ZVBhdGgoY29uc3QgU3RyaW5nJiBkaXJlY3RvcnkpCiAgICAgcmV0dXJuIEZpbGVTeXN0ZW06OnBh dGhCeUFwcGVuZGluZ0NvbXBvbmVudChkaXJlY3RvcnksIE9yaWdpblN0b3JhZ2VNYW5hZ2VyOjpv cmlnaW5GaWxlSWRlbnRpZmllcigpKTsKIH0KIAotT3JpZ2luU3RvcmFnZU1hbmFnZXImIE5ldHdv cmtTdG9yYWdlTWFuYWdlcjo6bG9jYWxPcmlnaW5TdG9yYWdlTWFuYWdlcihjb25zdCBXZWJDb3Jl OjpDbGllbnRPcmlnaW4mIG9yaWdpbikKK09yaWdpblN0b3JhZ2VNYW5hZ2VyJiBOZXR3b3JrU3Rv cmFnZU1hbmFnZXI6OmxvY2FsT3JpZ2luU3RvcmFnZU1hbmFnZXIoY29uc3QgV2ViQ29yZTo6Q2xp ZW50T3JpZ2luJiBvcmlnaW4sIFNob3VsZFdyaXRlT3JpZ2luRmlsZSBzaG91bGRXcml0ZU9yaWdp bkZpbGUpCiB7CiAgICAgQVNTRVJUKCFSdW5Mb29wOjppc01haW4oKSk7CiAKICAgICByZXR1cm4g Km1fbG9jYWxPcmlnaW5TdG9yYWdlTWFuYWdlcnMuZW5zdXJlKG9yaWdpbiwgWyZdIHsKICAgICAg ICAgYXV0byBvcmlnaW5EaXJlY3RvcnkgPSBvcmlnaW5EaXJlY3RvcnlQYXRoKG1fcGF0aCwgb3Jp Z2luLCBtX3NhbHQpOwotICAgICAgICAvLyBXcml0ZSBvcmlnaW4gZmlsZSBhc3luY2hyb25vdXNs eSB0byBhdm9pZCBkZWxheSBpbiByZXBseWluZyBzeW5jIG1lc3NhZ2VzIGZvciBXZWIgU3RvcmFn ZSBBUEkuCi0gICAgICAgIGlmICghb3JpZ2luRGlyZWN0b3J5LmlzRW1wdHkoKSkgewotICAgICAg ICAgICAgbV9xdWV1ZS0+ZGlzcGF0Y2goW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBSZWYgeyAqdGhp cyB9LCBvcmlnaW4sIG9yaWdpbkRpcmVjdG9yeV0oKSBtdXRhYmxlIHsKLSAgICAgICAgICAgICAg ICBpZiAoIW1fbG9jYWxPcmlnaW5TdG9yYWdlTWFuYWdlcnMuY29udGFpbnMob3JpZ2luKSkKLSAg ICAgICAgICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgICAgICAgICAgd3JpdGVPcmlnaW5U b0ZpbGVJZk5lY2Vzc2FyeShvcmlnaW5GaWxlUGF0aChvcmlnaW5EaXJlY3RvcnkpLCBvcmlnaW4p OwotICAgICAgICAgICAgfSk7Ci0gICAgICAgIH0KKyAgICAgICAgaWYgKCFvcmlnaW5EaXJlY3Rv cnkuaXNFbXB0eSgpICYmIHNob3VsZFdyaXRlT3JpZ2luRmlsZSA9PSBTaG91bGRXcml0ZU9yaWdp bkZpbGU6OlllcykKKyAgICAgICAgICAgIHdyaXRlT3JpZ2luVG9GaWxlSWZOZWNlc3Nhcnkob3Jp Z2luRmlsZVBhdGgob3JpZ2luRGlyZWN0b3J5KSwgb3JpZ2luKTsKICAgICAgICAgYXV0byBsb2Nh bFN0b3JhZ2VQYXRoID0gTG9jYWxTdG9yYWdlTWFuYWdlcjo6bG9jYWxTdG9yYWdlRmlsZVBhdGgo bV9jdXN0b21Mb2NhbFN0b3JhZ2VQYXRoLCBvcmlnaW4pOwogICAgICAgICBhdXRvIGlkYlN0b3Jh Z2VQYXRoID0gSURCU3RvcmFnZU1hbmFnZXI6OmlkYlN0b3JhZ2VPcmlnaW5EaXJlY3RvcnkobV9j dXN0b21JREJTdG9yYWdlUGF0aCwgb3JpZ2luKTsKICAgICAgICAgYXV0byBjYWNoZVN0b3JhZ2VQ YXRoID0gQ2FjaGVTdG9yYWdlOjpFbmdpbmU6OnN0b3JhZ2VQYXRoKG1fY3VzdG9tQ2FjaGVTdG9y YWdlUGF0aCwgb3JpZ2luKTsKQEAgLTcyOSw3ICs3MjIsMTcgQEAgdm9pZCBOZXR3b3JrU3RvcmFn ZU1hbmFnZXI6OmNvbm5lY3RUb1N0b3JhZ2VBcmVhKElQQzo6Q29ubmVjdGlvbiYgY29ubmVjdGlv biwgV2UKICAgICBBU1NFUlQoIVJ1bkxvb3A6OmlzTWFpbigpKTsKIAogICAgIGF1dG8gY29ubmVj dGlvbklkZW50aWZpZXIgPSBjb25uZWN0aW9uLnVuaXF1ZUlEKCk7Ci0gICAgYXV0byYgb3JpZ2lu U3RvcmFnZU1hbmFnZXIgPSBsb2NhbE9yaWdpblN0b3JhZ2VNYW5hZ2VyKG9yaWdpbik7CisgICAg Ym9vbCB3aWxsQ3JlYXRlT3JpZ2luU3RvcmFnZU1hbmFnZXIgPSAhbV9sb2NhbE9yaWdpblN0b3Jh Z2VNYW5hZ2Vycy5jb250YWlucyhvcmlnaW4pOworICAgIC8vIEF2b2lkIGRlbGF5IGluIHJlcGx5 aW5nIHN5bmMgbWVzc2FnZSBieSB3cml0aW5nIG9yaWdpbiBmaWxlIGFmdGVyIHJlcGx5aW5nIG1l c3NhZ2UuCisgICAgYXV0byYgb3JpZ2luU3RvcmFnZU1hbmFnZXIgPSBsb2NhbE9yaWdpblN0b3Jh Z2VNYW5hZ2VyKG9yaWdpbiwgU2hvdWxkV3JpdGVPcmlnaW5GaWxlOjpObyk7CisgICAgYXV0byB3 cml0ZU9yaWdpbkZpbGUgPSBtYWtlU2NvcGVFeGl0KFsmXSB7CisgICAgICAgIGlmICghd2lsbENy ZWF0ZU9yaWdpblN0b3JhZ2VNYW5hZ2VyKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAg IGlmIChhdXRvIG9yaWdpbkRpcmVjdG9yeSA9IG9yaWdpbkRpcmVjdG9yeVBhdGgobV9wYXRoLCBv cmlnaW4sIG1fc2FsdCk7ICFvcmlnaW5EaXJlY3RvcnkuaXNFbXB0eSgpKQorICAgICAgICAgICAg d3JpdGVPcmlnaW5Ub0ZpbGVJZk5lY2Vzc2FyeShvcmlnaW5GaWxlUGF0aChvcmlnaW5EaXJlY3Rv cnkpLCBvcmlnaW4pOworICAgIH0pOworCiAgICAgU3RvcmFnZUFyZWFJZGVudGlmaWVyIHJlc3Vs dElkZW50aWZpZXI7CiAgICAgc3dpdGNoICh0eXBlKSB7CiAgICAgY2FzZSBXZWJDb3JlOjpTdG9y YWdlVHlwZTo6TG9jYWw6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L3N0b3JhZ2UvTmV0d29ya1N0b3JhZ2VNYW5hZ2VyLmggYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL3N0b3JhZ2UvTmV0d29ya1N0b3JhZ2VNYW5hZ2VyLmgKaW5kZXggMGU1YmJhNzYwOWNh ZmUxMjQyZTA4ZWQ2YWNmMzZjMjMzZDgzMDFjNy4uMjJmY2QxMDcxMDIzNmUzM2IzYTllNTI3YjEx YWQwM2E5ZWNiZWYyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9z dG9yYWdlL05ldHdvcmtTdG9yYWdlTWFuYWdlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3Mvc3RvcmFnZS9OZXR3b3JrU3RvcmFnZU1hbmFnZXIuaApAQCAtOTcsNyArOTcsOCBA QCBwdWJsaWM6CiBwcml2YXRlOgogICAgIE5ldHdvcmtTdG9yYWdlTWFuYWdlcihQQUw6OlNlc3Np b25JRCwgSVBDOjpDb25uZWN0aW9uOjpVbmlxdWVJRCwgY29uc3QgU3RyaW5nJiBwYXRoLCBjb25z dCBTdHJpbmcmIGN1c3RvbUxvY2FsU3RvcmFnZVBhdGgsIGNvbnN0IFN0cmluZyYgY3VzdG9tSURC U3RvcmFnZVBhdGgsIGNvbnN0IFN0cmluZyYgY3VzdG9tQ2FjaGVTdG9yYWdlUGF0aCwgdWludDY0 X3QgZGVmYXVsdE9yaWdpblF1b3RhLCB1aW50NjRfdCBkZWZhdWx0VGhpcmRQYXJ0eU9yaWdpblF1 b3RhLCBib29sIHNob3VsZFVzZUN1c3RvbVBhdGhzKTsKICAgICB+TmV0d29ya1N0b3JhZ2VNYW5h Z2VyKCk7Ci0gICAgT3JpZ2luU3RvcmFnZU1hbmFnZXImIGxvY2FsT3JpZ2luU3RvcmFnZU1hbmFn ZXIoY29uc3QgV2ViQ29yZTo6Q2xpZW50T3JpZ2luJik7CisgICAgZW51bSBjbGFzcyBTaG91bGRX cml0ZU9yaWdpbkZpbGUgOiBib29sIHsgTm8sIFllcyB9OworICAgIE9yaWdpblN0b3JhZ2VNYW5h Z2VyJiBsb2NhbE9yaWdpblN0b3JhZ2VNYW5hZ2VyKGNvbnN0IFdlYkNvcmU6OkNsaWVudE9yaWdp biYsIFNob3VsZFdyaXRlT3JpZ2luRmlsZSA9IFNob3VsZFdyaXRlT3JpZ2luRmlsZTo6WWVzKTsK ICAgICBib29sIHJlbW92ZU9yaWdpblN0b3JhZ2VNYW5hZ2VySWZQb3NzaWJsZShjb25zdCBXZWJD b3JlOjpDbGllbnRPcmlnaW4mKTsKICAgICB2b2lkIGRlbGV0ZU9yaWdpbkRpcmVjdG9yeUlmUG9z c2libGUoY29uc3QgV2ViQ29yZTo6Q2xpZW50T3JpZ2luJik7CiAKZGlmZiAtLWdpdCBhL1Rvb2xz L0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBiMGI0YTRlNTQxODY3NmE1MTljZTYy YjEwMjQ2ZmU4N2VhMDMzNTNlLi41MDFiZTBlNmM0NjYwZDQ4ZDJiNWUwZDhkMjA3MDgxMzEzYTA5 NmVmIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTMgQEAKKzIwMjItMDItMjAgIFNpaHVpIExpdSAgPHNpaHVpX2xpdUBhcHBsZS5j b20+CisKKyAgICAgICAgT3JpZ2luIGZpbGUgbWF5IG5vdCBiZSBjcmVhdGVkIGFmdGVyIG1pZ3Jh dGluZyBkYXRhIHRvIGdlbmVyYWwgc3RvcmFnZSBkaXJlY3RvcnkKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjkwMQorCisgICAgICAgIFJldmlld2Vk IGJ5IENocmlzIER1bWV6LgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRD b2NvYS9XZWJzaXRlRGF0YVN0b3JlQ3VzdG9tUGF0aHMubW06CisgICAgICAgIChURVNUKToKKwog MjAyMi0wMi0yMCAgQnJhbmRvbiBTdGV3YXJ0ICA8YnJhbmRvbnN0ZXdhcnRAYXBwbGUuY29tPgog CiAgICAgICAgIEdlbmVyYXRlIGNvbXBpbGVfY29tbWFuZHMuanNvbiBvbiBtYWNPUyBCdWlsZHMK ZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV2Vic2l0 ZURhdGFTdG9yZUN1c3RvbVBhdGhzLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXRDb2NvYS9XZWJzaXRlRGF0YVN0b3JlQ3VzdG9tUGF0aHMubW0KaW5kZXggMGQ3MzkzM2Y5NmNm YmFmMGU4ZjhlZjI2OGYzMmM3NTI4NDY0MDk0Yy4uZTNkMDBjMTQ2NzEyOGE5ZTI0YjVkZGE3Yzhh NDY1MDBhMWY5NjYyZiAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXRDb2NvYS9XZWJzaXRlRGF0YVN0b3JlQ3VzdG9tUGF0aHMubW0KKysrIGIvVG9vbHMvVGVzdFdl YktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XZWJzaXRlRGF0YVN0b3JlQ3VzdG9tUGF0aHMubW0K QEAgLTk2Miw4ICs5NjIsMTAgQEAgVEVTVChXZWJLaXQsIEZldGNoRGF0YUFmdGVyRW5hYmxpbmdH ZW5lcmFsU3RvcmFnZURpcmVjdG9yeSkKICAgICBOU1VSTCAqd2Via2l0R2VuZXJhbFN0b3JhZ2VE aXJlY3RvcnkgPSBbZ2VuZXJhbFN0b3JhZ2VEaXJlY3RvcnkgVVJMQnlBcHBlbmRpbmdQYXRoQ29t cG9uZW50OkAiWVVuX3dnUjUxVkxWbzlsYzV4aWl2QXpaOFRNbW9qb2EwSWJXMzIzcWlicy9ZVW5f d2dSNTFWTFZvOWxjNXhpaXZBelo4VE1tb2pvYTBJYlczMjNxaWJzIl07CiAgICAgTlNVUkwgKndl YmtpdEdlbmVyYWxMb2NhbFN0b3JhZ2VEaXJlY3RvcnkgPSBbd2Via2l0R2VuZXJhbFN0b3JhZ2VE aXJlY3RvcnkgVVJMQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiTG9jYWxTdG9yYWdlIl07CiAg ICAgTlNVUkwgKndlYktpdEdlbmVyYWxMb2NhbFN0b3JhZ2VGaWxlID0gW3dlYmtpdEdlbmVyYWxM b2NhbFN0b3JhZ2VEaXJlY3RvcnkgVVJMQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAibG9jYWxz dG9yYWdlLnNxbGl0ZTMiXTsKLSAgICBOU1VSTCAqYXBwbGVHZW5lcmFsTG9jYWxTdG9yYWdlRmls ZSA9IFtnZW5lcmFsU3RvcmFnZURpcmVjdG9yeSBVUkxCeUFwcGVuZGluZ1BhdGhDb21wb25lbnQ6 QCJ4S0s4WFFlSGVieGhTek15b3RPT3ROS3AyaldaNGxfQ0VONFdnZ1lZWGJJL3hLSzhYUWVIZWJ4 aFN6TXlvdE9PdE5LcDJqV1o0bF9DRU40V2dnWVlYYkkvTG9jYWxTdG9yYWdlL2xvY2Fsc3RvcmFn ZS5zcWxpdGUzIl07Ci0gICAgTlNVUkwgKmFwcGxlR2VuZXJhbEluZGV4ZWREQkRhdGFiYXNlRmls ZSA9IFtnZW5lcmFsU3RvcmFnZURpcmVjdG9yeSBVUkxCeUFwcGVuZGluZ1BhdGhDb21wb25lbnQ6 QCJ4S0s4WFFlSGVieGhTek15b3RPT3ROS3AyaldaNGxfQ0VONFdnZ1lZWGJJL3hLSzhYUWVIZWJ4 aFN6TXlvdE9PdE5LcDJqV1o0bF9DRU40V2dnWVlYYkkvSW5kZXhlZERCLzYyMEFENTQ4MDAwQjBB NDlDMDJEMkU4RDc1QzMyRTBGODU2OTdCNTRERjg2MTQ2RUNBRTM2MERFMTA0QUIzRjkvSW5kZXhl ZERCLnNxbGl0ZTMiXTsKKyAgICBOU1VSTCAqYXBwbGVHZW5lcmFsU3RvcmFnZURpcmVjdG9yeSA9 IFtnZW5lcmFsU3RvcmFnZURpcmVjdG9yeSBVUkxCeUFwcGVuZGluZ1BhdGhDb21wb25lbnQ6QCJ4 S0s4WFFlSGVieGhTek15b3RPT3ROS3AyaldaNGxfQ0VONFdnZ1lZWGJJL3hLSzhYUWVIZWJ4aFN6 TXlvdE9PdE5LcDJqV1o0bF9DRU40V2dnWVlYYkkiXTsKKyAgICBOU1VSTCAqYXBwbGVHZW5lcmFs T3JpZ2luRmlsZSA9IFthcHBsZUdlbmVyYWxTdG9yYWdlRGlyZWN0b3J5IFVSTEJ5QXBwZW5kaW5n UGF0aENvbXBvbmVudDpAIm9yaWdpbiJdOworICAgIE5TVVJMICphcHBsZUdlbmVyYWxMb2NhbFN0 b3JhZ2VGaWxlID0gW2FwcGxlR2VuZXJhbFN0b3JhZ2VEaXJlY3RvcnkgVVJMQnlBcHBlbmRpbmdQ YXRoQ29tcG9uZW50OkAiTG9jYWxTdG9yYWdlL2xvY2Fsc3RvcmFnZS5zcWxpdGUzIl07CisgICAg TlNVUkwgKmFwcGxlR2VuZXJhbEluZGV4ZWREQkRhdGFiYXNlRmlsZSA9IFthcHBsZUdlbmVyYWxT dG9yYWdlRGlyZWN0b3J5IFVSTEJ5QXBwZW5kaW5nUGF0aENvbXBvbmVudDpAIkluZGV4ZWREQi82 MjBBRDU0ODAwMEIwQTQ5QzAyRDJFOEQ3NUMzMkUwRjg1Njk3QjU0REY4NjE0NkVDQUUzNjBERTEw NEFCM0Y5L0luZGV4ZWREQi5zcWxpdGUzIl07CiAKICAgICAvLyBDb3B5IGFwcGxlLmNvbSBmaWxl cyB0byBjdXN0b20gcGF0aC4KICAgICBOU0ZpbGVNYW5hZ2VyICpmaWxlTWFuYWdlciA9IFtOU0Zp bGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXTsKQEAgLTk4OSwxMiArOTkxLDEyIEBAIFRFU1QoV2Vi S2l0LCBGZXRjaERhdGFBZnRlckVuYWJsaW5nR2VuZXJhbFN0b3JhZ2VEaXJlY3RvcnkpCiAKICAg ICAvLyBFbnN1cmUgZGF0YSBpcyBmZXRjaGVkIGZyb20gYm90aCBjdXN0b20gcGF0aCBhbmQgbmV3 IHBhdGguCiAgICAgYXV0byBkYXRhVHlwZXMgPSBbTlNTZXQgc2V0V2l0aE9iamVjdHM6V0tXZWJz aXRlRGF0YVR5cGVMb2NhbFN0b3JhZ2UsIFdLV2Vic2l0ZURhdGFUeXBlSW5kZXhlZERCRGF0YWJh c2VzLCBuaWxdOworICAgIGF1dG8gc29ydEZ1bmN0aW9uID0gXihXS1dlYnNpdGVEYXRhUmVjb3Jk ICpyZWNvcmQxLCBXS1dlYnNpdGVEYXRhUmVjb3JkICpyZWNvcmQyKSB7CisgICAgICAgIHJldHVy biBbcmVjb3JkMS5kaXNwbGF5TmFtZSBjb21wYXJlOnJlY29yZDIuZGlzcGxheU5hbWVdOworICAg IH07CiAgICAgZG9uZSA9IGZhbHNlOwogICAgIFt3ZWJzaXRlRGF0YVN0b3JlIGZldGNoRGF0YVJl Y29yZHNPZlR5cGVzOmRhdGFUeXBlcyBjb21wbGV0aW9uSGFuZGxlcjpeKE5TQXJyYXk8V0tXZWJz aXRlRGF0YVJlY29yZCAqPiAqcmVjb3JkcykgewogICAgICAgICBFWFBFQ1RfRVEocmVjb3Jkcy5j b3VudCwgMnUpOwotICAgICAgICBhdXRvIHNvcnRGdW5jdGlvbiA9IF4oV0tXZWJzaXRlRGF0YVJl Y29yZCAqcmVjb3JkMSwgV0tXZWJzaXRlRGF0YVJlY29yZCAqcmVjb3JkMikgewotICAgICAgICAg ICAgcmV0dXJuIFtyZWNvcmQxLmRpc3BsYXlOYW1lIGNvbXBhcmU6cmVjb3JkMi5kaXNwbGF5TmFt ZV07Ci0gICAgICAgIH07CiAgICAgICAgIGF1dG8gc29ydGVkUmVjb3JkcyA9IFtyZWNvcmRzIHNv cnRlZEFycmF5VXNpbmdDb21wYXJhdG9yOnNvcnRGdW5jdGlvbl07CiAgICAgICAgIGF1dG8gYXBw bGVSZWNvcmQgPSBbc29ydGVkUmVjb3JkcyBvYmplY3RBdEluZGV4OjBdOwogICAgICAgICBFWFBF Q1RfV0tfU1RSRVEoQCJhcHBsZS5jb20iLCBbYXBwbGVSZWNvcmQgZGlzcGxheU5hbWVdKTsKQEAg LTEwMDksOCArMTAxMSwxOCBAQCBURVNUKFdlYktpdCwgRmV0Y2hEYXRhQWZ0ZXJFbmFibGluZ0dl bmVyYWxTdG9yYWdlRGlyZWN0b3J5KQogICAgIC8vIEVuc3VyZSBhcHBsZS5jb20gZGF0YSBpcyBt b3ZlZCB0byBuZXcgcGF0aCBhZnRlciBmZXRjaC4KICAgICBFWFBFQ1RfRkFMU0UoW2ZpbGVNYW5h Z2VyIGZpbGVFeGlzdHNBdFBhdGg6YXBwbGVDdXN0b21Mb2NhbFN0b3JhZ2VGaWxlLnBhdGhdKTsK ICAgICBFWFBFQ1RfRkFMU0UoW2ZpbGVNYW5hZ2VyIGZpbGVFeGlzdHNBdFBhdGg6YXBwbGVDdXN0 b21JbmRleGVkREJEYXRhYmFzZUZpbGUucGF0aF0pOworICAgIEVYUEVDVF9UUlVFKFtmaWxlTWFu YWdlciBmaWxlRXhpc3RzQXRQYXRoOmFwcGxlR2VuZXJhbE9yaWdpbkZpbGUucGF0aF0pOwogICAg IEVYUEVDVF9UUlVFKFtmaWxlTWFuYWdlciBmaWxlRXhpc3RzQXRQYXRoOmFwcGxlR2VuZXJhbExv Y2FsU3RvcmFnZUZpbGUucGF0aF0pOwogICAgIEVYUEVDVF9UUlVFKFtmaWxlTWFuYWdlciBmaWxl RXhpc3RzQXRQYXRoOmFwcGxlR2VuZXJhbEluZGV4ZWREQkRhdGFiYXNlRmlsZS5wYXRoXSk7CisK KyAgICBkb25lID0gZmFsc2U7CisgICAgW3dlYnNpdGVEYXRhU3RvcmUgZmV0Y2hEYXRhUmVjb3Jk c09mVHlwZXM6ZGF0YVR5cGVzIGNvbXBsZXRpb25IYW5kbGVyOl4oTlNBcnJheTxXS1dlYnNpdGVE YXRhUmVjb3JkICo+ICpyZWNvcmRzKSB7CisgICAgICAgIEVYUEVDVF9FUShyZWNvcmRzLmNvdW50 LCAydSk7CisgICAgICAgIGF1dG8gc29ydGVkUmVjb3JkcyA9IFtyZWNvcmRzIHNvcnRlZEFycmF5 VXNpbmdDb21wYXJhdG9yOnNvcnRGdW5jdGlvbl07CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShA ImFwcGxlLmNvbSIsIFtbc29ydGVkUmVjb3JkcyBvYmplY3RBdEluZGV4OjBdIGRpc3BsYXlOYW1l XSk7CisgICAgICAgIGRvbmUgPSB0cnVlOworICAgIH1dOworICAgIFRlc3RXZWJLaXRBUEk6OlV0 aWw6OnJ1bigmZG9uZSk7CiB9CiAKIFRFU1QoV2ViS2l0LCBEZWxldGVEYXRhQWZ0ZXJFbmFibGlu Z0dlbmVyYWxTdG9yYWdlRGlyZWN0b3J5KQo= 452699 2022-02-20 13:12:51 -0800 2022-02-20 15:11:10 -0800 Patch for landing bug-236901-20220220131248.patch text/plain 11276 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMjMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDVmZjRiOTYxYTJkMzIxZDFk MzNkY2ZmODcyNzMwZGZlMzVmNmNlZmMuLmM2NWY1YzNkODQyMTU1ODZmMTViMjBhYzlmYTg0MzVi ZGJkNjNlMzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMjItMDItMjAgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgT3JpZ2luIGZpbGUgbWF5IG5vdCBi ZSBjcmVhdGVkIGFmdGVyIG1pZ3JhdGluZyBkYXRhIHRvIGdlbmVyYWwgc3RvcmFnZSBkaXJlY3Rv cnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjkw MQorCisgICAgICAgIFJldmlld2VkIGJ5IENocmlzIER1bWV6LgorCisgICAgICAgIEluIHIyODkw ODEsIHdlIHN0YXJ0ZWQgd3JpdGluZyBvcmlnaW4gZmlsZSBhc3luY2hyb25vdWx5ICh3ZSB1c2Vk IHRvIHdyaXRlIGl0IGF0IGNyZWF0aW9uIG9mIAorICAgICAgICBPcmlnaW5TdG9yYWdlTWFuYWdl ciksIHRvIGF2b2lkIGRlbGF5IGluIHJlcGx5aW5nIHN5bmMgV2ViU3RvcmFnZSBtZXNzYWdlLiBJ biB0aGUgYXN5bmMgdGFzaywgd2UgY2hlY2sgaWYgdGhlCisgICAgICAgIE9yaWdpblN0b3JhZ2VN YW5hZ2VyIHN0aWxsIGV4aXN0cy4gSWYgaXQgZG9lcyBub3QsIHdlIHdpbGwgbm90IHdyaXRlIG9y aWdpbiBmaWxlLCBiZWNhdXNlIHRoZSAKKyAgICAgICAgT3JpZ2luU3RvcmFnZU1hbmFnZXIgbWF5 IGJlIHJlbW92ZWQgYWZ0ZXIgb3JpZ2luIGRhdGEgZ2V0cyBkZWxldGVkLCBhbmQgdGhlcmUncyBu byBuZWVkIHRvIGFkZCBuZXcgb3JpZ2luIGZpbGUuCisgICAgICAgIEl0J3MgYWxzbyBwb3NzaWJs ZSB0aGF0IHRoZSBPcmlnaW5TdG9yYWdlTWFuYWdlciBpcyBjcmVhdGVkIGZvciB3ZWJzaXRlIGRh dGEgZmV0Y2gsIGFuZCByZW1vdmVkIGltbWVkaWF0ZWx5IAorICAgICAgICBhZnRlciB0aGUgZmV0 Y2ggdGFzayBpcyBkb25lIChzZWUgTmV0d29ya1N0b3JhZ2VNYW5hZ2VyOjpmZXRjaERhdGFGcm9t RGlzaykuIFdlIHVzZWQgdG8gbm90IHN0b3JlIAorICAgICAgICBuZXcgZGF0YSBpbiBnZW5lcmFs IHN0b3JhZ2UgZGlyZWN0b3J5IGR1cmluZyBkYXRhIGZldGNoLCBzbyBpdCdzIGZpbmUgdG8gbm90 IHdyaXRlIG9yaWdpbiBmaWxlIGluIHRoaXMgY2FzZS4gCisKKyAgICAgICAgV2l0aCByMjg5ODc4 LCBleGlzdGluZyBkYXRhIGNhbiBiZSBtaWdyYXRlZCB0byBnZW5lcmFsIHN0b3JhZ2UgZGlyZWN0 b3J5IGF0IGRhdGEgZmV0Y2gsIHNvIGl0IGlzIGltcG9ydGFudCB0byAKKyAgICAgICAgZW5zdXJl IHdlIHdyaXRlIG9yaWdpbiB0byBmaWxlOyBvdGhlcndpc2UsIHdlIHdpbGwgbG9zZSB0cmFjayBv ZiB0aGUgb3JpZ2luLiBUbyBzb2x2ZSB0aGlzLCBsZXQncyByZXN0b3JlIHRoZQorICAgICAgICBv bGQgYmVoYXZpb3IgdGhhdCBzeW5jaHJvbm91bHkgd3JpdGVzIG9yaWdpbiBmaWxlIGF0IGNyZWF0 aW9uIG9mIE9yaWdpblN0b3JhZ2VNYW5hZ2VyLiBUbyBzb2x2ZSB0aGUgZGVsYXkgaXNzdWUsCisg ICAgICAgIGluIHRoZSBzeW5jIG1lc3NhZ2UgaGFuZGxlciAoTmV0d29ya1N0b3JhZ2VNYW5hZ2Vy Ojpjb25uZWN0VG9TdG9yYWdlQXJlYSksIHdlIHNwZWNpZmljYWxseSBhc2sgdG8gbm90IHdyaXRl IAorICAgICAgICBvcmlnaW4gZmlsZSwgYW5kIG1hbnVhbGx5IHdyaXRlIG9yaWdpbiBmaWxlIGFm dGVyIG1lc3NhZ2UgaXMgcmVwbGllZC4gCisKKyAgICAgICAgVXBkYXRlZCBleGlzdGluZyBBUEkg dGVzdCB0byBhZGQgdGVzdCBjb3ZlcmFnZS4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL3N0 b3JhZ2UvTmV0d29ya1N0b3JhZ2VNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29y a1N0b3JhZ2VNYW5hZ2VyOjpsb2NhbE9yaWdpblN0b3JhZ2VNYW5hZ2VyKToKKyAgICAgICAgKFdl YktpdDo6TmV0d29ya1N0b3JhZ2VNYW5hZ2VyOjpjb25uZWN0VG9TdG9yYWdlQXJlYSk6CisgICAg ICAgICogTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9OZXR3b3JrU3RvcmFnZU1hbmFnZXIuaDoKKwog MjAyMi0wMi0yMCAgQnJhbmRvbiBTdGV3YXJ0ICA8YnJhbmRvbnN0ZXdhcnRAYXBwbGUuY29tPgog CiAgICAgICAgIEdlbmVyYXRlIGNvbXBpbGVfY29tbWFuZHMuanNvbiBvbiBtYWNPUyBCdWlsZHMK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9OZXR3b3Jr U3RvcmFnZU1hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdl L05ldHdvcmtTdG9yYWdlTWFuYWdlci5jcHAKaW5kZXggOTIxZTRjOGRiNmNmNWI1NjQ5Nzc4MzU0 NDRhNjc2YWYyM2IyMGVmNi4uNzM5YzE1MjE0MWJhMjk4OWZhZDU5NzJlN2MzYjc5Y2I5ZGNhMjI5 YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL05ldHdv cmtTdG9yYWdlTWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9z dG9yYWdlL05ldHdvcmtTdG9yYWdlTWFuYWdlci5jcHAKQEAgLTIyNywyMSArMjI3LDE0IEBAIHN0 YXRpYyBTdHJpbmcgb3JpZ2luRmlsZVBhdGgoY29uc3QgU3RyaW5nJiBkaXJlY3RvcnkpCiAgICAg cmV0dXJuIEZpbGVTeXN0ZW06OnBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChkaXJlY3RvcnksIE9y aWdpblN0b3JhZ2VNYW5hZ2VyOjpvcmlnaW5GaWxlSWRlbnRpZmllcigpKTsKIH0KIAotT3JpZ2lu U3RvcmFnZU1hbmFnZXImIE5ldHdvcmtTdG9yYWdlTWFuYWdlcjo6bG9jYWxPcmlnaW5TdG9yYWdl TWFuYWdlcihjb25zdCBXZWJDb3JlOjpDbGllbnRPcmlnaW4mIG9yaWdpbikKK09yaWdpblN0b3Jh Z2VNYW5hZ2VyJiBOZXR3b3JrU3RvcmFnZU1hbmFnZXI6OmxvY2FsT3JpZ2luU3RvcmFnZU1hbmFn ZXIoY29uc3QgV2ViQ29yZTo6Q2xpZW50T3JpZ2luJiBvcmlnaW4sIFNob3VsZFdyaXRlT3JpZ2lu RmlsZSBzaG91bGRXcml0ZU9yaWdpbkZpbGUpCiB7CiAgICAgQVNTRVJUKCFSdW5Mb29wOjppc01h aW4oKSk7CiAKICAgICByZXR1cm4gKm1fbG9jYWxPcmlnaW5TdG9yYWdlTWFuYWdlcnMuZW5zdXJl KG9yaWdpbiwgWyZdIHsKICAgICAgICAgYXV0byBvcmlnaW5EaXJlY3RvcnkgPSBvcmlnaW5EaXJl Y3RvcnlQYXRoKG1fcGF0aCwgb3JpZ2luLCBtX3NhbHQpOwotICAgICAgICAvLyBXcml0ZSBvcmln aW4gZmlsZSBhc3luY2hyb25vdXNseSB0byBhdm9pZCBkZWxheSBpbiByZXBseWluZyBzeW5jIG1l c3NhZ2VzIGZvciBXZWIgU3RvcmFnZSBBUEkuCi0gICAgICAgIGlmICghb3JpZ2luRGlyZWN0b3J5 LmlzRW1wdHkoKSkgewotICAgICAgICAgICAgbV9xdWV1ZS0+ZGlzcGF0Y2goW3RoaXMsIHByb3Rl Y3RlZFRoaXMgPSBSZWYgeyAqdGhpcyB9LCBvcmlnaW4sIG9yaWdpbkRpcmVjdG9yeV0oKSBtdXRh YmxlIHsKLSAgICAgICAgICAgICAgICBpZiAoIW1fbG9jYWxPcmlnaW5TdG9yYWdlTWFuYWdlcnMu Y29udGFpbnMob3JpZ2luKSkKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAg ICAgICAgICAgd3JpdGVPcmlnaW5Ub0ZpbGVJZk5lY2Vzc2FyeShvcmlnaW5GaWxlUGF0aChvcmln aW5EaXJlY3RvcnkpLCBvcmlnaW4pOwotICAgICAgICAgICAgfSk7Ci0gICAgICAgIH0KKyAgICAg ICAgaWYgKCFvcmlnaW5EaXJlY3RvcnkuaXNFbXB0eSgpICYmIHNob3VsZFdyaXRlT3JpZ2luRmls ZSA9PSBTaG91bGRXcml0ZU9yaWdpbkZpbGU6OlllcykKKyAgICAgICAgICAgIHdyaXRlT3JpZ2lu VG9GaWxlSWZOZWNlc3Nhcnkob3JpZ2luRmlsZVBhdGgob3JpZ2luRGlyZWN0b3J5KSwgb3JpZ2lu KTsKICAgICAgICAgYXV0byBsb2NhbFN0b3JhZ2VQYXRoID0gTG9jYWxTdG9yYWdlTWFuYWdlcjo6 bG9jYWxTdG9yYWdlRmlsZVBhdGgobV9jdXN0b21Mb2NhbFN0b3JhZ2VQYXRoLCBvcmlnaW4pOwog ICAgICAgICBhdXRvIGlkYlN0b3JhZ2VQYXRoID0gSURCU3RvcmFnZU1hbmFnZXI6OmlkYlN0b3Jh Z2VPcmlnaW5EaXJlY3RvcnkobV9jdXN0b21JREJTdG9yYWdlUGF0aCwgb3JpZ2luKTsKICAgICAg ICAgYXV0byBjYWNoZVN0b3JhZ2VQYXRoID0gQ2FjaGVTdG9yYWdlOjpFbmdpbmU6OnN0b3JhZ2VQ YXRoKG1fY3VzdG9tQ2FjaGVTdG9yYWdlUGF0aCwgb3JpZ2luKTsKQEAgLTcyOSw3ICs3MjIsMTcg QEAgdm9pZCBOZXR3b3JrU3RvcmFnZU1hbmFnZXI6OmNvbm5lY3RUb1N0b3JhZ2VBcmVhKElQQzo6 Q29ubmVjdGlvbiYgY29ubmVjdGlvbiwgV2UKICAgICBBU1NFUlQoIVJ1bkxvb3A6OmlzTWFpbigp KTsKIAogICAgIGF1dG8gY29ubmVjdGlvbklkZW50aWZpZXIgPSBjb25uZWN0aW9uLnVuaXF1ZUlE KCk7Ci0gICAgYXV0byYgb3JpZ2luU3RvcmFnZU1hbmFnZXIgPSBsb2NhbE9yaWdpblN0b3JhZ2VN YW5hZ2VyKG9yaWdpbik7CisgICAgYm9vbCB3aWxsQ3JlYXRlT3JpZ2luU3RvcmFnZU1hbmFnZXIg PSAhbV9sb2NhbE9yaWdpblN0b3JhZ2VNYW5hZ2Vycy5jb250YWlucyhvcmlnaW4pOworICAgIC8v IEF2b2lkIGRlbGF5IGluIHJlcGx5aW5nIHN5bmMgbWVzc2FnZSBieSB3cml0aW5nIG9yaWdpbiBm aWxlIGFmdGVyIHJlcGx5aW5nIG1lc3NhZ2UuCisgICAgYXV0byYgb3JpZ2luU3RvcmFnZU1hbmFn ZXIgPSBsb2NhbE9yaWdpblN0b3JhZ2VNYW5hZ2VyKG9yaWdpbiwgU2hvdWxkV3JpdGVPcmlnaW5G aWxlOjpObyk7CisgICAgYXV0byB3cml0ZU9yaWdpbkZpbGUgPSBtYWtlU2NvcGVFeGl0KFsmXSB7 CisgICAgICAgIGlmICghd2lsbENyZWF0ZU9yaWdpblN0b3JhZ2VNYW5hZ2VyKQorICAgICAgICAg ICAgcmV0dXJuOworCisgICAgICAgIGlmIChhdXRvIG9yaWdpbkRpcmVjdG9yeSA9IG9yaWdpbkRp cmVjdG9yeVBhdGgobV9wYXRoLCBvcmlnaW4sIG1fc2FsdCk7ICFvcmlnaW5EaXJlY3RvcnkuaXNF bXB0eSgpKQorICAgICAgICAgICAgd3JpdGVPcmlnaW5Ub0ZpbGVJZk5lY2Vzc2FyeShvcmlnaW5G aWxlUGF0aChvcmlnaW5EaXJlY3RvcnkpLCBvcmlnaW4pOworICAgIH0pOworCiAgICAgU3RvcmFn ZUFyZWFJZGVudGlmaWVyIHJlc3VsdElkZW50aWZpZXI7CiAgICAgc3dpdGNoICh0eXBlKSB7CiAg ICAgY2FzZSBXZWJDb3JlOjpTdG9yYWdlVHlwZTo6TG9jYWw6CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvTmV0d29ya1N0b3JhZ2VNYW5hZ2VyLmggYi9T b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvTmV0d29ya1N0b3JhZ2VNYW5hZ2Vy LmgKaW5kZXggMGU1YmJhNzYwOWNhZmUxMjQyZTA4ZWQ2YWNmMzZjMjMzZDgzMDFjNy4uMjJmY2Qx MDcxMDIzNmUzM2IzYTllNTI3YjExYWQwM2E5ZWNiZWYyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL05ldHdvcmtTdG9yYWdlTWFuYWdlci5oCisrKyBi L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9OZXR3b3JrU3RvcmFnZU1hbmFn ZXIuaApAQCAtOTcsNyArOTcsOCBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIE5ldHdvcmtTdG9y YWdlTWFuYWdlcihQQUw6OlNlc3Npb25JRCwgSVBDOjpDb25uZWN0aW9uOjpVbmlxdWVJRCwgY29u c3QgU3RyaW5nJiBwYXRoLCBjb25zdCBTdHJpbmcmIGN1c3RvbUxvY2FsU3RvcmFnZVBhdGgsIGNv bnN0IFN0cmluZyYgY3VzdG9tSURCU3RvcmFnZVBhdGgsIGNvbnN0IFN0cmluZyYgY3VzdG9tQ2Fj aGVTdG9yYWdlUGF0aCwgdWludDY0X3QgZGVmYXVsdE9yaWdpblF1b3RhLCB1aW50NjRfdCBkZWZh dWx0VGhpcmRQYXJ0eU9yaWdpblF1b3RhLCBib29sIHNob3VsZFVzZUN1c3RvbVBhdGhzKTsKICAg ICB+TmV0d29ya1N0b3JhZ2VNYW5hZ2VyKCk7Ci0gICAgT3JpZ2luU3RvcmFnZU1hbmFnZXImIGxv Y2FsT3JpZ2luU3RvcmFnZU1hbmFnZXIoY29uc3QgV2ViQ29yZTo6Q2xpZW50T3JpZ2luJik7Cisg ICAgZW51bSBjbGFzcyBTaG91bGRXcml0ZU9yaWdpbkZpbGUgOiBib29sIHsgTm8sIFllcyB9Owor ICAgIE9yaWdpblN0b3JhZ2VNYW5hZ2VyJiBsb2NhbE9yaWdpblN0b3JhZ2VNYW5hZ2VyKGNvbnN0 IFdlYkNvcmU6OkNsaWVudE9yaWdpbiYsIFNob3VsZFdyaXRlT3JpZ2luRmlsZSA9IFNob3VsZFdy aXRlT3JpZ2luRmlsZTo6WWVzKTsKICAgICBib29sIHJlbW92ZU9yaWdpblN0b3JhZ2VNYW5hZ2Vy SWZQb3NzaWJsZShjb25zdCBXZWJDb3JlOjpDbGllbnRPcmlnaW4mKTsKICAgICB2b2lkIGRlbGV0 ZU9yaWdpbkRpcmVjdG9yeUlmUG9zc2libGUoY29uc3QgV2ViQ29yZTo6Q2xpZW50T3JpZ2luJik7 CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBi MGI0YTRlNTQxODY3NmE1MTljZTYyYjEwMjQ2ZmU4N2VhMDMzNTNlLi41MDFiZTBlNmM0NjYwZDQ4 ZDJiNWUwZDhkMjA3MDgxMzEzYTA5NmVmIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysr IGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjItMDItMjAgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgT3JpZ2luIGZpbGUgbWF5IG5vdCBi ZSBjcmVhdGVkIGFmdGVyIG1pZ3JhdGluZyBkYXRhIHRvIGdlbmVyYWwgc3RvcmFnZSBkaXJlY3Rv cnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjkw MQorCisgICAgICAgIFJldmlld2VkIGJ5IENocmlzIER1bWV6LgorCisgICAgICAgICogVGVzdFdl YktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XZWJzaXRlRGF0YVN0b3JlQ3VzdG9tUGF0aHMubW06 CisgICAgICAgIChURVNUKToKKwogMjAyMi0wMi0yMCAgQnJhbmRvbiBTdGV3YXJ0ICA8YnJhbmRv bnN0ZXdhcnRAYXBwbGUuY29tPgogCiAgICAgICAgIEdlbmVyYXRlIGNvbXBpbGVfY29tbWFuZHMu anNvbiBvbiBtYWNPUyBCdWlsZHMKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz dHMvV2ViS2l0Q29jb2EvV2Vic2l0ZURhdGFTdG9yZUN1c3RvbVBhdGhzLm1tIGIvVG9vbHMvVGVz dFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XZWJzaXRlRGF0YVN0b3JlQ3VzdG9tUGF0aHMu bW0KaW5kZXggMGQ3MzkzM2Y5NmNmYmFmMGU4ZjhlZjI2OGYzMmM3NTI4NDY0MDk0Yy4uZTNkMDBj MTQ2NzEyOGE5ZTI0YjVkZGE3YzhhNDY1MDBhMWY5NjYyZiAxMDA2NDQKLS0tIGEvVG9vbHMvVGVz dFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XZWJzaXRlRGF0YVN0b3JlQ3VzdG9tUGF0aHMu bW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XZWJzaXRlRGF0 YVN0b3JlQ3VzdG9tUGF0aHMubW0KQEAgLTk2Miw4ICs5NjIsMTAgQEAgVEVTVChXZWJLaXQsIEZl dGNoRGF0YUFmdGVyRW5hYmxpbmdHZW5lcmFsU3RvcmFnZURpcmVjdG9yeSkKICAgICBOU1VSTCAq d2Via2l0R2VuZXJhbFN0b3JhZ2VEaXJlY3RvcnkgPSBbZ2VuZXJhbFN0b3JhZ2VEaXJlY3Rvcnkg VVJMQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiWVVuX3dnUjUxVkxWbzlsYzV4aWl2QXpaOFRN bW9qb2EwSWJXMzIzcWlicy9ZVW5fd2dSNTFWTFZvOWxjNXhpaXZBelo4VE1tb2pvYTBJYlczMjNx aWJzIl07CiAgICAgTlNVUkwgKndlYmtpdEdlbmVyYWxMb2NhbFN0b3JhZ2VEaXJlY3RvcnkgPSBb d2Via2l0R2VuZXJhbFN0b3JhZ2VEaXJlY3RvcnkgVVJMQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50 OkAiTG9jYWxTdG9yYWdlIl07CiAgICAgTlNVUkwgKndlYktpdEdlbmVyYWxMb2NhbFN0b3JhZ2VG aWxlID0gW3dlYmtpdEdlbmVyYWxMb2NhbFN0b3JhZ2VEaXJlY3RvcnkgVVJMQnlBcHBlbmRpbmdQ YXRoQ29tcG9uZW50OkAibG9jYWxzdG9yYWdlLnNxbGl0ZTMiXTsKLSAgICBOU1VSTCAqYXBwbGVH ZW5lcmFsTG9jYWxTdG9yYWdlRmlsZSA9IFtnZW5lcmFsU3RvcmFnZURpcmVjdG9yeSBVUkxCeUFw cGVuZGluZ1BhdGhDb21wb25lbnQ6QCJ4S0s4WFFlSGVieGhTek15b3RPT3ROS3AyaldaNGxfQ0VO NFdnZ1lZWGJJL3hLSzhYUWVIZWJ4aFN6TXlvdE9PdE5LcDJqV1o0bF9DRU40V2dnWVlYYkkvTG9j YWxTdG9yYWdlL2xvY2Fsc3RvcmFnZS5zcWxpdGUzIl07Ci0gICAgTlNVUkwgKmFwcGxlR2VuZXJh bEluZGV4ZWREQkRhdGFiYXNlRmlsZSA9IFtnZW5lcmFsU3RvcmFnZURpcmVjdG9yeSBVUkxCeUFw cGVuZGluZ1BhdGhDb21wb25lbnQ6QCJ4S0s4WFFlSGVieGhTek15b3RPT3ROS3AyaldaNGxfQ0VO NFdnZ1lZWGJJL3hLSzhYUWVIZWJ4aFN6TXlvdE9PdE5LcDJqV1o0bF9DRU40V2dnWVlYYkkvSW5k ZXhlZERCLzYyMEFENTQ4MDAwQjBBNDlDMDJEMkU4RDc1QzMyRTBGODU2OTdCNTRERjg2MTQ2RUNB RTM2MERFMTA0QUIzRjkvSW5kZXhlZERCLnNxbGl0ZTMiXTsKKyAgICBOU1VSTCAqYXBwbGVHZW5l cmFsU3RvcmFnZURpcmVjdG9yeSA9IFtnZW5lcmFsU3RvcmFnZURpcmVjdG9yeSBVUkxCeUFwcGVu ZGluZ1BhdGhDb21wb25lbnQ6QCJ4S0s4WFFlSGVieGhTek15b3RPT3ROS3AyaldaNGxfQ0VONFdn Z1lZWGJJL3hLSzhYUWVIZWJ4aFN6TXlvdE9PdE5LcDJqV1o0bF9DRU40V2dnWVlYYkkiXTsKKyAg ICBOU1VSTCAqYXBwbGVHZW5lcmFsT3JpZ2luRmlsZSA9IFthcHBsZUdlbmVyYWxTdG9yYWdlRGly ZWN0b3J5IFVSTEJ5QXBwZW5kaW5nUGF0aENvbXBvbmVudDpAIm9yaWdpbiJdOworICAgIE5TVVJM ICphcHBsZUdlbmVyYWxMb2NhbFN0b3JhZ2VGaWxlID0gW2FwcGxlR2VuZXJhbFN0b3JhZ2VEaXJl Y3RvcnkgVVJMQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OkAiTG9jYWxTdG9yYWdlL2xvY2Fsc3Rv cmFnZS5zcWxpdGUzIl07CisgICAgTlNVUkwgKmFwcGxlR2VuZXJhbEluZGV4ZWREQkRhdGFiYXNl RmlsZSA9IFthcHBsZUdlbmVyYWxTdG9yYWdlRGlyZWN0b3J5IFVSTEJ5QXBwZW5kaW5nUGF0aENv bXBvbmVudDpAIkluZGV4ZWREQi82MjBBRDU0ODAwMEIwQTQ5QzAyRDJFOEQ3NUMzMkUwRjg1Njk3 QjU0REY4NjE0NkVDQUUzNjBERTEwNEFCM0Y5L0luZGV4ZWREQi5zcWxpdGUzIl07CiAKICAgICAv LyBDb3B5IGFwcGxlLmNvbSBmaWxlcyB0byBjdXN0b20gcGF0aC4KICAgICBOU0ZpbGVNYW5hZ2Vy ICpmaWxlTWFuYWdlciA9IFtOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXTsKQEAgLTk4OSwx MiArOTkxLDEyIEBAIFRFU1QoV2ViS2l0LCBGZXRjaERhdGFBZnRlckVuYWJsaW5nR2VuZXJhbFN0 b3JhZ2VEaXJlY3RvcnkpCiAKICAgICAvLyBFbnN1cmUgZGF0YSBpcyBmZXRjaGVkIGZyb20gYm90 aCBjdXN0b20gcGF0aCBhbmQgbmV3IHBhdGguCiAgICAgYXV0byBkYXRhVHlwZXMgPSBbTlNTZXQg c2V0V2l0aE9iamVjdHM6V0tXZWJzaXRlRGF0YVR5cGVMb2NhbFN0b3JhZ2UsIFdLV2Vic2l0ZURh dGFUeXBlSW5kZXhlZERCRGF0YWJhc2VzLCBuaWxdOworICAgIGF1dG8gc29ydEZ1bmN0aW9uID0g XihXS1dlYnNpdGVEYXRhUmVjb3JkICpyZWNvcmQxLCBXS1dlYnNpdGVEYXRhUmVjb3JkICpyZWNv cmQyKSB7CisgICAgICAgIHJldHVybiBbcmVjb3JkMS5kaXNwbGF5TmFtZSBjb21wYXJlOnJlY29y ZDIuZGlzcGxheU5hbWVdOworICAgIH07CiAgICAgZG9uZSA9IGZhbHNlOwogICAgIFt3ZWJzaXRl RGF0YVN0b3JlIGZldGNoRGF0YVJlY29yZHNPZlR5cGVzOmRhdGFUeXBlcyBjb21wbGV0aW9uSGFu ZGxlcjpeKE5TQXJyYXk8V0tXZWJzaXRlRGF0YVJlY29yZCAqPiAqcmVjb3JkcykgewogICAgICAg ICBFWFBFQ1RfRVEocmVjb3Jkcy5jb3VudCwgMnUpOwotICAgICAgICBhdXRvIHNvcnRGdW5jdGlv biA9IF4oV0tXZWJzaXRlRGF0YVJlY29yZCAqcmVjb3JkMSwgV0tXZWJzaXRlRGF0YVJlY29yZCAq cmVjb3JkMikgewotICAgICAgICAgICAgcmV0dXJuIFtyZWNvcmQxLmRpc3BsYXlOYW1lIGNvbXBh cmU6cmVjb3JkMi5kaXNwbGF5TmFtZV07Ci0gICAgICAgIH07CiAgICAgICAgIGF1dG8gc29ydGVk UmVjb3JkcyA9IFtyZWNvcmRzIHNvcnRlZEFycmF5VXNpbmdDb21wYXJhdG9yOnNvcnRGdW5jdGlv bl07CiAgICAgICAgIGF1dG8gYXBwbGVSZWNvcmQgPSBbc29ydGVkUmVjb3JkcyBvYmplY3RBdElu ZGV4OjBdOwogICAgICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJhcHBsZS5jb20iLCBbYXBwbGVSZWNv cmQgZGlzcGxheU5hbWVdKTsKQEAgLTEwMDksOCArMTAxMSwxOCBAQCBURVNUKFdlYktpdCwgRmV0 Y2hEYXRhQWZ0ZXJFbmFibGluZ0dlbmVyYWxTdG9yYWdlRGlyZWN0b3J5KQogICAgIC8vIEVuc3Vy ZSBhcHBsZS5jb20gZGF0YSBpcyBtb3ZlZCB0byBuZXcgcGF0aCBhZnRlciBmZXRjaC4KICAgICBF WFBFQ1RfRkFMU0UoW2ZpbGVNYW5hZ2VyIGZpbGVFeGlzdHNBdFBhdGg6YXBwbGVDdXN0b21Mb2Nh bFN0b3JhZ2VGaWxlLnBhdGhdKTsKICAgICBFWFBFQ1RfRkFMU0UoW2ZpbGVNYW5hZ2VyIGZpbGVF eGlzdHNBdFBhdGg6YXBwbGVDdXN0b21JbmRleGVkREJEYXRhYmFzZUZpbGUucGF0aF0pOworICAg IEVYUEVDVF9UUlVFKFtmaWxlTWFuYWdlciBmaWxlRXhpc3RzQXRQYXRoOmFwcGxlR2VuZXJhbE9y aWdpbkZpbGUucGF0aF0pOwogICAgIEVYUEVDVF9UUlVFKFtmaWxlTWFuYWdlciBmaWxlRXhpc3Rz QXRQYXRoOmFwcGxlR2VuZXJhbExvY2FsU3RvcmFnZUZpbGUucGF0aF0pOwogICAgIEVYUEVDVF9U UlVFKFtmaWxlTWFuYWdlciBmaWxlRXhpc3RzQXRQYXRoOmFwcGxlR2VuZXJhbEluZGV4ZWREQkRh dGFiYXNlRmlsZS5wYXRoXSk7CisKKyAgICBkb25lID0gZmFsc2U7CisgICAgW3dlYnNpdGVEYXRh U3RvcmUgZmV0Y2hEYXRhUmVjb3Jkc09mVHlwZXM6ZGF0YVR5cGVzIGNvbXBsZXRpb25IYW5kbGVy Ol4oTlNBcnJheTxXS1dlYnNpdGVEYXRhUmVjb3JkICo+ICpyZWNvcmRzKSB7CisgICAgICAgIEVY UEVDVF9FUShyZWNvcmRzLmNvdW50LCAydSk7CisgICAgICAgIGF1dG8gc29ydGVkUmVjb3JkcyA9 IFtyZWNvcmRzIHNvcnRlZEFycmF5VXNpbmdDb21wYXJhdG9yOnNvcnRGdW5jdGlvbl07CisgICAg ICAgIEVYUEVDVF9XS19TVFJFUShAImFwcGxlLmNvbSIsIFtbc29ydGVkUmVjb3JkcyBvYmplY3RB dEluZGV4OjBdIGRpc3BsYXlOYW1lXSk7CisgICAgICAgIGRvbmUgPSB0cnVlOworICAgIH1dOwor ICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7CiB9CiAKIFRFU1QoV2ViS2l0LCBE ZWxldGVEYXRhQWZ0ZXJFbmFibGluZ0dlbmVyYWxTdG9yYWdlRGlyZWN0b3J5KQo=