164315 2016-11-02 03:16:21 -0700 [GTK] Remove FileSystem::filenameToString() and use FileSystem::stringFromFileSystemRepresentation() everywhere instead 2016-11-02 06:05:33 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Local Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned berto bugs-noreply commit-queue gustavo mcatanzaro mrobinson oldest_to_newest 1247270 0 cgarcia 2016-11-02 03:16:21 -0700 Both methods are the same, but FileSystem::filenameToString() is only defined by GTK and used everywhere. We should use the other one instead and remove FileSystem::filenameToString(). 1247271 1 293652 cgarcia 2016-11-02 03:17:48 -0700 Created attachment 293652 Patch 1247272 2 commit-queue 2016-11-02 03:19:42 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1247288 3 293652 mcatanzaro 2016-11-02 05:37:05 -0700 Comment on attachment 293652 Patch I guess this is fine. I suspect the purpose of using the different name was to indicate that GLib doesn't support filenames with embedded NUL characters, but whatever. 1247295 4 cgarcia 2016-11-02 06:05:33 -0700 Committed r208278: <http://trac.webkit.org/changeset/208278> 293652 2016-11-02 03:17:48 -0700 2016-11-02 05:37:05 -0700 Patch wgtk-filename-to-string.diff text/plain 17954 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2NDliZWNhLi4wNGJhOGUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTYtMTEtMDIgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIFJlbW92ZSBGaWxlU3lzdGVtOjpmaWxlbmFtZVRvU3RyaW5nKCkg YW5kIHVzZSBGaWxlU3lzdGVtOjpzdHJpbmdGcm9tRmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKCkg ZXZlcnl3aGVyZSBpbnN0ZWFkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNjQzMTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIHBsYXRmb3JtL0ZpbGVTeXN0ZW0uaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9n bGliL0ZpbGVTeXN0ZW1HbGliLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnN0cmluZ0Zyb21GaWxl U3lzdGVtUmVwcmVzZW50YXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6aG9tZURpcmVjdG9yeVBh dGgpOgorICAgICAgICAoV2ViQ29yZTo6bGlzdERpcmVjdG9yeSk6CisgICAgICAgIChXZWJDb3Jl OjpmaWxlbmFtZVRvU3RyaW5nKTogRGVsZXRlZC4KKwogMjAxNi0xMS0wMiAgS2VpdGggUm9sbGlu ICA8a3JvbGxpbkBhcHBsZS5jb20+CiAKICAgICAgICAgTmV0d29ya1Nlc3Npb246IEFkZCBOZXR3 b3JrRGF0YVRhc2sgaW1wbGVtZW50YXRpb24gZm9yIGJsb2JzCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9GaWxlU3lzdGVtLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9G aWxlU3lzdGVtLmgKaW5kZXggODY4YmNlNS4uMjg5ZWY4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vRmlsZVN5c3RlbS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L0ZpbGVTeXN0ZW0uaApAQCAtMTk4LDcgKzE5OCw2IEBAIFJldGFpblB0cjxDRlVSTFJlZj4gcGF0 aEFzVVJMKGNvbnN0IFN0cmluZyYpOwogI2VuZGlmCiAKICNpZiBQTEFURk9STShHVEspCi1TdHJp bmcgZmlsZW5hbWVUb1N0cmluZyhjb25zdCBjaGFyKik7CiBTdHJpbmcgZmlsZW5hbWVGb3JEaXNw bGF5KGNvbnN0IFN0cmluZyYpOwogQ1N0cmluZyBhcHBsaWNhdGlvbkRpcmVjdG9yeVBhdGgoKTsK IENTdHJpbmcgc2hhcmVkUmVzb3VyY2VzUGF0aCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ2xpYi9GaWxlU3lzdGVtR2xpYi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9nbGliL0ZpbGVTeXN0ZW1HbGliLmNwcAppbmRleCA5N2U2NjE1Li5kZmZkODZiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9nbGliL0ZpbGVTeXN0ZW1HbGliLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9nbGliL0ZpbGVTeXN0ZW1HbGliLmNwcApAQCAt NDEsMjQgKzQxLDE5IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAqIGFyZSB2YWxpZCBmaWxlIG5h bWVzLiBUaGlzIG1lYW4gdGhhdCB3ZSBjYW5ub3QganVzdCBzdG9yZSBhIGZpbGUgbmFtZSBhcy1p cyBpbiBhIFN0cmluZwogICogYnV0IHdlIGhhdmUgdG8gZXNjYXBlIGl0LgogICogT24gV2luZG93 cyB0aGUgR0xpYiBmaWxlIG5hbWUgZW5jb2RpbmcgaXMgYWx3YXlzIFVURi04IHNvIHdlIGNhbiBv cHRpbWl6ZSB0aGlzIGNhc2UuICovCi1TdHJpbmcgZmlsZW5hbWVUb1N0cmluZyhjb25zdCBjaGFy KiBmaWxlbmFtZSkKK1N0cmluZyBzdHJpbmdGcm9tRmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKGNv bnN0IGNoYXIqIGZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbikKIHsKLSAgICBpZiAoIWZpbGVuYW1l KQorICAgIGlmICghZmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKQogICAgICAgICByZXR1cm4gU3Ry aW5nKCk7CiAKICNpZiBPUyhXSU5ET1dTKQotICAgIHJldHVybiBTdHJpbmc6OmZyb21VVEY4KGZp bGVuYW1lKTsKKyAgICByZXR1cm4gU3RyaW5nOjpmcm9tVVRGOChmaWxlU3lzdGVtUmVwcmVzZW50 YXRpb24pOwogI2Vsc2UKLSAgICBHVW5pcXVlUHRyPGdjaGFyPiBlc2NhcGVkU3RyaW5nKGdfdXJp X2VzY2FwZV9zdHJpbmcoZmlsZW5hbWUsICIvOiIsIGZhbHNlKSk7CisgICAgR1VuaXF1ZVB0cjxn Y2hhcj4gZXNjYXBlZFN0cmluZyhnX3VyaV9lc2NhcGVfc3RyaW5nKGZpbGVTeXN0ZW1SZXByZXNl bnRhdGlvbiwgIi86IiwgRkFMU0UpKTsKICAgICByZXR1cm4gZXNjYXBlZFN0cmluZy5nZXQoKTsK ICNlbmRpZgogfQogCi1TdHJpbmcgc3RyaW5nRnJvbUZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbihj b25zdCBjaGFyKiBmaWxlU3lzdGVtUmVwcmVzZW50YXRpb24pCi17Ci0gICAgcmV0dXJuIGZpbGVu YW1lVG9TdHJpbmcoZmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKTsKLX0KLQogc3RhdGljIEdVbmlx dWVQdHI8Y2hhcj4gdW5lc2NhcGVkRmlsZW5hbWUoY29uc3QgU3RyaW5nJiBwYXRoKQogewogICAg IGlmIChwYXRoLmlzRW1wdHkoKSkKQEAgLTE4NCw3ICsxNzksNyBAQCBib29sIG1ha2VBbGxEaXJl Y3Rvcmllcyhjb25zdCBTdHJpbmcmIHBhdGgpCiAKIFN0cmluZyBob21lRGlyZWN0b3J5UGF0aCgp CiB7Ci0gICAgcmV0dXJuIGZpbGVuYW1lVG9TdHJpbmcoZ19nZXRfaG9tZV9kaXIoKSk7CisgICAg cmV0dXJuIHN0cmluZ0Zyb21GaWxlU3lzdGVtUmVwcmVzZW50YXRpb24oZ19nZXRfaG9tZV9kaXIo KSk7CiB9CiAKIFN0cmluZyBwYXRoR2V0RmlsZU5hbWUoY29uc3QgU3RyaW5nJiBwYXRoTmFtZSkK QEAgLTI3NSw3ICsyNzAsNyBAQCBWZWN0b3I8U3RyaW5nPiBsaXN0RGlyZWN0b3J5KGNvbnN0IFN0 cmluZyYgcGF0aCwgY29uc3QgU3RyaW5nJiBmaWx0ZXIpCiAgICAgICAgICAgICBjb250aW51ZTsK IAogICAgICAgICBHVW5pcXVlUHRyPGdjaGFyPiBlbnRyeShnX2J1aWxkX2ZpbGVuYW1lKGZpbGVu YW1lLmdldCgpLCBuYW1lLCBudWxscHRyKSk7Ci0gICAgICAgIGVudHJpZXMuYXBwZW5kKGZpbGVu YW1lVG9TdHJpbmcoZW50cnkuZ2V0KCkpKTsKKyAgICAgICAgZW50cmllcy5hcHBlbmQoc3RyaW5n RnJvbUZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbihlbnRyeS5nZXQoKSkpOwogICAgIH0KIAogICAg IHJldHVybiBlbnRyaWVzOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIv U291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IGY2NGUzNDMuLjc1NjcxYzAgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VM b2cKQEAgLTEsNSArMSwzMyBAQAogMjAxNi0xMS0wMiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxj Z2FyY2lhQGlnYWxpYS5jb20+CiAKKyAgICAgICAgW0dUS10gUmVtb3ZlIEZpbGVTeXN0ZW06OmZp bGVuYW1lVG9TdHJpbmcoKSBhbmQgdXNlIEZpbGVTeXN0ZW06OnN0cmluZ0Zyb21GaWxlU3lzdGVt UmVwcmVzZW50YXRpb24oKSBldmVyeXdoZXJlIGluc3RlYWQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2NDMxNQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2hhcmVkL2d0ay9Qcm9jZXNzRXhlY3V0YWJs ZVBhdGhHdGsuY3BwOgorICAgICAgICAoV2ViS2l0OjpnZXRFeGVjdXRhYmxlUGF0aCk6CisgICAg ICAgIChXZWJLaXQ6OmZpbmRXZWJLaXRQcm9jZXNzKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L2d0ay9BUElXZWJzaXRlRGF0YVN0b3JlR3RrLmNwcDoKKyAgICAgICAgKEFQSTo6V2Vic2l0ZURh dGFTdG9yZTo6ZGVmYXVsdE5ldHdvcmtDYWNoZURpcmVjdG9yeSk6CisgICAgICAgIChBUEk6Oldl YnNpdGVEYXRhU3RvcmU6OmNhY2hlRGlyZWN0b3J5RmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKToK KyAgICAgICAgKEFQSTo6V2Vic2l0ZURhdGFTdG9yZTo6d2Vic2l0ZURhdGFEaXJlY3RvcnlGaWxl U3lzdGVtUmVwcmVzZW50YXRpb24pOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktp dFdlYkNvbnRleHQuY3BwOgorICAgICAgICAod2Via2l0V2ViQ29udGV4dENvbnN0cnVjdGVkKToK KyAgICAgICAgKHdlYmtpdF93ZWJfY29udGV4dF9zZXRfZmF2aWNvbl9kYXRhYmFzZV9kaXJlY3Rv cnkpOgorICAgICAgICAod2Via2l0X3dlYl9jb250ZXh0X3NldF9hZGRpdGlvbmFsX3BsdWdpbnNf ZGlyZWN0b3J5KToKKyAgICAgICAgKHdlYmtpdF93ZWJfY29udGV4dF9zZXRfZGlza19jYWNoZV9k aXJlY3RvcnkpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYnNpdGVEYXRh TWFuYWdlci5jcHA6CisgICAgICAgICh3ZWJraXRXZWJzaXRlRGF0YU1hbmFnZXJHZXREYXRhU3Rv cmUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9QbHVnaW5zL2d0ay9QbHVnaW5JbmZvQ2FjaGUuY3Bw OgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5JbmZvQ2FjaGU6OlBsdWdpbkluZm9DYWNoZSk6Cisg ICAgICAgICogVUlQcm9jZXNzL2d0ay9XZWJQcm9jZXNzUG9vbEd0ay5jcHA6CisgICAgICAgIChX ZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpwbGF0Zm9ybURlZmF1bHRJY29uRGF0YWJhc2VQYXRoKToK KyAgICAgICAgKiBXZWJQcm9jZXNzL2d0ay9XZWJHdGtFeHRlbnNpb25NYW5hZ2VyLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6cGFyc2VVc2VyRGF0YSk6CisKKzIwMTYtMTEtMDIgIENhcmxvcyBHYXJj aWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCiAgICAgICAgIE5ldHdvcmtTZXNzaW9u OiBBZGQgTmV0d29ya0RhdGFUYXNrIGltcGxlbWVudGF0aW9uIGZvciBibG9icwogICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYzOTM5CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9ndGsvUHJvY2Vzc0V4ZWN1dGFibGVQYXRoR3RrLmNw cCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9ndGsvUHJvY2Vzc0V4ZWN1dGFibGVQYXRoR3RrLmNw cAppbmRleCAyMmY3MDViLi5mMGFhOTY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFy ZWQvZ3RrL1Byb2Nlc3NFeGVjdXRhYmxlUGF0aEd0ay5jcHAKKysrIGIvU291cmNlL1dlYktpdDIv U2hhcmVkL2d0ay9Qcm9jZXNzRXhlY3V0YWJsZVBhdGhHdGsuY3BwCkBAIC00Myw3ICs0Myw3IEBA IHN0YXRpYyBTdHJpbmcgZ2V0RXhlY3V0YWJsZVBhdGgoKQogewogICAgIENTdHJpbmcgZXhlY3V0 YWJsZVBhdGggPSBnZXRDdXJyZW50RXhlY3V0YWJsZVBhdGgoKTsKICAgICBpZiAoIWV4ZWN1dGFi bGVQYXRoLmlzTnVsbCgpKQotICAgICAgICByZXR1cm4gZGlyZWN0b3J5TmFtZShmaWxlbmFtZVRv U3RyaW5nKGV4ZWN1dGFibGVQYXRoLmRhdGEoKSkpOworICAgICAgICByZXR1cm4gZGlyZWN0b3J5 TmFtZShzdHJpbmdGcm9tRmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKGV4ZWN1dGFibGVQYXRoLmRh dGEoKSkpOwogICAgIHJldHVybiBTdHJpbmcoKTsKIH0KICNlbmRpZgpAQCAtNTMsNyArNTMsNyBA QCBzdGF0aWMgU3RyaW5nIGZpbmRXZWJLaXRQcm9jZXNzKGNvbnN0IGNoYXIqIHByb2Nlc3NOYW1l KQogI2lmIEVOQUJMRShERVZFTE9QRVJfTU9ERSkKICAgICBzdGF0aWMgY29uc3QgY2hhciogZXhl Y0RpcmVjdG9yeSA9IGdfZ2V0ZW52KCJXRUJLSVRfRVhFQ19QQVRIIik7CiAgICAgaWYgKGV4ZWNE aXJlY3RvcnkpIHsKLSAgICAgICAgU3RyaW5nIHByb2Nlc3NQYXRoID0gcGF0aEJ5QXBwZW5kaW5n Q29tcG9uZW50KGZpbGVuYW1lVG9TdHJpbmcoZXhlY0RpcmVjdG9yeSksIHByb2Nlc3NOYW1lKTsK KyAgICAgICAgU3RyaW5nIHByb2Nlc3NQYXRoID0gcGF0aEJ5QXBwZW5kaW5nQ29tcG9uZW50KHN0 cmluZ0Zyb21GaWxlU3lzdGVtUmVwcmVzZW50YXRpb24oZXhlY0RpcmVjdG9yeSksIHByb2Nlc3NO YW1lKTsKICAgICAgICAgaWYgKGZpbGVFeGlzdHMocHJvY2Vzc1BhdGgpKQogICAgICAgICAgICAg cmV0dXJuIHByb2Nlc3NQYXRoOwogICAgIH0KQEAgLTY2LDcgKzY2LDcgQEAgc3RhdGljIFN0cmlu ZyBmaW5kV2ViS2l0UHJvY2Vzcyhjb25zdCBjaGFyKiBwcm9jZXNzTmFtZSkKICAgICB9CiAjZW5k aWYKIAotICAgIHJldHVybiBwYXRoQnlBcHBlbmRpbmdDb21wb25lbnQoZmlsZW5hbWVUb1N0cmlu ZyhQS0dMSUJFWEVDRElSKSwgcHJvY2Vzc05hbWUpOworICAgIHJldHVybiBwYXRoQnlBcHBlbmRp bmdDb21wb25lbnQoc3RyaW5nRnJvbUZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbihQS0dMSUJFWEVD RElSKSwgcHJvY2Vzc05hbWUpOwogfQogCiBTdHJpbmcgZXhlY3V0YWJsZVBhdGhPZldlYlByb2Nl c3MoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvQVBJV2Vi c2l0ZURhdGFTdG9yZUd0ay5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9B UElXZWJzaXRlRGF0YVN0b3JlR3RrLmNwcAppbmRleCA4YmFkZjk1Li4xYmM5OWZiIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9BUElXZWJzaXRlRGF0YVN0b3Jl R3RrLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9BUElXZWJzaXRl RGF0YVN0b3JlR3RrLmNwcApAQCAtMzksNyArMzksNyBAQCBTdHJpbmcgV2Vic2l0ZURhdGFTdG9y ZTo6ZGVmYXVsdEFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkoKQogLy8gV2h5IGlzIG9ubHkgdGhp cyBkaXJlY3RvcnkgbmFtZXNwYWNlZCB0byBhIHBhcnRpY3VsYXIgYXBwbGljYXRpb24/CiBTdHJp bmcgV2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdE5ldHdvcmtDYWNoZURpcmVjdG9yeSgpCiB7Ci0g ICAgcmV0dXJuIGNhY2hlRGlyZWN0b3J5RmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKFdlYkNvcmU6 OnBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChXZWJDb3JlOjpmaWxlbmFtZVRvU3RyaW5nKGdfZ2V0 X3ByZ25hbWUoKSksICJXZWJLaXRDYWNoZSIpKTsKKyAgICByZXR1cm4gY2FjaGVEaXJlY3RvcnlG aWxlU3lzdGVtUmVwcmVzZW50YXRpb24oV2ViQ29yZTo6cGF0aEJ5QXBwZW5kaW5nQ29tcG9uZW50 KFdlYkNvcmU6OnN0cmluZ0Zyb21GaWxlU3lzdGVtUmVwcmVzZW50YXRpb24oZ19nZXRfcHJnbmFt ZSgpKSwgIldlYktpdENhY2hlIikpOwogfQogCiBTdHJpbmcgV2Vic2l0ZURhdGFTdG9yZTo6ZGVm YXVsdEluZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5KCkKQEAgLTY5LDEyICs2OSwxMiBAQCBTdHJp bmcgV2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdFJlc291cmNlTG9hZFN0YXRpc3RpY3NEaXJlY3Rv cnkoKQogCiBTdHJpbmcgV2Vic2l0ZURhdGFTdG9yZTo6Y2FjaGVEaXJlY3RvcnlGaWxlU3lzdGVt UmVwcmVzZW50YXRpb24oY29uc3QgU3RyaW5nJiBkaXJlY3RvcnlOYW1lKQogewotICAgIHJldHVy biBXZWJDb3JlOjpwYXRoQnlBcHBlbmRpbmdDb21wb25lbnQoV2ViQ29yZTo6ZmlsZW5hbWVUb1N0 cmluZyhnX2dldF91c2VyX2NhY2hlX2RpcigpKSwgZGlyZWN0b3J5TmFtZSk7CisgICAgcmV0dXJu IFdlYkNvcmU6OnBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChXZWJDb3JlOjpzdHJpbmdGcm9tRmls ZVN5c3RlbVJlcHJlc2VudGF0aW9uKGdfZ2V0X3VzZXJfY2FjaGVfZGlyKCkpLCBkaXJlY3RvcnlO YW1lKTsKIH0KIAogU3RyaW5nIFdlYnNpdGVEYXRhU3RvcmU6OndlYnNpdGVEYXRhRGlyZWN0b3J5 RmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKGNvbnN0IFN0cmluZyYgZGlyZWN0b3J5TmFtZSkKIHsK LSAgICByZXR1cm4gV2ViQ29yZTo6cGF0aEJ5QXBwZW5kaW5nQ29tcG9uZW50KFdlYkNvcmU6OmZp bGVuYW1lVG9TdHJpbmcoZ19nZXRfdXNlcl9kYXRhX2RpcigpKSwgZGlyZWN0b3J5TmFtZSk7Cisg ICAgcmV0dXJuIFdlYkNvcmU6OnBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChXZWJDb3JlOjpzdHJp bmdGcm9tRmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKGdfZ2V0X3VzZXJfZGF0YV9kaXIoKSksIGRp cmVjdG9yeU5hbWUpOwogfQogCiBXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6OkNvbmZpZ3VyYXRp b24gV2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdERhdGFTdG9yZUNvbmZpZ3VyYXRpb24oKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4 dC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0 LmNwcAppbmRleCA4MzY1MWFjLi43YzA4NTI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0LmNwcApAQCAtMjYwLDIwICsyNjAs MjAgQEAgc3RhdGljIHZvaWQgd2Via2l0V2ViQ29udGV4dENvbnN0cnVjdGVkKEdPYmplY3QqIG9i amVjdCkKICAgICBHVW5pcXVlUHRyPGNoYXI+IGJ1bmRsZUZpbGVuYW1lKGdfYnVpbGRfZmlsZW5h bWUoaW5qZWN0ZWRCdW5kbGVEaXJlY3RvcnkoKSwgImxpYndlYmtpdDJndGtpbmplY3RlZGJ1bmRs ZS5zbyIsIG51bGxwdHIpKTsKIAogICAgIEFQSTo6UHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uIGNv bmZpZ3VyYXRpb247Ci0gICAgY29uZmlndXJhdGlvbi5zZXRJbmplY3RlZEJ1bmRsZVBhdGgoV2Vi Q29yZTo6ZmlsZW5hbWVUb1N0cmluZyhidW5kbGVGaWxlbmFtZS5nZXQoKSkpOworICAgIGNvbmZp Z3VyYXRpb24uc2V0SW5qZWN0ZWRCdW5kbGVQYXRoKFdlYkNvcmU6OnN0cmluZ0Zyb21GaWxlU3lz dGVtUmVwcmVzZW50YXRpb24oYnVuZGxlRmlsZW5hbWUuZ2V0KCkpKTsKICAgICBjb25maWd1cmF0 aW9uLnNldE1heGltdW1Qcm9jZXNzQ291bnQoMSk7CiAgICAgY29uZmlndXJhdGlvbi5zZXREaXNr Q2FjaGVTcGVjdWxhdGl2ZVZhbGlkYXRpb25FbmFibGVkKHRydWUpOwogCiAgICAgV2ViS2l0V2Vi Q29udGV4dCogd2ViQ29udGV4dCA9IFdFQktJVF9XRUJfQ09OVEVYVChvYmplY3QpOwogICAgIFdl YktpdFdlYkNvbnRleHRQcml2YXRlKiBwcml2ID0gd2ViQ29udGV4dC0+cHJpdjsKICAgICBpZiAo cHJpdi0+d2Vic2l0ZURhdGFNYW5hZ2VyKSB7Ci0gICAgICAgIGNvbmZpZ3VyYXRpb24uc2V0TG9j YWxTdG9yYWdlRGlyZWN0b3J5KFdlYkNvcmU6OmZpbGVuYW1lVG9TdHJpbmcod2Via2l0X3dlYnNp dGVfZGF0YV9tYW5hZ2VyX2dldF9sb2NhbF9zdG9yYWdlX2RpcmVjdG9yeShwcml2LT53ZWJzaXRl RGF0YU1hbmFnZXIuZ2V0KCkpKSk7Ci0gICAgICAgIGNvbmZpZ3VyYXRpb24uc2V0RGlza0NhY2hl RGlyZWN0b3J5KFdlYkNvcmU6OnBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChXZWJDb3JlOjpmaWxl bmFtZVRvU3RyaW5nKHdlYmtpdF93ZWJzaXRlX2RhdGFfbWFuYWdlcl9nZXRfZGlza19jYWNoZV9k aXJlY3RvcnkocHJpdi0+d2Vic2l0ZURhdGFNYW5hZ2VyLmdldCgpKSksIG5ldHdvcmtDYWNoZVN1 YmRpcmVjdG9yeSkpOwotICAgICAgICBjb25maWd1cmF0aW9uLnNldEFwcGxpY2F0aW9uQ2FjaGVE aXJlY3RvcnkoV2ViQ29yZTo6ZmlsZW5hbWVUb1N0cmluZyh3ZWJraXRfd2Vic2l0ZV9kYXRhX21h bmFnZXJfZ2V0X29mZmxpbmVfYXBwbGljYXRpb25fY2FjaGVfZGlyZWN0b3J5KHByaXYtPndlYnNp dGVEYXRhTWFuYWdlci5nZXQoKSkpKTsKLSAgICAgICAgY29uZmlndXJhdGlvbi5zZXRJbmRleGVk REJEYXRhYmFzZURpcmVjdG9yeShXZWJDb3JlOjpmaWxlbmFtZVRvU3RyaW5nKHdlYmtpdF93ZWJz aXRlX2RhdGFfbWFuYWdlcl9nZXRfaW5kZXhlZGRiX2RpcmVjdG9yeShwcml2LT53ZWJzaXRlRGF0 YU1hbmFnZXIuZ2V0KCkpKSk7Ci0gICAgICAgIGNvbmZpZ3VyYXRpb24uc2V0V2ViU1FMRGF0YWJh c2VEaXJlY3RvcnkoV2ViQ29yZTo6ZmlsZW5hbWVUb1N0cmluZyh3ZWJraXRfd2Vic2l0ZV9kYXRh X21hbmFnZXJfZ2V0X3dlYnNxbF9kaXJlY3RvcnkocHJpdi0+d2Vic2l0ZURhdGFNYW5hZ2VyLmdl dCgpKSkpOworICAgICAgICBjb25maWd1cmF0aW9uLnNldExvY2FsU3RvcmFnZURpcmVjdG9yeShX ZWJDb3JlOjpzdHJpbmdGcm9tRmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKHdlYmtpdF93ZWJzaXRl X2RhdGFfbWFuYWdlcl9nZXRfbG9jYWxfc3RvcmFnZV9kaXJlY3RvcnkocHJpdi0+d2Vic2l0ZURh dGFNYW5hZ2VyLmdldCgpKSkpOworICAgICAgICBjb25maWd1cmF0aW9uLnNldERpc2tDYWNoZURp cmVjdG9yeShXZWJDb3JlOjpwYXRoQnlBcHBlbmRpbmdDb21wb25lbnQoV2ViQ29yZTo6c3RyaW5n RnJvbUZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbih3ZWJraXRfd2Vic2l0ZV9kYXRhX21hbmFnZXJf Z2V0X2Rpc2tfY2FjaGVfZGlyZWN0b3J5KHByaXYtPndlYnNpdGVEYXRhTWFuYWdlci5nZXQoKSkp LCBuZXR3b3JrQ2FjaGVTdWJkaXJlY3RvcnkpKTsKKyAgICAgICAgY29uZmlndXJhdGlvbi5zZXRB cHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KFdlYkNvcmU6OnN0cmluZ0Zyb21GaWxlU3lzdGVtUmVw cmVzZW50YXRpb24od2Via2l0X3dlYnNpdGVfZGF0YV9tYW5hZ2VyX2dldF9vZmZsaW5lX2FwcGxp Y2F0aW9uX2NhY2hlX2RpcmVjdG9yeShwcml2LT53ZWJzaXRlRGF0YU1hbmFnZXIuZ2V0KCkpKSk7 CisgICAgICAgIGNvbmZpZ3VyYXRpb24uc2V0SW5kZXhlZERCRGF0YWJhc2VEaXJlY3RvcnkoV2Vi Q29yZTo6c3RyaW5nRnJvbUZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbih3ZWJraXRfd2Vic2l0ZV9k YXRhX21hbmFnZXJfZ2V0X2luZGV4ZWRkYl9kaXJlY3RvcnkocHJpdi0+d2Vic2l0ZURhdGFNYW5h Z2VyLmdldCgpKSkpOworICAgICAgICBjb25maWd1cmF0aW9uLnNldFdlYlNRTERhdGFiYXNlRGly ZWN0b3J5KFdlYkNvcmU6OnN0cmluZ0Zyb21GaWxlU3lzdGVtUmVwcmVzZW50YXRpb24od2Via2l0 X3dlYnNpdGVfZGF0YV9tYW5hZ2VyX2dldF93ZWJzcWxfZGlyZWN0b3J5KHByaXYtPndlYnNpdGVE YXRhTWFuYWdlci5nZXQoKSkpKTsKICAgICB9IGVsc2UgaWYgKCFwcml2LT5sb2NhbFN0b3JhZ2VE aXJlY3RvcnkuaXNOdWxsKCkpCi0gICAgICAgIGNvbmZpZ3VyYXRpb24uc2V0TG9jYWxTdG9yYWdl RGlyZWN0b3J5KFdlYkNvcmU6OmZpbGVuYW1lVG9TdHJpbmcocHJpdi0+bG9jYWxTdG9yYWdlRGly ZWN0b3J5LmRhdGEoKSkpOworICAgICAgICBjb25maWd1cmF0aW9uLnNldExvY2FsU3RvcmFnZURp cmVjdG9yeShXZWJDb3JlOjpzdHJpbmdGcm9tRmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKHByaXYt PmxvY2FsU3RvcmFnZURpcmVjdG9yeS5kYXRhKCkpKTsKIAogICAgIHByaXYtPnByb2Nlc3NQb29s ID0gV2ViUHJvY2Vzc1Bvb2w6OmNyZWF0ZShjb25maWd1cmF0aW9uKTsKIApAQCAtNjQzLDcgKzY0 Myw3IEBAIHZvaWQgd2Via2l0X3dlYl9jb250ZXh0X3NldF9mYXZpY29uX2RhdGFiYXNlX2RpcmVj dG9yeShXZWJLaXRXZWJDb250ZXh0KiBjb250ZXh0CiAgICAgZW5zdXJlRmF2aWNvbkRhdGFiYXNl KGNvbnRleHQpOwogCiAgICAgLy8gVXNlIGRlZmF1bHQgaWYgMCBpcyBwYXNzZWQgYXMgcGFyYW1l dGVyLgotICAgIFN0cmluZyBkaXJlY3RvcnlQYXRoID0gV2ViQ29yZTo6ZmlsZW5hbWVUb1N0cmlu ZyhwYXRoKTsKKyAgICBTdHJpbmcgZGlyZWN0b3J5UGF0aCA9IFdlYkNvcmU6OnN0cmluZ0Zyb21G aWxlU3lzdGVtUmVwcmVzZW50YXRpb24ocGF0aCk7CiAgICAgcHJpdi0+ZmF2aWNvbkRhdGFiYXNl RGlyZWN0b3J5ID0gZGlyZWN0b3J5UGF0aC5pc0VtcHR5KCkKICAgICAgICAgPyBwcml2LT5wcm9j ZXNzUG9vbC0+aWNvbkRhdGFiYXNlUGF0aCgpLnV0ZjgoKQogICAgICAgICA6IGRpcmVjdG9yeVBh dGgudXRmOCgpOwpAQCAtNjUzLDcgKzY1Myw3IEBAIHZvaWQgd2Via2l0X3dlYl9jb250ZXh0X3Nl dF9mYXZpY29uX2RhdGFiYXNlX2RpcmVjdG9yeShXZWJLaXRXZWJDb250ZXh0KiBjb250ZXh0CiAg ICAgICAgIFdlYkNvcmU6Okljb25EYXRhYmFzZTo6ZGVmYXVsdERhdGFiYXNlRmlsZW5hbWUoKS51 dGY4KCkuZGF0YSgpLCBudWxscHRyKSk7CiAKICAgICAvLyBTZXR0aW5nIHRoZSBwYXRoIHdpbGwg Y2F1c2UgdGhlIGljb24gZGF0YWJhc2UgdG8gYmUgb3BlbmVkLgotICAgIHByaXYtPnByb2Nlc3NQ b29sLT5zZXRJY29uRGF0YWJhc2VQYXRoKFdlYkNvcmU6OmZpbGVuYW1lVG9TdHJpbmcoZmF2aWNv bkRhdGFiYXNlUGF0aC5nZXQoKSkpOworICAgIHByaXYtPnByb2Nlc3NQb29sLT5zZXRJY29uRGF0 YWJhc2VQYXRoKFdlYkNvcmU6OnN0cmluZ0Zyb21GaWxlU3lzdGVtUmVwcmVzZW50YXRpb24oZmF2 aWNvbkRhdGFiYXNlUGF0aC5nZXQoKSkpOwogfQogCiAvKioKQEAgLTczNCw3ICs3MzQsNyBAQCB2 b2lkIHdlYmtpdF93ZWJfY29udGV4dF9zZXRfYWRkaXRpb25hbF9wbHVnaW5zX2RpcmVjdG9yeShX ZWJLaXRXZWJDb250ZXh0KiBjb250ZQogICAgIGdfcmV0dXJuX2lmX2ZhaWwoZGlyZWN0b3J5KTsK IAogI2lmIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKQotICAgIGNvbnRleHQtPnByaXYtPnBy b2Nlc3NQb29sLT5zZXRBZGRpdGlvbmFsUGx1Z2luc0RpcmVjdG9yeShXZWJDb3JlOjpmaWxlbmFt ZVRvU3RyaW5nKGRpcmVjdG9yeSkpOworICAgIGNvbnRleHQtPnByaXYtPnByb2Nlc3NQb29sLT5z ZXRBZGRpdGlvbmFsUGx1Z2luc0RpcmVjdG9yeShXZWJDb3JlOjpzdHJpbmdGcm9tRmlsZVN5c3Rl bVJlcHJlc2VudGF0aW9uKGRpcmVjdG9yeSkpOwogI2VuZGlmCiB9CiAKQEAgLTEwNzksNyArMTA3 OSw3IEBAIHZvaWQgd2Via2l0X3dlYl9jb250ZXh0X3NldF9kaXNrX2NhY2hlX2RpcmVjdG9yeShX ZWJLaXRXZWJDb250ZXh0KiBjb250ZXh0LCBjb25zCiAgICAgZ19yZXR1cm5faWZfZmFpbChXRUJL SVRfSVNfV0VCX0NPTlRFWFQoY29udGV4dCkpOwogICAgIGdfcmV0dXJuX2lmX2ZhaWwoZGlyZWN0 b3J5KTsKIAotICAgIGNvbnRleHQtPnByaXYtPnByb2Nlc3NQb29sLT5jb25maWd1cmF0aW9uKCku c2V0RGlza0NhY2hlRGlyZWN0b3J5KFdlYkNvcmU6OnBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChX ZWJDb3JlOjpmaWxlbmFtZVRvU3RyaW5nKGRpcmVjdG9yeSksIG5ldHdvcmtDYWNoZVN1YmRpcmVj dG9yeSkpOworICAgIGNvbnRleHQtPnByaXYtPnByb2Nlc3NQb29sLT5jb25maWd1cmF0aW9uKCku c2V0RGlza0NhY2hlRGlyZWN0b3J5KFdlYkNvcmU6OnBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChX ZWJDb3JlOjpzdHJpbmdGcm9tRmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKGRpcmVjdG9yeSksIG5l dHdvcmtDYWNoZVN1YmRpcmVjdG9yeSkpOwogfQogCiAvKioKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYnNpdGVEYXRhTWFuYWdlci5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJzaXRlRGF0YU1hbmFnZXIu Y3BwCmluZGV4IDc3ZDU2ZWZmLi4xYzM1NTI0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2Vic2l0ZURhdGFNYW5hZ2VyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJzaXRlRGF0YU1hbmFnZXIuY3Bw CkBAIC0zMTAsMTMgKzMxMCwxMyBAQCBBUEk6OldlYnNpdGVEYXRhU3RvcmUmIHdlYmtpdFdlYnNp dGVEYXRhTWFuYWdlckdldERhdGFTdG9yZShXZWJLaXRXZWJzaXRlRGF0YU1hbgogICAgIGlmICgh cHJpdi0+d2Vic2l0ZURhdGFTdG9yZSkgewogICAgICAgICBXZWJzaXRlRGF0YVN0b3JlOjpDb25m aWd1cmF0aW9uIGNvbmZpZ3VyYXRpb247CiAgICAgICAgIGNvbmZpZ3VyYXRpb24ubG9jYWxTdG9y YWdlRGlyZWN0b3J5ID0gIXByaXYtPmxvY2FsU3RvcmFnZURpcmVjdG9yeSA/Ci0gICAgICAgICAg ICBBUEk6OldlYnNpdGVEYXRhU3RvcmU6OmRlZmF1bHRMb2NhbFN0b3JhZ2VEaXJlY3RvcnkoKSA6 IFdlYkNvcmU6OmZpbGVuYW1lVG9TdHJpbmcocHJpdi0+bG9jYWxTdG9yYWdlRGlyZWN0b3J5Lmdl dCgpKTsKKyAgICAgICAgICAgIEFQSTo6V2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdExvY2FsU3Rv cmFnZURpcmVjdG9yeSgpIDogV2ViQ29yZTo6c3RyaW5nRnJvbUZpbGVTeXN0ZW1SZXByZXNlbnRh dGlvbihwcml2LT5sb2NhbFN0b3JhZ2VEaXJlY3RvcnkuZ2V0KCkpOwogICAgICAgICBjb25maWd1 cmF0aW9uLm5ldHdvcmtDYWNoZURpcmVjdG9yeSA9ICFwcml2LT5kaXNrQ2FjaGVEaXJlY3Rvcnkg PwotICAgICAgICAgICAgQVBJOjpXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0TmV0d29ya0NhY2hl RGlyZWN0b3J5KCkgOiBXZWJDb3JlOjpwYXRoQnlBcHBlbmRpbmdDb21wb25lbnQoV2ViQ29yZTo6 ZmlsZW5hbWVUb1N0cmluZyhwcml2LT5kaXNrQ2FjaGVEaXJlY3RvcnkuZ2V0KCkpLCBuZXR3b3Jr Q2FjaGVTdWJkaXJlY3RvcnkpOworICAgICAgICAgICAgQVBJOjpXZWJzaXRlRGF0YVN0b3JlOjpk ZWZhdWx0TmV0d29ya0NhY2hlRGlyZWN0b3J5KCkgOiBXZWJDb3JlOjpwYXRoQnlBcHBlbmRpbmdD b21wb25lbnQoV2ViQ29yZTo6c3RyaW5nRnJvbUZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbihwcml2 LT5kaXNrQ2FjaGVEaXJlY3RvcnkuZ2V0KCkpLCBuZXR3b3JrQ2FjaGVTdWJkaXJlY3RvcnkpOwog ICAgICAgICBjb25maWd1cmF0aW9uLmFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkgPSAhcHJpdi0+ YXBwbGljYXRpb25DYWNoZURpcmVjdG9yeSA/Ci0gICAgICAgICAgICBBUEk6OldlYnNpdGVEYXRh U3RvcmU6OmRlZmF1bHRBcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KCkgOiBXZWJDb3JlOjpmaWxl bmFtZVRvU3RyaW5nKHByaXYtPmFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkuZ2V0KCkpOworICAg ICAgICAgICAgQVBJOjpXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0QXBwbGljYXRpb25DYWNoZURp cmVjdG9yeSgpIDogV2ViQ29yZTo6c3RyaW5nRnJvbUZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbihw cml2LT5hcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5LmdldCgpKTsKICAgICAgICAgY29uZmlndXJh dGlvbi53ZWJTUUxEYXRhYmFzZURpcmVjdG9yeSA9ICFwcml2LT53ZWJTUUxEaXJlY3RvcnkgPwot ICAgICAgICAgICAgQVBJOjpXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0V2ViU1FMRGF0YWJhc2VE aXJlY3RvcnkoKSA6IFdlYkNvcmU6OmZpbGVuYW1lVG9TdHJpbmcocHJpdi0+d2ViU1FMRGlyZWN0 b3J5LmdldCgpKTsKKyAgICAgICAgICAgIEFQSTo6V2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdFdl YlNRTERhdGFiYXNlRGlyZWN0b3J5KCkgOiBXZWJDb3JlOjpzdHJpbmdGcm9tRmlsZVN5c3RlbVJl cHJlc2VudGF0aW9uKHByaXYtPndlYlNRTERpcmVjdG9yeS5nZXQoKSk7CiAgICAgICAgIGNvbmZp Z3VyYXRpb24ubWVkaWFLZXlzU3RvcmFnZURpcmVjdG9yeSA9IEFQSTo6V2Vic2l0ZURhdGFTdG9y ZTo6ZGVmYXVsdE1lZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkoKTsKICAgICAgICAgcHJpdi0+d2Vi c2l0ZURhdGFTdG9yZSA9IEFQSTo6V2Vic2l0ZURhdGFTdG9yZTo6Y3JlYXRlKFdURk1vdmUoY29u ZmlndXJhdGlvbikpOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9QbHVnaW5zL2d0ay9QbHVnaW5JbmZvQ2FjaGUuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1BsdWdpbnMvZ3RrL1BsdWdpbkluZm9DYWNoZS5jcHAKaW5kZXggMjI3MGNiYi4uM2UxYzJl ZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL2d0ay9QbHVn aW5JbmZvQ2FjaGUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL2d0 ay9QbHVnaW5JbmZvQ2FjaGUuY3BwCkBAIC02OSw3ICs2OSw3IEBAIFBsdWdpbkluZm9DYWNoZTo6 UGx1Z2luSW5mb0NhY2hlKCkKICAgICBpZiAoV2ViQ29yZTo6bWFrZUFsbERpcmVjdG9yaWVzKGNh Y2hlRGlyZWN0b3J5LmdldCgpKSkgewogICAgICAgICAvLyBEZWxldGUgb2xkIGNhY2hlIGZpbGUu CiAgICAgICAgIEdVbmlxdWVQdHI8Y2hhcj4gb2xkQ2FjaGVQYXRoKGdfYnVpbGRfZmlsZW5hbWUo Y2FjaGVEaXJlY3RvcnkuZ2V0KCksICJwbHVnaW5zIiwgbnVsbHB0cikpOwotICAgICAgICBXZWJD b3JlOjpkZWxldGVGaWxlKFdlYkNvcmU6OmZpbGVuYW1lVG9TdHJpbmcob2xkQ2FjaGVQYXRoLmdl dCgpKSk7CisgICAgICAgIFdlYkNvcmU6OmRlbGV0ZUZpbGUoV2ViQ29yZTo6c3RyaW5nRnJvbUZp bGVTeXN0ZW1SZXByZXNlbnRhdGlvbihvbGRDYWNoZVBhdGguZ2V0KCkpKTsKIAogICAgICAgICBt X2NhY2hlUGF0aC5yZXNldChnX2J1aWxkX2ZpbGVuYW1lKGNhY2hlRGlyZWN0b3J5LmdldCgpLCBj YWNoZUZpbGVuYW1lRm9yQ3VycmVudERpc3BsYXkoKSwgbnVsbHB0cikpOwogICAgICAgICBnX2tl eV9maWxlX2xvYWRfZnJvbV9maWxlKG1fY2FjaGVGaWxlLmdldCgpLCBtX2NhY2hlUGF0aC5nZXQo KSwgR19LRVlfRklMRV9OT05FLCBudWxscHRyKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9ndGsvV2ViUHJvY2Vzc1Bvb2xHdGsuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL2d0ay9XZWJQcm9jZXNzUG9vbEd0ay5jcHAKaW5kZXggMTgxNTgyNC4uODE5N2ZkMyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9XZWJQcm9jZXNzUG9vbEd0 ay5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9XZWJQcm9jZXNzUG9vbEd0 ay5jcHAKQEAgLTExMyw3ICsxMTMsNyBAQCBTdHJpbmcgV2ViUHJvY2Vzc1Bvb2w6OmxlZ2FjeVBs YXRmb3JtRGVmYXVsdEluZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5KCkKIFN0cmluZyBXZWJQcm9j ZXNzUG9vbDo6cGxhdGZvcm1EZWZhdWx0SWNvbkRhdGFiYXNlUGF0aCgpIGNvbnN0CiB7CiAgICAg R1VuaXF1ZVB0cjxnY2hhcj4gZGF0YWJhc2VEaXJlY3RvcnkoZ19idWlsZF9maWxlbmFtZShnX2dl dF91c2VyX2NhY2hlX2RpcigpLCAid2Via2l0Z3RrIiwgImljb25kYXRhYmFzZSIsIG51bGxwdHIp KTsKLSAgICByZXR1cm4gV2ViQ29yZTo6ZmlsZW5hbWVUb1N0cmluZyhkYXRhYmFzZURpcmVjdG9y eS5nZXQoKSk7CisgICAgcmV0dXJuIFdlYkNvcmU6OnN0cmluZ0Zyb21GaWxlU3lzdGVtUmVwcmVz ZW50YXRpb24oZGF0YWJhc2VEaXJlY3RvcnkuZ2V0KCkpOwogfQogCiBTdHJpbmcgV2ViUHJvY2Vz c1Bvb2w6OmxlZ2FjeVBsYXRmb3JtRGVmYXVsdExvY2FsU3RvcmFnZURpcmVjdG9yeSgpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL2d0ay9XZWJHdGtFeHRlbnNpb25NYW5h Z2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvZ3RrL1dlYkd0a0V4dGVuc2lvbk1h bmFnZXIuY3BwCmluZGV4IGRlMjVlM2QuLjM2YjliZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvZ3RrL1dlYkd0a0V4dGVuc2lvbk1hbmFnZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvZ3RrL1dlYkd0a0V4dGVuc2lvbk1hbmFnZXIuY3BwCkBAIC02 Nyw3ICs2Nyw3IEBAIHN0YXRpYyB2b2lkIHBhcnNlVXNlckRhdGEoV0tUeXBlUmVmIHVzZXJEYXRh LCBTdHJpbmcmIHdlYkV4dGVuc2lvbnNEaXJlY3RvcnksIEdSCiAgICAgR1ZhcmlhbnQqIGRhdGEg PSBudWxscHRyOwogICAgIGdfdmFyaWFudF9nZXQodmFyaWFudC5nZXQoKSwgIihtJnNtdikiLCAm ZGlyZWN0b3J5LCAmZGF0YSk7CiAKLSAgICB3ZWJFeHRlbnNpb25zRGlyZWN0b3J5ID0gV2ViQ29y ZTo6ZmlsZW5hbWVUb1N0cmluZyhkaXJlY3RvcnkpOworICAgIHdlYkV4dGVuc2lvbnNEaXJlY3Rv cnkgPSBXZWJDb3JlOjpzdHJpbmdGcm9tRmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKGRpcmVjdG9y eSk7CiAgICAgaW5pdGlhbGl6YXRpb25Vc2VyRGF0YSA9IGFkb3B0R1JlZihkYXRhKTsKIH0KIAo=