234505 2021-12-19 22:28:26 -0800 [Win] MSVC reports "DragImageCairoWin.cpp(142): error C2362: initialization of 'cr' is skipped by 'goto exit'" with /std:c++20 2021-12-20 11:56:23 -0800 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 233448 1 fujii fujii don.olmstead webkit-bug-importer oldest_to_newest 1825541 0 fujii 2021-12-19 22:28:26 -0800 [Win] MSVC reports "DragImageCairoWin.cpp(142): error C2362: initialization of 'cr' is skipped by 'goto exit'" with /std:c++20 > Source\WebCore\platform\win\DragImageCairoWin.cpp(142): error C2362: initialization of 'cr' is skipped by 'goto exit' > Source\WebCore\platform\win\DragImageCairoWin.cpp(131): note: see declaration of 'cr' > Source\WebCore\platform\win\DragImageCairoWin.cpp(142): note: see declaration of 'exit' > Source\WebCore\platform\win\DragImageCairoWin.cpp(142): error C2362: initialization of 'srcImage' is skipped by 'goto exit' > Source\WebCore\platform\win\DragImageCairoWin.cpp(126): note: see declaration of 'srcImage' > Source\WebCore\platform\win\DragImageCairoWin.cpp(142): note: see declaration of 'exit' 1825542 1 447585 fujii 2021-12-19 22:30:43 -0800 Created attachment 447585 Patch 1825543 2 447586 fujii 2021-12-19 22:40:25 -0800 Created attachment 447586 Patch 1825668 3 447586 fujii 2021-12-20 11:55:03 -0800 Comment on attachment 447586 Patch Clearing flags on attachment: 447586 Committed r287268 (245424@trunk): <https://commits.webkit.org/245424@trunk> 1825669 4 fujii 2021-12-20 11:55:07 -0800 All reviewed patches have been landed. Closing bug. 1825670 5 webkit-bug-importer 2021-12-20 11:56:23 -0800 <rdar://problem/86734337> 447585 2021-12-19 22:30:43 -0800 2021-12-19 22:33:47 -0800 Patch bug-234505-20211220153041.patch text/plain 7143 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MjUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDM0ZGQ0NjEwY2E0M2Rj MDI5YmY2YTBiOWNlNjkwMjZiNTk1YjU4ZS4uNGY1OTMyZmM5NWVjNDI1NjI4NzJmNDI5MjYyNjRk MzU1NGQ4ZjZjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTEyLTE5ICBGdWpp aSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgorCisgICAgICAgIFtXaW5dIE1T VkMgcmVwb3J0cyAiRHJhZ0ltYWdlQ2Fpcm9XaW4uY3BwKDE0Mik6IGVycm9yIEMyMzYyOiBpbml0 aWFsaXphdGlvbiBvZiAnY3InIGlzIHNraXBwZWQgYnkgJ2dvdG8gZXhpdCciIHdpdGggL3N0ZDpj KysyMAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM0 NTA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBw bGF0Zm9ybS9uZXR3b3JrL3dpbi9Eb3dubG9hZEJ1bmRsZVdpbi5jcHA6CisgICAgICAgIChXZWJD b3JlOjpEb3dubG9hZEJ1bmRsZTo6YXBwZW5kUmVzdW1lRGF0YSk6CisgICAgICAgIChXZWJDb3Jl OjpEb3dubG9hZEJ1bmRsZTo6ZXh0cmFjdFJlc3VtZURhdGEpOgorICAgICAgICBSZWltcGxlbWVu dGVkIHdpdGhvdXQgZ290byBzdGF0ZW1lbnRzLgorCiAyMDIxLTEyLTE5ICBCcmFkeSBFaWRzb24g IDxiZWlkc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBTdHViIG91dCBOb3RpZmljYXRpb25FdmVu dCBhbmQgcmVsYXRlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay93aW4vRG93bmxvYWRCdW5kbGVXaW4uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay93aW4vRG93bmxvYWRCdW5kbGVXaW4uY3BwCmluZGV4IGQ4M2MzYjJhNjNiMjJjMzllMThj MTI5ZTQ0YmM4ZjJkMzhiOGIyYzguLjA5OGY2OGU4MzNmMGU3ZmVkMGU2M2ViM2RiYzVkZmUxYjJj YjZmZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvd2luL0Rv d25sb2FkQnVuZGxlV2luLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L3dpbi9Eb3dubG9hZEJ1bmRsZVdpbi5jcHAKQEAgLTU5LDM0ICs1OSwzMiBAQCBib29sIGFwcGVu ZFJlc3VtZURhdGEoY29uc3QgdWludDhfdCogcmVzdW1lQnl0ZXMsIHVpbnQzMl90IHJlc3VtZUxl bmd0aCwgY29uc3QgUwogICAgIH0KIAogICAgIGF1dG8gbnVsbGlmaWVkUGF0aCA9IGJ1bmRsZVBh dGgud2lkZUNoYXJhY3RlcnMoKTsKLSAgICBGSUxFKiBidW5kbGUgPSAwOwotICAgIGlmIChfd2Zv cGVuX3MoJmJ1bmRsZSwgbnVsbGlmaWVkUGF0aC5kYXRhKCksIFRFWFQoImFiIikpIHx8ICFidW5k bGUpIHsKKyAgICBGSUxFKiBidW5kbGVQdHIgPSAwOworICAgIGlmIChfd2ZvcGVuX3MoJmJ1bmRs ZVB0ciwgbnVsbGlmaWVkUGF0aC5kYXRhKCksIFRFWFQoImFiIikpIHx8ICFidW5kbGVQdHIpIHsK ICAgICAgICAgTE9HX0VSUk9SKCJGYWlsZWQgdG8gb3BlbiBmaWxlICVzIHRvIGFwcGVuZCByZXN1 bWUgZGF0YSIsIGJ1bmRsZVBhdGguYXNjaWkoKS5kYXRhKCkpOwogICAgICAgICByZXR1cm4gZmFs c2U7CiAgICAgfQorICAgIGF1dG8gY2xvc2VyID0gW10oRklMRSogZmlsZSkgeworICAgICAgICBm Y2xvc2UoZmlsZSk7CisgICAgfTsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8RklMRSwgZGVjbHR5cGUo Y2xvc2VyKT4gYnVuZGxlKGJ1bmRsZVB0cik7CiAKLSAgICBib29sIHJlc3VsdCA9IGZhbHNlOwot Ci0gICAgaWYgKGZ3cml0ZShyZXN1bWVCeXRlcywgMSwgcmVzdW1lTGVuZ3RoLCBidW5kbGUpICE9 IHJlc3VtZUxlbmd0aCkgeworICAgIGlmIChmd3JpdGUocmVzdW1lQnl0ZXMsIDEsIHJlc3VtZUxl bmd0aCwgYnVuZGxlLmdldCgpKSAhPSByZXN1bWVMZW5ndGgpIHsKICAgICAgICAgTE9HX0VSUk9S KCJGYWlsZWQgdG8gd3JpdGUgcmVzdW1lIGRhdGEgdG8gdGhlIGJ1bmRsZSAtIGVycm5vKCVpKSIs IGVycm5vKTsKLSAgICAgICAgZ290byBleGl0OworICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAg fQogCi0gICAgaWYgKGZ3cml0ZSgmcmVzdW1lTGVuZ3RoLCA0LCAxLCBidW5kbGUpICE9IDEpIHsK KyAgICBpZiAoZndyaXRlKCZyZXN1bWVMZW5ndGgsIDQsIDEsIGJ1bmRsZS5nZXQoKSkgIT0gMSkg ewogICAgICAgICBMT0dfRVJST1IoIkZhaWxlZCB0byB3cml0ZSBmb290ZXIgbGVuZ3RoIHRvIHRo ZSBidW5kbGUgLSBlcnJubyglaSkiLCBlcnJubyk7Ci0gICAgICAgIGdvdG8gZXhpdDsKKyAgICAg ICAgcmV0dXJuIGZhbHNlOwogICAgIH0KIAogICAgIGNvbnN0IHVpbnQzMl90IG1hZ2ljID0gbWFn aWNOdW1iZXIoKTsKLSAgICBpZiAoZndyaXRlKCZtYWdpYywgNCwgMSwgYnVuZGxlKSAhPSAxKSB7 CisgICAgaWYgKGZ3cml0ZSgmbWFnaWMsIDQsIDEsIGJ1bmRsZS5nZXQoKSkgIT0gMSkgewogICAg ICAgICBMT0dfRVJST1IoIkZhaWxlZCB0byB3cml0ZSBmb290ZXIgbWFnaWMgbnVtYmVyIHRvIHRo ZSBidW5kbGUgLSBlcnJubyglaSkiLCBlcnJubyk7Ci0gICAgICAgIGdvdG8gZXhpdDsKKyAgICAg ICAgcmV0dXJuIGZhbHNlOwogICAgIH0KLQotICAgIHJlc3VsdCA9IHRydWU7Ci1leGl0OgotICAg IGZjbG9zZShidW5kbGUpOwotICAgIHJldHVybiByZXN1bHQ7CisgICAgcmV0dXJuIHRydWU7CiB9 CiAKIGJvb2wgZXh0cmFjdFJlc3VtZURhdGEoY29uc3QgU3RyaW5nJiBidW5kbGVQYXRoLCBWZWN0 b3I8dWludDhfdD4mIHJlc3VtZURhdGEpCkBAIC05OCwzNiArOTYsMzggQEAgYm9vbCBleHRyYWN0 UmVzdW1lRGF0YShjb25zdCBTdHJpbmcmIGJ1bmRsZVBhdGgsIFZlY3Rvcjx1aW50OF90PiYgcmVz dW1lRGF0YSkKIAogICAgIC8vIE9wZW4gYSBoYW5kbGUgdG8gdGhlIGJ1bmRsZSBmaWxlCiAgICAg YXV0byBudWxsaWZpZWRQYXRoID0gYnVuZGxlUGF0aC53aWRlQ2hhcmFjdGVycygpOwotICAgIEZJ TEUqIGJ1bmRsZSA9IDA7Ci0gICAgaWYgKF93Zm9wZW5fcygmYnVuZGxlLCBudWxsaWZpZWRQYXRo LmRhdGEoKSwgVEVYVCgicitiIikpIHx8ICFidW5kbGUpIHsKKyAgICBGSUxFKiBidW5kbGVQdHIg PSAwOworICAgIGlmIChfd2ZvcGVuX3MoJmJ1bmRsZVB0ciwgbnVsbGlmaWVkUGF0aC5kYXRhKCks IFRFWFQoInIrYiIpKSB8fCAhYnVuZGxlUHRyKSB7CiAgICAgICAgIExPR19FUlJPUigiRmFpbGVk IHRvIG9wZW4gZmlsZSAlcyB0byBnZXQgcmVzdW1lIGRhdGEiLCBidW5kbGVQYXRoLmFzY2lpKCku ZGF0YSgpKTsKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KLQotICAgIGJvb2wgcmVzdWx0 ID0gZmFsc2U7CisgICAgYXV0byBjbG9zZXIgPSBbXShGSUxFKiBmaWxlKSB7CisgICAgICAgIGZj bG9zZShmaWxlKTsKKyAgICB9OworICAgIHN0ZDo6dW5pcXVlX3B0cjxGSUxFLCBkZWNsdHlwZShj bG9zZXIpPiBidW5kbGUoYnVuZGxlUHRyKTsKIAogICAgIC8vIFN0YXQgdGhlIGZpbGUgdG8gZ2V0 IGl0cyBzaXplCiAgICAgc3RydWN0IF9zdGF0NjQgZmlsZVN0YXQ7Ci0gICAgaWYgKF9mc3RhdDY0 KF9maWxlbm8oYnVuZGxlKSwgJmZpbGVTdGF0KSkKLSAgICAgICAgZ290byBleGl0OworICAgIGlm IChfZnN0YXQ2NChfZmlsZW5vKGJ1bmRsZS5nZXQoKSksICZmaWxlU3RhdCkpCisgICAgICAgIHJl dHVybiBmYWxzZTsKIAogICAgIC8vIENoZWNrIGZvciB0aGUgYnVuZGxlIG1hZ2ljIG51bWJlciBh dCB0aGUgZW5kIG9mIHRoZSBmaWxlCiAgICAgZnBvc190IGZvb3Rlck1hZ2ljTnVtYmVyUG9zaXRp b24gPSBmaWxlU3RhdC5zdF9zaXplIC0gNDsKICAgICBBU1NFUlQoZm9vdGVyTWFnaWNOdW1iZXJQ b3NpdGlvbiA+PSAwKTsKICAgICBpZiAoZm9vdGVyTWFnaWNOdW1iZXJQb3NpdGlvbiA8IDApCi0g ICAgICAgIGdvdG8gZXhpdDsKLSAgICBpZiAoZnNldHBvcyhidW5kbGUsICZmb290ZXJNYWdpY051 bWJlclBvc2l0aW9uKSkKLSAgICAgICAgZ290byBleGl0OworICAgICAgICByZXR1cm4gZmFsc2U7 CisgICAgaWYgKGZzZXRwb3MoYnVuZGxlLmdldCgpLCAmZm9vdGVyTWFnaWNOdW1iZXJQb3NpdGlv bikpCisgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIHVpbnQzMl90IGZvb3Rlck1hZ2ljTnVt YmVyID0gMDsKLSAgICBpZiAoZnJlYWQoJmZvb3Rlck1hZ2ljTnVtYmVyLCA0LCAxLCBidW5kbGUp ICE9IDEpIHsKKyAgICBpZiAoZnJlYWQoJmZvb3Rlck1hZ2ljTnVtYmVyLCA0LCAxLCBidW5kbGUu Z2V0KCkpICE9IDEpIHsKICAgICAgICAgTE9HX0VSUk9SKCJGYWlsZWQgdG8gcmVhZCBmb290ZXIg bWFnaWMgbnVtYmVyIGZyb20gdGhlIGJ1bmRsZSAtIGVycm5vKCVpKSIsIGVycm5vKTsKLSAgICAg ICAgZ290byBleGl0OworICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCiAgICAgaWYgKGZv b3Rlck1hZ2ljTnVtYmVyICE9IG1hZ2ljTnVtYmVyKCkpIHsKICAgICAgICAgTE9HX0VSUk9SKCJG b290ZXIncyBtYWdpYyBudW1iZXIgZG9lcyBub3QgbWF0Y2ggMHglWCAtIGVycm5vKCVpKSIsIG1h Z2ljTnVtYmVyKCksIGVycm5vKTsKLSAgICAgICAgZ290byBleGl0OworICAgICAgICByZXR1cm4g ZmFsc2U7CiAgICAgfQogCiAgICAgLy8gTm93IHdlJ3JlICpyZWFzb25hYmx5KiBzdXJlIHRoaXMg aXMgYSAuZG93bmxvYWQgYnVuZGxlIHdlIGFjdHVhbGx5IHdyb3RlLgpAQCAtMTM1LDQ0ICsxMzUs NDEgQEAgYm9vbCBleHRyYWN0UmVzdW1lRGF0YShjb25zdCBTdHJpbmcmIGJ1bmRsZVBhdGgsIFZl Y3Rvcjx1aW50OF90PiYgcmVzdW1lRGF0YSkKICAgICBmcG9zX3QgZm9vdGVyTGVuZ3RoUG9zaXRp b24gPSBmaWxlU3RhdC5zdF9zaXplIC0gODsKICAgICBBU1NFUlQoZm9vdGVyTGVuZ3RoUG9zaXRp b24gPj0gMCk7CiAgICAgaWYgKGZvb3Rlckxlbmd0aFBvc2l0aW9uIDwgMCkKLSAgICAgICAgZ290 byBleGl0OworICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAoZnNldHBvcyhidW5kbGUs ICZmb290ZXJMZW5ndGhQb3NpdGlvbikpCi0gICAgICAgIGdvdG8gZXhpdDsKKyAgICBpZiAoZnNl dHBvcyhidW5kbGUuZ2V0KCksICZmb290ZXJMZW5ndGhQb3NpdGlvbikpCisgICAgICAgIHJldHVy biBmYWxzZTsKIAogICAgIHVpbnQzMl90IGZvb3Rlckxlbmd0aCA9IDA7Ci0gICAgaWYgKGZyZWFk KCZmb290ZXJMZW5ndGgsIDQsIDEsIGJ1bmRsZSkgIT0gMSkgeworICAgIGlmIChmcmVhZCgmZm9v dGVyTGVuZ3RoLCA0LCAxLCBidW5kbGUuZ2V0KCkpICE9IDEpIHsKICAgICAgICAgTE9HX0VSUk9S KCJGYWlsZWQgdG8gcmVhZCBSZXN1bWVEYXRhIGxlbmd0aCBmcm9tIHRoZSBidW5kbGUgLSBlcnJu byglaSkiLCBlcnJubyk7Ci0gICAgICAgIGdvdG8gZXhpdDsKKyAgICAgICAgcmV0dXJuIGZhbHNl OwogICAgIH0KIAogICAgIC8vIE1ha2Ugc3VyZSB0aGVyZXMgZW5vdWdoIGJ5dGVzIHRvIHJlYWQg aW4gZm9yIHRoZSByZXN1bWUgZGF0YSwgYW5kIHBlcmZvcm0gdGhlIHJlYWQKICAgICBmcG9zX3Qg Zm9vdGVyU3RhcnRQb3NpdGlvbiA9IGZpbGVTdGF0LnN0X3NpemUgLSA4IC0gZm9vdGVyTGVuZ3Ro OwogICAgIEFTU0VSVChmb290ZXJTdGFydFBvc2l0aW9uID49IDApOwogICAgIGlmIChmb290ZXJT dGFydFBvc2l0aW9uIDwgMCkKLSAgICAgICAgZ290byBleGl0OwotICAgIGlmIChmc2V0cG9zKGJ1 bmRsZSwgJmZvb3RlclN0YXJ0UG9zaXRpb24pKQotICAgICAgICBnb3RvIGV4aXQ7CisgICAgICAg IHJldHVybiBmYWxzZTsKKyAgICBpZiAoZnNldHBvcyhidW5kbGUuZ2V0KCksICZmb290ZXJTdGFy dFBvc2l0aW9uKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgcmVzdW1lRGF0YS5yZXNp emUoZm9vdGVyTGVuZ3RoKTsKLSAgICBpZiAoZnJlYWQocmVzdW1lRGF0YS5kYXRhKCksIDEsIGZv b3Rlckxlbmd0aCwgYnVuZGxlKSAhPSBmb290ZXJMZW5ndGgpIHsKKyAgICBpZiAoZnJlYWQocmVz dW1lRGF0YS5kYXRhKCksIDEsIGZvb3Rlckxlbmd0aCwgYnVuZGxlLmdldCgpKSAhPSBmb290ZXJM ZW5ndGgpIHsKICAgICAgICAgTE9HX0VSUk9SKCJGYWlsZWQgdG8gcmVhZCBSZXN1bWVEYXRhIGZy b20gdGhlIGJ1bmRsZSAtIGVycm5vKCVpKSIsIGVycm5vKTsKLSAgICAgICAgZ290byBleGl0Owor ICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCiAgICAgLy8gQ0ZVUkxEb3dubG9hZCB3aWxs IHNlZWsgdG8gdGhlIGFwcHJvcHJpYXRlIHBsYWNlIGluIHRoZSBmaWxlIChiZWZvcmUgb3VyIGZv b3RlcikgYW5kIHN0YXJ0IG92ZXJ3cml0aW5nIGZyb20gdGhlcmUKICAgICAvLyBIb3dldmVyLCBz YXkgd2Ugd2VyZSB3aXRoaW4gYSBmZXcgaHVuZHJlZCBieXRlcyBvZiB0aGUgZW5kIG9mIGEgZG93 bmxvYWQgd2hlbiBpdCB3YXMgcGF1c2VkIC0KICAgICAvLyBUaGUgYWRkaXRpb25hbCBmb290ZXIg ZXh0ZW5kZWQgdGhlIGxlbmd0aCBvZiB0aGUgZmlsZSBiZXlvbmQgaXRzIGZpbmFsIGxlbmd0aCwg YW5kIHRoZXJlIHdpbGwgYmUganVuayBkYXRhIGxlZnRvdmVyCiAgICAgLy8gYXQgdGhlIGVuZC4g IFRoZXJlZm9yZSwgbm93IHRoYXQgd2UndmUgcmV0cmlldmVkIHRoZSBmb290ZXIgZGF0YSwgd2Ug bmVlZCB0byB0cnVuY2F0ZSBpdC4KLSAgICBpZiAoZXJybm9fdCByZXNpemVFcnJvciA9IF9jaHNp emVfcyhfZmlsZW5vKGJ1bmRsZSksIGZvb3RlclN0YXJ0UG9zaXRpb24pKSB7CisgICAgaWYgKGVy cm5vX3QgcmVzaXplRXJyb3IgPSBfY2hzaXplX3MoX2ZpbGVubyhidW5kbGUuZ2V0KCkpLCBmb290 ZXJTdGFydFBvc2l0aW9uKSkgewogICAgICAgICBMT0dfRVJST1IoIkZhaWxlZCB0byB0cnVuY2F0 ZSB0aGUgcmVzdW1lIGZvb3RlciBvZmYgdGhlIGVuZCBvZiB0aGUgZmlsZSAtIGVycm5vKCVpKSIs IHJlc2l6ZUVycm9yKTsKLSAgICAgICAgZ290byBleGl0OworICAgICAgICByZXR1cm4gZmFsc2U7 CiAgICAgfQogCi0gICAgcmVzdWx0ID0gdHJ1ZTsKLWV4aXQ6Ci0gICAgZmNsb3NlKGJ1bmRsZSk7 Ci0gICAgcmV0dXJuIHJlc3VsdDsKKyAgICByZXR1cm4gdHJ1ZTsKIH0KIAogfSAvLyBuYW1lc3Bh Y2UgRG93bmxvYWRCdW5kbGUK 447586 2021-12-19 22:40:25 -0800 2021-12-20 11:55:03 -0800 Patch bug-234505-20211220154024.patch text/plain 2184 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MjUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDM0ZGQ0NjEwY2E0M2Rj MDI5YmY2YTBiOWNlNjkwMjZiNTk1YjU4ZS4uZDhiNWYxNmJhODIzMDkwY2M2ZTBhMTIwOTVjZjFj MjIzMjI4ZTBhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTEyLTE5ICBGdWpp aSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgorCisgICAgICAgIFtXaW5dIE1T VkMgcmVwb3J0cyAiRHJhZ0ltYWdlQ2Fpcm9XaW4uY3BwKDE0Mik6IGVycm9yIEMyMzYyOiBpbml0 aWFsaXphdGlvbiBvZiAnY3InIGlzIHNraXBwZWQgYnkgJ2dvdG8gZXhpdCciIHdpdGggL3N0ZDpj KysyMAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM0 NTA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBw bGF0Zm9ybS93aW4vRHJhZ0ltYWdlQ2Fpcm9XaW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6c2Nh bGVEcmFnSW1hZ2UpOgorICAgICAgICBSZWltcGxlbWVudGVkIHdpdGhvdXQgZ290byBzdGF0ZW1l bnRzLgorCiAyMDIxLTEyLTE5ICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KIAog ICAgICAgICBTdHViIG91dCBOb3RpZmljYXRpb25FdmVudCBhbmQgcmVsYXRlZApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd2luL0RyYWdJbWFnZUNhaXJvV2luLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9EcmFnSW1hZ2VDYWlyb1dpbi5jcHAKaW5kZXggNzkz MjYzMDY1MWNhMjZkNGJlMzc4NDE1ZDdjNTQ5ZjljMzVjMGU5Yy4uZThmNTQ3NjQ5NzZiZThlNjc0 ZTQxYTBhNDgzNDY5NTNjZDYyOTQ5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vd2luL0RyYWdJbWFnZUNhaXJvV2luLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS93aW4vRHJhZ0ltYWdlQ2Fpcm9XaW4uY3BwCkBAIC0xMDcsNyArMTA3LDYgQEAgRHJhZ0ltYWdl UmVmIHNjYWxlRHJhZ0ltYWdlKERyYWdJbWFnZVJlZiBpbWFnZVJlZiwgRmxvYXRTaXplIHNjYWxl KQogICAgIGlmICghaW1hZ2VSZWYpCiAgICAgICAgIHJldHVybiAwOwogCi0gICAgR0RJT2JqZWN0 PEhCSVRNQVA+IGhibXA7CiAgICAgYXV0byBpbWFnZSA9IGFkb3B0R0RJT2JqZWN0KGltYWdlUmVm KTsKIAogICAgIEludFNpemUgc3JjU2l6ZSA9IGRyYWdJbWFnZVNpemUoaW1hZ2UuZ2V0KCkpOwpA QCAtMTE2LDEyICsxMTUsMTIgQEAgRHJhZ0ltYWdlUmVmIHNjYWxlRHJhZ0ltYWdlKERyYWdJbWFn ZVJlZiBpbWFnZVJlZiwgRmxvYXRTaXplIHNjYWxlKQogICAgIEhXbmREQyBkYygwKTsKICAgICBh dXRvIGRzdERDID0gYWRvcHRHRElPYmplY3QoOjpDcmVhdGVDb21wYXRpYmxlREMoZGMpKTsKICAg ICBpZiAoIWRzdERDKQotICAgICAgICBnb3RvIGV4aXQ7CisgICAgICAgIHJldHVybiBpbWFnZS5s ZWFrKCk7CiAKICAgICBHcmFwaGljc0NvbnRleHRDYWlybyogdGFyZ2V0Q29udGV4dDsKLSAgICBo Ym1wID0gYWxsb2NJbWFnZShkc3REQy5nZXQoKSwgZHN0U2l6ZSwgJnRhcmdldENvbnRleHQpOwor ICAgIEdESU9iamVjdDxIQklUTUFQPiBoYm1wID0gYWxsb2NJbWFnZShkc3REQy5nZXQoKSwgZHN0 U2l6ZSwgJnRhcmdldENvbnRleHQpOwogICAgIGlmICghaGJtcCkKLSAgICAgICAgZ290byBleGl0 OworICAgICAgICByZXR1cm4gaW1hZ2UubGVhaygpOwogCiAgICAgY2Fpcm9fc3VyZmFjZV90KiBz cmNJbWFnZSA9IGNyZWF0ZUNhaXJvQ29udGV4dEZyb21CaXRtYXAoaW1hZ2UuZ2V0KCkpOwogCkBA IC0xMzksOSArMTM4LDYgQEAgRHJhZ0ltYWdlUmVmIHNjYWxlRHJhZ0ltYWdlKERyYWdJbWFnZVJl ZiBpbWFnZVJlZiwgRmxvYXRTaXplIHNjYWxlKQogICAgIGNhaXJvX3N1cmZhY2VfZGVzdHJveShz cmNJbWFnZSk7CiAgICAgZGVhbGxvY0NvbnRleHQodGFyZ2V0Q29udGV4dCk7CiAKLWV4aXQ6Ci0g ICAgaWYgKCFoYm1wKQotICAgICAgICBoYm1wLnN3YXAoaW1hZ2UpOwogICAgIHJldHVybiBoYm1w LmxlYWsoKTsKIH0KICAgICAK