226667 2021-06-04 15:57:39 -0700 Use access instead of stat in some filesystem functions 2021-06-08 19:26:43 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 nham nham benjamin cdumez cmarcelo ews-watchlist nham webkit-bug-importer oldest_to_newest 1766970 0 nham 2021-06-04 15:57:39 -0700 Use access instead of stat in some filesystem functions 1766987 1 430630 nham 2021-06-04 16:21:32 -0700 Created attachment 430630 Patch 1766988 2 webkit-bug-importer 2021-06-04 16:22:14 -0700 <rdar://problem/78890899> 1766989 3 430631 nham 2021-06-04 16:25:59 -0700 Created attachment 430631 Patch 1767864 4 430880 cdumez 2021-06-08 12:54:31 -0700 Created attachment 430880 Patch 1767954 5 430880 cdumez 2021-06-08 16:28:21 -0700 Comment on attachment 430880 Patch r=me 1768026 6 ews-feeder 2021-06-08 19:26:41 -0700 Committed r278641 (238623@main): <https://commits.webkit.org/238623@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 430880. 430630 2021-06-04 16:21:32 -0700 2021-06-04 16:26:05 -0700 Patch bug-226667-20210604162131.patch text/plain 9368 nham U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4NDE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDc3ZGM0MTgyNGEwMDViNGUxNWY0MTQy ODYzMTUyMTgzZDIwZWY1ODQuLjBlZTlmZGYxMzc4NTdjZmU1OTgzMTA5MDAzNzU5NzRiMzFkNWM4 OWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsNDEgQEAKKzIwMjEtMDYtMDQgIEJlbiBOaGFtICA8bmhhbUBhcHBs ZS5jb20+CisKKyAgICAgICAgVXNlIGFjY2VzcyBpbnN0ZWFkIG9mIHN0YXQgaW4gc29tZSBmaWxl c3lzdGVtIGZ1bmN0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjI2NjY3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgV2UgYXJlIHNwZW5kaW5nIGEgYml0IG1vcmUgdGltZSBpbiBXVEY6OkZpbGVTeXN0 ZW1JbXBsIGZ1bmN0aW9ucyBhZnRlciB0aGUgbW92ZSB0bworICAgICAgICBzdGQ6OmZpbGVzeXN0 ZW0gKGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjUyNTUpLiBJbiBw YXJ0aWN1bGFyLCBzZXZlcmFsCisgICAgICAgIHN0ZDo6ZmlsZXN5c3RlbSBmdW5jdGlvbnMgKGxp a2UgdGhlIG9uZXMgY2FsbGVkIGJ5IGZpbGVFeGlzdHMgYW5kIG1ha2VBbGxEaXJlY3Rvcmllcykg cHJlZmVyCisgICAgICAgIHRvIHVzZSBzdGF0KCkgb3ZlciBhY2Nlc3MoKSBmb3IgZmlsZSBleGlz dGVuY2UgY2hlY2tzLiBTaW5jZSBvdXIgc2FuZGJveCBoYXMgYSBmYXN0IHBhdGggZm9yCisgICAg ICAgIGFjY2VzcyhwYXRoLCBGX09LKSBidXQgbm90IGZvciBzdGF0LCB3ZSBlbmRlZCB1cCBzcGVu ZGluZyBtb3JlIHRpbWUgaW4gc2FuZGJveCBldmFsdWF0aW9uIGluCisgICAgICAgIHRoZSBrZXJu ZWwgYWZ0ZXIgdGhlIG1vdmUgdG8gc3RkOjpmaWxlc3lzdGVtLgorCisgICAgICAgIE5vdGUgdGhh dCB0aGUgdHdvIGNoZWNrcyBkb24ndCBkbyBleGFjdGx5IHRoZSBzYW1lIHRoaW5nLiBhY2Nlc3Mo cGF0aCwgRl9PSykgb25seSBjaGVja3MgZm9yCisgICAgICAgIHBhdGggZXhpc3RlbmNlLCB3aGls ZSBzdGF0KHBhdGgpIGFkZGl0aW9uYWxseSBmZXRjaGVzIG1ldGFkYXRhLCB3aGljaCByZXF1aXJl cyBjaGVja2luZyB0aGUKKyAgICAgICAgZmlsZS1yZWFkLW1ldGFkYXRhIHBlcm1pc3Npb24uIEJ1 dCBpbiBwcmFjdGljZSBvdXIgY29kZSB3YXMgd3JpdHRlbiB0byBiZSBmaW5lIHdpdGgganVzdAor ICAgICAgICBjaGVja2luZyBmb3IgZXhpc3RlbmNlLgorCisgICAgICAgIFRvIHdvcmsgYXJvdW5k IHRoaXMsIEkndmUgcmUtaW50cm9kdWNlZCBzb21lIG9mIHRoZSBvbGQgV1RGOjpGaWxlU3lzdGVt SW1wbCBmdW5jdGlvbnMgZnJvbQorICAgICAgICBGaWxlU3lzdGVtUG9zaXguY3BwLiBUaGV5IGFy ZSB0aGUgb25lcyB0aGF0IGFyZSBjYWxsZWQgYnkgTmV0d29ya0NhY2hlLCB3aGljaCBzZWVtcyB0 byBiZQorICAgICAgICB0aGUgYmlnZ2VzdCBjb25zdW1lciBvZiB0aGVzZSBmdW5jdGlvbnMuIFRo ZSByZXN0IG9mIHRoZSBmdW5jdGlvbnMgYXJlIHN0aWxsIGltcGxlbWVudGVkCisgICAgICAgIHVz aW5nIHN0ZDo6ZmlsZXN5c3RlbS4KKworICAgICAgICAqIHd0Zi9GaWxlU3lzdGVtLmNwcDoKKyAg ICAgICAgKFdURjo6RmlsZVN5c3RlbUltcGw6OmZpbGVFeGlzdHMpOgorICAgICAgICAoV1RGOjpG aWxlU3lzdGVtSW1wbDo6ZGVsZXRlRmlsZSk6CisgICAgICAgIChXVEY6OkZpbGVTeXN0ZW1JbXBs OjptYWtlQWxsRGlyZWN0b3JpZXMpOgorICAgICAgICAoV1RGOjpGaWxlU3lzdGVtSW1wbDo6cGF0 aEJ5QXBwZW5kaW5nQ29tcG9uZW50KToKKyAgICAgICAgKFdURjo6RmlsZVN5c3RlbUltcGw6OnBh dGhCeUFwcGVuZGluZ0NvbXBvbmVudHMpOgorICAgICAgICAqIHd0Zi9QbGF0Zm9ybUVuYWJsZUNv Y29hLmg6CisgICAgICAgICogd3RmL3Bvc2l4L0ZpbGVTeXN0ZW1QT1NJWC5jcHA6CisgICAgICAg IChXVEY6OkZpbGVTeXN0ZW1JbXBsOjpmaWxlRXhpc3RzKToKKyAgICAgICAgKFdURjo6RmlsZVN5 c3RlbUltcGw6OmRlbGV0ZUZpbGUpOgorICAgICAgICAoV1RGOjpGaWxlU3lzdGVtSW1wbDo6bWFr ZUFsbERpcmVjdG9yaWVzKToKKyAgICAgICAgKFdURjo6RmlsZVN5c3RlbUltcGw6OnBhdGhCeUFw cGVuZGluZ0NvbXBvbmVudCk6CisgICAgICAgIChXVEY6OkZpbGVTeXN0ZW1JbXBsOjpwYXRoQnlB cHBlbmRpbmdDb21wb25lbnRzKToKKwogMjAyMS0wNi0wMyAgTWljaGFlbCBDYXRhbnphcm8gIDxt Y2F0YW56YXJvQGdub21lLm9yZz4KIAogICAgICAgICBSRUdSRVNTSU9OKHIyNzc3NDQpOiBCcm9r ZSBidWlsZCBvbiBzMzkweCBtYWluZnJhbWVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9G aWxlU3lzdGVtLmNwcCBiL1NvdXJjZS9XVEYvd3RmL0ZpbGVTeXN0ZW0uY3BwCmluZGV4IDkxZGRj ZjI2MTkwYjk3MjRiYTE5MzVjZDBlM2MwMDVjMTk5YjRjMWUuLjZhNzk4ODFjYWIwZDM0ZWNmNjli MWRiMjc1YjQ1MmI5N2QyMWRmZDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL0ZpbGVTeXN0 ZW0uY3BwCisrKyBiL1NvdXJjZS9XVEYvd3RmL0ZpbGVTeXN0ZW0uY3BwCkBAIC01MjIsMjYgKzUy Miw2IEBAIHN0ZDo6b3B0aW9uYWw8U2FsdD4gcmVhZE9yTWFrZVNhbHQoY29uc3QgU3RyaW5nJiBw YXRoKQogCiAjaWYgSEFWRShTVERfRklMRVNZU1RFTSkgfHwgSEFWRShTVERfRVhQRVJJTUVOVEFM X0ZJTEVTWVNURU0pCiAKLWJvb2wgZmlsZUV4aXN0cyhjb25zdCBTdHJpbmcmIHBhdGgpCi17Ci0g ICAgc3RkOjplcnJvcl9jb2RlIGVjOwotICAgIC8vIGV4aXN0cygpIHJldHVybnMgZmFsc2Ugb24g ZXJyb3Igc28gbm8gbmVlZCB0byBjaGVjayBlYy4KLSAgICByZXR1cm4gc3RkOjpmaWxlc3lzdGVt OjpleGlzdHModG9TdGRGaWxlU3lzdGVtUGF0aChwYXRoKSwgZWMpOwotfQotCi1ib29sIGRlbGV0 ZUZpbGUoY29uc3QgU3RyaW5nJiBwYXRoKQotewotICAgIHN0ZDo6ZXJyb3JfY29kZSBlYzsKLSAg ICBhdXRvIGZzUGF0aCA9IHRvU3RkRmlsZVN5c3RlbVBhdGgocGF0aCk7Ci0KLSAgICBhdXRvIGZp bGVTdGF0dXMgPSBzdGQ6OmZpbGVzeXN0ZW06OnN5bWxpbmtfc3RhdHVzKGZzUGF0aCwgZWMpOwot ICAgIGlmIChlYyB8fCBmaWxlU3RhdHVzLnR5cGUoKSA9PSBzdGQ6OmZpbGVzeXN0ZW06OmZpbGVf dHlwZTo6ZGlyZWN0b3J5KQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICAvLyByZW1vdmUo KSByZXR1cm5zIGZhbHNlIG9uIGVycm9yIHNvIG5vIG5lZWQgdG8gY2hlY2sgZWMuCi0gICAgcmV0 dXJuIHN0ZDo6ZmlsZXN5c3RlbTo6cmVtb3ZlKGZzUGF0aCwgZWMpOwotfQotCiBib29sIGRlbGV0 ZUVtcHR5RGlyZWN0b3J5KGNvbnN0IFN0cmluZyYgcGF0aCkKIHsKICAgICBzdGQ6OmVycm9yX2Nv ZGUgZWM7CkBAIC01OTcsMTMgKzU3Nyw2IEBAIHN0ZDo6b3B0aW9uYWw8dWludDY0X3Q+IGZpbGVT aXplKGNvbnN0IFN0cmluZyYgcGF0aCkKICAgICByZXR1cm4gc2l6ZTsKIH0KIAotYm9vbCBtYWtl QWxsRGlyZWN0b3JpZXMoY29uc3QgU3RyaW5nJiBwYXRoKQotewotICAgIHN0ZDo6ZXJyb3JfY29k ZSBlYzsKLSAgICBzdGQ6OmZpbGVzeXN0ZW06OmNyZWF0ZV9kaXJlY3Rvcmllcyh0b1N0ZEZpbGVT eXN0ZW1QYXRoKHBhdGgpLCBlYyk7Ci0gICAgcmV0dXJuICFlYzsKLX0KLQogc3RkOjpvcHRpb25h bDx1aW50NjRfdD4gdm9sdW1lRnJlZVNwYWNlKGNvbnN0IFN0cmluZyYgcGF0aCkKIHsKICAgICBz dGQ6OmVycm9yX2NvZGUgZWM7CkBAIC03MjgsNiArNzAxLDQ4IEBAIFN0cmluZyByZWFsUGF0aChj b25zdCBTdHJpbmcmIHBhdGgpCiAgICAgcmV0dXJuIGVjID8gcGF0aCA6IGZyb21TdGRGaWxlU3lz dGVtUGF0aChjYW5vbmljYWxQYXRoKTsKIH0KIAorVmVjdG9yPFN0cmluZz4gbGlzdERpcmVjdG9y eShjb25zdCBTdHJpbmcmIHBhdGgpCit7CisgICAgVmVjdG9yPFN0cmluZz4gZmlsZU5hbWVzOwor ICAgIHN0ZDo6ZXJyb3JfY29kZSBlYzsKKyAgICBhdXRvIGVudHJpZXMgPSBzdGQ6OmZpbGVzeXN0 ZW06OmRpcmVjdG9yeV9pdGVyYXRvcih0b1N0ZEZpbGVTeXN0ZW1QYXRoKHBhdGgpLCBlYyk7Cisg ICAgZm9yIChhdXRvIGl0ID0gc3RkOjpmaWxlc3lzdGVtOjpiZWdpbihlbnRyaWVzKSwgZW5kID0g c3RkOjpmaWxlc3lzdGVtOjplbmQoZW50cmllcyk7ICFlYyAmJiBpdCAhPSBlbmQ7IGl0LmluY3Jl bWVudChlYykpIHsKKyAgICAgICAgYXV0byBmaWxlTmFtZSA9IGZyb21TdGRGaWxlU3lzdGVtUGF0 aChpdC0+cGF0aCgpLmZpbGVuYW1lKCkpOworICAgICAgICBpZiAoIWZpbGVOYW1lLmlzTnVsbCgp KQorICAgICAgICAgICAgZmlsZU5hbWVzLmFwcGVuZChXVEZNb3ZlKGZpbGVOYW1lKSk7CisgICAg fQorICAgIHJldHVybiBmaWxlTmFtZXM7Cit9CisKKyNpZiBFTkFCTEUoRklMRVNZU1RFTV9QT1NJ WF9GQVNUX1BBVEgpCisKK2Jvb2wgZmlsZUV4aXN0cyhjb25zdCBTdHJpbmcmIHBhdGgpCit7Cisg ICAgc3RkOjplcnJvcl9jb2RlIGVjOworICAgIC8vIGV4aXN0cygpIHJldHVybnMgZmFsc2Ugb24g ZXJyb3Igc28gbm8gbmVlZCB0byBjaGVjayBlYy4KKyAgICByZXR1cm4gc3RkOjpmaWxlc3lzdGVt OjpleGlzdHModG9TdGRGaWxlU3lzdGVtUGF0aChwYXRoKSwgZWMpOworfQorCitib29sIGRlbGV0 ZUZpbGUoY29uc3QgU3RyaW5nJiBwYXRoKQoreworICAgIHN0ZDo6ZXJyb3JfY29kZSBlYzsKKyAg ICBhdXRvIGZzUGF0aCA9IHRvU3RkRmlsZVN5c3RlbVBhdGgocGF0aCk7CisKKyAgICBhdXRvIGZp bGVTdGF0dXMgPSBzdGQ6OmZpbGVzeXN0ZW06OnN5bWxpbmtfc3RhdHVzKGZzUGF0aCwgZWMpOwor ICAgIGlmIChlYyB8fCBmaWxlU3RhdHVzLnR5cGUoKSA9PSBzdGQ6OmZpbGVzeXN0ZW06OmZpbGVf dHlwZTo6ZGlyZWN0b3J5KQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICAvLyByZW1vdmUo KSByZXR1cm5zIGZhbHNlIG9uIGVycm9yIHNvIG5vIG5lZWQgdG8gY2hlY2sgZWMuCisgICAgcmV0 dXJuIHN0ZDo6ZmlsZXN5c3RlbTo6cmVtb3ZlKGZzUGF0aCwgZWMpOworfQorCitib29sIG1ha2VB bGxEaXJlY3Rvcmllcyhjb25zdCBTdHJpbmcmIHBhdGgpCit7CisgICAgc3RkOjplcnJvcl9jb2Rl IGVjOworICAgIHN0ZDo6ZmlsZXN5c3RlbTo6Y3JlYXRlX2RpcmVjdG9yaWVzKHRvU3RkRmlsZVN5 c3RlbVBhdGgocGF0aCksIGVjKTsKKyAgICByZXR1cm4gIWVjOworfQorCiBTdHJpbmcgcGF0aEJ5 QXBwZW5kaW5nQ29tcG9uZW50KGNvbnN0IFN0cmluZyYgcGF0aCwgY29uc3QgU3RyaW5nJiBjb21w b25lbnQpCiB7CiAgICAgcmV0dXJuIGZyb21TdGRGaWxlU3lzdGVtUGF0aCh0b1N0ZEZpbGVTeXN0 ZW1QYXRoKHBhdGgpIC8gdG9TdGRGaWxlU3lzdGVtUGF0aChjb21wb25lbnQpKTsKQEAgLTc0MSwx OCArNzU2LDcgQEAgU3RyaW5nIHBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudHMoU3RyaW5nVmlldyBw YXRoLCBjb25zdCBWZWN0b3I8U3RyaW5nVmlldz4mIGNvbXAKICAgICByZXR1cm4gZnJvbVN0ZEZp bGVTeXN0ZW1QYXRoKGZzUGF0aCk7CiB9CiAKLVZlY3RvcjxTdHJpbmc+IGxpc3REaXJlY3Rvcnko Y29uc3QgU3RyaW5nJiBwYXRoKQotewotICAgIFZlY3RvcjxTdHJpbmc+IGZpbGVOYW1lczsKLSAg ICBzdGQ6OmVycm9yX2NvZGUgZWM7Ci0gICAgYXV0byBlbnRyaWVzID0gc3RkOjpmaWxlc3lzdGVt OjpkaXJlY3RvcnlfaXRlcmF0b3IodG9TdGRGaWxlU3lzdGVtUGF0aChwYXRoKSwgZWMpOwotICAg IGZvciAoYXV0byBpdCA9IHN0ZDo6ZmlsZXN5c3RlbTo6YmVnaW4oZW50cmllcyksIGVuZCA9IHN0 ZDo6ZmlsZXN5c3RlbTo6ZW5kKGVudHJpZXMpOyAhZWMgJiYgaXQgIT0gZW5kOyBpdC5pbmNyZW1l bnQoZWMpKSB7Ci0gICAgICAgIGF1dG8gZmlsZU5hbWUgPSBmcm9tU3RkRmlsZVN5c3RlbVBhdGgo aXQtPnBhdGgoKS5maWxlbmFtZSgpKTsKLSAgICAgICAgaWYgKCFmaWxlTmFtZS5pc051bGwoKSkK LSAgICAgICAgICAgIGZpbGVOYW1lcy5hcHBlbmQoV1RGTW92ZShmaWxlTmFtZSkpOwotICAgIH0K LSAgICByZXR1cm4gZmlsZU5hbWVzOwotfQorI2VuZGlmCiAKICNlbmRpZiAvLyBIQVZFKFNURF9G SUxFU1lTVEVNKSB8fCBIQVZFKFNURF9FWFBFUklNRU5UQUxfRklMRVNZU1RFTSkKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dURi93dGYvUGxhdGZvcm1FbmFibGVDb2NvYS5oIGIvU291cmNlL1dURi93 dGYvUGxhdGZvcm1FbmFibGVDb2NvYS5oCmluZGV4IDA3ZWQwMzI0ZjhiN2ZjMjJlM2Q2NTRiMjY1 NmRjMzcwOWY1ODc4MzYuLjJhODJhYmJlYzUxZTZmZjJhNjM0ODBhNjNkMGZiZDMzNDlhZWMzYTIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtRW5hYmxlQ29jb2EuaAorKysgYi9T b3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUVuYWJsZUNvY29hLmgKQEAgLTE5Niw2ICsxOTYsMTAgQEAK ICNkZWZpbmUgRU5BQkxFX0ZJTEVfUkVQTEFDRU1FTlQgMQogI2VuZGlmCiAKKyNpZiAhZGVmaW5l ZChFTkFCTEVfRklMRVNZU1RFTV9QT1NJWF9GQVNUX1BBVEgpCisjZGVmaW5lIEVOQUJMRV9GSUxF U1lTVEVNX1BPU0lYX0ZBU1RfUEFUSCAxCisjZW5kaWYKKwogI2lmICFkZWZpbmVkKEVOQUJMRV9G SUxURVJTX0xFVkVMXzIpCiAjZGVmaW5lIEVOQUJMRV9GSUxURVJTX0xFVkVMXzIgMQogI2VuZGlm CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9wb3NpeC9GaWxlU3lzdGVtUE9TSVguY3BwIGIv U291cmNlL1dURi93dGYvcG9zaXgvRmlsZVN5c3RlbVBPU0lYLmNwcAppbmRleCBiZjRmNzM5Nzkw Mzk2OTgyN2NmYTIwMzVmYTkwNWZlYmY1MjQwM2NhLi43Zjk0MWYxMDZjYmFjZTk2Nzc2NmIyYmM3 YWJiNGJlNzc2YjFmY2Y5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9wb3NpeC9GaWxlU3lz dGVtUE9TSVguY3BwCisrKyBiL1NvdXJjZS9XVEYvd3RmL3Bvc2l4L0ZpbGVTeXN0ZW1QT1NJWC5j cHAKQEAgLTIzNSw1ICsyMzUsODQgQEAgc3RkOjpvcHRpb25hbDxpbnQzMl90PiBnZXRGaWxlRGV2 aWNlSWQoY29uc3QgQ1N0cmluZyYgZnNGaWxlKQogICAgIHJldHVybiBmaWxlU3RhdC5zdF9kZXY7 CiB9CiAKKyNpZiBFTkFCTEUoRklMRVNZU1RFTV9QT1NJWF9GQVNUX1BBVEgpCisKK2Jvb2wgZmls ZUV4aXN0cyhjb25zdCBTdHJpbmcmIHBhdGgpCit7CisgICAgaWYgKHBhdGguaXNOdWxsKCkpCisg ICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIENTdHJpbmcgZnNSZXAgPSBmaWxlU3lzdGVtUmVw cmVzZW50YXRpb24ocGF0aCk7CisKKyAgICBpZiAoIWZzUmVwLmRhdGEoKSB8fCBmc1JlcC5kYXRh KClbMF0gPT0gJ1wwJykKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgcmV0dXJuIGFjY2Vz cyhmc1JlcC5kYXRhKCksIEZfT0spICE9IC0xOworfQorCitib29sIGRlbGV0ZUZpbGUoY29uc3Qg U3RyaW5nJiBwYXRoKQoreworICAgIENTdHJpbmcgZnNSZXAgPSBmaWxlU3lzdGVtUmVwcmVzZW50 YXRpb24ocGF0aCk7CisKKyAgICBpZiAoIWZzUmVwLmRhdGEoKSB8fCBmc1JlcC5kYXRhKClbMF0g PT0gJ1wwJykgeworICAgICAgICBMT0dfRVJST1IoIkZpbGUgZmFpbGVkIHRvIGRlbGV0ZS4gRmFp bGVkIHRvIGdldCBmaWxlc3lzdGVtIHJlcHJlc2VudGF0aW9uIHRvIGNyZWF0ZSBDU3RyaW5nIGZy b20gY2ZTdHJpbmcgb3IgZmlsZXN5c3RlbSByZXByZXNlbnRhdGlvbiBpcyBhIG51bGwgdmFsdWUi KTsKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKworICAgIC8vIHVubGluayguLi4pIHJl dHVybnMgMCBvbiBzdWNjZXNzZnVsIGRlbGV0aW9uIG9mIHRoZSBwYXRoIGFuZCBub24temVybyBp biBhbnkgb3RoZXIgY2FzZSAoaW5jbHVkaW5nIGludmFsaWQgcGVybWlzc2lvbnMgb3Igbm9uLWV4 aXN0ZW50IGZpbGUpCisgICAgYm9vbCB1bmxpbmtlZCA9ICF1bmxpbmsoZnNSZXAuZGF0YSgpKTsK KyAgICBpZiAoIXVubGlua2VkICYmIGVycm5vICE9IEVOT0VOVCkKKyAgICAgICAgTE9HX0VSUk9S KCJGaWxlIGZhaWxlZCB0byBkZWxldGUuIEVycm9yIG1lc3NhZ2U6ICVzIiwgc3RyZXJyb3IoZXJy bm8pKTsKKworICAgIHJldHVybiB1bmxpbmtlZDsKK30KKworYm9vbCBtYWtlQWxsRGlyZWN0b3Jp ZXMoY29uc3QgU3RyaW5nJiBwYXRoKQoreworICAgIENTdHJpbmcgZnVsbFBhdGggPSBmaWxlU3lz dGVtUmVwcmVzZW50YXRpb24ocGF0aCk7CisgICAgaWYgKCFhY2Nlc3MoZnVsbFBhdGguZGF0YSgp LCBGX09LKSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisKKyAgICBjaGFyKiBwID0gZnVsbFBhdGgu bXV0YWJsZURhdGEoKSArIDE7CisgICAgaW50IGxlbmd0aCA9IGZ1bGxQYXRoLmxlbmd0aCgpOwor CisgICAgaWYgKHBbbGVuZ3RoIC0gMV0gPT0gJy8nKQorICAgICAgICBwW2xlbmd0aCAtIDFdID0g J1wwJzsKKyAgICBmb3IgKDsgKnA7ICsrcCkgeworICAgICAgICBpZiAoKnAgPT0gJy8nKSB7Cisg ICAgICAgICAgICAqcCA9ICdcMCc7CisgICAgICAgICAgICBpZiAoYWNjZXNzKGZ1bGxQYXRoLmRh dGEoKSwgRl9PSykpIHsKKyAgICAgICAgICAgICAgICBpZiAobWtkaXIoZnVsbFBhdGguZGF0YSgp LCBTX0lSV1hVKSkKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICAg ICAgfQorICAgICAgICAgICAgKnAgPSAnLyc7CisgICAgICAgIH0KKyAgICB9CisgICAgaWYgKGFj Y2VzcyhmdWxsUGF0aC5kYXRhKCksIEZfT0spKSB7CisgICAgICAgIGlmIChta2RpcihmdWxsUGF0 aC5kYXRhKCksIFNfSVJXWFUpKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKwor ICAgIHJldHVybiB0cnVlOworfQorCitTdHJpbmcgcGF0aEJ5QXBwZW5kaW5nQ29tcG9uZW50KGNv bnN0IFN0cmluZyYgcGF0aCwgY29uc3QgU3RyaW5nJiBjb21wb25lbnQpCit7CisgICAgaWYgKHBh dGguZW5kc1dpdGgoJy8nKSkKKyAgICAgICAgcmV0dXJuIHBhdGggKyBjb21wb25lbnQ7CisgICAg cmV0dXJuIHBhdGggKyAiLyIgKyBjb21wb25lbnQ7Cit9CisKK1N0cmluZyBwYXRoQnlBcHBlbmRp bmdDb21wb25lbnRzKFN0cmluZ1ZpZXcgcGF0aCwgY29uc3QgVmVjdG9yPFN0cmluZ1ZpZXc+JiBj b21wb25lbnRzKQoreworICAgIFN0cmluZ0J1aWxkZXIgYnVpbGRlcjsKKyAgICBidWlsZGVyLmFw cGVuZChwYXRoKTsKKyAgICBmb3IgKGF1dG8mIGNvbXBvbmVudCA6IGNvbXBvbmVudHMpCisgICAg ICAgIGJ1aWxkZXIuYXBwZW5kKCcvJywgY29tcG9uZW50KTsKKyAgICByZXR1cm4gYnVpbGRlci50 b1N0cmluZygpOworfQorCisjZW5kaWYKKwogfSAvLyBuYW1lc3BhY2UgRmlsZVN5c3RlbUltcGwK IH0gLy8gbmFtZXNwYWNlIFdURgo= 430631 2021-06-04 16:25:59 -0700 2021-06-08 12:54:29 -0700 Patch bug-226667-20210604162558.patch text/plain 9369 nham U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4NDE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDc3ZGM0MTgyNGEwMDViNGUxNWY0MTQy ODYzMTUyMTgzZDIwZWY1ODQuLjBlZTlmZGYxMzc4NTdjZmU1OTgzMTA5MDAzNzU5NzRiMzFkNWM4 OWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsNDEgQEAKKzIwMjEtMDYtMDQgIEJlbiBOaGFtICA8bmhhbUBhcHBs ZS5jb20+CisKKyAgICAgICAgVXNlIGFjY2VzcyBpbnN0ZWFkIG9mIHN0YXQgaW4gc29tZSBmaWxl c3lzdGVtIGZ1bmN0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjI2NjY3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgV2UgYXJlIHNwZW5kaW5nIGEgYml0IG1vcmUgdGltZSBpbiBXVEY6OkZpbGVTeXN0 ZW1JbXBsIGZ1bmN0aW9ucyBhZnRlciB0aGUgbW92ZSB0bworICAgICAgICBzdGQ6OmZpbGVzeXN0 ZW0gKGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjUyNTUpLiBJbiBw YXJ0aWN1bGFyLCBzZXZlcmFsCisgICAgICAgIHN0ZDo6ZmlsZXN5c3RlbSBmdW5jdGlvbnMgKGxp a2UgdGhlIG9uZXMgY2FsbGVkIGJ5IGZpbGVFeGlzdHMgYW5kIG1ha2VBbGxEaXJlY3Rvcmllcykg cHJlZmVyCisgICAgICAgIHRvIHVzZSBzdGF0KCkgb3ZlciBhY2Nlc3MoKSBmb3IgZmlsZSBleGlz dGVuY2UgY2hlY2tzLiBTaW5jZSBvdXIgc2FuZGJveCBoYXMgYSBmYXN0IHBhdGggZm9yCisgICAg ICAgIGFjY2VzcyhwYXRoLCBGX09LKSBidXQgbm90IGZvciBzdGF0LCB3ZSBlbmRlZCB1cCBzcGVu ZGluZyBtb3JlIHRpbWUgaW4gc2FuZGJveCBldmFsdWF0aW9uIGluCisgICAgICAgIHRoZSBrZXJu ZWwgYWZ0ZXIgdGhlIG1vdmUgdG8gc3RkOjpmaWxlc3lzdGVtLgorCisgICAgICAgIE5vdGUgdGhh dCB0aGUgdHdvIGNoZWNrcyBkb24ndCBkbyBleGFjdGx5IHRoZSBzYW1lIHRoaW5nLiBhY2Nlc3Mo cGF0aCwgRl9PSykgb25seSBjaGVja3MgZm9yCisgICAgICAgIHBhdGggZXhpc3RlbmNlLCB3aGls ZSBzdGF0KHBhdGgpIGFkZGl0aW9uYWxseSBmZXRjaGVzIG1ldGFkYXRhLCB3aGljaCByZXF1aXJl cyBjaGVja2luZyB0aGUKKyAgICAgICAgZmlsZS1yZWFkLW1ldGFkYXRhIHBlcm1pc3Npb24uIEJ1 dCBpbiBwcmFjdGljZSBvdXIgY29kZSB3YXMgd3JpdHRlbiB0byBiZSBmaW5lIHdpdGgganVzdAor ICAgICAgICBjaGVja2luZyBmb3IgZXhpc3RlbmNlLgorCisgICAgICAgIFRvIHdvcmsgYXJvdW5k IHRoaXMsIEkndmUgcmUtaW50cm9kdWNlZCBzb21lIG9mIHRoZSBvbGQgV1RGOjpGaWxlU3lzdGVt SW1wbCBmdW5jdGlvbnMgZnJvbQorICAgICAgICBGaWxlU3lzdGVtUG9zaXguY3BwLiBUaGV5IGFy ZSB0aGUgb25lcyB0aGF0IGFyZSBjYWxsZWQgYnkgTmV0d29ya0NhY2hlLCB3aGljaCBzZWVtcyB0 byBiZQorICAgICAgICB0aGUgYmlnZ2VzdCBjb25zdW1lciBvZiB0aGVzZSBmdW5jdGlvbnMuIFRo ZSByZXN0IG9mIHRoZSBmdW5jdGlvbnMgYXJlIHN0aWxsIGltcGxlbWVudGVkCisgICAgICAgIHVz aW5nIHN0ZDo6ZmlsZXN5c3RlbS4KKworICAgICAgICAqIHd0Zi9GaWxlU3lzdGVtLmNwcDoKKyAg ICAgICAgKFdURjo6RmlsZVN5c3RlbUltcGw6OmZpbGVFeGlzdHMpOgorICAgICAgICAoV1RGOjpG aWxlU3lzdGVtSW1wbDo6ZGVsZXRlRmlsZSk6CisgICAgICAgIChXVEY6OkZpbGVTeXN0ZW1JbXBs OjptYWtlQWxsRGlyZWN0b3JpZXMpOgorICAgICAgICAoV1RGOjpGaWxlU3lzdGVtSW1wbDo6cGF0 aEJ5QXBwZW5kaW5nQ29tcG9uZW50KToKKyAgICAgICAgKFdURjo6RmlsZVN5c3RlbUltcGw6OnBh dGhCeUFwcGVuZGluZ0NvbXBvbmVudHMpOgorICAgICAgICAqIHd0Zi9QbGF0Zm9ybUVuYWJsZUNv Y29hLmg6CisgICAgICAgICogd3RmL3Bvc2l4L0ZpbGVTeXN0ZW1QT1NJWC5jcHA6CisgICAgICAg IChXVEY6OkZpbGVTeXN0ZW1JbXBsOjpmaWxlRXhpc3RzKToKKyAgICAgICAgKFdURjo6RmlsZVN5 c3RlbUltcGw6OmRlbGV0ZUZpbGUpOgorICAgICAgICAoV1RGOjpGaWxlU3lzdGVtSW1wbDo6bWFr ZUFsbERpcmVjdG9yaWVzKToKKyAgICAgICAgKFdURjo6RmlsZVN5c3RlbUltcGw6OnBhdGhCeUFw cGVuZGluZ0NvbXBvbmVudCk6CisgICAgICAgIChXVEY6OkZpbGVTeXN0ZW1JbXBsOjpwYXRoQnlB cHBlbmRpbmdDb21wb25lbnRzKToKKwogMjAyMS0wNi0wMyAgTWljaGFlbCBDYXRhbnphcm8gIDxt Y2F0YW56YXJvQGdub21lLm9yZz4KIAogICAgICAgICBSRUdSRVNTSU9OKHIyNzc3NDQpOiBCcm9r ZSBidWlsZCBvbiBzMzkweCBtYWluZnJhbWVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9G aWxlU3lzdGVtLmNwcCBiL1NvdXJjZS9XVEYvd3RmL0ZpbGVTeXN0ZW0uY3BwCmluZGV4IDkxZGRj ZjI2MTkwYjk3MjRiYTE5MzVjZDBlM2MwMDVjMTk5YjRjMWUuLmU2ZGY2MGNlOGUyZGY3ZGQxY2Nl N2MzMDVlYTQ3NTdlZTgyZTJkYTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL0ZpbGVTeXN0 ZW0uY3BwCisrKyBiL1NvdXJjZS9XVEYvd3RmL0ZpbGVTeXN0ZW0uY3BwCkBAIC01MjIsMjYgKzUy Miw2IEBAIHN0ZDo6b3B0aW9uYWw8U2FsdD4gcmVhZE9yTWFrZVNhbHQoY29uc3QgU3RyaW5nJiBw YXRoKQogCiAjaWYgSEFWRShTVERfRklMRVNZU1RFTSkgfHwgSEFWRShTVERfRVhQRVJJTUVOVEFM X0ZJTEVTWVNURU0pCiAKLWJvb2wgZmlsZUV4aXN0cyhjb25zdCBTdHJpbmcmIHBhdGgpCi17Ci0g ICAgc3RkOjplcnJvcl9jb2RlIGVjOwotICAgIC8vIGV4aXN0cygpIHJldHVybnMgZmFsc2Ugb24g ZXJyb3Igc28gbm8gbmVlZCB0byBjaGVjayBlYy4KLSAgICByZXR1cm4gc3RkOjpmaWxlc3lzdGVt OjpleGlzdHModG9TdGRGaWxlU3lzdGVtUGF0aChwYXRoKSwgZWMpOwotfQotCi1ib29sIGRlbGV0 ZUZpbGUoY29uc3QgU3RyaW5nJiBwYXRoKQotewotICAgIHN0ZDo6ZXJyb3JfY29kZSBlYzsKLSAg ICBhdXRvIGZzUGF0aCA9IHRvU3RkRmlsZVN5c3RlbVBhdGgocGF0aCk7Ci0KLSAgICBhdXRvIGZp bGVTdGF0dXMgPSBzdGQ6OmZpbGVzeXN0ZW06OnN5bWxpbmtfc3RhdHVzKGZzUGF0aCwgZWMpOwot ICAgIGlmIChlYyB8fCBmaWxlU3RhdHVzLnR5cGUoKSA9PSBzdGQ6OmZpbGVzeXN0ZW06OmZpbGVf dHlwZTo6ZGlyZWN0b3J5KQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICAvLyByZW1vdmUo KSByZXR1cm5zIGZhbHNlIG9uIGVycm9yIHNvIG5vIG5lZWQgdG8gY2hlY2sgZWMuCi0gICAgcmV0 dXJuIHN0ZDo6ZmlsZXN5c3RlbTo6cmVtb3ZlKGZzUGF0aCwgZWMpOwotfQotCiBib29sIGRlbGV0 ZUVtcHR5RGlyZWN0b3J5KGNvbnN0IFN0cmluZyYgcGF0aCkKIHsKICAgICBzdGQ6OmVycm9yX2Nv ZGUgZWM7CkBAIC01OTcsMTMgKzU3Nyw2IEBAIHN0ZDo6b3B0aW9uYWw8dWludDY0X3Q+IGZpbGVT aXplKGNvbnN0IFN0cmluZyYgcGF0aCkKICAgICByZXR1cm4gc2l6ZTsKIH0KIAotYm9vbCBtYWtl QWxsRGlyZWN0b3JpZXMoY29uc3QgU3RyaW5nJiBwYXRoKQotewotICAgIHN0ZDo6ZXJyb3JfY29k ZSBlYzsKLSAgICBzdGQ6OmZpbGVzeXN0ZW06OmNyZWF0ZV9kaXJlY3Rvcmllcyh0b1N0ZEZpbGVT eXN0ZW1QYXRoKHBhdGgpLCBlYyk7Ci0gICAgcmV0dXJuICFlYzsKLX0KLQogc3RkOjpvcHRpb25h bDx1aW50NjRfdD4gdm9sdW1lRnJlZVNwYWNlKGNvbnN0IFN0cmluZyYgcGF0aCkKIHsKICAgICBz dGQ6OmVycm9yX2NvZGUgZWM7CkBAIC03MjgsNiArNzAxLDQ4IEBAIFN0cmluZyByZWFsUGF0aChj b25zdCBTdHJpbmcmIHBhdGgpCiAgICAgcmV0dXJuIGVjID8gcGF0aCA6IGZyb21TdGRGaWxlU3lz dGVtUGF0aChjYW5vbmljYWxQYXRoKTsKIH0KIAorVmVjdG9yPFN0cmluZz4gbGlzdERpcmVjdG9y eShjb25zdCBTdHJpbmcmIHBhdGgpCit7CisgICAgVmVjdG9yPFN0cmluZz4gZmlsZU5hbWVzOwor ICAgIHN0ZDo6ZXJyb3JfY29kZSBlYzsKKyAgICBhdXRvIGVudHJpZXMgPSBzdGQ6OmZpbGVzeXN0 ZW06OmRpcmVjdG9yeV9pdGVyYXRvcih0b1N0ZEZpbGVTeXN0ZW1QYXRoKHBhdGgpLCBlYyk7Cisg ICAgZm9yIChhdXRvIGl0ID0gc3RkOjpmaWxlc3lzdGVtOjpiZWdpbihlbnRyaWVzKSwgZW5kID0g c3RkOjpmaWxlc3lzdGVtOjplbmQoZW50cmllcyk7ICFlYyAmJiBpdCAhPSBlbmQ7IGl0LmluY3Jl bWVudChlYykpIHsKKyAgICAgICAgYXV0byBmaWxlTmFtZSA9IGZyb21TdGRGaWxlU3lzdGVtUGF0 aChpdC0+cGF0aCgpLmZpbGVuYW1lKCkpOworICAgICAgICBpZiAoIWZpbGVOYW1lLmlzTnVsbCgp KQorICAgICAgICAgICAgZmlsZU5hbWVzLmFwcGVuZChXVEZNb3ZlKGZpbGVOYW1lKSk7CisgICAg fQorICAgIHJldHVybiBmaWxlTmFtZXM7Cit9CisKKyNpZiAhRU5BQkxFKEZJTEVTWVNURU1fUE9T SVhfRkFTVF9QQVRIKQorCitib29sIGZpbGVFeGlzdHMoY29uc3QgU3RyaW5nJiBwYXRoKQorewor ICAgIHN0ZDo6ZXJyb3JfY29kZSBlYzsKKyAgICAvLyBleGlzdHMoKSByZXR1cm5zIGZhbHNlIG9u IGVycm9yIHNvIG5vIG5lZWQgdG8gY2hlY2sgZWMuCisgICAgcmV0dXJuIHN0ZDo6ZmlsZXN5c3Rl bTo6ZXhpc3RzKHRvU3RkRmlsZVN5c3RlbVBhdGgocGF0aCksIGVjKTsKK30KKworYm9vbCBkZWxl dGVGaWxlKGNvbnN0IFN0cmluZyYgcGF0aCkKK3sKKyAgICBzdGQ6OmVycm9yX2NvZGUgZWM7Cisg ICAgYXV0byBmc1BhdGggPSB0b1N0ZEZpbGVTeXN0ZW1QYXRoKHBhdGgpOworCisgICAgYXV0byBm aWxlU3RhdHVzID0gc3RkOjpmaWxlc3lzdGVtOjpzeW1saW5rX3N0YXR1cyhmc1BhdGgsIGVjKTsK KyAgICBpZiAoZWMgfHwgZmlsZVN0YXR1cy50eXBlKCkgPT0gc3RkOjpmaWxlc3lzdGVtOjpmaWxl X3R5cGU6OmRpcmVjdG9yeSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgLy8gcmVtb3Zl KCkgcmV0dXJucyBmYWxzZSBvbiBlcnJvciBzbyBubyBuZWVkIHRvIGNoZWNrIGVjLgorICAgIHJl dHVybiBzdGQ6OmZpbGVzeXN0ZW06OnJlbW92ZShmc1BhdGgsIGVjKTsKK30KKworYm9vbCBtYWtl QWxsRGlyZWN0b3JpZXMoY29uc3QgU3RyaW5nJiBwYXRoKQoreworICAgIHN0ZDo6ZXJyb3JfY29k ZSBlYzsKKyAgICBzdGQ6OmZpbGVzeXN0ZW06OmNyZWF0ZV9kaXJlY3Rvcmllcyh0b1N0ZEZpbGVT eXN0ZW1QYXRoKHBhdGgpLCBlYyk7CisgICAgcmV0dXJuICFlYzsKK30KKwogU3RyaW5nIHBhdGhC eUFwcGVuZGluZ0NvbXBvbmVudChjb25zdCBTdHJpbmcmIHBhdGgsIGNvbnN0IFN0cmluZyYgY29t cG9uZW50KQogewogICAgIHJldHVybiBmcm9tU3RkRmlsZVN5c3RlbVBhdGgodG9TdGRGaWxlU3lz dGVtUGF0aChwYXRoKSAvIHRvU3RkRmlsZVN5c3RlbVBhdGgoY29tcG9uZW50KSk7CkBAIC03NDEs MTggKzc1Niw3IEBAIFN0cmluZyBwYXRoQnlBcHBlbmRpbmdDb21wb25lbnRzKFN0cmluZ1ZpZXcg cGF0aCwgY29uc3QgVmVjdG9yPFN0cmluZ1ZpZXc+JiBjb21wCiAgICAgcmV0dXJuIGZyb21TdGRG aWxlU3lzdGVtUGF0aChmc1BhdGgpOwogfQogCi1WZWN0b3I8U3RyaW5nPiBsaXN0RGlyZWN0b3J5 KGNvbnN0IFN0cmluZyYgcGF0aCkKLXsKLSAgICBWZWN0b3I8U3RyaW5nPiBmaWxlTmFtZXM7Ci0g ICAgc3RkOjplcnJvcl9jb2RlIGVjOwotICAgIGF1dG8gZW50cmllcyA9IHN0ZDo6ZmlsZXN5c3Rl bTo6ZGlyZWN0b3J5X2l0ZXJhdG9yKHRvU3RkRmlsZVN5c3RlbVBhdGgocGF0aCksIGVjKTsKLSAg ICBmb3IgKGF1dG8gaXQgPSBzdGQ6OmZpbGVzeXN0ZW06OmJlZ2luKGVudHJpZXMpLCBlbmQgPSBz dGQ6OmZpbGVzeXN0ZW06OmVuZChlbnRyaWVzKTsgIWVjICYmIGl0ICE9IGVuZDsgaXQuaW5jcmVt ZW50KGVjKSkgewotICAgICAgICBhdXRvIGZpbGVOYW1lID0gZnJvbVN0ZEZpbGVTeXN0ZW1QYXRo KGl0LT5wYXRoKCkuZmlsZW5hbWUoKSk7Ci0gICAgICAgIGlmICghZmlsZU5hbWUuaXNOdWxsKCkp Ci0gICAgICAgICAgICBmaWxlTmFtZXMuYXBwZW5kKFdURk1vdmUoZmlsZU5hbWUpKTsKLSAgICB9 Ci0gICAgcmV0dXJuIGZpbGVOYW1lczsKLX0KKyNlbmRpZgogCiAjZW5kaWYgLy8gSEFWRShTVERf RklMRVNZU1RFTSkgfHwgSEFWRShTVERfRVhQRVJJTUVOVEFMX0ZJTEVTWVNURU0pCiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtRW5hYmxlQ29jb2EuaCBiL1NvdXJjZS9XVEYv d3RmL1BsYXRmb3JtRW5hYmxlQ29jb2EuaAppbmRleCAwN2VkMDMyNGY4YjdmYzIyZTNkNjU0YjI2 NTZkYzM3MDlmNTg3ODM2Li4yYTgyYWJiZWM1MWU2ZmYyYTYzNDgwYTYzZDBmYmQzMzQ5YWVjM2Ey IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUVuYWJsZUNvY29hLmgKKysrIGIv U291cmNlL1dURi93dGYvUGxhdGZvcm1FbmFibGVDb2NvYS5oCkBAIC0xOTYsNiArMTk2LDEwIEBA CiAjZGVmaW5lIEVOQUJMRV9GSUxFX1JFUExBQ0VNRU5UIDEKICNlbmRpZgogCisjaWYgIWRlZmlu ZWQoRU5BQkxFX0ZJTEVTWVNURU1fUE9TSVhfRkFTVF9QQVRIKQorI2RlZmluZSBFTkFCTEVfRklM RVNZU1RFTV9QT1NJWF9GQVNUX1BBVEggMQorI2VuZGlmCisKICNpZiAhZGVmaW5lZChFTkFCTEVf RklMVEVSU19MRVZFTF8yKQogI2RlZmluZSBFTkFCTEVfRklMVEVSU19MRVZFTF8yIDEKICNlbmRp ZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvcG9zaXgvRmlsZVN5c3RlbVBPU0lYLmNwcCBi L1NvdXJjZS9XVEYvd3RmL3Bvc2l4L0ZpbGVTeXN0ZW1QT1NJWC5jcHAKaW5kZXggYmY0ZjczOTc5 MDM5Njk4MjdjZmEyMDM1ZmE5MDVmZWJmNTI0MDNjYS4uN2Y5NDFmMTA2Y2JhY2U5Njc3NjZiMmJj N2FiYjRiZTc3NmIxZmNmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvcG9zaXgvRmlsZVN5 c3RlbVBPU0lYLmNwcAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9wb3NpeC9GaWxlU3lzdGVtUE9TSVgu Y3BwCkBAIC0yMzUsNSArMjM1LDg0IEBAIHN0ZDo6b3B0aW9uYWw8aW50MzJfdD4gZ2V0RmlsZURl dmljZUlkKGNvbnN0IENTdHJpbmcmIGZzRmlsZSkKICAgICByZXR1cm4gZmlsZVN0YXQuc3RfZGV2 OwogfQogCisjaWYgRU5BQkxFKEZJTEVTWVNURU1fUE9TSVhfRkFTVF9QQVRIKQorCitib29sIGZp bGVFeGlzdHMoY29uc3QgU3RyaW5nJiBwYXRoKQoreworICAgIGlmIChwYXRoLmlzTnVsbCgpKQor ICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBDU3RyaW5nIGZzUmVwID0gZmlsZVN5c3RlbVJl cHJlc2VudGF0aW9uKHBhdGgpOworCisgICAgaWYgKCFmc1JlcC5kYXRhKCkgfHwgZnNSZXAuZGF0 YSgpWzBdID09ICdcMCcpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIHJldHVybiBhY2Nl c3MoZnNSZXAuZGF0YSgpLCBGX09LKSAhPSAtMTsKK30KKworYm9vbCBkZWxldGVGaWxlKGNvbnN0 IFN0cmluZyYgcGF0aCkKK3sKKyAgICBDU3RyaW5nIGZzUmVwID0gZmlsZVN5c3RlbVJlcHJlc2Vu dGF0aW9uKHBhdGgpOworCisgICAgaWYgKCFmc1JlcC5kYXRhKCkgfHwgZnNSZXAuZGF0YSgpWzBd ID09ICdcMCcpIHsKKyAgICAgICAgTE9HX0VSUk9SKCJGaWxlIGZhaWxlZCB0byBkZWxldGUuIEZh aWxlZCB0byBnZXQgZmlsZXN5c3RlbSByZXByZXNlbnRhdGlvbiB0byBjcmVhdGUgQ1N0cmluZyBm cm9tIGNmU3RyaW5nIG9yIGZpbGVzeXN0ZW0gcmVwcmVzZW50YXRpb24gaXMgYSBudWxsIHZhbHVl Iik7CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisKKyAgICAvLyB1bmxpbmsoLi4uKSBy ZXR1cm5zIDAgb24gc3VjY2Vzc2Z1bCBkZWxldGlvbiBvZiB0aGUgcGF0aCBhbmQgbm9uLXplcm8g aW4gYW55IG90aGVyIGNhc2UgKGluY2x1ZGluZyBpbnZhbGlkIHBlcm1pc3Npb25zIG9yIG5vbi1l eGlzdGVudCBmaWxlKQorICAgIGJvb2wgdW5saW5rZWQgPSAhdW5saW5rKGZzUmVwLmRhdGEoKSk7 CisgICAgaWYgKCF1bmxpbmtlZCAmJiBlcnJubyAhPSBFTk9FTlQpCisgICAgICAgIExPR19FUlJP UigiRmlsZSBmYWlsZWQgdG8gZGVsZXRlLiBFcnJvciBtZXNzYWdlOiAlcyIsIHN0cmVycm9yKGVy cm5vKSk7CisKKyAgICByZXR1cm4gdW5saW5rZWQ7Cit9CisKK2Jvb2wgbWFrZUFsbERpcmVjdG9y aWVzKGNvbnN0IFN0cmluZyYgcGF0aCkKK3sKKyAgICBDU3RyaW5nIGZ1bGxQYXRoID0gZmlsZVN5 c3RlbVJlcHJlc2VudGF0aW9uKHBhdGgpOworICAgIGlmICghYWNjZXNzKGZ1bGxQYXRoLmRhdGEo KSwgRl9PSykpCisgICAgICAgIHJldHVybiB0cnVlOworCisgICAgY2hhciogcCA9IGZ1bGxQYXRo Lm11dGFibGVEYXRhKCkgKyAxOworICAgIGludCBsZW5ndGggPSBmdWxsUGF0aC5sZW5ndGgoKTsK KworICAgIGlmIChwW2xlbmd0aCAtIDFdID09ICcvJykKKyAgICAgICAgcFtsZW5ndGggLSAxXSA9 ICdcMCc7CisgICAgZm9yICg7ICpwOyArK3ApIHsKKyAgICAgICAgaWYgKCpwID09ICcvJykgewor ICAgICAgICAgICAgKnAgPSAnXDAnOworICAgICAgICAgICAgaWYgKGFjY2VzcyhmdWxsUGF0aC5k YXRhKCksIEZfT0spKSB7CisgICAgICAgICAgICAgICAgaWYgKG1rZGlyKGZ1bGxQYXRoLmRhdGEo KSwgU19JUldYVSkpCisgICAgICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAg ICAgIH0KKyAgICAgICAgICAgICpwID0gJy8nOworICAgICAgICB9CisgICAgfQorICAgIGlmIChh Y2Nlc3MoZnVsbFBhdGguZGF0YSgpLCBGX09LKSkgeworICAgICAgICBpZiAobWtkaXIoZnVsbFBh dGguZGF0YSgpLCBTX0lSV1hVKSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisK KyAgICByZXR1cm4gdHJ1ZTsKK30KKworU3RyaW5nIHBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChj b25zdCBTdHJpbmcmIHBhdGgsIGNvbnN0IFN0cmluZyYgY29tcG9uZW50KQoreworICAgIGlmIChw YXRoLmVuZHNXaXRoKCcvJykpCisgICAgICAgIHJldHVybiBwYXRoICsgY29tcG9uZW50OworICAg IHJldHVybiBwYXRoICsgIi8iICsgY29tcG9uZW50OworfQorCitTdHJpbmcgcGF0aEJ5QXBwZW5k aW5nQ29tcG9uZW50cyhTdHJpbmdWaWV3IHBhdGgsIGNvbnN0IFZlY3RvcjxTdHJpbmdWaWV3PiYg Y29tcG9uZW50cykKK3sKKyAgICBTdHJpbmdCdWlsZGVyIGJ1aWxkZXI7CisgICAgYnVpbGRlci5h cHBlbmQocGF0aCk7CisgICAgZm9yIChhdXRvJiBjb21wb25lbnQgOiBjb21wb25lbnRzKQorICAg ICAgICBidWlsZGVyLmFwcGVuZCgnLycsIGNvbXBvbmVudCk7CisgICAgcmV0dXJuIGJ1aWxkZXIu dG9TdHJpbmcoKTsKK30KKworI2VuZGlmCisKIH0gLy8gbmFtZXNwYWNlIEZpbGVTeXN0ZW1JbXBs CiB9IC8vIG5hbWVzcGFjZSBXVEYK 430880 2021-06-08 12:54:31 -0700 2021-06-08 19:26:42 -0700 Patch bug-226667-20210608125431.patch text/plain 9169 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4NjIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDhkNjlkYzlkNWE1Yjg0MjQ5N2UwNWE2 ZDQ3OWRiZDRjMzM4YjEwNzAuLmUzMTBhODhkNzI4NTQwOWNkMzc2YTNkNjI3YmFkN2M5ODNiZDY1 ZGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsNDEgQEAKKzIwMjEtMDYtMDggIEJlbiBOaGFtICA8bmhhbUBhcHBs ZS5jb20+CisKKyAgICAgICAgVXNlIGFjY2VzcyBpbnN0ZWFkIG9mIHN0YXQgaW4gc29tZSBmaWxl c3lzdGVtIGZ1bmN0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjI2NjY3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgV2UgYXJlIHNwZW5kaW5nIGEgYml0IG1vcmUgdGltZSBpbiBXVEY6OkZpbGVTeXN0 ZW1JbXBsIGZ1bmN0aW9ucyBhZnRlciB0aGUgbW92ZSB0bworICAgICAgICBzdGQ6OmZpbGVzeXN0 ZW0gKGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjUyNTUpLiBJbiBw YXJ0aWN1bGFyLCBzZXZlcmFsCisgICAgICAgIHN0ZDo6ZmlsZXN5c3RlbSBmdW5jdGlvbnMgKGxp a2UgdGhlIG9uZXMgY2FsbGVkIGJ5IGZpbGVFeGlzdHMgYW5kIG1ha2VBbGxEaXJlY3Rvcmllcykg cHJlZmVyCisgICAgICAgIHRvIHVzZSBzdGF0KCkgb3ZlciBhY2Nlc3MoKSBmb3IgZmlsZSBleGlz dGVuY2UgY2hlY2tzLiBTaW5jZSBvdXIgc2FuZGJveCBoYXMgYSBmYXN0IHBhdGggZm9yCisgICAg ICAgIGFjY2VzcyhwYXRoLCBGX09LKSBidXQgbm90IGZvciBzdGF0LCB3ZSBlbmRlZCB1cCBzcGVu ZGluZyBtb3JlIHRpbWUgaW4gc2FuZGJveCBldmFsdWF0aW9uIGluCisgICAgICAgIHRoZSBrZXJu ZWwgYWZ0ZXIgdGhlIG1vdmUgdG8gc3RkOjpmaWxlc3lzdGVtLgorCisgICAgICAgIE5vdGUgdGhh dCB0aGUgdHdvIGNoZWNrcyBkb24ndCBkbyBleGFjdGx5IHRoZSBzYW1lIHRoaW5nLiBhY2Nlc3Mo cGF0aCwgRl9PSykgb25seSBjaGVja3MgZm9yCisgICAgICAgIHBhdGggZXhpc3RlbmNlLCB3aGls ZSBzdGF0KHBhdGgpIGFkZGl0aW9uYWxseSBmZXRjaGVzIG1ldGFkYXRhLCB3aGljaCByZXF1aXJl cyBjaGVja2luZyB0aGUKKyAgICAgICAgZmlsZS1yZWFkLW1ldGFkYXRhIHBlcm1pc3Npb24uIEJ1 dCBpbiBwcmFjdGljZSBvdXIgY29kZSB3YXMgd3JpdHRlbiB0byBiZSBmaW5lIHdpdGgganVzdAor ICAgICAgICBjaGVja2luZyBmb3IgZXhpc3RlbmNlLgorCisgICAgICAgIFRvIHdvcmsgYXJvdW5k IHRoaXMsIEkndmUgcmUtaW50cm9kdWNlZCBzb21lIG9mIHRoZSBvbGQgV1RGOjpGaWxlU3lzdGVt SW1wbCBmdW5jdGlvbnMgZnJvbQorICAgICAgICBGaWxlU3lzdGVtUG9zaXguY3BwLiBUaGV5IGFy ZSB0aGUgb25lcyB0aGF0IGFyZSBjYWxsZWQgYnkgTmV0d29ya0NhY2hlLCB3aGljaCBzZWVtcyB0 byBiZQorICAgICAgICB0aGUgYmlnZ2VzdCBjb25zdW1lciBvZiB0aGVzZSBmdW5jdGlvbnMuIFRo ZSByZXN0IG9mIHRoZSBmdW5jdGlvbnMgYXJlIHN0aWxsIGltcGxlbWVudGVkCisgICAgICAgIHVz aW5nIHN0ZDo6ZmlsZXN5c3RlbS4KKworICAgICAgICAqIHd0Zi9GaWxlU3lzdGVtLmNwcDoKKyAg ICAgICAgKFdURjo6RmlsZVN5c3RlbUltcGw6OmZpbGVFeGlzdHMpOgorICAgICAgICAoV1RGOjpG aWxlU3lzdGVtSW1wbDo6ZGVsZXRlRmlsZSk6CisgICAgICAgIChXVEY6OkZpbGVTeXN0ZW1JbXBs OjptYWtlQWxsRGlyZWN0b3JpZXMpOgorICAgICAgICAoV1RGOjpGaWxlU3lzdGVtSW1wbDo6cGF0 aEJ5QXBwZW5kaW5nQ29tcG9uZW50KToKKyAgICAgICAgKFdURjo6RmlsZVN5c3RlbUltcGw6OnBh dGhCeUFwcGVuZGluZ0NvbXBvbmVudHMpOgorICAgICAgICAqIHd0Zi9QbGF0Zm9ybUVuYWJsZUNv Y29hLmg6CisgICAgICAgICogd3RmL3Bvc2l4L0ZpbGVTeXN0ZW1QT1NJWC5jcHA6CisgICAgICAg IChXVEY6OkZpbGVTeXN0ZW1JbXBsOjpmaWxlRXhpc3RzKToKKyAgICAgICAgKFdURjo6RmlsZVN5 c3RlbUltcGw6OmRlbGV0ZUZpbGUpOgorICAgICAgICAoV1RGOjpGaWxlU3lzdGVtSW1wbDo6bWFr ZUFsbERpcmVjdG9yaWVzKToKKyAgICAgICAgKFdURjo6RmlsZVN5c3RlbUltcGw6OnBhdGhCeUFw cGVuZGluZ0NvbXBvbmVudCk6CisgICAgICAgIChXVEY6OkZpbGVTeXN0ZW1JbXBsOjpwYXRoQnlB cHBlbmRpbmdDb21wb25lbnRzKToKKwogMjAyMS0wNi0wOCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpA YXBwbGUuY29tPgogCiAgICAgICAgIFJlZHVjZSB1c2Ugb2YgcmVpbnRlcnByZXRfY2FzdDw+IGlu IHRoZSBjb2RlYmFzZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvRmlsZVN5c3RlbS5jcHAg Yi9Tb3VyY2UvV1RGL3d0Zi9GaWxlU3lzdGVtLmNwcAppbmRleCA3MDQyNGIyZDQ2ZjQ4NzVmODk0 ZmJhM2Y2ODg4MDczNzQ4NDQ4YWUxLi44NzFhN2ExYTBhZjZjZTJhNjk5YWM4N2YxMzk0YzY3Nzlk NmJmNDYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9GaWxlU3lzdGVtLmNwcAorKysgYi9T b3VyY2UvV1RGL3d0Zi9GaWxlU3lzdGVtLmNwcApAQCAtNTIyLDI2ICs1MjIsNiBAQCBzdGQ6Om9w dGlvbmFsPFNhbHQ+IHJlYWRPck1ha2VTYWx0KGNvbnN0IFN0cmluZyYgcGF0aCkKIAogI2lmIEhB VkUoU1REX0ZJTEVTWVNURU0pIHx8IEhBVkUoU1REX0VYUEVSSU1FTlRBTF9GSUxFU1lTVEVNKQog Ci1ib29sIGZpbGVFeGlzdHMoY29uc3QgU3RyaW5nJiBwYXRoKQotewotICAgIHN0ZDo6ZXJyb3Jf Y29kZSBlYzsKLSAgICAvLyBleGlzdHMoKSByZXR1cm5zIGZhbHNlIG9uIGVycm9yIHNvIG5vIG5l ZWQgdG8gY2hlY2sgZWMuCi0gICAgcmV0dXJuIHN0ZDo6ZmlsZXN5c3RlbTo6ZXhpc3RzKHRvU3Rk RmlsZVN5c3RlbVBhdGgocGF0aCksIGVjKTsKLX0KLQotYm9vbCBkZWxldGVGaWxlKGNvbnN0IFN0 cmluZyYgcGF0aCkKLXsKLSAgICBzdGQ6OmVycm9yX2NvZGUgZWM7Ci0gICAgYXV0byBmc1BhdGgg PSB0b1N0ZEZpbGVTeXN0ZW1QYXRoKHBhdGgpOwotCi0gICAgYXV0byBmaWxlU3RhdHVzID0gc3Rk OjpmaWxlc3lzdGVtOjpzeW1saW5rX3N0YXR1cyhmc1BhdGgsIGVjKTsKLSAgICBpZiAoZWMgfHwg ZmlsZVN0YXR1cy50eXBlKCkgPT0gc3RkOjpmaWxlc3lzdGVtOjpmaWxlX3R5cGU6OmRpcmVjdG9y eSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgLy8gcmVtb3ZlKCkgcmV0dXJucyBmYWxz ZSBvbiBlcnJvciBzbyBubyBuZWVkIHRvIGNoZWNrIGVjLgotICAgIHJldHVybiBzdGQ6OmZpbGVz eXN0ZW06OnJlbW92ZShmc1BhdGgsIGVjKTsKLX0KLQogYm9vbCBkZWxldGVFbXB0eURpcmVjdG9y eShjb25zdCBTdHJpbmcmIHBhdGgpCiB7CiAgICAgc3RkOjplcnJvcl9jb2RlIGVjOwpAQCAtNTk3 LDEzICs1NzcsNiBAQCBzdGQ6Om9wdGlvbmFsPHVpbnQ2NF90PiBmaWxlU2l6ZShjb25zdCBTdHJp bmcmIHBhdGgpCiAgICAgcmV0dXJuIHNpemU7CiB9CiAKLWJvb2wgbWFrZUFsbERpcmVjdG9yaWVz KGNvbnN0IFN0cmluZyYgcGF0aCkKLXsKLSAgICBzdGQ6OmVycm9yX2NvZGUgZWM7Ci0gICAgc3Rk OjpmaWxlc3lzdGVtOjpjcmVhdGVfZGlyZWN0b3JpZXModG9TdGRGaWxlU3lzdGVtUGF0aChwYXRo KSwgZWMpOwotICAgIHJldHVybiAhZWM7Ci19Ci0KIHN0ZDo6b3B0aW9uYWw8dWludDY0X3Q+IHZv bHVtZUZyZWVTcGFjZShjb25zdCBTdHJpbmcmIHBhdGgpCiB7CiAgICAgc3RkOjplcnJvcl9jb2Rl IGVjOwpAQCAtNzI4LDYgKzcwMSw0OCBAQCBTdHJpbmcgcmVhbFBhdGgoY29uc3QgU3RyaW5nJiBw YXRoKQogICAgIHJldHVybiBlYyA/IHBhdGggOiBmcm9tU3RkRmlsZVN5c3RlbVBhdGgoY2Fub25p Y2FsUGF0aCk7CiB9CiAKK1ZlY3RvcjxTdHJpbmc+IGxpc3REaXJlY3RvcnkoY29uc3QgU3RyaW5n JiBwYXRoKQoreworICAgIFZlY3RvcjxTdHJpbmc+IGZpbGVOYW1lczsKKyAgICBzdGQ6OmVycm9y X2NvZGUgZWM7CisgICAgYXV0byBlbnRyaWVzID0gc3RkOjpmaWxlc3lzdGVtOjpkaXJlY3Rvcnlf aXRlcmF0b3IodG9TdGRGaWxlU3lzdGVtUGF0aChwYXRoKSwgZWMpOworICAgIGZvciAoYXV0byBp dCA9IHN0ZDo6ZmlsZXN5c3RlbTo6YmVnaW4oZW50cmllcyksIGVuZCA9IHN0ZDo6ZmlsZXN5c3Rl bTo6ZW5kKGVudHJpZXMpOyAhZWMgJiYgaXQgIT0gZW5kOyBpdC5pbmNyZW1lbnQoZWMpKSB7Cisg ICAgICAgIGF1dG8gZmlsZU5hbWUgPSBmcm9tU3RkRmlsZVN5c3RlbVBhdGgoaXQtPnBhdGgoKS5m aWxlbmFtZSgpKTsKKyAgICAgICAgaWYgKCFmaWxlTmFtZS5pc051bGwoKSkKKyAgICAgICAgICAg IGZpbGVOYW1lcy5hcHBlbmQoV1RGTW92ZShmaWxlTmFtZSkpOworICAgIH0KKyAgICByZXR1cm4g ZmlsZU5hbWVzOworfQorCisjaWYgIUVOQUJMRShGSUxFU1lTVEVNX1BPU0lYX0ZBU1RfUEFUSCkK KworYm9vbCBmaWxlRXhpc3RzKGNvbnN0IFN0cmluZyYgcGF0aCkKK3sKKyAgICBzdGQ6OmVycm9y X2NvZGUgZWM7CisgICAgLy8gZXhpc3RzKCkgcmV0dXJucyBmYWxzZSBvbiBlcnJvciBzbyBubyBu ZWVkIHRvIGNoZWNrIGVjLgorICAgIHJldHVybiBzdGQ6OmZpbGVzeXN0ZW06OmV4aXN0cyh0b1N0 ZEZpbGVTeXN0ZW1QYXRoKHBhdGgpLCBlYyk7Cit9CisKK2Jvb2wgZGVsZXRlRmlsZShjb25zdCBT dHJpbmcmIHBhdGgpCit7CisgICAgc3RkOjplcnJvcl9jb2RlIGVjOworICAgIGF1dG8gZnNQYXRo ID0gdG9TdGRGaWxlU3lzdGVtUGF0aChwYXRoKTsKKworICAgIGF1dG8gZmlsZVN0YXR1cyA9IHN0 ZDo6ZmlsZXN5c3RlbTo6c3ltbGlua19zdGF0dXMoZnNQYXRoLCBlYyk7CisgICAgaWYgKGVjIHx8 IGZpbGVTdGF0dXMudHlwZSgpID09IHN0ZDo6ZmlsZXN5c3RlbTo6ZmlsZV90eXBlOjpkaXJlY3Rv cnkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIC8vIHJlbW92ZSgpIHJldHVybnMgZmFs c2Ugb24gZXJyb3Igc28gbm8gbmVlZCB0byBjaGVjayBlYy4KKyAgICByZXR1cm4gc3RkOjpmaWxl c3lzdGVtOjpyZW1vdmUoZnNQYXRoLCBlYyk7Cit9CisKK2Jvb2wgbWFrZUFsbERpcmVjdG9yaWVz KGNvbnN0IFN0cmluZyYgcGF0aCkKK3sKKyAgICBzdGQ6OmVycm9yX2NvZGUgZWM7CisgICAgc3Rk OjpmaWxlc3lzdGVtOjpjcmVhdGVfZGlyZWN0b3JpZXModG9TdGRGaWxlU3lzdGVtUGF0aChwYXRo KSwgZWMpOworICAgIHJldHVybiAhZWM7Cit9CisKIFN0cmluZyBwYXRoQnlBcHBlbmRpbmdDb21w b25lbnQoY29uc3QgU3RyaW5nJiBwYXRoLCBjb25zdCBTdHJpbmcmIGNvbXBvbmVudCkKIHsKICAg ICByZXR1cm4gZnJvbVN0ZEZpbGVTeXN0ZW1QYXRoKHRvU3RkRmlsZVN5c3RlbVBhdGgocGF0aCkg LyB0b1N0ZEZpbGVTeXN0ZW1QYXRoKGNvbXBvbmVudCkpOwpAQCAtNzQxLDE4ICs3NTYsNyBAQCBT dHJpbmcgcGF0aEJ5QXBwZW5kaW5nQ29tcG9uZW50cyhTdHJpbmdWaWV3IHBhdGgsIGNvbnN0IFZl Y3RvcjxTdHJpbmdWaWV3PiYgY29tcAogICAgIHJldHVybiBmcm9tU3RkRmlsZVN5c3RlbVBhdGgo ZnNQYXRoKTsKIH0KIAotVmVjdG9yPFN0cmluZz4gbGlzdERpcmVjdG9yeShjb25zdCBTdHJpbmcm IHBhdGgpCi17Ci0gICAgVmVjdG9yPFN0cmluZz4gZmlsZU5hbWVzOwotICAgIHN0ZDo6ZXJyb3Jf Y29kZSBlYzsKLSAgICBhdXRvIGVudHJpZXMgPSBzdGQ6OmZpbGVzeXN0ZW06OmRpcmVjdG9yeV9p dGVyYXRvcih0b1N0ZEZpbGVTeXN0ZW1QYXRoKHBhdGgpLCBlYyk7Ci0gICAgZm9yIChhdXRvIGl0 ID0gc3RkOjpmaWxlc3lzdGVtOjpiZWdpbihlbnRyaWVzKSwgZW5kID0gc3RkOjpmaWxlc3lzdGVt OjplbmQoZW50cmllcyk7ICFlYyAmJiBpdCAhPSBlbmQ7IGl0LmluY3JlbWVudChlYykpIHsKLSAg ICAgICAgYXV0byBmaWxlTmFtZSA9IGZyb21TdGRGaWxlU3lzdGVtUGF0aChpdC0+cGF0aCgpLmZp bGVuYW1lKCkpOwotICAgICAgICBpZiAoIWZpbGVOYW1lLmlzTnVsbCgpKQotICAgICAgICAgICAg ZmlsZU5hbWVzLmFwcGVuZChXVEZNb3ZlKGZpbGVOYW1lKSk7Ci0gICAgfQotICAgIHJldHVybiBm aWxlTmFtZXM7Ci19CisjZW5kaWYKIAogI2VuZGlmIC8vIEhBVkUoU1REX0ZJTEVTWVNURU0pIHx8 IEhBVkUoU1REX0VYUEVSSU1FTlRBTF9GSUxFU1lTVEVNKQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V1RGL3d0Zi9QbGF0Zm9ybUVuYWJsZUNvY29hLmggYi9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUVu YWJsZUNvY29hLmgKaW5kZXggMDc4MDkwYWJkYWJhMTVmZWEyNGU2N2QwNDhjYTFiZDgwODYzMzdi My4uNTJkYTY5OTUxZjMxODQxNWFmNzA2Yzk2NzQ0YTJmMWI2Njk5YzRiYSAxMDA2NDQKLS0tIGEv U291cmNlL1dURi93dGYvUGxhdGZvcm1FbmFibGVDb2NvYS5oCisrKyBiL1NvdXJjZS9XVEYvd3Rm L1BsYXRmb3JtRW5hYmxlQ29jb2EuaApAQCAtMTk2LDYgKzE5NiwxMCBAQAogI2RlZmluZSBFTkFC TEVfRklMRV9SRVBMQUNFTUVOVCAxCiAjZW5kaWYKIAorI2lmICFkZWZpbmVkKEVOQUJMRV9GSUxF U1lTVEVNX1BPU0lYX0ZBU1RfUEFUSCkKKyNkZWZpbmUgRU5BQkxFX0ZJTEVTWVNURU1fUE9TSVhf RkFTVF9QQVRIIDEKKyNlbmRpZgorCiAjaWYgIWRlZmluZWQoRU5BQkxFX0ZJTFRFUlNfTEVWRUxf MikKICNkZWZpbmUgRU5BQkxFX0ZJTFRFUlNfTEVWRUxfMiAxCiAjZW5kaWYKZGlmZiAtLWdpdCBh L1NvdXJjZS9XVEYvd3RmL3Bvc2l4L0ZpbGVTeXN0ZW1QT1NJWC5jcHAgYi9Tb3VyY2UvV1RGL3d0 Zi9wb3NpeC9GaWxlU3lzdGVtUE9TSVguY3BwCmluZGV4IDEzOGFlYzljYmM2Y2Y4MDE5NTc1YTdk MjY4ZTE3OGEwYTJjMDdlYmUuLjdiZDI5NzczMjQxZjEzOTg4MDNmODZmZmNhYzE2M2ViYjAzODQz ZDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL3Bvc2l4L0ZpbGVTeXN0ZW1QT1NJWC5jcHAK KysrIGIvU291cmNlL1dURi93dGYvcG9zaXgvRmlsZVN5c3RlbVBPU0lYLmNwcApAQCAtMjM1LDUg KzIzNSw3NyBAQCBzdGQ6Om9wdGlvbmFsPGludDMyX3Q+IGdldEZpbGVEZXZpY2VJZChjb25zdCBD U3RyaW5nJiBmc0ZpbGUpCiAgICAgcmV0dXJuIGZpbGVTdGF0LnN0X2RldjsKIH0KIAorI2lmIEVO QUJMRShGSUxFU1lTVEVNX1BPU0lYX0ZBU1RfUEFUSCkKKworYm9vbCBmaWxlRXhpc3RzKGNvbnN0 IFN0cmluZyYgcGF0aCkKK3sKKyAgICByZXR1cm4gYWNjZXNzKGZpbGVTeXN0ZW1SZXByZXNlbnRh dGlvbihwYXRoKS5kYXRhKCksIEZfT0spICE9IC0xOworfQorCitib29sIGRlbGV0ZUZpbGUoY29u c3QgU3RyaW5nJiBwYXRoKQoreworICAgIC8vIHVubGluayguLi4pIHJldHVybnMgMCBvbiBzdWNj ZXNzZnVsIGRlbGV0aW9uIG9mIHRoZSBwYXRoIGFuZCBub24temVybyBpbiBhbnkgb3RoZXIgY2Fz ZSAoaW5jbHVkaW5nIGludmFsaWQgcGVybWlzc2lvbnMgb3Igbm9uLWV4aXN0ZW50IGZpbGUpCisg ICAgYm9vbCB1bmxpbmtlZCA9ICF1bmxpbmsoZmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKHBhdGgp LmRhdGEoKSk7CisgICAgaWYgKCF1bmxpbmtlZCAmJiBlcnJubyAhPSBFTk9FTlQpCisgICAgICAg IExPR19FUlJPUigiRmlsZSBmYWlsZWQgdG8gZGVsZXRlLiBFcnJvciBtZXNzYWdlOiAlcyIsIHN0 cmVycm9yKGVycm5vKSk7CisKKyAgICByZXR1cm4gdW5saW5rZWQ7Cit9CisKK2Jvb2wgbWFrZUFs bERpcmVjdG9yaWVzKGNvbnN0IFN0cmluZyYgcGF0aCkKK3sKKyAgICBhdXRvIGZ1bGxQYXRoID0g ZmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKHBhdGgpOworICAgIGlmICghYWNjZXNzKGZ1bGxQYXRo LmRhdGEoKSwgRl9PSykpCisgICAgICAgIHJldHVybiB0cnVlOworCisgICAgY2hhciogcCA9IGZ1 bGxQYXRoLm11dGFibGVEYXRhKCkgKyAxOworICAgIGludCBsZW5ndGggPSBmdWxsUGF0aC5sZW5n dGgoKTsKKyAgICBpZiAocFtsZW5ndGggLSAxXSA9PSAnLycpCisgICAgICAgIHBbbGVuZ3RoIC0g MV0gPSAnXDAnOworICAgIGZvciAoOyAqcDsgKytwKSB7CisgICAgICAgIGlmICgqcCA9PSAnLycp IHsKKyAgICAgICAgICAgICpwID0gJ1wwJzsKKyAgICAgICAgICAgIGlmIChhY2Nlc3MoZnVsbFBh dGguZGF0YSgpLCBGX09LKSkgeworICAgICAgICAgICAgICAgIGlmIChta2RpcihmdWxsUGF0aC5k YXRhKCksIFNfSVJXWFUpKQorICAgICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAg ICAgICAgICB9CisgICAgICAgICAgICAqcCA9ICcvJzsKKyAgICAgICAgfQorICAgIH0KKyAgICBp ZiAoYWNjZXNzKGZ1bGxQYXRoLmRhdGEoKSwgRl9PSykpIHsKKyAgICAgICAgaWYgKG1rZGlyKGZ1 bGxQYXRoLmRhdGEoKSwgU19JUldYVSkpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAg fQorCisgICAgcmV0dXJuIHRydWU7Cit9CisKK1N0cmluZyBwYXRoQnlBcHBlbmRpbmdDb21wb25l bnQoY29uc3QgU3RyaW5nJiBwYXRoLCBjb25zdCBTdHJpbmcmIGNvbXBvbmVudCkKK3sKKyAgICBp ZiAocGF0aC5lbmRzV2l0aCgnLycpKQorICAgICAgICByZXR1cm4gcGF0aCArIGNvbXBvbmVudDsK KyAgICByZXR1cm4gcGF0aCArICIvIiArIGNvbXBvbmVudDsKK30KKworU3RyaW5nIHBhdGhCeUFw cGVuZGluZ0NvbXBvbmVudHMoU3RyaW5nVmlldyBwYXRoLCBjb25zdCBWZWN0b3I8U3RyaW5nVmll dz4mIGNvbXBvbmVudHMpCit7CisgICAgU3RyaW5nQnVpbGRlciBidWlsZGVyOworICAgIGJ1aWxk ZXIuYXBwZW5kKHBhdGgpOworICAgIGJvb2wgaXNGaXJzdENvbXBvbmVudCA9IHRydWU7CisgICAg Zm9yIChhdXRvJiBjb21wb25lbnQgOiBjb21wb25lbnRzKSB7CisgICAgICAgIGlmIChpc0ZpcnN0 Q29tcG9uZW50KSB7CisgICAgICAgICAgICBpc0ZpcnN0Q29tcG9uZW50ID0gZmFsc2U7CisgICAg ICAgICAgICBpZiAocGF0aC5lbmRzV2l0aCgnLycpKSB7CisgICAgICAgICAgICAgICAgYnVpbGRl ci5hcHBlbmQoY29tcG9uZW50KTsKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAg ICAgIH0KKyAgICAgICAgfQorICAgICAgICBidWlsZGVyLmFwcGVuZCgnLycsIGNvbXBvbmVudCk7 CisgICAgfQorICAgIHJldHVybiBidWlsZGVyLnRvU3RyaW5nKCk7Cit9CisKKyNlbmRpZgorCiB9 IC8vIG5hbWVzcGFjZSBGaWxlU3lzdGVtSW1wbAogfSAvLyBuYW1lc3BhY2UgV1RGCg==