234504 2021-12-19 22:22:22 -0800 [Win] MSVC reports "DownloadBundleWin.cpp(87): error C2362: initialization of 'magic' is skipped by 'goto exit'" with /std:c++20 2021-12-24 13:41:00 -0800 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 233448 1 fujii fujii achristensen darin don.olmstead ross.kirsling webkit-bug-importer oldest_to_newest 1825539 0 fujii 2021-12-19 22:22:22 -0800 [Win] MSVC reports "DownloadBundleWin.cpp(87): error C2362: initialization of 'magic' is skipped by 'goto exit'" with /std:c++20 > Source\WebCore\platform\network\win\DownloadBundleWin.cpp(87): error C2362: initialization of 'magic' is skipped by 'goto exit' > Source\WebCore\platform\network\win\DownloadBundleWin.cpp(80): note: see declaration of 'magic' > Source\WebCore\platform\network\win\DownloadBundleWin.cpp(87): note: see declaration of 'exit' > Source\WebCore\platform\network\win\DownloadBundleWin.cpp(173): error C2362: initialization of 'footerStartPosition' is skipped by 'goto exit' > Source\WebCore\platform\network\win\DownloadBundleWin.cpp(150): note: see declaration of 'footerStartPosition' > Source\WebCore\platform\network\win\DownloadBundleWin.cpp(173): note: see declaration of 'exit' > Source\WebCore\platform\network\win\DownloadBundleWin.cpp(173): error C2362: initialization of 'footerLength' is skipped by 'goto exit' > Source\WebCore\platform\network\win\DownloadBundleWin.cpp(143): note: see declaration of 'footerLength' > Source\WebCore\platform\network\win\DownloadBundleWin.cpp(173): note: see declaration of 'exit' > Source\WebCore\platform\network\win\DownloadBundleWin.cpp(173): error C2362: initialization of 'footerLengthPosition' is skipped by 'goto exit' > Source\WebCore\platform\network\win\DownloadBundleWin.cpp(135): note: see declaration of 'footerLengthPosition' > Source\WebCore\platform\network\win\DownloadBundleWin.cpp(173): note: see declaration of 'exit' > Source\WebCore\platform\network\win\DownloadBundleWin.cpp(173): error C2362: initialization of 'footerMagicNumber' is skipped by 'goto exit' > Source\WebCore\platform\network\win\DownloadBundleWin.cpp(122): note: see declaration of 'footerMagicNumber' > Source\WebCore\platform\network\win\DownloadBundleWin.cpp(173): note: see declaration of 'exit' > Source\WebCore\platform\network\win\DownloadBundleWin.cpp(173): error C2362: initialization of 'footerMagicNumberPosition' is skipped by 'goto exit' > Source\WebCore\platform\network\win\DownloadBundleWin.cpp(115): note: see declaration of 'footerMagicNumberPosition' > Source\WebCore\platform\network\win\DownloadBundleWin.cpp(173): note: see declaration of 'exit' 1825540 1 447584 fujii 2021-12-19 22:25:12 -0800 Created attachment 447584 Patch 1825699 2 447624 fujii 2021-12-20 12:50:37 -0800 Created attachment 447624 Patch 1825704 3 447626 fujii 2021-12-20 12:57:48 -0800 Created attachment 447626 Patch 1825884 4 ews-feeder 2021-12-20 23:20:54 -0800 Committed r287299 (245451@main): <https://commits.webkit.org/245451@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 447626. 1825885 5 webkit-bug-importer 2021-12-20 23:21:16 -0800 <rdar://problem/86755997> 1825913 6 447626 darin 2021-12-21 01:07:27 -0800 Comment on attachment 447626 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=447626&action=review > Source/WebCore/platform/network/win/DownloadBundleWin.cpp:47 > +}; There should not be a semicolon here. > Source/WebCore/platform/network/win/DownloadBundleWin.cpp:72 > + std::unique_ptr<FILE, decltype(&fileCloser)> bundle(bundlePtr, &fileCloser); Should be able to just write std::unique_ptr with no template arguments and rely on the deduction guide to deduce the argument types. > Source/WebCore/platform/network/win/DownloadBundleWin.cpp:107 > + std::unique_ptr<FILE, decltype(&fileCloser)> bundle(bundlePtr, &fileCloser); Ditto. 1826081 7 fujii 2021-12-21 12:06:33 -0800 reopened. 1826108 8 447626 fujii 2021-12-21 14:05:04 -0800 Comment on attachment 447626 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=447626&action=review >> Source/WebCore/platform/network/win/DownloadBundleWin.cpp:72 >> + std::unique_ptr<FILE, decltype(&fileCloser)> bundle(bundlePtr, &fileCloser); > > Should be able to just write std::unique_ptr with no template arguments and rely on the deduction guide to deduce the argument types. std::unique_ptr doesn't have the deduction guide. c++ - Why does std::unique_ptr not permit type inference? - Stack Overflow https://stackoverflow.com/q/41162868 c++ - Why can't unique_ptr's template arguments be deduced? - Stack Overflow https://stackoverflow.com/q/51109767 And, I want to specify a deleter in this case. And, C++17 lambda type doesn't have the default constructor. C++20 can compile the following code. > std::unique_ptr<FILE, decltype(&fileCloser)> bundle(bundlePtr); 1826117 9 darin 2021-12-21 14:38:33 -0800 (In reply to Fujii Hironori from comment #8) > std::unique_ptr doesn't have the deduction guide. I understand why it can’t have one without a deleter; too bad it can’t have one with a deleter. Glad you investigated. 1826166 10 447765 fujii 2021-12-21 16:57:03 -0800 Created attachment 447765 Patch 1826760 11 ews-feeder 2021-12-24 13:40:58 -0800 Committed r287432 (245567@main): <https://commits.webkit.org/245567@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 447765. 447584 2021-12-19 22:25:12 -0800 2021-12-20 12:50:27 -0800 Patch bug-234504-20211220152511.patch text/plain 7145 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MjUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDM0ZGQ0NjEwY2E0M2Rj MDI5YmY2YTBiOWNlNjkwMjZiNTk1YjU4ZS4uODAyZWQ1N2RjYjQ3YmQ1ZDRmOGYwZmM4OWMyYTQw ZDQ2ZTkyMWY5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTEyLTE5ICBGdWpp aSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgorCisgICAgICAgIFtXaW5dIE1T VkMgcmVwb3J0cyAiRG93bmxvYWRCdW5kbGVXaW4uY3BwKDg3KTogZXJyb3IgQzIzNjI6IGluaXRp YWxpemF0aW9uIG9mICdtYWdpYycgaXMgc2tpcHBlZCBieSAnZ290byBleGl0JyIgd2l0aCAvc3Rk OmMrKzIwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MzQ1MDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IHBsYXRmb3JtL25ldHdvcmsvd2luL0Rvd25sb2FkQnVuZGxlV2luLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkRvd25sb2FkQnVuZGxlOjphcHBlbmRSZXN1bWVEYXRhKToKKyAgICAgICAgKFdlYkNv cmU6OkRvd25sb2FkQnVuZGxlOjpleHRyYWN0UmVzdW1lRGF0YSk6CisgICAgICAgIFJlaW1wbGVt ZW50ZWQgd2l0aG91dCBnb3RvIHN0YXRlbWVudHMuCisKIDIwMjEtMTItMTkgIEJyYWR5IEVpZHNv biAgPGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFN0dWIgb3V0IE5vdGlmaWNhdGlvbkV2 ZW50IGFuZCByZWxhdGVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL3dpbi9Eb3dubG9hZEJ1bmRsZVdpbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL3dpbi9Eb3dubG9hZEJ1bmRsZVdpbi5jcHAKaW5kZXggZDgzYzNiMmE2M2IyMmMzOWUx OGMxMjllNDRiYzhmMmQzOGI4YjJjOC4uMDk4ZjY4ZTgzM2YwZTdmZWQwZTYzZWIzZGJjNWRmZTFi MmNiNmZlNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay93aW4v RG93bmxvYWRCdW5kbGVXaW4uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvd2luL0Rvd25sb2FkQnVuZGxlV2luLmNwcApAQCAtNTksMzQgKzU5LDMyIEBAIGJvb2wgYXBw ZW5kUmVzdW1lRGF0YShjb25zdCB1aW50OF90KiByZXN1bWVCeXRlcywgdWludDMyX3QgcmVzdW1l TGVuZ3RoLCBjb25zdCBTCiAgICAgfQogCiAgICAgYXV0byBudWxsaWZpZWRQYXRoID0gYnVuZGxl UGF0aC53aWRlQ2hhcmFjdGVycygpOwotICAgIEZJTEUqIGJ1bmRsZSA9IDA7Ci0gICAgaWYgKF93 Zm9wZW5fcygmYnVuZGxlLCBudWxsaWZpZWRQYXRoLmRhdGEoKSwgVEVYVCgiYWIiKSkgfHwgIWJ1 bmRsZSkgeworICAgIEZJTEUqIGJ1bmRsZVB0ciA9IDA7CisgICAgaWYgKF93Zm9wZW5fcygmYnVu ZGxlUHRyLCBudWxsaWZpZWRQYXRoLmRhdGEoKSwgVEVYVCgiYWIiKSkgfHwgIWJ1bmRsZVB0cikg ewogICAgICAgICBMT0dfRVJST1IoIkZhaWxlZCB0byBvcGVuIGZpbGUgJXMgdG8gYXBwZW5kIHJl c3VtZSBkYXRhIiwgYnVuZGxlUGF0aC5hc2NpaSgpLmRhdGEoKSk7CiAgICAgICAgIHJldHVybiBm YWxzZTsKICAgICB9CisgICAgYXV0byBjbG9zZXIgPSBbXShGSUxFKiBmaWxlKSB7CisgICAgICAg IGZjbG9zZShmaWxlKTsKKyAgICB9OworICAgIHN0ZDo6dW5pcXVlX3B0cjxGSUxFLCBkZWNsdHlw ZShjbG9zZXIpPiBidW5kbGUoYnVuZGxlUHRyKTsKIAotICAgIGJvb2wgcmVzdWx0ID0gZmFsc2U7 Ci0KLSAgICBpZiAoZndyaXRlKHJlc3VtZUJ5dGVzLCAxLCByZXN1bWVMZW5ndGgsIGJ1bmRsZSkg IT0gcmVzdW1lTGVuZ3RoKSB7CisgICAgaWYgKGZ3cml0ZShyZXN1bWVCeXRlcywgMSwgcmVzdW1l TGVuZ3RoLCBidW5kbGUuZ2V0KCkpICE9IHJlc3VtZUxlbmd0aCkgewogICAgICAgICBMT0dfRVJS T1IoIkZhaWxlZCB0byB3cml0ZSByZXN1bWUgZGF0YSB0byB0aGUgYnVuZGxlIC0gZXJybm8oJWkp IiwgZXJybm8pOwotICAgICAgICBnb3RvIGV4aXQ7CisgICAgICAgIHJldHVybiBmYWxzZTsKICAg ICB9CiAKLSAgICBpZiAoZndyaXRlKCZyZXN1bWVMZW5ndGgsIDQsIDEsIGJ1bmRsZSkgIT0gMSkg eworICAgIGlmIChmd3JpdGUoJnJlc3VtZUxlbmd0aCwgNCwgMSwgYnVuZGxlLmdldCgpKSAhPSAx KSB7CiAgICAgICAgIExPR19FUlJPUigiRmFpbGVkIHRvIHdyaXRlIGZvb3RlciBsZW5ndGggdG8g dGhlIGJ1bmRsZSAtIGVycm5vKCVpKSIsIGVycm5vKTsKLSAgICAgICAgZ290byBleGl0OworICAg ICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCiAgICAgY29uc3QgdWludDMyX3QgbWFnaWMgPSBt YWdpY051bWJlcigpOwotICAgIGlmIChmd3JpdGUoJm1hZ2ljLCA0LCAxLCBidW5kbGUpICE9IDEp IHsKKyAgICBpZiAoZndyaXRlKCZtYWdpYywgNCwgMSwgYnVuZGxlLmdldCgpKSAhPSAxKSB7CiAg ICAgICAgIExPR19FUlJPUigiRmFpbGVkIHRvIHdyaXRlIGZvb3RlciBtYWdpYyBudW1iZXIgdG8g dGhlIGJ1bmRsZSAtIGVycm5vKCVpKSIsIGVycm5vKTsKLSAgICAgICAgZ290byBleGl0OworICAg ICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQotCi0gICAgcmVzdWx0ID0gdHJ1ZTsKLWV4aXQ6Ci0g ICAgZmNsb3NlKGJ1bmRsZSk7Ci0gICAgcmV0dXJuIHJlc3VsdDsKKyAgICByZXR1cm4gdHJ1ZTsK IH0KIAogYm9vbCBleHRyYWN0UmVzdW1lRGF0YShjb25zdCBTdHJpbmcmIGJ1bmRsZVBhdGgsIFZl Y3Rvcjx1aW50OF90PiYgcmVzdW1lRGF0YSkKQEAgLTk4LDM2ICs5NiwzOCBAQCBib29sIGV4dHJh Y3RSZXN1bWVEYXRhKGNvbnN0IFN0cmluZyYgYnVuZGxlUGF0aCwgVmVjdG9yPHVpbnQ4X3Q+JiBy ZXN1bWVEYXRhKQogCiAgICAgLy8gT3BlbiBhIGhhbmRsZSB0byB0aGUgYnVuZGxlIGZpbGUKICAg ICBhdXRvIG51bGxpZmllZFBhdGggPSBidW5kbGVQYXRoLndpZGVDaGFyYWN0ZXJzKCk7Ci0gICAg RklMRSogYnVuZGxlID0gMDsKLSAgICBpZiAoX3dmb3Blbl9zKCZidW5kbGUsIG51bGxpZmllZFBh dGguZGF0YSgpLCBURVhUKCJyK2IiKSkgfHwgIWJ1bmRsZSkgeworICAgIEZJTEUqIGJ1bmRsZVB0 ciA9IDA7CisgICAgaWYgKF93Zm9wZW5fcygmYnVuZGxlUHRyLCBudWxsaWZpZWRQYXRoLmRhdGEo KSwgVEVYVCgicitiIikpIHx8ICFidW5kbGVQdHIpIHsKICAgICAgICAgTE9HX0VSUk9SKCJGYWls ZWQgdG8gb3BlbiBmaWxlICVzIHRvIGdldCByZXN1bWUgZGF0YSIsIGJ1bmRsZVBhdGguYXNjaWko KS5kYXRhKCkpOwogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQotCi0gICAgYm9vbCByZXN1 bHQgPSBmYWxzZTsKKyAgICBhdXRvIGNsb3NlciA9IFtdKEZJTEUqIGZpbGUpIHsKKyAgICAgICAg ZmNsb3NlKGZpbGUpOworICAgIH07CisgICAgc3RkOjp1bmlxdWVfcHRyPEZJTEUsIGRlY2x0eXBl KGNsb3Nlcik+IGJ1bmRsZShidW5kbGVQdHIpOwogCiAgICAgLy8gU3RhdCB0aGUgZmlsZSB0byBn ZXQgaXRzIHNpemUKICAgICBzdHJ1Y3QgX3N0YXQ2NCBmaWxlU3RhdDsKLSAgICBpZiAoX2ZzdGF0 NjQoX2ZpbGVubyhidW5kbGUpLCAmZmlsZVN0YXQpKQotICAgICAgICBnb3RvIGV4aXQ7CisgICAg aWYgKF9mc3RhdDY0KF9maWxlbm8oYnVuZGxlLmdldCgpKSwgJmZpbGVTdGF0KSkKKyAgICAgICAg cmV0dXJuIGZhbHNlOwogCiAgICAgLy8gQ2hlY2sgZm9yIHRoZSBidW5kbGUgbWFnaWMgbnVtYmVy IGF0IHRoZSBlbmQgb2YgdGhlIGZpbGUKICAgICBmcG9zX3QgZm9vdGVyTWFnaWNOdW1iZXJQb3Np dGlvbiA9IGZpbGVTdGF0LnN0X3NpemUgLSA0OwogICAgIEFTU0VSVChmb290ZXJNYWdpY051bWJl clBvc2l0aW9uID49IDApOwogICAgIGlmIChmb290ZXJNYWdpY051bWJlclBvc2l0aW9uIDwgMCkK LSAgICAgICAgZ290byBleGl0OwotICAgIGlmIChmc2V0cG9zKGJ1bmRsZSwgJmZvb3Rlck1hZ2lj TnVtYmVyUG9zaXRpb24pKQotICAgICAgICBnb3RvIGV4aXQ7CisgICAgICAgIHJldHVybiBmYWxz ZTsKKyAgICBpZiAoZnNldHBvcyhidW5kbGUuZ2V0KCksICZmb290ZXJNYWdpY051bWJlclBvc2l0 aW9uKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgdWludDMyX3QgZm9vdGVyTWFnaWNO dW1iZXIgPSAwOwotICAgIGlmIChmcmVhZCgmZm9vdGVyTWFnaWNOdW1iZXIsIDQsIDEsIGJ1bmRs ZSkgIT0gMSkgeworICAgIGlmIChmcmVhZCgmZm9vdGVyTWFnaWNOdW1iZXIsIDQsIDEsIGJ1bmRs ZS5nZXQoKSkgIT0gMSkgewogICAgICAgICBMT0dfRVJST1IoIkZhaWxlZCB0byByZWFkIGZvb3Rl ciBtYWdpYyBudW1iZXIgZnJvbSB0aGUgYnVuZGxlIC0gZXJybm8oJWkpIiwgZXJybm8pOwotICAg ICAgICBnb3RvIGV4aXQ7CisgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAKICAgICBpZiAo Zm9vdGVyTWFnaWNOdW1iZXIgIT0gbWFnaWNOdW1iZXIoKSkgewogICAgICAgICBMT0dfRVJST1Io IkZvb3RlcidzIG1hZ2ljIG51bWJlciBkb2VzIG5vdCBtYXRjaCAweCVYIC0gZXJybm8oJWkpIiwg bWFnaWNOdW1iZXIoKSwgZXJybm8pOwotICAgICAgICBnb3RvIGV4aXQ7CisgICAgICAgIHJldHVy biBmYWxzZTsKICAgICB9CiAKICAgICAvLyBOb3cgd2UncmUgKnJlYXNvbmFibHkqIHN1cmUgdGhp cyBpcyBhIC5kb3dubG9hZCBidW5kbGUgd2UgYWN0dWFsbHkgd3JvdGUuCkBAIC0xMzUsNDQgKzEz NSw0MSBAQCBib29sIGV4dHJhY3RSZXN1bWVEYXRhKGNvbnN0IFN0cmluZyYgYnVuZGxlUGF0aCwg VmVjdG9yPHVpbnQ4X3Q+JiByZXN1bWVEYXRhKQogICAgIGZwb3NfdCBmb290ZXJMZW5ndGhQb3Np dGlvbiA9IGZpbGVTdGF0LnN0X3NpemUgLSA4OwogICAgIEFTU0VSVChmb290ZXJMZW5ndGhQb3Np dGlvbiA+PSAwKTsKICAgICBpZiAoZm9vdGVyTGVuZ3RoUG9zaXRpb24gPCAwKQotICAgICAgICBn b3RvIGV4aXQ7CisgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIGlmIChmc2V0cG9zKGJ1bmRs ZSwgJmZvb3Rlckxlbmd0aFBvc2l0aW9uKSkKLSAgICAgICAgZ290byBleGl0OworICAgIGlmIChm c2V0cG9zKGJ1bmRsZS5nZXQoKSwgJmZvb3Rlckxlbmd0aFBvc2l0aW9uKSkKKyAgICAgICAgcmV0 dXJuIGZhbHNlOwogCiAgICAgdWludDMyX3QgZm9vdGVyTGVuZ3RoID0gMDsKLSAgICBpZiAoZnJl YWQoJmZvb3Rlckxlbmd0aCwgNCwgMSwgYnVuZGxlKSAhPSAxKSB7CisgICAgaWYgKGZyZWFkKCZm b290ZXJMZW5ndGgsIDQsIDEsIGJ1bmRsZS5nZXQoKSkgIT0gMSkgewogICAgICAgICBMT0dfRVJS T1IoIkZhaWxlZCB0byByZWFkIFJlc3VtZURhdGEgbGVuZ3RoIGZyb20gdGhlIGJ1bmRsZSAtIGVy cm5vKCVpKSIsIGVycm5vKTsKLSAgICAgICAgZ290byBleGl0OworICAgICAgICByZXR1cm4gZmFs c2U7CiAgICAgfQogCiAgICAgLy8gTWFrZSBzdXJlIHRoZXJlcyBlbm91Z2ggYnl0ZXMgdG8gcmVh ZCBpbiBmb3IgdGhlIHJlc3VtZSBkYXRhLCBhbmQgcGVyZm9ybSB0aGUgcmVhZAogICAgIGZwb3Nf dCBmb290ZXJTdGFydFBvc2l0aW9uID0gZmlsZVN0YXQuc3Rfc2l6ZSAtIDggLSBmb290ZXJMZW5n dGg7CiAgICAgQVNTRVJUKGZvb3RlclN0YXJ0UG9zaXRpb24gPj0gMCk7CiAgICAgaWYgKGZvb3Rl clN0YXJ0UG9zaXRpb24gPCAwKQotICAgICAgICBnb3RvIGV4aXQ7Ci0gICAgaWYgKGZzZXRwb3Mo YnVuZGxlLCAmZm9vdGVyU3RhcnRQb3NpdGlvbikpCi0gICAgICAgIGdvdG8gZXhpdDsKKyAgICAg ICAgcmV0dXJuIGZhbHNlOworICAgIGlmIChmc2V0cG9zKGJ1bmRsZS5nZXQoKSwgJmZvb3RlclN0 YXJ0UG9zaXRpb24pKQorICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICByZXN1bWVEYXRhLnJl c2l6ZShmb290ZXJMZW5ndGgpOwotICAgIGlmIChmcmVhZChyZXN1bWVEYXRhLmRhdGEoKSwgMSwg Zm9vdGVyTGVuZ3RoLCBidW5kbGUpICE9IGZvb3Rlckxlbmd0aCkgeworICAgIGlmIChmcmVhZChy ZXN1bWVEYXRhLmRhdGEoKSwgMSwgZm9vdGVyTGVuZ3RoLCBidW5kbGUuZ2V0KCkpICE9IGZvb3Rl ckxlbmd0aCkgewogICAgICAgICBMT0dfRVJST1IoIkZhaWxlZCB0byByZWFkIFJlc3VtZURhdGEg ZnJvbSB0aGUgYnVuZGxlIC0gZXJybm8oJWkpIiwgZXJybm8pOwotICAgICAgICBnb3RvIGV4aXQ7 CisgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAKICAgICAvLyBDRlVSTERvd25sb2FkIHdp bGwgc2VlayB0byB0aGUgYXBwcm9wcmlhdGUgcGxhY2UgaW4gdGhlIGZpbGUgKGJlZm9yZSBvdXIg Zm9vdGVyKSBhbmQgc3RhcnQgb3ZlcndyaXRpbmcgZnJvbSB0aGVyZQogICAgIC8vIEhvd2V2ZXIs IHNheSB3ZSB3ZXJlIHdpdGhpbiBhIGZldyBodW5kcmVkIGJ5dGVzIG9mIHRoZSBlbmQgb2YgYSBk b3dubG9hZCB3aGVuIGl0IHdhcyBwYXVzZWQgLQogICAgIC8vIFRoZSBhZGRpdGlvbmFsIGZvb3Rl ciBleHRlbmRlZCB0aGUgbGVuZ3RoIG9mIHRoZSBmaWxlIGJleW9uZCBpdHMgZmluYWwgbGVuZ3Ro LCBhbmQgdGhlcmUgd2lsbCBiZSBqdW5rIGRhdGEgbGVmdG92ZXIKICAgICAvLyBhdCB0aGUgZW5k LiAgVGhlcmVmb3JlLCBub3cgdGhhdCB3ZSd2ZSByZXRyaWV2ZWQgdGhlIGZvb3RlciBkYXRhLCB3 ZSBuZWVkIHRvIHRydW5jYXRlIGl0LgotICAgIGlmIChlcnJub190IHJlc2l6ZUVycm9yID0gX2No c2l6ZV9zKF9maWxlbm8oYnVuZGxlKSwgZm9vdGVyU3RhcnRQb3NpdGlvbikpIHsKKyAgICBpZiAo ZXJybm9fdCByZXNpemVFcnJvciA9IF9jaHNpemVfcyhfZmlsZW5vKGJ1bmRsZS5nZXQoKSksIGZv b3RlclN0YXJ0UG9zaXRpb24pKSB7CiAgICAgICAgIExPR19FUlJPUigiRmFpbGVkIHRvIHRydW5j YXRlIHRoZSByZXN1bWUgZm9vdGVyIG9mZiB0aGUgZW5kIG9mIHRoZSBmaWxlIC0gZXJybm8oJWkp IiwgcmVzaXplRXJyb3IpOwotICAgICAgICBnb3RvIGV4aXQ7CisgICAgICAgIHJldHVybiBmYWxz ZTsKICAgICB9CiAKLSAgICByZXN1bHQgPSB0cnVlOwotZXhpdDoKLSAgICBmY2xvc2UoYnVuZGxl KTsKLSAgICByZXR1cm4gcmVzdWx0OworICAgIHJldHVybiB0cnVlOwogfQogCiB9IC8vIG5hbWVz cGFjZSBEb3dubG9hZEJ1bmRsZQo= 447624 2021-12-20 12:50:37 -0800 2021-12-20 12:57:38 -0800 Patch bug-234504-20211221055036.patch text/plain 7191 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MjcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWE5ZGM2Y2QyNTAwMDQ3 MWQ5N2QxZDExZDAzNzZlMzA4MWNlZmIzNS4uMjc3Zjk3YjM2ODllMjlmYmFlMzYxMjg3OThiNzZk ZWFjY2MxNDJkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTEyLTIwICBGdWpp aSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgorCisgICAgICAgIFtXaW5dIE1T VkMgcmVwb3J0cyAiRG93bmxvYWRCdW5kbGVXaW4uY3BwKDg3KTogZXJyb3IgQzIzNjI6IGluaXRp YWxpemF0aW9uIG9mICdtYWdpYycgaXMgc2tpcHBlZCBieSAnZ290byBleGl0JyIgd2l0aCAvc3Rk OmMrKzIwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MzQ1MDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IHBsYXRmb3JtL25ldHdvcmsvd2luL0Rvd25sb2FkQnVuZGxlV2luLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkRvd25sb2FkQnVuZGxlOjphcHBlbmRSZXN1bWVEYXRhKToKKyAgICAgICAgKFdlYkNv cmU6OkRvd25sb2FkQnVuZGxlOjpleHRyYWN0UmVzdW1lRGF0YSk6CisgICAgICAgIFJlbW92ZWQg Z290byBzdGF0ZW1lbnRzLiBVc2Ugc3RkOjp1bmlxdWVfcHRyIGZvciBGSUxFKi4KKwogMjAyMS0x Mi0yMCAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZD XSBNb3ZlIGRpc3BsYXkgYnVpbGRlciBmaWxlcyB1bmRlciAvZGlzcGxheSBkaXJlY3RvcnkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvd2luL0Rvd25sb2FkQnVu ZGxlV2luLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvd2luL0Rvd25sb2Fk QnVuZGxlV2luLmNwcAppbmRleCBkODNjM2IyYTYzYjIyYzM5ZTE4YzEyOWU0NGJjOGYyZDM4Yjhi MmM4Li4yYjFiZTM2ZTA1NDVkMjQ0MmMzZWMwMDczYzA4YTM0N2U3ZjNmNzUzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3dpbi9Eb3dubG9hZEJ1bmRsZVdpbi5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay93aW4vRG93bmxvYWRCdW5k bGVXaW4uY3BwCkBAIC01OSwzNCArNTksMzIgQEAgYm9vbCBhcHBlbmRSZXN1bWVEYXRhKGNvbnN0 IHVpbnQ4X3QqIHJlc3VtZUJ5dGVzLCB1aW50MzJfdCByZXN1bWVMZW5ndGgsIGNvbnN0IFMKICAg ICB9CiAKICAgICBhdXRvIG51bGxpZmllZFBhdGggPSBidW5kbGVQYXRoLndpZGVDaGFyYWN0ZXJz KCk7Ci0gICAgRklMRSogYnVuZGxlID0gMDsKLSAgICBpZiAoX3dmb3Blbl9zKCZidW5kbGUsIG51 bGxpZmllZFBhdGguZGF0YSgpLCBURVhUKCJhYiIpKSB8fCAhYnVuZGxlKSB7CisgICAgRklMRSog YnVuZGxlUHRyID0gMDsKKyAgICBpZiAoX3dmb3Blbl9zKCZidW5kbGVQdHIsIG51bGxpZmllZFBh dGguZGF0YSgpLCBURVhUKCJhYiIpKSB8fCAhYnVuZGxlUHRyKSB7CiAgICAgICAgIExPR19FUlJP UigiRmFpbGVkIHRvIG9wZW4gZmlsZSAlcyB0byBhcHBlbmQgcmVzdW1lIGRhdGEiLCBidW5kbGVQ YXRoLmFzY2lpKCkuZGF0YSgpKTsKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KKyAgICBh dXRvIGNsb3NlciA9IFtdKEZJTEUqIGZpbGUpIHsKKyAgICAgICAgZmNsb3NlKGZpbGUpOworICAg IH07CisgICAgc3RkOjp1bmlxdWVfcHRyPEZJTEUsIGRlY2x0eXBlKGNsb3Nlcik+IGJ1bmRsZShi dW5kbGVQdHIsIGNsb3Nlcik7CiAKLSAgICBib29sIHJlc3VsdCA9IGZhbHNlOwotCi0gICAgaWYg KGZ3cml0ZShyZXN1bWVCeXRlcywgMSwgcmVzdW1lTGVuZ3RoLCBidW5kbGUpICE9IHJlc3VtZUxl bmd0aCkgeworICAgIGlmIChmd3JpdGUocmVzdW1lQnl0ZXMsIDEsIHJlc3VtZUxlbmd0aCwgYnVu ZGxlLmdldCgpKSAhPSByZXN1bWVMZW5ndGgpIHsKICAgICAgICAgTE9HX0VSUk9SKCJGYWlsZWQg dG8gd3JpdGUgcmVzdW1lIGRhdGEgdG8gdGhlIGJ1bmRsZSAtIGVycm5vKCVpKSIsIGVycm5vKTsK LSAgICAgICAgZ290byBleGl0OworICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCi0gICAg aWYgKGZ3cml0ZSgmcmVzdW1lTGVuZ3RoLCA0LCAxLCBidW5kbGUpICE9IDEpIHsKKyAgICBpZiAo ZndyaXRlKCZyZXN1bWVMZW5ndGgsIDQsIDEsIGJ1bmRsZS5nZXQoKSkgIT0gMSkgewogICAgICAg ICBMT0dfRVJST1IoIkZhaWxlZCB0byB3cml0ZSBmb290ZXIgbGVuZ3RoIHRvIHRoZSBidW5kbGUg LSBlcnJubyglaSkiLCBlcnJubyk7Ci0gICAgICAgIGdvdG8gZXhpdDsKKyAgICAgICAgcmV0dXJu IGZhbHNlOwogICAgIH0KIAogICAgIGNvbnN0IHVpbnQzMl90IG1hZ2ljID0gbWFnaWNOdW1iZXIo KTsKLSAgICBpZiAoZndyaXRlKCZtYWdpYywgNCwgMSwgYnVuZGxlKSAhPSAxKSB7CisgICAgaWYg KGZ3cml0ZSgmbWFnaWMsIDQsIDEsIGJ1bmRsZS5nZXQoKSkgIT0gMSkgewogICAgICAgICBMT0df RVJST1IoIkZhaWxlZCB0byB3cml0ZSBmb290ZXIgbWFnaWMgbnVtYmVyIHRvIHRoZSBidW5kbGUg LSBlcnJubyglaSkiLCBlcnJubyk7Ci0gICAgICAgIGdvdG8gZXhpdDsKKyAgICAgICAgcmV0dXJu IGZhbHNlOwogICAgIH0KLQotICAgIHJlc3VsdCA9IHRydWU7Ci1leGl0OgotICAgIGZjbG9zZShi dW5kbGUpOwotICAgIHJldHVybiByZXN1bHQ7CisgICAgcmV0dXJuIHRydWU7CiB9CiAKIGJvb2wg ZXh0cmFjdFJlc3VtZURhdGEoY29uc3QgU3RyaW5nJiBidW5kbGVQYXRoLCBWZWN0b3I8dWludDhf dD4mIHJlc3VtZURhdGEpCkBAIC05OCwzNiArOTYsMzggQEAgYm9vbCBleHRyYWN0UmVzdW1lRGF0 YShjb25zdCBTdHJpbmcmIGJ1bmRsZVBhdGgsIFZlY3Rvcjx1aW50OF90PiYgcmVzdW1lRGF0YSkK IAogICAgIC8vIE9wZW4gYSBoYW5kbGUgdG8gdGhlIGJ1bmRsZSBmaWxlCiAgICAgYXV0byBudWxs aWZpZWRQYXRoID0gYnVuZGxlUGF0aC53aWRlQ2hhcmFjdGVycygpOwotICAgIEZJTEUqIGJ1bmRs ZSA9IDA7Ci0gICAgaWYgKF93Zm9wZW5fcygmYnVuZGxlLCBudWxsaWZpZWRQYXRoLmRhdGEoKSwg VEVYVCgicitiIikpIHx8ICFidW5kbGUpIHsKKyAgICBGSUxFKiBidW5kbGVQdHIgPSAwOworICAg IGlmIChfd2ZvcGVuX3MoJmJ1bmRsZVB0ciwgbnVsbGlmaWVkUGF0aC5kYXRhKCksIFRFWFQoInIr YiIpKSB8fCAhYnVuZGxlUHRyKSB7CiAgICAgICAgIExPR19FUlJPUigiRmFpbGVkIHRvIG9wZW4g ZmlsZSAlcyB0byBnZXQgcmVzdW1lIGRhdGEiLCBidW5kbGVQYXRoLmFzY2lpKCkuZGF0YSgpKTsK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KLQotICAgIGJvb2wgcmVzdWx0ID0gZmFsc2U7 CisgICAgYXV0byBjbG9zZXIgPSBbXShGSUxFKiBmaWxlKSB7CisgICAgICAgIGZjbG9zZShmaWxl KTsKKyAgICB9OworICAgIHN0ZDo6dW5pcXVlX3B0cjxGSUxFLCBkZWNsdHlwZShjbG9zZXIpPiBi dW5kbGUoYnVuZGxlUHRyKTsKIAogICAgIC8vIFN0YXQgdGhlIGZpbGUgdG8gZ2V0IGl0cyBzaXpl CiAgICAgc3RydWN0IF9zdGF0NjQgZmlsZVN0YXQ7Ci0gICAgaWYgKF9mc3RhdDY0KF9maWxlbm8o YnVuZGxlKSwgJmZpbGVTdGF0KSkKLSAgICAgICAgZ290byBleGl0OworICAgIGlmIChfZnN0YXQ2 NChfZmlsZW5vKGJ1bmRsZS5nZXQoKSksICZmaWxlU3RhdCkpCisgICAgICAgIHJldHVybiBmYWxz ZTsKIAogICAgIC8vIENoZWNrIGZvciB0aGUgYnVuZGxlIG1hZ2ljIG51bWJlciBhdCB0aGUgZW5k IG9mIHRoZSBmaWxlCiAgICAgZnBvc190IGZvb3Rlck1hZ2ljTnVtYmVyUG9zaXRpb24gPSBmaWxl U3RhdC5zdF9zaXplIC0gNDsKICAgICBBU1NFUlQoZm9vdGVyTWFnaWNOdW1iZXJQb3NpdGlvbiA+ PSAwKTsKICAgICBpZiAoZm9vdGVyTWFnaWNOdW1iZXJQb3NpdGlvbiA8IDApCi0gICAgICAgIGdv dG8gZXhpdDsKLSAgICBpZiAoZnNldHBvcyhidW5kbGUsICZmb290ZXJNYWdpY051bWJlclBvc2l0 aW9uKSkKLSAgICAgICAgZ290byBleGl0OworICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgaWYg KGZzZXRwb3MoYnVuZGxlLmdldCgpLCAmZm9vdGVyTWFnaWNOdW1iZXJQb3NpdGlvbikpCisgICAg ICAgIHJldHVybiBmYWxzZTsKIAogICAgIHVpbnQzMl90IGZvb3Rlck1hZ2ljTnVtYmVyID0gMDsK LSAgICBpZiAoZnJlYWQoJmZvb3Rlck1hZ2ljTnVtYmVyLCA0LCAxLCBidW5kbGUpICE9IDEpIHsK KyAgICBpZiAoZnJlYWQoJmZvb3Rlck1hZ2ljTnVtYmVyLCA0LCAxLCBidW5kbGUuZ2V0KCkpICE9 IDEpIHsKICAgICAgICAgTE9HX0VSUk9SKCJGYWlsZWQgdG8gcmVhZCBmb290ZXIgbWFnaWMgbnVt YmVyIGZyb20gdGhlIGJ1bmRsZSAtIGVycm5vKCVpKSIsIGVycm5vKTsKLSAgICAgICAgZ290byBl eGl0OworICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCiAgICAgaWYgKGZvb3Rlck1hZ2lj TnVtYmVyICE9IG1hZ2ljTnVtYmVyKCkpIHsKICAgICAgICAgTE9HX0VSUk9SKCJGb290ZXIncyBt YWdpYyBudW1iZXIgZG9lcyBub3QgbWF0Y2ggMHglWCAtIGVycm5vKCVpKSIsIG1hZ2ljTnVtYmVy KCksIGVycm5vKTsKLSAgICAgICAgZ290byBleGl0OworICAgICAgICByZXR1cm4gZmFsc2U7CiAg ICAgfQogCiAgICAgLy8gTm93IHdlJ3JlICpyZWFzb25hYmx5KiBzdXJlIHRoaXMgaXMgYSAuZG93 bmxvYWQgYnVuZGxlIHdlIGFjdHVhbGx5IHdyb3RlLgpAQCAtMTM1LDQ0ICsxMzUsNDEgQEAgYm9v bCBleHRyYWN0UmVzdW1lRGF0YShjb25zdCBTdHJpbmcmIGJ1bmRsZVBhdGgsIFZlY3Rvcjx1aW50 OF90PiYgcmVzdW1lRGF0YSkKICAgICBmcG9zX3QgZm9vdGVyTGVuZ3RoUG9zaXRpb24gPSBmaWxl U3RhdC5zdF9zaXplIC0gODsKICAgICBBU1NFUlQoZm9vdGVyTGVuZ3RoUG9zaXRpb24gPj0gMCk7 CiAgICAgaWYgKGZvb3Rlckxlbmd0aFBvc2l0aW9uIDwgMCkKLSAgICAgICAgZ290byBleGl0Owor ICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAoZnNldHBvcyhidW5kbGUsICZmb290ZXJM ZW5ndGhQb3NpdGlvbikpCi0gICAgICAgIGdvdG8gZXhpdDsKKyAgICBpZiAoZnNldHBvcyhidW5k bGUuZ2V0KCksICZmb290ZXJMZW5ndGhQb3NpdGlvbikpCisgICAgICAgIHJldHVybiBmYWxzZTsK IAogICAgIHVpbnQzMl90IGZvb3Rlckxlbmd0aCA9IDA7Ci0gICAgaWYgKGZyZWFkKCZmb290ZXJM ZW5ndGgsIDQsIDEsIGJ1bmRsZSkgIT0gMSkgeworICAgIGlmIChmcmVhZCgmZm9vdGVyTGVuZ3Ro LCA0LCAxLCBidW5kbGUuZ2V0KCkpICE9IDEpIHsKICAgICAgICAgTE9HX0VSUk9SKCJGYWlsZWQg dG8gcmVhZCBSZXN1bWVEYXRhIGxlbmd0aCBmcm9tIHRoZSBidW5kbGUgLSBlcnJubyglaSkiLCBl cnJubyk7Ci0gICAgICAgIGdvdG8gZXhpdDsKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0K IAogICAgIC8vIE1ha2Ugc3VyZSB0aGVyZXMgZW5vdWdoIGJ5dGVzIHRvIHJlYWQgaW4gZm9yIHRo ZSByZXN1bWUgZGF0YSwgYW5kIHBlcmZvcm0gdGhlIHJlYWQKICAgICBmcG9zX3QgZm9vdGVyU3Rh cnRQb3NpdGlvbiA9IGZpbGVTdGF0LnN0X3NpemUgLSA4IC0gZm9vdGVyTGVuZ3RoOwogICAgIEFT U0VSVChmb290ZXJTdGFydFBvc2l0aW9uID49IDApOwogICAgIGlmIChmb290ZXJTdGFydFBvc2l0 aW9uIDwgMCkKLSAgICAgICAgZ290byBleGl0OwotICAgIGlmIChmc2V0cG9zKGJ1bmRsZSwgJmZv b3RlclN0YXJ0UG9zaXRpb24pKQotICAgICAgICBnb3RvIGV4aXQ7CisgICAgICAgIHJldHVybiBm YWxzZTsKKyAgICBpZiAoZnNldHBvcyhidW5kbGUuZ2V0KCksICZmb290ZXJTdGFydFBvc2l0aW9u KSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgcmVzdW1lRGF0YS5yZXNpemUoZm9vdGVy TGVuZ3RoKTsKLSAgICBpZiAoZnJlYWQocmVzdW1lRGF0YS5kYXRhKCksIDEsIGZvb3Rlckxlbmd0 aCwgYnVuZGxlKSAhPSBmb290ZXJMZW5ndGgpIHsKKyAgICBpZiAoZnJlYWQocmVzdW1lRGF0YS5k YXRhKCksIDEsIGZvb3Rlckxlbmd0aCwgYnVuZGxlLmdldCgpKSAhPSBmb290ZXJMZW5ndGgpIHsK ICAgICAgICAgTE9HX0VSUk9SKCJGYWlsZWQgdG8gcmVhZCBSZXN1bWVEYXRhIGZyb20gdGhlIGJ1 bmRsZSAtIGVycm5vKCVpKSIsIGVycm5vKTsKLSAgICAgICAgZ290byBleGl0OworICAgICAgICBy ZXR1cm4gZmFsc2U7CiAgICAgfQogCiAgICAgLy8gQ0ZVUkxEb3dubG9hZCB3aWxsIHNlZWsgdG8g dGhlIGFwcHJvcHJpYXRlIHBsYWNlIGluIHRoZSBmaWxlIChiZWZvcmUgb3VyIGZvb3RlcikgYW5k IHN0YXJ0IG92ZXJ3cml0aW5nIGZyb20gdGhlcmUKICAgICAvLyBIb3dldmVyLCBzYXkgd2Ugd2Vy ZSB3aXRoaW4gYSBmZXcgaHVuZHJlZCBieXRlcyBvZiB0aGUgZW5kIG9mIGEgZG93bmxvYWQgd2hl biBpdCB3YXMgcGF1c2VkIC0KICAgICAvLyBUaGUgYWRkaXRpb25hbCBmb290ZXIgZXh0ZW5kZWQg dGhlIGxlbmd0aCBvZiB0aGUgZmlsZSBiZXlvbmQgaXRzIGZpbmFsIGxlbmd0aCwgYW5kIHRoZXJl IHdpbGwgYmUganVuayBkYXRhIGxlZnRvdmVyCiAgICAgLy8gYXQgdGhlIGVuZC4gIFRoZXJlZm9y ZSwgbm93IHRoYXQgd2UndmUgcmV0cmlldmVkIHRoZSBmb290ZXIgZGF0YSwgd2UgbmVlZCB0byB0 cnVuY2F0ZSBpdC4KLSAgICBpZiAoZXJybm9fdCByZXNpemVFcnJvciA9IF9jaHNpemVfcyhfZmls ZW5vKGJ1bmRsZSksIGZvb3RlclN0YXJ0UG9zaXRpb24pKSB7CisgICAgaWYgKGVycm5vX3QgcmVz aXplRXJyb3IgPSBfY2hzaXplX3MoX2ZpbGVubyhidW5kbGUuZ2V0KCkpLCBmb290ZXJTdGFydFBv c2l0aW9uKSkgewogICAgICAgICBMT0dfRVJST1IoIkZhaWxlZCB0byB0cnVuY2F0ZSB0aGUgcmVz dW1lIGZvb3RlciBvZmYgdGhlIGVuZCBvZiB0aGUgZmlsZSAtIGVycm5vKCVpKSIsIHJlc2l6ZUVy cm9yKTsKLSAgICAgICAgZ290byBleGl0OworICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQog Ci0gICAgcmVzdWx0ID0gdHJ1ZTsKLWV4aXQ6Ci0gICAgZmNsb3NlKGJ1bmRsZSk7Ci0gICAgcmV0 dXJuIHJlc3VsdDsKKyAgICByZXR1cm4gdHJ1ZTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgRG93bmxv YWRCdW5kbGUK 447626 2021-12-20 12:57:48 -0800 2021-12-21 16:56:53 -0800 Patch bug-234504-20211221055747.patch text/plain 7332 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MjcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWE5ZGM2Y2QyNTAwMDQ3 MWQ5N2QxZDExZDAzNzZlMzA4MWNlZmIzNS4uMjc3Zjk3YjM2ODllMjlmYmFlMzYxMjg3OThiNzZk ZWFjY2MxNDJkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTEyLTIwICBGdWpp aSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgorCisgICAgICAgIFtXaW5dIE1T VkMgcmVwb3J0cyAiRG93bmxvYWRCdW5kbGVXaW4uY3BwKDg3KTogZXJyb3IgQzIzNjI6IGluaXRp YWxpemF0aW9uIG9mICdtYWdpYycgaXMgc2tpcHBlZCBieSAnZ290byBleGl0JyIgd2l0aCAvc3Rk OmMrKzIwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MzQ1MDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IHBsYXRmb3JtL25ldHdvcmsvd2luL0Rvd25sb2FkQnVuZGxlV2luLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkRvd25sb2FkQnVuZGxlOjphcHBlbmRSZXN1bWVEYXRhKToKKyAgICAgICAgKFdlYkNv cmU6OkRvd25sb2FkQnVuZGxlOjpleHRyYWN0UmVzdW1lRGF0YSk6CisgICAgICAgIFJlbW92ZWQg Z290byBzdGF0ZW1lbnRzLiBVc2Ugc3RkOjp1bmlxdWVfcHRyIGZvciBGSUxFKi4KKwogMjAyMS0x Mi0yMCAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZD XSBNb3ZlIGRpc3BsYXkgYnVpbGRlciBmaWxlcyB1bmRlciAvZGlzcGxheSBkaXJlY3RvcnkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvd2luL0Rvd25sb2FkQnVu ZGxlV2luLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvd2luL0Rvd25sb2Fk QnVuZGxlV2luLmNwcAppbmRleCBkODNjM2IyYTYzYjIyYzM5ZTE4YzEyOWU0NGJjOGYyZDM4Yjhi MmM4Li43ZGYyZWU4NmYwZDc5ZjlhYTM0YzdlZGIxNGEzNmI1NDJmMzdlOWNkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3dpbi9Eb3dubG9hZEJ1bmRsZVdpbi5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay93aW4vRG93bmxvYWRCdW5k bGVXaW4uY3BwCkBAIC00MSw2ICs0MSwxMSBAQCBzdGF0aWMgdWludDMyX3QgbWFnaWNOdW1iZXIo KQogICAgIHJldHVybiAweERFQ0FGNEVBOwogfQogCitzdGF0aWMgdm9pZCBmaWxlQ2xvc2VyKEZJ TEUqIGZpbGUpIAoreworICAgIGZjbG9zZShmaWxlKTsKK307CisKIGNvbnN0IFN0cmluZyYgZmls ZUV4dGVuc2lvbigpCiB7CiAgICAgc3RhdGljIGNvbnN0IE5ldmVyRGVzdHJveWVkPFN0cmluZz4g ZXh0ZW5zaW9uIHsgIi5kb3dubG9hZCJfcyB9OwpAQCAtNTksMzQgKzY0LDMwIEBAIGJvb2wgYXBw ZW5kUmVzdW1lRGF0YShjb25zdCB1aW50OF90KiByZXN1bWVCeXRlcywgdWludDMyX3QgcmVzdW1l TGVuZ3RoLCBjb25zdCBTCiAgICAgfQogCiAgICAgYXV0byBudWxsaWZpZWRQYXRoID0gYnVuZGxl UGF0aC53aWRlQ2hhcmFjdGVycygpOwotICAgIEZJTEUqIGJ1bmRsZSA9IDA7Ci0gICAgaWYgKF93 Zm9wZW5fcygmYnVuZGxlLCBudWxsaWZpZWRQYXRoLmRhdGEoKSwgVEVYVCgiYWIiKSkgfHwgIWJ1 bmRsZSkgeworICAgIEZJTEUqIGJ1bmRsZVB0ciA9IDA7CisgICAgaWYgKF93Zm9wZW5fcygmYnVu ZGxlUHRyLCBudWxsaWZpZWRQYXRoLmRhdGEoKSwgVEVYVCgiYWIiKSkgfHwgIWJ1bmRsZVB0cikg ewogICAgICAgICBMT0dfRVJST1IoIkZhaWxlZCB0byBvcGVuIGZpbGUgJXMgdG8gYXBwZW5kIHJl c3VtZSBkYXRhIiwgYnVuZGxlUGF0aC5hc2NpaSgpLmRhdGEoKSk7CiAgICAgICAgIHJldHVybiBm YWxzZTsKICAgICB9CisgICAgc3RkOjp1bmlxdWVfcHRyPEZJTEUsIGRlY2x0eXBlKCZmaWxlQ2xv c2VyKT4gYnVuZGxlKGJ1bmRsZVB0ciwgJmZpbGVDbG9zZXIpOwogCi0gICAgYm9vbCByZXN1bHQg PSBmYWxzZTsKLQotICAgIGlmIChmd3JpdGUocmVzdW1lQnl0ZXMsIDEsIHJlc3VtZUxlbmd0aCwg YnVuZGxlKSAhPSByZXN1bWVMZW5ndGgpIHsKKyAgICBpZiAoZndyaXRlKHJlc3VtZUJ5dGVzLCAx LCByZXN1bWVMZW5ndGgsIGJ1bmRsZS5nZXQoKSkgIT0gcmVzdW1lTGVuZ3RoKSB7CiAgICAgICAg IExPR19FUlJPUigiRmFpbGVkIHRvIHdyaXRlIHJlc3VtZSBkYXRhIHRvIHRoZSBidW5kbGUgLSBl cnJubyglaSkiLCBlcnJubyk7Ci0gICAgICAgIGdvdG8gZXhpdDsKKyAgICAgICAgcmV0dXJuIGZh bHNlOwogICAgIH0KIAotICAgIGlmIChmd3JpdGUoJnJlc3VtZUxlbmd0aCwgNCwgMSwgYnVuZGxl KSAhPSAxKSB7CisgICAgaWYgKGZ3cml0ZSgmcmVzdW1lTGVuZ3RoLCA0LCAxLCBidW5kbGUuZ2V0 KCkpICE9IDEpIHsKICAgICAgICAgTE9HX0VSUk9SKCJGYWlsZWQgdG8gd3JpdGUgZm9vdGVyIGxl bmd0aCB0byB0aGUgYnVuZGxlIC0gZXJybm8oJWkpIiwgZXJybm8pOwotICAgICAgICBnb3RvIGV4 aXQ7CisgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAKICAgICBjb25zdCB1aW50MzJfdCBt YWdpYyA9IG1hZ2ljTnVtYmVyKCk7Ci0gICAgaWYgKGZ3cml0ZSgmbWFnaWMsIDQsIDEsIGJ1bmRs ZSkgIT0gMSkgeworICAgIGlmIChmd3JpdGUoJm1hZ2ljLCA0LCAxLCBidW5kbGUuZ2V0KCkpICE9 IDEpIHsKICAgICAgICAgTE9HX0VSUk9SKCJGYWlsZWQgdG8gd3JpdGUgZm9vdGVyIG1hZ2ljIG51 bWJlciB0byB0aGUgYnVuZGxlIC0gZXJybm8oJWkpIiwgZXJybm8pOwotICAgICAgICBnb3RvIGV4 aXQ7CisgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAKLSAgICByZXN1bHQgPSB0cnVlOwot ZXhpdDoKLSAgICBmY2xvc2UoYnVuZGxlKTsKLSAgICByZXR1cm4gcmVzdWx0OworICAgIHJldHVy biB0cnVlOwogfQogCiBib29sIGV4dHJhY3RSZXN1bWVEYXRhKGNvbnN0IFN0cmluZyYgYnVuZGxl UGF0aCwgVmVjdG9yPHVpbnQ4X3Q+JiByZXN1bWVEYXRhKQpAQCAtOTgsMzYgKzk5LDM1IEBAIGJv b2wgZXh0cmFjdFJlc3VtZURhdGEoY29uc3QgU3RyaW5nJiBidW5kbGVQYXRoLCBWZWN0b3I8dWlu dDhfdD4mIHJlc3VtZURhdGEpCiAKICAgICAvLyBPcGVuIGEgaGFuZGxlIHRvIHRoZSBidW5kbGUg ZmlsZQogICAgIGF1dG8gbnVsbGlmaWVkUGF0aCA9IGJ1bmRsZVBhdGgud2lkZUNoYXJhY3RlcnMo KTsKLSAgICBGSUxFKiBidW5kbGUgPSAwOwotICAgIGlmIChfd2ZvcGVuX3MoJmJ1bmRsZSwgbnVs bGlmaWVkUGF0aC5kYXRhKCksIFRFWFQoInIrYiIpKSB8fCAhYnVuZGxlKSB7CisgICAgRklMRSog YnVuZGxlUHRyID0gMDsKKyAgICBpZiAoX3dmb3Blbl9zKCZidW5kbGVQdHIsIG51bGxpZmllZFBh dGguZGF0YSgpLCBURVhUKCJyK2IiKSkgfHwgIWJ1bmRsZVB0cikgewogICAgICAgICBMT0dfRVJS T1IoIkZhaWxlZCB0byBvcGVuIGZpbGUgJXMgdG8gZ2V0IHJlc3VtZSBkYXRhIiwgYnVuZGxlUGF0 aC5hc2NpaSgpLmRhdGEoKSk7CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9Ci0KLSAgICBi b29sIHJlc3VsdCA9IGZhbHNlOworICAgIHN0ZDo6dW5pcXVlX3B0cjxGSUxFLCBkZWNsdHlwZSgm ZmlsZUNsb3Nlcik+IGJ1bmRsZShidW5kbGVQdHIsICZmaWxlQ2xvc2VyKTsKIAogICAgIC8vIFN0 YXQgdGhlIGZpbGUgdG8gZ2V0IGl0cyBzaXplCiAgICAgc3RydWN0IF9zdGF0NjQgZmlsZVN0YXQ7 Ci0gICAgaWYgKF9mc3RhdDY0KF9maWxlbm8oYnVuZGxlKSwgJmZpbGVTdGF0KSkKLSAgICAgICAg Z290byBleGl0OworICAgIGlmIChfZnN0YXQ2NChfZmlsZW5vKGJ1bmRsZS5nZXQoKSksICZmaWxl U3RhdCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIC8vIENoZWNrIGZvciB0aGUgYnVu ZGxlIG1hZ2ljIG51bWJlciBhdCB0aGUgZW5kIG9mIHRoZSBmaWxlCiAgICAgZnBvc190IGZvb3Rl ck1hZ2ljTnVtYmVyUG9zaXRpb24gPSBmaWxlU3RhdC5zdF9zaXplIC0gNDsKICAgICBBU1NFUlQo Zm9vdGVyTWFnaWNOdW1iZXJQb3NpdGlvbiA+PSAwKTsKICAgICBpZiAoZm9vdGVyTWFnaWNOdW1i ZXJQb3NpdGlvbiA8IDApCi0gICAgICAgIGdvdG8gZXhpdDsKLSAgICBpZiAoZnNldHBvcyhidW5k bGUsICZmb290ZXJNYWdpY051bWJlclBvc2l0aW9uKSkKLSAgICAgICAgZ290byBleGl0OworICAg ICAgICByZXR1cm4gZmFsc2U7CisgICAgaWYgKGZzZXRwb3MoYnVuZGxlLmdldCgpLCAmZm9vdGVy TWFnaWNOdW1iZXJQb3NpdGlvbikpCisgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIHVpbnQz Ml90IGZvb3Rlck1hZ2ljTnVtYmVyID0gMDsKLSAgICBpZiAoZnJlYWQoJmZvb3Rlck1hZ2ljTnVt YmVyLCA0LCAxLCBidW5kbGUpICE9IDEpIHsKKyAgICBpZiAoZnJlYWQoJmZvb3Rlck1hZ2ljTnVt YmVyLCA0LCAxLCBidW5kbGUuZ2V0KCkpICE9IDEpIHsKICAgICAgICAgTE9HX0VSUk9SKCJGYWls ZWQgdG8gcmVhZCBmb290ZXIgbWFnaWMgbnVtYmVyIGZyb20gdGhlIGJ1bmRsZSAtIGVycm5vKCVp KSIsIGVycm5vKTsKLSAgICAgICAgZ290byBleGl0OworICAgICAgICByZXR1cm4gZmFsc2U7CiAg ICAgfQogCiAgICAgaWYgKGZvb3Rlck1hZ2ljTnVtYmVyICE9IG1hZ2ljTnVtYmVyKCkpIHsKICAg ICAgICAgTE9HX0VSUk9SKCJGb290ZXIncyBtYWdpYyBudW1iZXIgZG9lcyBub3QgbWF0Y2ggMHgl WCAtIGVycm5vKCVpKSIsIG1hZ2ljTnVtYmVyKCksIGVycm5vKTsKLSAgICAgICAgZ290byBleGl0 OworICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCiAgICAgLy8gTm93IHdlJ3JlICpyZWFz b25hYmx5KiBzdXJlIHRoaXMgaXMgYSAuZG93bmxvYWQgYnVuZGxlIHdlIGFjdHVhbGx5IHdyb3Rl LgpAQCAtMTM1LDQ0ICsxMzUsNDEgQEAgYm9vbCBleHRyYWN0UmVzdW1lRGF0YShjb25zdCBTdHJp bmcmIGJ1bmRsZVBhdGgsIFZlY3Rvcjx1aW50OF90PiYgcmVzdW1lRGF0YSkKICAgICBmcG9zX3Qg Zm9vdGVyTGVuZ3RoUG9zaXRpb24gPSBmaWxlU3RhdC5zdF9zaXplIC0gODsKICAgICBBU1NFUlQo Zm9vdGVyTGVuZ3RoUG9zaXRpb24gPj0gMCk7CiAgICAgaWYgKGZvb3Rlckxlbmd0aFBvc2l0aW9u IDwgMCkKLSAgICAgICAgZ290byBleGl0OworICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBp ZiAoZnNldHBvcyhidW5kbGUsICZmb290ZXJMZW5ndGhQb3NpdGlvbikpCi0gICAgICAgIGdvdG8g ZXhpdDsKKyAgICBpZiAoZnNldHBvcyhidW5kbGUuZ2V0KCksICZmb290ZXJMZW5ndGhQb3NpdGlv bikpCisgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIHVpbnQzMl90IGZvb3Rlckxlbmd0aCA9 IDA7Ci0gICAgaWYgKGZyZWFkKCZmb290ZXJMZW5ndGgsIDQsIDEsIGJ1bmRsZSkgIT0gMSkgewor ICAgIGlmIChmcmVhZCgmZm9vdGVyTGVuZ3RoLCA0LCAxLCBidW5kbGUuZ2V0KCkpICE9IDEpIHsK ICAgICAgICAgTE9HX0VSUk9SKCJGYWlsZWQgdG8gcmVhZCBSZXN1bWVEYXRhIGxlbmd0aCBmcm9t IHRoZSBidW5kbGUgLSBlcnJubyglaSkiLCBlcnJubyk7Ci0gICAgICAgIGdvdG8gZXhpdDsKKyAg ICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KIAogICAgIC8vIE1ha2Ugc3VyZSB0aGVyZXMgZW5v dWdoIGJ5dGVzIHRvIHJlYWQgaW4gZm9yIHRoZSByZXN1bWUgZGF0YSwgYW5kIHBlcmZvcm0gdGhl IHJlYWQKICAgICBmcG9zX3QgZm9vdGVyU3RhcnRQb3NpdGlvbiA9IGZpbGVTdGF0LnN0X3NpemUg LSA4IC0gZm9vdGVyTGVuZ3RoOwogICAgIEFTU0VSVChmb290ZXJTdGFydFBvc2l0aW9uID49IDAp OwogICAgIGlmIChmb290ZXJTdGFydFBvc2l0aW9uIDwgMCkKLSAgICAgICAgZ290byBleGl0Owot ICAgIGlmIChmc2V0cG9zKGJ1bmRsZSwgJmZvb3RlclN0YXJ0UG9zaXRpb24pKQotICAgICAgICBn b3RvIGV4aXQ7CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAoZnNldHBvcyhidW5kbGUu Z2V0KCksICZmb290ZXJTdGFydFBvc2l0aW9uKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAg ICAgcmVzdW1lRGF0YS5yZXNpemUoZm9vdGVyTGVuZ3RoKTsKLSAgICBpZiAoZnJlYWQocmVzdW1l RGF0YS5kYXRhKCksIDEsIGZvb3Rlckxlbmd0aCwgYnVuZGxlKSAhPSBmb290ZXJMZW5ndGgpIHsK KyAgICBpZiAoZnJlYWQocmVzdW1lRGF0YS5kYXRhKCksIDEsIGZvb3Rlckxlbmd0aCwgYnVuZGxl LmdldCgpKSAhPSBmb290ZXJMZW5ndGgpIHsKICAgICAgICAgTE9HX0VSUk9SKCJGYWlsZWQgdG8g cmVhZCBSZXN1bWVEYXRhIGZyb20gdGhlIGJ1bmRsZSAtIGVycm5vKCVpKSIsIGVycm5vKTsKLSAg ICAgICAgZ290byBleGl0OworICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCiAgICAgLy8g Q0ZVUkxEb3dubG9hZCB3aWxsIHNlZWsgdG8gdGhlIGFwcHJvcHJpYXRlIHBsYWNlIGluIHRoZSBm aWxlIChiZWZvcmUgb3VyIGZvb3RlcikgYW5kIHN0YXJ0IG92ZXJ3cml0aW5nIGZyb20gdGhlcmUK ICAgICAvLyBIb3dldmVyLCBzYXkgd2Ugd2VyZSB3aXRoaW4gYSBmZXcgaHVuZHJlZCBieXRlcyBv ZiB0aGUgZW5kIG9mIGEgZG93bmxvYWQgd2hlbiBpdCB3YXMgcGF1c2VkIC0KICAgICAvLyBUaGUg YWRkaXRpb25hbCBmb290ZXIgZXh0ZW5kZWQgdGhlIGxlbmd0aCBvZiB0aGUgZmlsZSBiZXlvbmQg aXRzIGZpbmFsIGxlbmd0aCwgYW5kIHRoZXJlIHdpbGwgYmUganVuayBkYXRhIGxlZnRvdmVyCiAg ICAgLy8gYXQgdGhlIGVuZC4gIFRoZXJlZm9yZSwgbm93IHRoYXQgd2UndmUgcmV0cmlldmVkIHRo ZSBmb290ZXIgZGF0YSwgd2UgbmVlZCB0byB0cnVuY2F0ZSBpdC4KLSAgICBpZiAoZXJybm9fdCBy ZXNpemVFcnJvciA9IF9jaHNpemVfcyhfZmlsZW5vKGJ1bmRsZSksIGZvb3RlclN0YXJ0UG9zaXRp b24pKSB7CisgICAgaWYgKGVycm5vX3QgcmVzaXplRXJyb3IgPSBfY2hzaXplX3MoX2ZpbGVubyhi dW5kbGUuZ2V0KCkpLCBmb290ZXJTdGFydFBvc2l0aW9uKSkgewogICAgICAgICBMT0dfRVJST1Io IkZhaWxlZCB0byB0cnVuY2F0ZSB0aGUgcmVzdW1lIGZvb3RlciBvZmYgdGhlIGVuZCBvZiB0aGUg ZmlsZSAtIGVycm5vKCVpKSIsIHJlc2l6ZUVycm9yKTsKLSAgICAgICAgZ290byBleGl0OworICAg ICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCi0gICAgcmVzdWx0ID0gdHJ1ZTsKLWV4aXQ6Ci0g ICAgZmNsb3NlKGJ1bmRsZSk7Ci0gICAgcmV0dXJuIHJlc3VsdDsKKyAgICByZXR1cm4gdHJ1ZTsK IH0KIAogfSAvLyBuYW1lc3BhY2UgRG93bmxvYWRCdW5kbGUK 447765 2021-12-21 16:57:03 -0800 2021-12-24 13:40:59 -0800 Patch bug-234504-20211222095702.patch text/plain 2552 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MzMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWMyZWRhODY4YjY0ODJk ZGU5Y2ZlYzAwMGFjOGMzYjU5OGFiZDc2Zi4uNWY2ODdhNGY4YzgxMTg3NThkZjMyZWViNmI0Y2Zj N2I0YjU5N2EwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTEyLTIxICBGdWpp aSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgorCisgICAgICAgIFtXaW5dIE1T VkMgcmVwb3J0cyAiRG93bmxvYWRCdW5kbGVXaW4uY3BwKDg3KTogZXJyb3IgQzIzNjI6IGluaXRp YWxpemF0aW9uIG9mICdtYWdpYycgaXMgc2tpcHBlZCBieSAnZ290byBleGl0JyIgd2l0aCAvc3Rk OmMrKzIwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MzQ1MDQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzg2NzU1OTk3PgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay93aW4v RG93bmxvYWRCdW5kbGVXaW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG93bmxvYWRCdW5kbGU6 OmFwcGVuZFJlc3VtZURhdGEpOiBVc2UgZmNsb3NlIGRpcmVjdGx5LgorICAgICAgICAoV2ViQ29y ZTo6RG93bmxvYWRCdW5kbGU6OmV4dHJhY3RSZXN1bWVEYXRhKTogRGl0dG8uCisgICAgICAgIChX ZWJDb3JlOjpEb3dubG9hZEJ1bmRsZTo6ZmlsZUNsb3Nlcik6IERlbGV0ZWQuCisKIDIwMjEtMTIt MjEgIEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10g Q29tcHV0ZSB2aXN1YWwgZ2VvbWV0cnkgZm9yIElubGluZURpc3BsYXk6OkxpbmUKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvd2luL0Rvd25sb2FkQnVuZGxlV2lu LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvd2luL0Rvd25sb2FkQnVuZGxl V2luLmNwcAppbmRleCA3ZGYyZWU4NmYwZDc5ZjlhYTM0YzdlZGIxNGEzNmI1NDJmMzdlOWNkLi45 NGZlMDg3OGU5ZmFhNTNkYTRmOWYwMjRjMTA4MTIxNjE1YjMxYjNmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3dpbi9Eb3dubG9hZEJ1bmRsZVdpbi5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay93aW4vRG93bmxvYWRCdW5kbGVXaW4u Y3BwCkBAIC00MSwxMSArNDEsNiBAQCBzdGF0aWMgdWludDMyX3QgbWFnaWNOdW1iZXIoKQogICAg IHJldHVybiAweERFQ0FGNEVBOwogfQogCi1zdGF0aWMgdm9pZCBmaWxlQ2xvc2VyKEZJTEUqIGZp bGUpIAotewotICAgIGZjbG9zZShmaWxlKTsKLX07Ci0KIGNvbnN0IFN0cmluZyYgZmlsZUV4dGVu c2lvbigpCiB7CiAgICAgc3RhdGljIGNvbnN0IE5ldmVyRGVzdHJveWVkPFN0cmluZz4gZXh0ZW5z aW9uIHsgIi5kb3dubG9hZCJfcyB9OwpAQCAtNjksNyArNjQsNyBAQCBib29sIGFwcGVuZFJlc3Vt ZURhdGEoY29uc3QgdWludDhfdCogcmVzdW1lQnl0ZXMsIHVpbnQzMl90IHJlc3VtZUxlbmd0aCwg Y29uc3QgUwogICAgICAgICBMT0dfRVJST1IoIkZhaWxlZCB0byBvcGVuIGZpbGUgJXMgdG8gYXBw ZW5kIHJlc3VtZSBkYXRhIiwgYnVuZGxlUGF0aC5hc2NpaSgpLmRhdGEoKSk7CiAgICAgICAgIHJl dHVybiBmYWxzZTsKICAgICB9Ci0gICAgc3RkOjp1bmlxdWVfcHRyPEZJTEUsIGRlY2x0eXBlKCZm aWxlQ2xvc2VyKT4gYnVuZGxlKGJ1bmRsZVB0ciwgJmZpbGVDbG9zZXIpOworICAgIHN0ZDo6dW5p cXVlX3B0cjxGSUxFLCBkZWNsdHlwZSgmZmNsb3NlKT4gYnVuZGxlKGJ1bmRsZVB0ciwgJmZjbG9z ZSk7CiAKICAgICBpZiAoZndyaXRlKHJlc3VtZUJ5dGVzLCAxLCByZXN1bWVMZW5ndGgsIGJ1bmRs ZS5nZXQoKSkgIT0gcmVzdW1lTGVuZ3RoKSB7CiAgICAgICAgIExPR19FUlJPUigiRmFpbGVkIHRv IHdyaXRlIHJlc3VtZSBkYXRhIHRvIHRoZSBidW5kbGUgLSBlcnJubyglaSkiLCBlcnJubyk7CkBA IC0xMDQsNyArOTksNyBAQCBib29sIGV4dHJhY3RSZXN1bWVEYXRhKGNvbnN0IFN0cmluZyYgYnVu ZGxlUGF0aCwgVmVjdG9yPHVpbnQ4X3Q+JiByZXN1bWVEYXRhKQogICAgICAgICBMT0dfRVJST1Io IkZhaWxlZCB0byBvcGVuIGZpbGUgJXMgdG8gZ2V0IHJlc3VtZSBkYXRhIiwgYnVuZGxlUGF0aC5h c2NpaSgpLmRhdGEoKSk7CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9Ci0gICAgc3RkOjp1 bmlxdWVfcHRyPEZJTEUsIGRlY2x0eXBlKCZmaWxlQ2xvc2VyKT4gYnVuZGxlKGJ1bmRsZVB0ciwg JmZpbGVDbG9zZXIpOworICAgIHN0ZDo6dW5pcXVlX3B0cjxGSUxFLCBkZWNsdHlwZSgmZmNsb3Nl KT4gYnVuZGxlKGJ1bmRsZVB0ciwgJmZjbG9zZSk7CiAKICAgICAvLyBTdGF0IHRoZSBmaWxlIHRv IGdldCBpdHMgc2l6ZQogICAgIHN0cnVjdCBfc3RhdDY0IGZpbGVTdGF0Owo=