225806 2021-05-14 07:49:45 -0700 Rename FileSystem::pathGetFileName() to FileSystem::pathFileName() 2021-05-14 09:02:18 -0700 1 1 1 Unclassified WebKit Web Template Framework WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez achristensen benjamin calvaris cgarcia changseok cmarcelo darin eric.carlson esprehn+autocc ews-watchlist ggaren glenn gustavo gyuyoung.kim japhet jer.noble menard mifenton philipj pnormand sam sergio vjaquez webkit-bug-importer oldest_to_newest 1760069 0 cdumez 2021-05-14 07:49:45 -0700 Rename FileSystem::pathGetFileName() to FileSystem::pathFileName(), as we avoid "get" prefixes in WebKit. 1760070 1 428621 cdumez 2021-05-14 07:51:56 -0700 Created attachment 428621 Patch 1760100 2 ews-feeder 2021-05-14 09:01:09 -0700 Committed r277491 (237725@main): <https://commits.webkit.org/237725@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 428621. 1760101 3 webkit-bug-importer 2021-05-14 09:02:18 -0700 <rdar://problem/78018914> 428621 2021-05-14 07:51:56 -0700 2021-05-14 09:01:11 -0700 Patch bug-225806-20210514075155.patch text/plain 21613 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3NDg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDAwMWMyZDQ2MjA0ZGUxYjAyZDc3MTFj NzE4ODk4NWRjNTU1NDQ0NmIuLjUyNzJjZGM2ZmNjNjJjNDQxM2E4ZmUxNGZjOGJkZjJmNDI0Njgx NTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMjEtMDUtMTQgIENocmlzIER1bWV6ICA8Y2R1bWV6 QGFwcGxlLmNvbT4KKworICAgICAgICBSZW5hbWUgRmlsZVN5c3RlbTo6cGF0aEdldEZpbGVOYW1l KCkgdG8gRmlsZVN5c3RlbTo6cGF0aEZpbGVOYW1lKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNTgwNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbmFtZSBGaWxlU3lzdGVtOjpwYXRoR2V0RmlsZU5h bWUoKSB0byBGaWxlU3lzdGVtOjpwYXRoRmlsZU5hbWUoKSwgYXMgd2UgYXZvaWQgImdldCIgcHJl Zml4ZXMgaW4gV2ViS2l0LgorCisgICAgICAgICogd3RmL0ZpbGVTeXN0ZW0uY3BwOgorICAgICAg ICAoV1RGOjpGaWxlU3lzdGVtSW1wbDo6cGF0aEZpbGVOYW1lKToKKyAgICAgICAgKFdURjo6Rmls ZVN5c3RlbUltcGw6OnBhdGhHZXRGaWxlTmFtZSk6IERlbGV0ZWQuCisgICAgICAgICogd3RmL0Zp bGVTeXN0ZW0uaDoKKwogMjAyMS0wNS0xMyAgRGVhbiBKYWNrc29uICA8ZGlub0BhcHBsZS5jb20+ CiAKICAgICAgICAgW1dlYlhSXSBBbGxvdyBXZWJYUiB0byBiZSB0ZXN0ZWQgb24gUExBVEZPUk0o Q09DT0EpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cKaW5kZXggYWU1OWFmNDI1Y2FhMmU5MTkzMDFiN2MyYzliNTc3MGQxMGZj NmIyMC4uOWU3NWFmOGYxNjk4ZjE0NmE1MzNkMGIyNDNmZmI1ZGE0NzFjNmVhNCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDMxIEBACisyMDIxLTA1LTE0ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBs ZS5jb20+CisKKyAgICAgICAgUmVuYW1lIEZpbGVTeXN0ZW06OnBhdGhHZXRGaWxlTmFtZSgpIHRv IEZpbGVTeXN0ZW06OnBhdGhGaWxlTmFtZSgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMjU4MDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBSZW5hbWUgRmlsZVN5c3RlbTo6cGF0aEdldEZpbGVOYW1lKCkg dG8gRmlsZVN5c3RlbTo6cGF0aEZpbGVOYW1lKCksIGFzIHdlIGF2b2lkICJnZXQiIHByZWZpeGVz IGluIFdlYktpdC4KKworICAgICAgICAqIE1vZHVsZXMvZW50cmllc2FwaS9GaWxlU3lzdGVtRW50 cnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RmlsZVN5c3RlbUVudHJ5OjpGaWxlU3lzdGVtRW50 cnkpOgorICAgICAgICAqIE1vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2VUcmFja2VyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkRhdGFiYXNlVHJhY2tlcjo6cmVtb3ZlRGVsZXRlZE9wZW5lZERh dGFiYXNlcyk6CisgICAgICAgICogZWRpdGluZy9jb2NvYS9XZWJDb250ZW50UmVhZGVyQ29jb2Eu bW06CisgICAgICAgIChXZWJDb3JlOjphdHRhY2htZW50Rm9yRmlsZVBhdGgpOgorICAgICAgICAq IGZpbGVhcGkvRmlsZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGaWxlOjpjb21wdXRlTmFtZUFu ZENvbnRlbnRUeXBlKToKKyAgICAgICAgKiBmaWxlYXBpL0ZpbGVDb2NvYS5tbToKKyAgICAgICAg KFdlYkNvcmU6OkZpbGU6OmNvbXB1dGVOYW1lQW5kQ29udGVudFR5cGVGb3JSZXBsYWNlZEZpbGUp OgorICAgICAgICAqIGh0bWwvRGlyZWN0b3J5RmlsZUxpc3RDcmVhdG9yLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OmdhdGhlckZpbGVJbmZvcm1hdGlvbik6CisgICAgICAgICogbG9hZGVyL2FwcGNh Y2hlL0FwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFwcGxp Y2F0aW9uQ2FjaGVTdG9yYWdlOjpzdG9yZSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv YXZmb3VuZGF0aW9uL29iamMvQ0RNSW5zdGFuY2VGYWlyUGxheVN0cmVhbWluZ0FWRk9iakMubW06 CisgICAgICAgIChXZWJDb3JlOjpDRE1JbnN0YW5jZUZhaXJQbGF5U3RyZWFtaW5nQVZGT2JqQzo6 c2V0U3RvcmFnZURpcmVjdG9yeSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVh bWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpN ZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnB1cmdlT2xkRG93bmxvYWRGaWxlcyk6CisKIDIw MjEtMDUtMTMgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KIAogICAgICAgICBDaGVjayBm b3IgbnVsbCBlbGVtZW50IGluIHBhaW50U2VhcmNoRmllbGRSZXN1bHRzQnV0dG9uCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmlu ZGV4IGZhYTU4YWNkYjM4YmQ2M2I5NWFmOGU5Njc5MzMwM2UxMGZkMDU1ZmQuLjI0OGIxNGZjNmJk OGFmZjE3MzY3ZjcxMjNiNWFjN2E0ZDRiMzYwYWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAK KzIwMjEtMDUtMTQgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBS ZW5hbWUgRmlsZVN5c3RlbTo6cGF0aEdldEZpbGVOYW1lKCkgdG8gRmlsZVN5c3RlbTo6cGF0aEZp bGVOYW1lKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIyNTgwNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFJlbmFtZSBGaWxlU3lzdGVtOjpwYXRoR2V0RmlsZU5hbWUoKSB0byBGaWxlU3lzdGVtOjpwYXRo RmlsZU5hbWUoKSwgYXMgd2UgYXZvaWQgImdldCIgcHJlZml4ZXMgaW4gV2ViS2l0LgorCisgICAg ICAgICogTmV0d29ya1Byb2Nlc3MvV2ViU3RvcmFnZS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNr ZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpMb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXI6Om9y aWdpbnMgY29uc3QpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0 YVN0b3JlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6cmVzb2x2ZURp cmVjdG9yaWVzSWZOZWNlc3NhcnkpOgorCiAyMDIxLTA1LTE0ICBDYXJsb3MgR2FyY2lhIENhbXBv cyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLiBVcGRhdGUgT3B0 aW9uc0dUSy5jbWFrZSBhbmQgTkVXUyBmb3IgMi4zMy4xIHJlbGVhc2UKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXRMZWdhY3kvd2luL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2lu L0NoYW5nZUxvZwppbmRleCBiM2YzMzMwMGEzODZiNWY0OTkzMzRiZTFlMWI2MTZkY2UxYTMyNTNm Li5mZDZhMTE4ZGJhMmEwYmU4OTMxNmNlNzk0OWY0NWVmNDVjYzIwMmZjIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdExlZ2Fj eS93aW4vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMjEtMDUtMTQgIENocmlzIER1bWV6 ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBSZW5hbWUgRmlsZVN5c3RlbTo6cGF0aEdl dEZpbGVOYW1lKCkgdG8gRmlsZVN5c3RlbTo6cGF0aEZpbGVOYW1lKCkKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNTgwNgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbmFtZSBGaWxlU3lzdGVtOjpwYXRo R2V0RmlsZU5hbWUoKSB0byBGaWxlU3lzdGVtOjpwYXRoRmlsZU5hbWUoKSwgYXMgd2UgYXZvaWQg ImdldCIgcHJlZml4ZXMgaW4gV2ViS2l0LgorCisgICAgICAgICogUGx1Z2lucy9QbHVnaW5EYXRh YmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5EYXRhYmFzZTo6ZmlsZUV4aXN0c0Fu ZElzTm90RGlzYWJsZWQgY29uc3QpOgorICAgICAgICAqIFBsdWdpbnMvUGx1Z2luUGFja2FnZS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5QYWNrYWdlOjpQbHVnaW5QYWNrYWdlKToKKyAg ICAgICAgKiBXZWJEb3dubG9hZEN1cmwuY3BwOgorICAgICAgICAoV2ViRG93bmxvYWQ6OmRpZFJl Y2VpdmVSZXNwb25zZSk6CisKIDIwMjEtMDUtMTMgIE1lZ2FuIEdhcmRuZXIgIDxtZWdhbl9nYXJk bmVyQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgdGV4dEluZGljYXRvciBib3VuY2UgZm9yIEFw cEhpZ2hsaWdodHMgb24gc2Nyb2xsLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvRmlsZVN5 c3RlbS5jcHAgYi9Tb3VyY2UvV1RGL3d0Zi9GaWxlU3lzdGVtLmNwcAppbmRleCBkZWEwNzAzMDZm OTdhY2IyMjA1NmQ5NmE4MThhYmY3MWVlZWE5N2E5Li41Y2M2NjY0MTc1Mjk5ZWMzODA1MTU2NGNm NTgwYTAzOWEzODNkZjE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9GaWxlU3lzdGVtLmNw cAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9GaWxlU3lzdGVtLmNwcApAQCAtNzM5LDcgKzczOSw3IEBA IE9wdGlvbmFsPEZpbGVNZXRhZGF0YT4gZmlsZU1ldGFkYXRhRm9sbG93aW5nU3ltbGlua3MoY29u c3QgU3RyaW5nJiBwYXRoKQogICAgIHJldHVybiBmaWxlTWV0YWRhdGFQb3RlbnRpYWxseUZvbGxv d2luZ1N5bWxpbmtzKHBhdGgsIFNob3VsZEZvbGxvd1N5bWJvbGljTGlua3M6Olllcyk7CiB9CiAK LVN0cmluZyBwYXRoR2V0RmlsZU5hbWUoY29uc3QgU3RyaW5nJiBwYXRoKQorU3RyaW5nIHBhdGhG aWxlTmFtZShjb25zdCBTdHJpbmcmIHBhdGgpCiB7CiAgICAgcmV0dXJuIGZyb21TdGRGaWxlU3lz dGVtUGF0aCh0b1N0ZEZpbGVTeXN0ZW1QYXRoKHBhdGgpLmZpbGVuYW1lKCkpOwogfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dURi93dGYvRmlsZVN5c3RlbS5oIGIvU291cmNlL1dURi93dGYvRmlsZVN5 c3RlbS5oCmluZGV4IGZlNzMwMmEwZjNkODA4YjJjN2FjNTQxZjFiMGNiOTQ1NTAyNjEyNWUuLjI0 YjY1N2FlNWZhN2QzZDczOWI1MzQ3ZTNjOGE0ODE3ZDY4OGQ3MDkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XVEYvd3RmL0ZpbGVTeXN0ZW0uaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9GaWxlU3lzdGVtLmgK QEAgLTEyNCw3ICsxMjQsNyBAQCBXVEZfRVhQT1JUX1BSSVZBVEUgU3RyaW5nIHBhdGhCeUFwcGVu ZGluZ0NvbXBvbmVudHMoU3RyaW5nVmlldyBwYXRoLCBjb25zdCBWZWN0bwogV1RGX0VYUE9SVF9Q UklWQVRFIFN0cmluZyBsYXN0Q29tcG9uZW50T2ZQYXRoSWdub3JpbmdUcmFpbGluZ1NsYXNoKGNv bnN0IFN0cmluZyYgcGF0aCk7CiBXVEZfRVhQT1JUX1BSSVZBVEUgYm9vbCBtYWtlQWxsRGlyZWN0 b3JpZXMoY29uc3QgU3RyaW5nJiBwYXRoKTsKIFdURl9FWFBPUlRfUFJJVkFURSBTdHJpbmcgaG9t ZURpcmVjdG9yeVBhdGgoKTsKLVdURl9FWFBPUlRfUFJJVkFURSBTdHJpbmcgcGF0aEdldEZpbGVO YW1lKGNvbnN0IFN0cmluZyYpOworV1RGX0VYUE9SVF9QUklWQVRFIFN0cmluZyBwYXRoRmlsZU5h bWUoY29uc3QgU3RyaW5nJik7CiBXVEZfRVhQT1JUX1BSSVZBVEUgU3RyaW5nIHBhcmVudFBhdGgo Y29uc3QgU3RyaW5nJik7CiBXVEZfRVhQT1JUX1BSSVZBVEUgYm9vbCBnZXRWb2x1bWVGcmVlU3Bh Y2UoY29uc3QgU3RyaW5nJiwgdWludDY0X3QmKTsKIFdURl9FWFBPUlRfUFJJVkFURSBPcHRpb25h bDxpbnQzMl90PiBnZXRGaWxlRGV2aWNlSWQoY29uc3QgQ1N0cmluZyYpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9lbnRyaWVzYXBpL0ZpbGVTeXN0ZW1FbnRyeS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2VudHJpZXNhcGkvRmlsZVN5c3RlbUVudHJ5LmNwcAppbmRl eCAwN2Q3Zjg3OTE1OTQ3ZjNmZTA1Njg0NjI0NmYzOGFhN2YwOWQ1M2UyLi5kYzk4N2FkYWE4NDY1 MmNhZDVjNzU1ZmM0MWIzOWI0MDg5NDFjYTdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL2VudHJpZXNhcGkvRmlsZVN5c3RlbUVudHJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL2VudHJpZXNhcGkvRmlsZVN5c3RlbUVudHJ5LmNwcApAQCAtNDQsNyArNDQsNyBA QCBXVEZfTUFLRV9JU09fQUxMT0NBVEVEX0lNUEwoRmlsZVN5c3RlbUVudHJ5KTsKIEZpbGVTeXN0 ZW1FbnRyeTo6RmlsZVN5c3RlbUVudHJ5KFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmIGNvbnRleHQs IERPTUZpbGVTeXN0ZW0mIGZpbGVzeXN0ZW0sIGNvbnN0IFN0cmluZyYgdmlydHVhbFBhdGgpCiAg ICAgOiBBY3RpdmVET01PYmplY3QoJmNvbnRleHQpCiAgICAgLCBtX2ZpbGVzeXN0ZW0oZmlsZXN5 c3RlbSkKLSAgICAsIG1fbmFtZShGaWxlU3lzdGVtOjpwYXRoR2V0RmlsZU5hbWUodmlydHVhbFBh dGgpKQorICAgICwgbV9uYW1lKEZpbGVTeXN0ZW06OnBhdGhGaWxlTmFtZSh2aXJ0dWFsUGF0aCkp CiAgICAgLCBtX3ZpcnR1YWxQYXRoKHZpcnR1YWxQYXRoKQogewogICAgIHN1c3BlbmRJZk5lZWRl ZCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9EYXRh YmFzZVRyYWNrZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJkYXRhYmFzZS9EYXRh YmFzZVRyYWNrZXIuY3BwCmluZGV4IDBhZDNiNDgwMjNmMWY5NmVhYjliY2Y0Zjc3MmRlNDkzMzA3 ZWJmODQuLjdmMzA0MTFkMjZjYjczNmIxNzg1NWZmZjI3NmQ4NWZkZjM5NWQ2OGQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2VUcmFja2VyLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL0RhdGFiYXNlVHJhY2tl ci5jcHAKQEAgLTEyMTMsNyArMTIxMyw3IEBAIHZvaWQgRGF0YWJhc2VUcmFja2VyOjpyZW1vdmVE ZWxldGVkT3BlbmVkRGF0YWJhc2VzKCkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb250 aW51ZTsKICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAg Ly8gSWYgdGhpcyBkYXRhYmFzZSBoYXMgYmVlbiBkZWxldGVkIG9yIGlmIGl0cyBkYXRhYmFzZSBm aWxlIG5vIGxvbmdlciBtYXRjaGVzIHRoZSBjdXJyZW50IHZlcnNpb24sIHRoaXMgZGF0YWJhc2Ug aXMgbm8gbG9uZ2VyIHZhbGlkIGFuZCBpdCBzaG91bGQgYmUgbWFya2VkIGFzIGRlbGV0ZWQuCi0g ICAgICAgICAgICAgICAgICAgICAgICBpZiAoZGF0YWJhc2VGaWxlTmFtZS5pc051bGwoKSB8fCBk YXRhYmFzZUZpbGVOYW1lICE9IEZpbGVTeXN0ZW06OnBhdGhHZXRGaWxlTmFtZShkYi0+ZmlsZU5h bWVJc29sYXRlZENvcHkoKSkpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIGlmIChkYXRhYmFz ZUZpbGVOYW1lLmlzTnVsbCgpIHx8IGRhdGFiYXNlRmlsZU5hbWUgIT0gRmlsZVN5c3RlbTo6cGF0 aEZpbGVOYW1lKGRiLT5maWxlTmFtZUlzb2xhdGVkQ29weSgpKSkgewogICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGRlbGV0ZWREYXRhYmFzZXMuYXBwZW5kKGRiKTsKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBmb3VuZERlbGV0ZWREYXRhYmFzZSA9IHRydWU7CiAgICAgICAgICAgICAg ICAgICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2NvY29hL1dl YkNvbnRlbnRSZWFkZXJDb2NvYS5tbSBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvY29jb2EvV2Vi Q29udGVudFJlYWRlckNvY29hLm1tCmluZGV4IGZmMWY1YTExZTc1NDA3YTlmZGFmMTdhNzY3ZmQ0 YmJkMjhjZWUwNjkuLjIzMTY4OGY2Njk5Mjk2YjU0MzNjMmRmMDU3Y2QwZmU4ODc1YzExNmYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvY29jb2EvV2ViQ29udGVudFJlYWRlckNv Y29hLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvY29jb2EvV2ViQ29udGVudFJlYWRl ckNvY29hLm1tCkBAIC03NDYsNyArNzQ2LDcgQEAgQUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElP TlNfRU5ECiAgICAgICAgIHJldHVybiBpbWFnZTsKICAgICB9CiAKLSAgICBhdHRhY2htZW50LT51 cGRhdGVBdHRyaWJ1dGVzKFdURk1vdmUoZmlsZVNpemVGb3JEaXNwbGF5KSwgY29udGVudFR5cGUs IEZpbGVTeXN0ZW06OnBhdGhHZXRGaWxlTmFtZShwYXRoKSk7CisgICAgYXR0YWNobWVudC0+dXBk YXRlQXR0cmlidXRlcyhXVEZNb3ZlKGZpbGVTaXplRm9yRGlzcGxheSksIGNvbnRlbnRUeXBlLCBG aWxlU3lzdGVtOjpwYXRoRmlsZU5hbWUocGF0aCkpOwogICAgIHJldHVybiBhdHRhY2htZW50Owog fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9maWxlYXBpL0ZpbGUuY3BwIGIvU291cmNl L1dlYkNvcmUvZmlsZWFwaS9GaWxlLmNwcAppbmRleCAzZTcyNzIxNWQ5YTAxY2M1ZGNlMWE5N2M5 ZjY4ZmJmNTFmMjdkODg2Li4yM2EyMjk2MWMxZGRlOTY3YmE0ZTM1NDJjM2ZmYmRjZmFjNjg2MTA3 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9maWxlYXBpL0ZpbGUuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2ZpbGVhcGkvRmlsZS5jcHAKQEAgLTEyNyw3ICsxMjcsNyBAQCB2b2lkIEZpbGU6 OmNvbXB1dGVOYW1lQW5kQ29udGVudFR5cGUoY29uc3QgU3RyaW5nJiBwYXRoLCBjb25zdCBTdHJp bmcmIG5hbWVPdmVycgogICAgICAgICByZXR1cm47CiAgICAgfQogI2VuZGlmCi0gICAgZWZmZWN0 aXZlTmFtZSA9IG5hbWVPdmVycmlkZS5pc0VtcHR5KCkgPyBGaWxlU3lzdGVtOjpwYXRoR2V0Rmls ZU5hbWUocGF0aCkgOiBuYW1lT3ZlcnJpZGU7CisgICAgZWZmZWN0aXZlTmFtZSA9IG5hbWVPdmVy cmlkZS5pc0VtcHR5KCkgPyBGaWxlU3lzdGVtOjpwYXRoRmlsZU5hbWUocGF0aCkgOiBuYW1lT3Zl cnJpZGU7CiAgICAgc2l6ZV90IGluZGV4ID0gZWZmZWN0aXZlTmFtZS5yZXZlcnNlRmluZCgnLicp OwogICAgIGlmIChpbmRleCAhPSBub3RGb3VuZCkgewogICAgICAgICBjYWxsT25NYWluVGhyZWFk QW5kV2FpdChbJmVmZmVjdGl2ZUNvbnRlbnRUeXBlLCAmZWZmZWN0aXZlTmFtZSwgaW5kZXhdIHsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2ZpbGVhcGkvRmlsZUNvY29hLm1tIGIvU291cmNl L1dlYkNvcmUvZmlsZWFwaS9GaWxlQ29jb2EubW0KaW5kZXggZDcxNjEyZjIxYWE5Mjc3MjQzZGZh MzhlYzNkZTAzYjA1YzFhNGJkNy4uNWYzMjMxMjU5Y2NhMDNmNWY3M2YwZTg1Mzg4YjMwYjE5YmMx MTcxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZmlsZWFwaS9GaWxlQ29jb2EubW0KKysr IGIvU291cmNlL1dlYkNvcmUvZmlsZWFwaS9GaWxlQ29jb2EubW0KQEAgLTYxLDkgKzYxLDkgQEAg QUxMT1dfREVQUkVDQVRFRF9ERUNMQVJBVElPTlNfRU5ECiAKIHZvaWQgRmlsZTo6Y29tcHV0ZU5h bWVBbmRDb250ZW50VHlwZUZvclJlcGxhY2VkRmlsZShjb25zdCBTdHJpbmcmIHBhdGgsIGNvbnN0 IFN0cmluZyYgbmFtZU92ZXJyaWRlLCBTdHJpbmcmIGVmZmVjdGl2ZU5hbWUsIFN0cmluZyYgZWZm ZWN0aXZlQ29udGVudFR5cGUpCiB7Ci0gICAgQVNTRVJUKCFGaWxlU3lzdGVtOjpwYXRoR2V0Rmls ZU5hbWUocGF0aCkuZW5kc1dpdGgoJy8nKSk7IC8vIEV4cGVjdGluZyB0byBnZXQgYSBwYXRoIHdp dGhvdXQgdHJhaWxpbmcgc2xhc2gsIGV2ZW4gZm9yIGRpcmVjdG9yaWVzLgorICAgIEFTU0VSVCgh RmlsZVN5c3RlbTo6cGF0aEZpbGVOYW1lKHBhdGgpLmVuZHNXaXRoKCcvJykpOyAvLyBFeHBlY3Rp bmcgdG8gZ2V0IGEgcGF0aCB3aXRob3V0IHRyYWlsaW5nIHNsYXNoLCBldmVuIGZvciBkaXJlY3Rv cmllcy4KICAgICBlZmZlY3RpdmVDb250ZW50VHlwZSA9ICJhcHBsaWNhdGlvbi96aXAiX3M7Ci0g ICAgZWZmZWN0aXZlTmFtZSA9IG1ha2VTdHJpbmcoKG5hbWVPdmVycmlkZS5pc051bGwoKSA/IEZp bGVTeXN0ZW06OnBhdGhHZXRGaWxlTmFtZShwYXRoKSA6IG5hbWVPdmVycmlkZSksICIuemlwIl9z KTsKKyAgICBlZmZlY3RpdmVOYW1lID0gbWFrZVN0cmluZygobmFtZU92ZXJyaWRlLmlzTnVsbCgp ID8gRmlsZVN5c3RlbTo6cGF0aEZpbGVOYW1lKHBhdGgpIDogbmFtZU92ZXJyaWRlKSwgIi56aXAi X3MpOwogfQogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0RpcmVjdG9yeUZp bGVMaXN0Q3JlYXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0RpcmVjdG9yeUZpbGVMaXN0 Q3JlYXRvci5jcHAKaW5kZXggMDA0NDA4YjY1NWMxMTk3ODBmODcwY2ZiN2E5ZThlYmNjNDQ0NGVj Ni4uMTg3ZWRlMzM5MzhmM2U0YWIzNzZjOGM3NDNkYTRjY2EwNzUxMGFiOSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaHRtbC9EaXJlY3RvcnlGaWxlTGlzdENyZWF0b3IuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2h0bWwvRGlyZWN0b3J5RmlsZUxpc3RDcmVhdG9yLmNwcApAQCAtNzcsNyAr NzcsNyBAQCBzdGF0aWMgVmVjdG9yPEZpbGVJbmZvcm1hdGlvbj4gZ2F0aGVyRmlsZUluZm9ybWF0 aW9uKGNvbnN0IFZlY3RvcjxGaWxlQ2hvb3NlckZpbAogICAgIFZlY3RvcjxGaWxlSW5mb3JtYXRp b24+IGZpbGVzOwogICAgIGZvciAoYXV0byYgaW5mbyA6IHBhdGhzKSB7CiAgICAgICAgIGlmIChG aWxlU3lzdGVtOjppc0RpcmVjdG9yeShpbmZvLnBhdGgpKQotICAgICAgICAgICAgYXBwZW5kRGly ZWN0b3J5RmlsZXMoaW5mby5wYXRoLCBGaWxlU3lzdGVtOjpwYXRoR2V0RmlsZU5hbWUoaW5mby5w YXRoKSwgZmlsZXMpOworICAgICAgICAgICAgYXBwZW5kRGlyZWN0b3J5RmlsZXMoaW5mby5wYXRo LCBGaWxlU3lzdGVtOjpwYXRoRmlsZU5hbWUoaW5mby5wYXRoKSwgZmlsZXMpOwogICAgICAgICBl bHNlCiAgICAgICAgICAgICBmaWxlcy5hcHBlbmQoRmlsZUluZm9ybWF0aW9uIHsgaW5mby5wYXRo LCB7IH0sIGluZm8uZGlzcGxheU5hbWUgfSk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9hcHBjYWNoZS9BcHBsaWNhdGlvbkNhY2hlU3RvcmFnZS5jcHAKaW5k ZXggMTc0Y2RkMTFkYzJlNmMwODFmNjZmNThjMDAxMTg2N2Q0NjAyYWJkZi4uZWYzNmRkNWQ1YjA5 MzE5NTIyNzhhMWUwYzZlNDI5ODU5YzU1MjE0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZVN0b3JhZ2UuY3BwCkBAIC03 ODgsNyArNzg4LDcgQEAgYm9vbCBBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZTo6c3RvcmUoQXBwbGlj YXRpb25DYWNoZVJlc291cmNlKiByZXNvdXJjZSwgdW5zaWduZWQKIAogICAgIFN0cmluZyBmdWxs UGF0aDsKICAgICBpZiAoIXJlc291cmNlLT5wYXRoKCkuaXNFbXB0eSgpKQotICAgICAgICBkYXRh U3RhdGVtZW50LmJpbmRUZXh0KDIsIEZpbGVTeXN0ZW06OnBhdGhHZXRGaWxlTmFtZShyZXNvdXJj ZS0+cGF0aCgpKSk7CisgICAgICAgIGRhdGFTdGF0ZW1lbnQuYmluZFRleHQoMiwgRmlsZVN5c3Rl bTo6cGF0aEZpbGVOYW1lKHJlc291cmNlLT5wYXRoKCkpKTsKICAgICBlbHNlIGlmIChzaG91bGRT dG9yZVJlc291cmNlQXNGbGF0RmlsZShyZXNvdXJjZSkpIHsKICAgICAgICAgLy8gRmlyc3QsIGNo ZWNrIHRvIHNlZSBpZiBjcmVhdGluZyB0aGUgZmxhdCBmaWxlIHdvdWxkIHZpb2xhdGUgdGhlIG1h eGltdW0gdG90YWwgcXVvdGEuIFdlIGRvbid0IG5lZWQKICAgICAgICAgLy8gdG8gY2hlY2sgdGhl IHBlci1vcmlnaW4gcXVvdGEgaGVyZSwgYXMgaXQgd2FzIGFscmVhZHkgY2hlY2tlZCBpbiBzdG9y ZU5ld2VzdENhY2hlKCkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9hdmZvdW5kYXRpb24vb2JqYy9DRE1JbnN0YW5jZUZhaXJQbGF5U3RyZWFtaW5nQVZGT2Jq Qy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpj L0NETUluc3RhbmNlRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpDLm1tCmluZGV4IDk3NjM2MmEzNjgy MTRhOTFlY2U2OWEzZTk3MTU5N2I4YWM0MTBhNGMuLmE1Yjc5NmUwZmI0NDg1MmE3MjQ5MWNkNjhi NjBjZjc5ZGFhODdhODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2F2Zm91bmRhdGlvbi9vYmpjL0NETUluc3RhbmNlRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpD Lm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9v YmpjL0NETUluc3RhbmNlRmFpclBsYXlTdHJlYW1pbmdBVkZPYmpDLm1tCkBAIC00MDYsNyArNDA2 LDcgQEAgdm9pZCBDRE1JbnN0YW5jZUZhaXJQbGF5U3RyZWFtaW5nQVZGT2JqQzo6c2V0U3RvcmFn ZURpcmVjdG9yeShjb25zdCBTdHJpbmcmIHN0b3IKICAgICAgICAgaWYgKCF0ZW1wRGlyZWN0b3J5 KQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIGF1dG8gdGVtcFN0b3JhZ2VQYXRoID0g RmlsZVN5c3RlbTo6cGF0aEJ5QXBwZW5kaW5nQ29tcG9uZW50KHRlbXBEaXJlY3RvcnksIEZpbGVT eXN0ZW06OnBhdGhHZXRGaWxlTmFtZShzdG9yYWdlUGF0aCkpOworICAgICAgICBhdXRvIHRlbXBT dG9yYWdlUGF0aCA9IEZpbGVTeXN0ZW06OnBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudCh0ZW1wRGly ZWN0b3J5LCBGaWxlU3lzdGVtOjpwYXRoRmlsZU5hbWUoc3RvcmFnZVBhdGgpKTsKICAgICAgICAg aWYgKCFGaWxlU3lzdGVtOjptb3ZlRmlsZShzdG9yYWdlRGlyZWN0b3J5LCB0ZW1wU3RvcmFnZVBh dGgpKQogICAgICAgICAgICAgcmV0dXJuOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXIuY3BwCmluZGV4IDAyYzJjMzBhN2QxOTRlZjA5MmU4OTkwYjE1ZjIy YmJlNGE4NzBlNGYuLjA3YjNkOWZiZTgwNGM0ZjgwMTAwNTUxYWVmMDEyMzYyYWUyMzgwZWYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRp YVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCkBAIC0y MjA5LDcgKzIyMDksNyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6cHVyZ2VP bGREb3dubG9hZEZpbGVzKGNvbnN0IFN0cmluZyYgZG93bmxvYWRGaQogICAgICAgICByZXR1cm47 CiAKICAgICBhdXRvIHRlbXBsYXRlRGlyZWN0b3J5ID0gRmlsZVN5c3RlbTo6cGFyZW50UGF0aChk b3dubG9hZEZpbGVQcmVmaXhQYXRoKTsKLSAgICBhdXRvIHRlbXBsYXRlUHJlZml4ID0gRmlsZVN5 c3RlbTo6cGF0aEdldEZpbGVOYW1lKGRvd25sb2FkRmlsZVByZWZpeFBhdGgpOworICAgIGF1dG8g dGVtcGxhdGVQcmVmaXggPSBGaWxlU3lzdGVtOjpwYXRoRmlsZU5hbWUoZG93bmxvYWRGaWxlUHJl Zml4UGF0aCk7CiAgICAgZm9yIChhdXRvJiBmaWxlTmFtZSA6IEZpbGVTeXN0ZW06Omxpc3REaXJl Y3RvcnkodGVtcGxhdGVEaXJlY3RvcnkpKSB7CiAgICAgICAgIGlmICghZmlsZU5hbWUuc3RhcnRz V2l0aCh0ZW1wbGF0ZVByZWZpeCkpCiAgICAgICAgICAgICBjb250aW51ZTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvV2ViU3RvcmFnZS9Mb2NhbFN0b3JhZ2VEYXRh YmFzZVRyYWNrZXIuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9XZWJTdG9yYWdl L0xvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlci5jcHAKaW5kZXggZDRlZDJhODcwOTAzNzZkMjg4 M2NkNTdjZmY4ODI0NjEzOWQwNGUwYS4uMWNmMzQyZjljY2JhNTA4NzNhYjAwYjhmYjJmZjkyZjdk ZGEwY2JjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9XZWJTdG9y YWdlL0xvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9XZWJTdG9yYWdlL0xvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlci5jcHAK QEAgLTEwNSw3ICsxMDUsNyBAQCBWZWN0b3I8U2VjdXJpdHlPcmlnaW5EYXRhPiBMb2NhbFN0b3Jh Z2VEYXRhYmFzZVRyYWNrZXI6Om9yaWdpbnMoKSBjb25zdAogewogICAgIFZlY3RvcjxTZWN1cml0 eU9yaWdpbkRhdGE+IGRhdGFiYXNlT3JpZ2luczsKICAgICBmb3IgKGF1dG8mIHBhdGggOiBGaWxl U3lzdGVtOjpsaXN0RGlyZWN0b3J5KGxvY2FsU3RvcmFnZURpcmVjdG9yeSgpKSkgewotICAgICAg ICBhdXRvIGZpbGVuYW1lID0gRmlsZVN5c3RlbTo6cGF0aEdldEZpbGVOYW1lKHBhdGgpOworICAg ICAgICBhdXRvIGZpbGVuYW1lID0gRmlsZVN5c3RlbTo6cGF0aEZpbGVOYW1lKHBhdGgpOwogICAg ICAgICBhdXRvIG9yaWdpbklkZW50aWZpZXIgPSBmaWxlbmFtZS5zdWJzdHJpbmcoMCwgZmlsZW5h bWUubGVuZ3RoKCkgLSBzdHJsZW4oIi5sb2NhbHN0b3JhZ2UiKSk7CiAgICAgICAgIGF1dG8gb3Jp Z2luID0gU2VjdXJpdHlPcmlnaW5EYXRhOjpmcm9tRGF0YWJhc2VJZGVudGlmaWVyKG9yaWdpbklk ZW50aWZpZXIpOwogICAgICAgICBpZiAob3JpZ2luKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcAppbmRleCAzMTE3 MDE0MjljZWU4ODlmMzlkZWYzOWVkNjYwZTRkMjhkYzk5OWI0Li43NWRlYzhjNzVhYjQzYzRmYmRl YmUwNmRhMThmMGY4NTNkNDM0NmI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcApAQCAtMjY5LDcgKzI2OSw3 IEBAIHZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6cmVzb2x2ZURpcmVjdG9yaWVzSWZOZWNlc3Nhcnko KQogICAgIC8vIFJlc29sdmUgZGlyZWN0b3JpZXMgZm9yIGZpbGUgcGF0aHMuCiAgICAgaWYgKCFt X2NvbmZpZ3VyYXRpb24tPmNvb2tpZVN0b3JhZ2VGaWxlKCkuaXNFbXB0eSgpKSB7CiAgICAgICAg IG1fcmVzb2x2ZWRDb25maWd1cmF0aW9uLT5zZXRDb29raWVTdG9yYWdlRmlsZShyZXNvbHZlQW5k Q3JlYXRlUmVhZFdyaXRlRGlyZWN0b3J5Rm9yU2FuZGJveEV4dGVuc2lvbihGaWxlU3lzdGVtOjpw YXJlbnRQYXRoKG1fY29uZmlndXJhdGlvbi0+Y29va2llU3RvcmFnZUZpbGUoKSkpKTsKLSAgICAg ICAgbV9yZXNvbHZlZENvbmZpZ3VyYXRpb24tPnNldENvb2tpZVN0b3JhZ2VGaWxlKEZpbGVTeXN0 ZW06OnBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChtX3Jlc29sdmVkQ29uZmlndXJhdGlvbi0+Y29v a2llU3RvcmFnZUZpbGUoKSwgRmlsZVN5c3RlbTo6cGF0aEdldEZpbGVOYW1lKG1fY29uZmlndXJh dGlvbi0+Y29va2llU3RvcmFnZUZpbGUoKSkpKTsKKyAgICAgICAgbV9yZXNvbHZlZENvbmZpZ3Vy YXRpb24tPnNldENvb2tpZVN0b3JhZ2VGaWxlKEZpbGVTeXN0ZW06OnBhdGhCeUFwcGVuZGluZ0Nv bXBvbmVudChtX3Jlc29sdmVkQ29uZmlndXJhdGlvbi0+Y29va2llU3RvcmFnZUZpbGUoKSwgRmls ZVN5c3RlbTo6cGF0aEZpbGVOYW1lKG1fY29uZmlndXJhdGlvbi0+Y29va2llU3RvcmFnZUZpbGUo KSkpKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1Bs dWdpbnMvUGx1Z2luRGF0YWJhc2UuY3BwIGIvU291cmNlL1dlYktpdExlZ2FjeS93aW4vUGx1Z2lu cy9QbHVnaW5EYXRhYmFzZS5jcHAKaW5kZXggZDJmYjc1ZjY1Y2U0NjFmOGUwYWQ3NGY4NjRmYzBh ZWQzYmNmYjU5OS4uMzNkZmMyMmE2MzQ0ZWRhMzhmYWQ5NzI5OTRlNTA3YmNlNGU2YzFhYyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS93aW4vUGx1Z2lucy9QbHVnaW5EYXRhYmFzZS5j cHAKKysrIGIvU291cmNlL1dlYktpdExlZ2FjeS93aW4vUGx1Z2lucy9QbHVnaW5EYXRhYmFzZS5j cHAKQEAgLTMwOSw3ICszMDksNyBAQCB2b2lkIFBsdWdpbkRhdGFiYXNlOjpzZXRQcmVmZXJyZWRQ bHVnaW5Gb3JNSU1FVHlwZShjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBQbHVnaQogYm9vbCBQbHVn aW5EYXRhYmFzZTo6ZmlsZUV4aXN0c0FuZElzTm90RGlzYWJsZWQoY29uc3QgU3RyaW5nJiBmaWxl UGF0aCkgY29uc3QKIHsKICAgICAvLyBTa2lwIHBsdWdpbiBmaWxlcyB0aGF0IGFyZSBkaXNhYmxl ZCBieSBmaWxlbmFtZS4KLSAgICBpZiAobV9kaXNhYmxlZFBsdWdpbkZpbGVzLmNvbnRhaW5zKEZp bGVTeXN0ZW06OnBhdGhHZXRGaWxlTmFtZShmaWxlUGF0aCkpKQorICAgIGlmIChtX2Rpc2FibGVk UGx1Z2luRmlsZXMuY29udGFpbnMoRmlsZVN5c3RlbTo6cGF0aEZpbGVOYW1lKGZpbGVQYXRoKSkp CiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIHJldHVybiBGaWxlU3lzdGVtOjpmaWxlRXhp c3RzKGZpbGVQYXRoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1BsdWdp bnMvUGx1Z2luUGFja2FnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9QbHVnaW5zL1Bs dWdpblBhY2thZ2UuY3BwCmluZGV4IDhjMjFiMDZmOTQ0NzhlM2RjMjA5ZmZiYzliOTE4MWJmNjY5 ODIyMTQuLjMwODViNzE2NDk5MjgxNDJjYTYyODQwNzUyYjQ1YmI0ZGUzODkwMWMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1BsdWdpbnMvUGx1Z2luUGFja2FnZS5jcHAKKysr IGIvU291cmNlL1dlYktpdExlZ2FjeS93aW4vUGx1Z2lucy9QbHVnaW5QYWNrYWdlLmNwcApAQCAt MTIwLDcgKzEyMCw3IEBAIFBsdWdpblBhY2thZ2U6OlBsdWdpblBhY2thZ2UoY29uc3QgU3RyaW5n JiBwYXRoLCBjb25zdCB0aW1lX3QmIGxhc3RNb2RpZmllZCkKICAgICAsIG1faW5mb0lzRnJvbUNh Y2hlKHRydWUpCiAjZW5kaWYKIHsKLSAgICBtX2ZpbGVOYW1lID0gRmlsZVN5c3RlbTo6cGF0aEdl dEZpbGVOYW1lKG1fcGF0aCk7CisgICAgbV9maWxlTmFtZSA9IEZpbGVTeXN0ZW06OnBhdGhGaWxl TmFtZShtX3BhdGgpOwogICAgIG1fcGFyZW50RGlyZWN0b3J5ID0gbV9wYXRoLmxlZnQobV9wYXRo Lmxlbmd0aCgpIC0gbV9maWxlTmFtZS5sZW5ndGgoKSAtIDEpOwogfQogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJEb3dubG9hZEN1cmwuY3BwIGIvU291cmNlL1dlYktp dExlZ2FjeS93aW4vV2ViRG93bmxvYWRDdXJsLmNwcAppbmRleCA5OWI2MjdmMWFhYzAzYWVkZjUw Njg3ZmM3ZjMzNmJiOTVkOWNkZDIwLi41ZDFkYjU5OTNiNmJkZTE5NGY0NmJmNjcyMmRlMThkYmFm OTg5YTZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJEb3dubG9hZEN1 cmwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1dlYkRvd25sb2FkQ3VybC5jcHAK QEAgLTIxMyw3ICsyMTMsNyBAQCB2b2lkIFdlYkRvd25sb2FkOjpkaWRSZWNlaXZlUmVzcG9uc2Uo Y29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UpCiAKICAgICAgICAgU3RyaW5nIHN1Z2dl c3RlZEZpbGVuYW1lID0gcmVzcG9uc2Uuc3VnZ2VzdGVkRmlsZW5hbWUoKTsKICAgICAgICAgaWYg KHN1Z2dlc3RlZEZpbGVuYW1lLmlzRW1wdHkoKSkKLSAgICAgICAgICAgIHN1Z2dlc3RlZEZpbGVu YW1lID0gRmlsZVN5c3RlbTo6cGF0aEdldEZpbGVOYW1lKHJlc3BvbnNlLnVybCgpLnN0cmluZygp KTsKKyAgICAgICAgICAgIHN1Z2dlc3RlZEZpbGVuYW1lID0gRmlsZVN5c3RlbTo6cGF0aEZpbGVO YW1lKHJlc3BvbnNlLnVybCgpLnN0cmluZygpKTsKICAgICAgICAgc3VnZ2VzdGVkRmlsZW5hbWUg PSBkZWNvZGVVUkxFc2NhcGVTZXF1ZW5jZXMoc3VnZ2VzdGVkRmlsZW5hbWUpOwogICAgICAgICBC U3RyaW5nIHN1Z2dlc3RlZEZpbGVuYW1lQlNUUihzdWdnZXN0ZWRGaWxlbmFtZSk7CiAgICAgICAg IG1fZGVsZWdhdGUtPmRlY2lkZURlc3RpbmF0aW9uV2l0aFN1Z2dlc3RlZEZpbGVuYW1lKHRoaXMs IHN1Z2dlc3RlZEZpbGVuYW1lQlNUUik7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9U b29scy9DaGFuZ2VMb2cKaW5kZXggNjc3OTljYjRlYTNlMTI1YjM2NWU3NmQ2OTYwOGI2YTAwOGY2 ZDA5ZC4uODYxZDU3NjljM2RiNTg5MzBhNDU4NjE0MjRjODE3ZTY5ZGRkOGU1NCAxMDA2NDQKLS0t IGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBA CisyMDIxLTA1LTE0ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAg UmVuYW1lIEZpbGVTeXN0ZW06OnBhdGhHZXRGaWxlTmFtZSgpIHRvIEZpbGVTeXN0ZW06OnBhdGhG aWxlTmFtZSgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMjU4MDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBSZW5hbWUgRmlsZVN5c3RlbTo6cGF0aEdldEZpbGVOYW1lKCkgdG8gRmlsZVN5c3RlbTo6cGF0 aEZpbGVOYW1lKCksIGFzIHdlIGF2b2lkICJnZXQiIHByZWZpeGVzIGluIFdlYktpdC4KKworICAg ICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV1RGL0ZpbGVTeXN0ZW0uY3BwOgorICAgICAgICAo VGVzdFdlYktpdEFQSTo6VEVTVF9GKToKKwogMjAyMS0wNS0xNCAgQ2FybG9zIEdhcmNpYSBDYW1w b3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gW0dUS10gRml4 IG1ha2UgZGlzdGNoZWNrCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dU Ri9GaWxlU3lzdGVtLmNwcCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV1RGL0ZpbGVTeXN0 ZW0uY3BwCmluZGV4IGQxNmM2OWY5OGMzZmJlMTI5MTE2ZGY0ZjdlMzA5ZDk5ZDE5MjVjOTIuLjAz NmZkNWQyZjdjYzgwZTgxMzU2OGYyZmJjM2JiMWI3MTIwYjFkNzYgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV1RGL0ZpbGVTeXN0ZW0uY3BwCisrKyBiL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV1RGL0ZpbGVTeXN0ZW0uY3BwCkBAIC03NDAsMjUgKzc0MCwyNSBAQCBU RVNUX0YoRmlsZVN5c3RlbVRlc3QsIGdldEZpbGVNb2RpZmljYXRpb25UaW1lVmlhRmlsZU1ldGFk YXRhKQogICAgIH0pOwogfQogCi1URVNUX0YoRmlsZVN5c3RlbVRlc3QsIHBhdGhHZXRGaWxlTmFt ZSkKK1RFU1RfRihGaWxlU3lzdGVtVGVzdCwgcGF0aEZpbGVOYW1lKQogewogICAgIGF1dG8gdGVz dFBhdGggPSBGaWxlU3lzdGVtOjpwYXRoQnlBcHBlbmRpbmdDb21wb25lbnRzKHRlbXBFbXB0eUZv bGRlclBhdGgoKSwgeyAic3ViZm9sZGVyIiwgImZpbGVuYW1lLnR4dCIgfSk7Ci0gICAgRVhQRUNU X1NUUkVRKCJmaWxlbmFtZS50eHQiLCBGaWxlU3lzdGVtOjpwYXRoR2V0RmlsZU5hbWUodGVzdFBh dGgpLnV0ZjgoKS5kYXRhKCkpOworICAgIEVYUEVDVF9TVFJFUSgiZmlsZW5hbWUudHh0IiwgRmls ZVN5c3RlbTo6cGF0aEZpbGVOYW1lKHRlc3RQYXRoKS51dGY4KCkuZGF0YSgpKTsKIAogI2lmIE9T KFVOSVgpCi0gICAgRVhQRUNUX1NUUkVRKCIuIiwgRmlsZVN5c3RlbTo6cGF0aEdldEZpbGVOYW1l KCIuIikudXRmOCgpLmRhdGEoKSk7Ci0gICAgRVhQRUNUX1NUUkVRKCIuLiIsIEZpbGVTeXN0ZW06 OnBhdGhHZXRGaWxlTmFtZSgiLi4iKS51dGY4KCkuZGF0YSgpKTsKLSAgICBFWFBFQ1RfU1RSRVEo IiIsIEZpbGVTeXN0ZW06OnBhdGhHZXRGaWxlTmFtZSgiLyIpLnV0ZjgoKS5kYXRhKCkpOwotICAg IEVYUEVDVF9TVFJFUSgiLiIsIEZpbGVTeXN0ZW06OnBhdGhHZXRGaWxlTmFtZSgiL2Zvby8uIiku dXRmOCgpLmRhdGEoKSk7Ci0gICAgRVhQRUNUX1NUUkVRKCIuLiIsIEZpbGVTeXN0ZW06OnBhdGhH ZXRGaWxlTmFtZSgiL2Zvby8uLiIpLnV0ZjgoKS5kYXRhKCkpOwotICAgIEVYUEVDVF9TVFJFUSgi IiwgRmlsZVN5c3RlbTo6cGF0aEdldEZpbGVOYW1lKCIvZm9vLyIpLnV0ZjgoKS5kYXRhKCkpOwot ICAgIEVYUEVDVF9TVFJFUSgiaG9zdCIsIEZpbGVTeXN0ZW06OnBhdGhHZXRGaWxlTmFtZSgiLy9o b3N0IikudXRmOCgpLmRhdGEoKSk7CisgICAgRVhQRUNUX1NUUkVRKCIuIiwgRmlsZVN5c3RlbTo6 cGF0aEZpbGVOYW1lKCIuIikudXRmOCgpLmRhdGEoKSk7CisgICAgRVhQRUNUX1NUUkVRKCIuLiIs IEZpbGVTeXN0ZW06OnBhdGhGaWxlTmFtZSgiLi4iKS51dGY4KCkuZGF0YSgpKTsKKyAgICBFWFBF Q1RfU1RSRVEoIiIsIEZpbGVTeXN0ZW06OnBhdGhGaWxlTmFtZSgiLyIpLnV0ZjgoKS5kYXRhKCkp OworICAgIEVYUEVDVF9TVFJFUSgiLiIsIEZpbGVTeXN0ZW06OnBhdGhGaWxlTmFtZSgiL2Zvby8u IikudXRmOCgpLmRhdGEoKSk7CisgICAgRVhQRUNUX1NUUkVRKCIuLiIsIEZpbGVTeXN0ZW06OnBh dGhGaWxlTmFtZSgiL2Zvby8uLiIpLnV0ZjgoKS5kYXRhKCkpOworICAgIEVYUEVDVF9TVFJFUSgi IiwgRmlsZVN5c3RlbTo6cGF0aEZpbGVOYW1lKCIvZm9vLyIpLnV0ZjgoKS5kYXRhKCkpOworICAg IEVYUEVDVF9TVFJFUSgiaG9zdCIsIEZpbGVTeXN0ZW06OnBhdGhGaWxlTmFtZSgiLy9ob3N0Iiku dXRmOCgpLmRhdGEoKSk7CiAjZW5kaWYKICNpZiBPUyhXSU5ET1dTKQotICAgIEVYUEVDVF9TVFJF USgiIiwgRmlsZVN5c3RlbTo6cGF0aEdldEZpbGVOYW1lKCJDOlxcIikudXRmOCgpLmRhdGEoKSk7 Ci0gICAgRVhQRUNUX1NUUkVRKCJmb28iLCBGaWxlU3lzdGVtOjpwYXRoR2V0RmlsZU5hbWUoIkM6 XFxmb28iKS51dGY4KCkuZGF0YSgpKTsKLSAgICBFWFBFQ1RfU1RSRVEoIiIsIEZpbGVTeXN0ZW06 OnBhdGhHZXRGaWxlTmFtZSgiQzpcXGZvb1xcIikudXRmOCgpLmRhdGEoKSk7Ci0gICAgRVhQRUNU X1NUUkVRKCJiYXIudHh0IiwgRmlsZVN5c3RlbTo6cGF0aEdldEZpbGVOYW1lKCJDOlxcZm9vXFxi YXIudHh0IikudXRmOCgpLmRhdGEoKSk7CisgICAgRVhQRUNUX1NUUkVRKCIiLCBGaWxlU3lzdGVt OjpwYXRoRmlsZU5hbWUoIkM6XFwiKS51dGY4KCkuZGF0YSgpKTsKKyAgICBFWFBFQ1RfU1RSRVEo ImZvbyIsIEZpbGVTeXN0ZW06OnBhdGhGaWxlTmFtZSgiQzpcXGZvbyIpLnV0ZjgoKS5kYXRhKCkp OworICAgIEVYUEVDVF9TVFJFUSgiIiwgRmlsZVN5c3RlbTo6cGF0aEZpbGVOYW1lKCJDOlxcZm9v XFwiKS51dGY4KCkuZGF0YSgpKTsKKyAgICBFWFBFQ1RfU1RSRVEoImJhci50eHQiLCBGaWxlU3lz dGVtOjpwYXRoRmlsZU5hbWUoIkM6XFxmb29cXGJhci50eHQiKS51dGY4KCkuZGF0YSgpKTsKICNl bmRpZgogfQogCg==