161557 2016-09-02 16:34:46 -0700 Use ASCIILiteral in some more places 2016-09-03 07:54:31 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 joepeck joepeck commit-queue oldest_to_newest 1226029 0 joepeck 2016-09-02 16:34:46 -0700 Use ASCIILiteral in some more places. A bunch of trivial places that were just returning a literal and the return type is WTFString. 1226030 1 287834 joepeck 2016-09-02 16:35:22 -0700 Created attachment 287834 [PATCH] Proposed Fix 1226133 2 287834 commit-queue 2016-09-03 07:54:28 -0700 Comment on attachment 287834 [PATCH] Proposed Fix Clearing flags on attachment: 287834 Committed r205405: <http://trac.webkit.org/changeset/205405> 1226134 3 commit-queue 2016-09-03 07:54:31 -0700 All reviewed patches have been landed. Closing bug. 287834 2016-09-02 16:35:22 -0700 2016-09-03 07:54:28 -0700 [PATCH] Proposed Fix ascii-literal-1.patch text/plain 12668 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDMzZmI5MzQuLjE2ZDZlN2YgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDE2LTA5LTAyICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgVXNlIEFTQ0lJTGl0ZXJhbCBpbiBz b21lIG1vcmUgcGxhY2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNjE1NTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIHJ1bnRpbWUvVHlwZVNldC5oOgorICAgICAgICAoSlNDOjpTdHJ1Y3R1cmVTaGFw ZTo6c2V0Q29uc3RydWN0b3JOYW1lKToKKwogMjAxNi0wOS0wMiAgQ2hyaXMgRHVtZXogIDxjZHVt ZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGwgb3V0IHIyMDUzNTQgYmVj YXVzZSBpdCBjYXVzZWQgSlNDIHRlc3QgZmFpbHVyZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL1R5cGVTZXQuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL1R5cGVTZXQuaAppbmRleCBmZWZiZTA4Li5hN2IwYWY2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvcnVudGltZS9UeXBlU2V0LmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL3J1bnRpbWUvVHlwZVNldC5oCkBAIC02Miw3ICs2Miw3IEBAIHB1YmxpYzoKICAgICBTdHJp bmcgc3RyaW5nUmVwcmVzZW50YXRpb24oKTsKICAgICBTdHJpbmcgdG9KU09OU3RyaW5nKCkgY29u c3Q7CiAgICAgUmVmPEluc3BlY3Rvcjo6UHJvdG9jb2w6OlJ1bnRpbWU6OlN0cnVjdHVyZURlc2Ny aXB0aW9uPiBpbnNwZWN0b3JSZXByZXNlbnRhdGlvbigpOwotICAgIHZvaWQgc2V0Q29uc3RydWN0 b3JOYW1lKFN0cmluZyBuYW1lKSB7IG1fY29uc3RydWN0b3JOYW1lID0gKG5hbWUuaXNFbXB0eSgp ID8gIk9iamVjdCIgOiBuYW1lKTsgfQorICAgIHZvaWQgc2V0Q29uc3RydWN0b3JOYW1lKFN0cmlu ZyBuYW1lKSB7IG1fY29uc3RydWN0b3JOYW1lID0gKG5hbWUuaXNFbXB0eSgpID8gQVNDSUlMaXRl cmFsKCJPYmplY3QiKSA6IG5hbWUpOyB9CiAgICAgU3RyaW5nIGNvbnN0cnVjdG9yTmFtZSgpIHsg cmV0dXJuIG1fY29uc3RydWN0b3JOYW1lOyB9CiAgICAgdm9pZCBzZXRQcm90byhQYXNzUmVmUHRy PFN0cnVjdHVyZVNoYXBlPiBzaGFwZSkgeyBtX3Byb3RvID0gc2hhcGU7IH0KICAgICB2b2lkIGVu dGVyRGljdGlvbmFyeU1vZGUoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAzZmM2MDhiLi4zM2UyN2ZhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCkBAIC0xLDUgKzEsMzUgQEAKIDIwMTYtMDktMDIgIEpvc2VwaCBQZWNvcmFybyAgPHBl Y29yYXJvQGFwcGxlLmNvbT4KIAorICAgICAgICBVc2UgQVNDSUlMaXRlcmFsIGluIHNvbWUgbW9y ZSBwbGFjZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE2MTU1NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogTW9kdWxlcy9pbmRleGVkZGIvSURCRGF0YWJhc2VFeGNlcHRpb24uY3BwOgorICAgICAgICAo V2ViQ29yZTo6SURCRGF0YWJhc2VFeGNlcHRpb246OmdldEVycm9yTmFtZSk6CisgICAgICAgIChX ZWJDb3JlOjpJREJEYXRhYmFzZUV4Y2VwdGlvbjo6Z2V0RXJyb3JEZXNjcmlwdGlvbik6CisgICAg ICAgICogTW9kdWxlcy93ZWJzb2NrZXRzL1dlYlNvY2tldC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpXZWJTb2NrZXQ6OmJpbmFyeVR5cGUpOgorICAgICAgICAqIGNzcy9Gb250RmFjZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpGb250RmFjZTo6c3RyZXRjaCk6CisgICAgICAgIChXZWJDb3JlOjpG b250RmFjZTo6dW5pY29kZVJhbmdlKToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRGYWNlOjpmZWF0 dXJlU2V0dGluZ3MpOgorICAgICAgICAqIGh0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4 dEJhc2UuY3BwOgorICAgICAgICAqIGh0bWwvcGFyc2VyL0hUTUxQcmVsb2FkU2Nhbm5lci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpUb2tlblByZWxvYWRTY2FubmVyOjppbml0aWF0b3JGb3IpOgor ICAgICAgICAqIGxvYWRlci9Gb3JtU3VibWlzc2lvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpG b3JtU3VibWlzc2lvbjo6QXR0cmlidXRlczo6cGFyc2VFbmNvZGluZ1R5cGUpOgorICAgICAgICAq IHBhZ2UvU2VjdXJpdHlPcmlnaW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2VjdXJpdHlPcmln aW46OnRvUmF3U3RyaW5nKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jZy9JbWFnZUJ1 ZmZlckNHLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNHSW1hZ2VUb0RhdGFVUkwpOgorICAgICAg ICAoV2ViQ29yZTo6SW1hZ2VCdWZmZXI6OnRvRGF0YVVSTCk6CisgICAgICAgIChXZWJDb3JlOjpJ bWFnZURhdGFUb0RhdGFVUkwpOgorICAgICAgICAqIHN2Zy9ncmFwaGljcy9TVkdJbWFnZS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpTVkdJbWFnZTo6ZmlsZW5hbWVFeHRlbnNpb24pOgorCisyMDE2 LTA5LTAyICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKICAgICAgICAg W01hY10gUmVtb3ZlIHVubmVjZXNzYXJ5IFJldGFpblB0ciBpbiBOZXZlckRlc3Ryb3llZCB2YWx1 ZQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYxNTUz CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQkRhdGFi YXNlRXhjZXB0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQkRh dGFiYXNlRXhjZXB0aW9uLmNwcAppbmRleCA1ZGViMDFmLi5iZTliY2VjIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJEYXRhYmFzZUV4Y2VwdGlvbi5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCRGF0YWJhc2VFeGNlcHRp b24uY3BwCkBAIC05MSw3ICs5MSw3IEBAIFN0cmluZyBJREJEYXRhYmFzZUV4Y2VwdGlvbjo6Z2V0 RXJyb3JOYW1lKEV4Y2VwdGlvbkNvZGUgZWMpCiAgICAgY29uc3QgSURCRGF0YWJhc2VFeGNlcHRp b25OYW1lRGVzY3JpcHRpb24qIGVudHJ5ID0gZ2V0RXJyb3JFbnRyeShlYyk7CiAgICAgQVNTRVJU KGVudHJ5KTsKICAgICBpZiAoIWVudHJ5KQotICAgICAgICByZXR1cm4gIlVua25vd25FcnJvciI7 CisgICAgICAgIHJldHVybiBBU0NJSUxpdGVyYWwoIlVua25vd25FcnJvciIpOwogCiAgICAgcmV0 dXJuIGVudHJ5LT5uYW1lOwogfQpAQCAtMTAxLDcgKzEwMSw3IEBAIFN0cmluZyBJREJEYXRhYmFz ZUV4Y2VwdGlvbjo6Z2V0RXJyb3JEZXNjcmlwdGlvbihFeGNlcHRpb25Db2RlIGVjKQogICAgIGNv bnN0IElEQkRhdGFiYXNlRXhjZXB0aW9uTmFtZURlc2NyaXB0aW9uKiBlbnRyeSA9IGdldEVycm9y RW50cnkoZWMpOwogICAgIEFTU0VSVChlbnRyeSk7CiAgICAgaWYgKCFlbnRyeSkKLSAgICAgICAg cmV0dXJuICJVbmtub3duIGVycm9yLiI7CisgICAgICAgIHJldHVybiBBU0NJSUxpdGVyYWwoIlVu a25vd24gZXJyb3IuIik7CiAKICAgICByZXR1cm4gZW50cnktPmRlc2NyaXB0aW9uOwogfQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJzb2NrZXRzL1dlYlNvY2tldC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYnNvY2tldHMvV2ViU29ja2V0LmNwcAppbmRleCA4 Yjk3YmJjLi5hZWVhMjdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYnNv Y2tldHMvV2ViU29ja2V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYnNvY2tl dHMvV2ViU29ja2V0LmNwcApAQCAtNDUzLDkgKzQ1Myw5IEBAIFN0cmluZyBXZWJTb2NrZXQ6OmJp bmFyeVR5cGUoKSBjb25zdAogewogICAgIHN3aXRjaCAobV9iaW5hcnlUeXBlKSB7CiAgICAgY2Fz ZSBCaW5hcnlUeXBlQmxvYjoKLSAgICAgICAgcmV0dXJuICJibG9iIjsKKyAgICAgICAgcmV0dXJu IEFTQ0lJTGl0ZXJhbCgiYmxvYiIpOwogICAgIGNhc2UgQmluYXJ5VHlwZUFycmF5QnVmZmVyOgot ICAgICAgICByZXR1cm4gImFycmF5YnVmZmVyIjsKKyAgICAgICAgcmV0dXJuIEFTQ0lJTGl0ZXJh bCgiYXJyYXlidWZmZXIiKTsKICAgICB9CiAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAg cmV0dXJuIFN0cmluZygpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0ZvbnRGYWNl LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9Gb250RmFjZS5jcHAKaW5kZXggYWU2ZjViMy4uM2U2 ZGU2NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0ZvbnRGYWNlLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9jc3MvRm9udEZhY2UuY3BwCkBAIC0zMTYsMTQgKzMxNiwxNCBAQCBTdHJp bmcgRm9udEZhY2U6OndlaWdodCgpIGNvbnN0CiAKIFN0cmluZyBGb250RmFjZTo6c3RyZXRjaCgp IGNvbnN0CiB7Ci0gICAgcmV0dXJuICJub3JtYWwiOworICAgIHJldHVybiBBU0NJSUxpdGVyYWwo Im5vcm1hbCIpOwogfQogCiBTdHJpbmcgRm9udEZhY2U6OnVuaWNvZGVSYW5nZSgpIGNvbnN0CiB7 CiAgICAgY29uc3RfY2FzdDxDU1NGb250RmFjZSY+KG1fYmFja2luZy5nZXQoKSkudXBkYXRlU3R5 bGVJZk5lZWRlZCgpOwogICAgIGlmICghbV9iYWNraW5nLT5yYW5nZXMoKS5zaXplKCkpCi0gICAg ICAgIHJldHVybiAiVSswLTEwRkZGRiI7CisgICAgICAgIHJldHVybiBBU0NJSUxpdGVyYWwoIlUr MC0xMEZGRkYiKTsKICAgICBSZWZQdHI8Q1NTVmFsdWVMaXN0PiB2YWx1ZXMgPSBDU1NWYWx1ZUxp c3Q6OmNyZWF0ZUNvbW1hU2VwYXJhdGVkKCk7CiAgICAgZm9yIChhdXRvJiByYW5nZSA6IG1fYmFj a2luZy0+cmFuZ2VzKCkpCiAgICAgICAgIHZhbHVlcy0+YXBwZW5kKENTU1VuaWNvZGVSYW5nZVZh bHVlOjpjcmVhdGUocmFuZ2UuZnJvbSwgcmFuZ2UudG8pKTsKQEAgLTM0MCw3ICszNDAsNyBAQCBT dHJpbmcgRm9udEZhY2U6OmZlYXR1cmVTZXR0aW5ncygpIGNvbnN0CiB7CiAgICAgY29uc3RfY2Fz dDxDU1NGb250RmFjZSY+KG1fYmFja2luZy5nZXQoKSkudXBkYXRlU3R5bGVJZk5lZWRlZCgpOwog ICAgIGlmICghbV9iYWNraW5nLT5mZWF0dXJlU2V0dGluZ3MoKS5zaXplKCkpCi0gICAgICAgIHJl dHVybiAibm9ybWFsIjsKKyAgICAgICAgcmV0dXJuIEFTQ0lJTGl0ZXJhbCgibm9ybWFsIik7CiAg ICAgUmVmUHRyPENTU1ZhbHVlTGlzdD4gbGlzdCA9IENTU1ZhbHVlTGlzdDo6Y3JlYXRlQ29tbWFT ZXBhcmF0ZWQoKTsKICAgICBmb3IgKGF1dG8mIGZlYXR1cmUgOiBtX2JhY2tpbmctPmZlYXR1cmVT ZXR0aW5ncygpKQogICAgICAgICBsaXN0LT5hcHBlbmQoQ1NTRm9udEZlYXR1cmVWYWx1ZTo6Y3Jl YXRlKEZvbnRGZWF0dXJlVGFnKGZlYXR1cmUudGFnKCkpLCBmZWF0dXJlLnZhbHVlKCkpKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4 dEJhc2UuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250 ZXh0QmFzZS5jcHAKaW5kZXggZTYzZDU2MS4uYTA1MDNjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0QmFzZS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0QmFzZS5jcHAKQEAg LTQ4NzMsMTcgKzQ4NzMsMTcgQEAgbmFtZXNwYWNlIHsKICAgICB7CiAgICAgICAgIHN3aXRjaCAo ZXJyb3IpIHsKICAgICAgICAgY2FzZSBHcmFwaGljc0NvbnRleHQzRDo6SU5WQUxJRF9FTlVNOgot ICAgICAgICAgICAgcmV0dXJuICJJTlZBTElEX0VOVU0iOworICAgICAgICAgICAgcmV0dXJuIEFT Q0lJTGl0ZXJhbCgiSU5WQUxJRF9FTlVNIik7CiAgICAgICAgIGNhc2UgR3JhcGhpY3NDb250ZXh0 M0Q6OklOVkFMSURfVkFMVUU6Ci0gICAgICAgICAgICByZXR1cm4gIklOVkFMSURfVkFMVUUiOwor ICAgICAgICAgICAgcmV0dXJuIEFTQ0lJTGl0ZXJhbCgiSU5WQUxJRF9WQUxVRSIpOwogICAgICAg ICBjYXNlIEdyYXBoaWNzQ29udGV4dDNEOjpJTlZBTElEX09QRVJBVElPTjoKLSAgICAgICAgICAg IHJldHVybiAiSU5WQUxJRF9PUEVSQVRJT04iOworICAgICAgICAgICAgcmV0dXJuIEFTQ0lJTGl0 ZXJhbCgiSU5WQUxJRF9PUEVSQVRJT04iKTsKICAgICAgICAgY2FzZSBHcmFwaGljc0NvbnRleHQz RDo6T1VUX09GX01FTU9SWToKLSAgICAgICAgICAgIHJldHVybiAiT1VUX09GX01FTU9SWSI7Cisg ICAgICAgICAgICByZXR1cm4gQVNDSUlMaXRlcmFsKCJPVVRfT0ZfTUVNT1JZIik7CiAgICAgICAg IGNhc2UgR3JhcGhpY3NDb250ZXh0M0Q6OklOVkFMSURfRlJBTUVCVUZGRVJfT1BFUkFUSU9OOgot ICAgICAgICAgICAgcmV0dXJuICJJTlZBTElEX0ZSQU1FQlVGRkVSX09QRVJBVElPTiI7CisgICAg ICAgICAgICByZXR1cm4gQVNDSUlMaXRlcmFsKCJJTlZBTElEX0ZSQU1FQlVGRkVSX09QRVJBVElP TiIpOwogICAgICAgICBjYXNlIEdyYXBoaWNzQ29udGV4dDNEOjpDT05URVhUX0xPU1RfV0VCR0w6 Ci0gICAgICAgICAgICByZXR1cm4gIkNPTlRFWFRfTE9TVF9XRUJHTCI7CisgICAgICAgICAgICBy ZXR1cm4gQVNDSUlMaXRlcmFsKCJDT05URVhUX0xPU1RfV0VCR0wiKTsKICAgICAgICAgZGVmYXVs dDoKICAgICAgICAgICAgIHJldHVybiBTdHJpbmc6OmZvcm1hdCgiV2ViR0wgRVJST1IoJTA0eCki LCBlcnJvcik7CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFy c2VyL0hUTUxQcmVsb2FkU2Nhbm5lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9I VE1MUHJlbG9hZFNjYW5uZXIuY3BwCmluZGV4IGVhMTVkZTAuLjA2N2U4ZWMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxQcmVsb2FkU2Nhbm5lci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFByZWxvYWRTY2FubmVyLmNwcApAQCAtNzQs MTMgKzc0LDEzIEBAIFN0cmluZyBUb2tlblByZWxvYWRTY2FubmVyOjppbml0aWF0b3JGb3IoVGFn SWQgdGFnSWQpCiAgICAgc3dpdGNoICh0YWdJZCkgewogICAgIGNhc2UgVGFnSWQ6OlNvdXJjZToK ICAgICBjYXNlIFRhZ0lkOjpJbWc6Ci0gICAgICAgIHJldHVybiAiaW1nIjsKKyAgICAgICAgcmV0 dXJuIEFTQ0lJTGl0ZXJhbCgiaW1nIik7CiAgICAgY2FzZSBUYWdJZDo6SW5wdXQ6Ci0gICAgICAg IHJldHVybiAiaW5wdXQiOworICAgICAgICByZXR1cm4gQVNDSUlMaXRlcmFsKCJpbnB1dCIpOwog ICAgIGNhc2UgVGFnSWQ6Okxpbms6Ci0gICAgICAgIHJldHVybiAibGluayI7CisgICAgICAgIHJl dHVybiBBU0NJSUxpdGVyYWwoImxpbmsiKTsKICAgICBjYXNlIFRhZ0lkOjpTY3JpcHQ6Ci0gICAg ICAgIHJldHVybiAic2NyaXB0IjsKKyAgICAgICAgcmV0dXJuIEFTQ0lJTGl0ZXJhbCgic2NyaXB0 Iik7CiAgICAgY2FzZSBUYWdJZDo6VW5rbm93bjoKICAgICBjYXNlIFRhZ0lkOjpTdHlsZToKICAg ICBjYXNlIFRhZ0lkOjpCYXNlOgpAQCAtODgsMTAgKzg4LDEwIEBAIFN0cmluZyBUb2tlblByZWxv YWRTY2FubmVyOjppbml0aWF0b3JGb3IoVGFnSWQgdGFnSWQpCiAgICAgY2FzZSBUYWdJZDo6TWV0 YToKICAgICBjYXNlIFRhZ0lkOjpQaWN0dXJlOgogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQo KTsKLSAgICAgICAgcmV0dXJuICJ1bmtub3duIjsKKyAgICAgICAgcmV0dXJuIEFTQ0lJTGl0ZXJh bCgidW5rbm93biIpOwogICAgIH0KICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICByZXR1 cm4gInVua25vd24iOworICAgIHJldHVybiBBU0NJSUxpdGVyYWwoInVua25vd24iKTsKIH0KIAog Y2xhc3MgVG9rZW5QcmVsb2FkU2Nhbm5lcjo6U3RhcnRUYWdTY2FubmVyIHsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Gb3JtU3VibWlzc2lvbi5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvRm9ybVN1Ym1pc3Npb24uY3BwCmluZGV4IGY5YmJkZTcuLjIwYWFmNGMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Gb3JtU3VibWlzc2lvbi5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvbG9hZGVyL0Zvcm1TdWJtaXNzaW9uLmNwcApAQCAtOTIsMTAgKzkyLDEwIEBA IHZvaWQgRm9ybVN1Ym1pc3Npb246OkF0dHJpYnV0ZXM6OnBhcnNlQWN0aW9uKGNvbnN0IFN0cmlu ZyYgYWN0aW9uKQogU3RyaW5nIEZvcm1TdWJtaXNzaW9uOjpBdHRyaWJ1dGVzOjpwYXJzZUVuY29k aW5nVHlwZShjb25zdCBTdHJpbmcmIHR5cGUpCiB7CiAgICAgaWYgKGVxdWFsTGV0dGVyc0lnbm9y aW5nQVNDSUlDYXNlKHR5cGUsICJtdWx0aXBhcnQvZm9ybS1kYXRhIikpCi0gICAgICAgIHJldHVy biAibXVsdGlwYXJ0L2Zvcm0tZGF0YSI7CisgICAgICAgIHJldHVybiBBU0NJSUxpdGVyYWwoIm11 bHRpcGFydC9mb3JtLWRhdGEiKTsKICAgICBpZiAoZXF1YWxMZXR0ZXJzSWdub3JpbmdBU0NJSUNh c2UodHlwZSwgInRleHQvcGxhaW4iKSkKLSAgICAgICAgcmV0dXJuICJ0ZXh0L3BsYWluIjsKLSAg ICByZXR1cm4gImFwcGxpY2F0aW9uL3gtd3d3LWZvcm0tdXJsZW5jb2RlZCI7CisgICAgICAgIHJl dHVybiBBU0NJSUxpdGVyYWwoInRleHQvcGxhaW4iKTsKKyAgICByZXR1cm4gQVNDSUlMaXRlcmFs KCJhcHBsaWNhdGlvbi94LXd3dy1mb3JtLXVybGVuY29kZWQiKTsKIH0KIAogdm9pZCBGb3JtU3Vi bWlzc2lvbjo6QXR0cmlidXRlczo6dXBkYXRlRW5jb2RpbmdUeXBlKGNvbnN0IFN0cmluZyYgdHlw ZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uY3BwIGIv U291cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbi5jcHAKaW5kZXggOTg5ZDkzOC4uYjQ0 MGYxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbi5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbi5jcHAKQEAgLTQ2NSw3ICs0 NjUsNyBAQCBTdHJpbmcgU2VjdXJpdHlPcmlnaW46OnRvU3RyaW5nKCkgY29uc3QKIFN0cmluZyBT ZWN1cml0eU9yaWdpbjo6dG9SYXdTdHJpbmcoKSBjb25zdAogewogICAgIGlmIChtX3Byb3RvY29s ID09ICJmaWxlIikKLSAgICAgICAgcmV0dXJuICJmaWxlOi8vIjsKKyAgICAgICAgcmV0dXJuIEFT Q0lJTGl0ZXJhbCgiZmlsZTovLyIpOwogCiAgICAgU3RyaW5nQnVpbGRlciByZXN1bHQ7CiAgICAg cmVzdWx0LnJlc2VydmVDYXBhY2l0eShtX3Byb3RvY29sLmxlbmd0aCgpICsgbV9ob3N0Lmxlbmd0 aCgpICsgMTApOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2cvSW1hZ2VCdWZmZXJDRy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j Zy9JbWFnZUJ1ZmZlckNHLmNwcAppbmRleCA1ZTM0YmMwLi45NGQxMDc2IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9JbWFnZUJ1ZmZlckNHLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9JbWFnZUJ1ZmZlckNHLmNwcApA QCAtNDkwLDcgKzQ5MCw3IEBAIHN0YXRpYyBTdHJpbmcgQ0dJbWFnZVRvRGF0YVVSTChDR0ltYWdl UmVmIGltYWdlLCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBjb25zdCBkCiAKICAgICBSZXRhaW5Q dHI8Q0ZNdXRhYmxlRGF0YVJlZj4gZGF0YSA9IGFkb3B0Q0YoQ0ZEYXRhQ3JlYXRlTXV0YWJsZShr Q0ZBbGxvY2F0b3JEZWZhdWx0LCAwKSk7CiAgICAgaWYgKCFDR0ltYWdlRW5jb2RlVG9EYXRhKGlt YWdlLCB1dGkuZ2V0KCksIHF1YWxpdHksIGRhdGEuZ2V0KCkpKQotICAgICAgICByZXR1cm4gImRh dGE6LCI7CisgICAgICAgIHJldHVybiBBU0NJSUxpdGVyYWwoImRhdGE6LCIpOwogCiAgICAgVmVj dG9yPGNoYXI+IGJhc2U2NERhdGE7CiAgICAgYmFzZTY0RW5jb2RlKENGRGF0YUdldEJ5dGVQdHIo ZGF0YS5nZXQoKSksIENGRGF0YUdldExlbmd0aChkYXRhLmdldCgpKSwgYmFzZTY0RGF0YSk7CkBA IC01MTUsMTIgKzUxNSwxMiBAQCBTdHJpbmcgSW1hZ2VCdWZmZXI6OnRvRGF0YVVSTChjb25zdCBT dHJpbmcmIG1pbWVUeXBlLCBjb25zdCBkb3VibGUqIHF1YWxpdHksIENvbwogICAgICAgICAvLyBK UEVHcyBkb24ndCBoYXZlIGFuIGFscGhhIGNoYW5uZWwsIHNvIHdlIGhhdmUgdG8gbWFudWFsbHkg Y29tcG9zaXRlIG9uIHRvcCBvZiBibGFjay4KICAgICAgICAgcHJlbXVsdGlwbGllZERhdGEgPSBn ZXRQcmVtdWx0aXBsaWVkSW1hZ2VEYXRhKEludFJlY3QoSW50UG9pbnQoMCwgMCksIGxvZ2ljYWxT aXplKCkpKTsKICAgICAgICAgaWYgKCFwcmVtdWx0aXBsaWVkRGF0YSkKLSAgICAgICAgICAgIHJl dHVybiAiZGF0YTosIjsKKyAgICAgICAgICAgIHJldHVybiBBU0NJSUxpdGVyYWwoImRhdGE6LCIp OwogCiAgICAgICAgIFJldGFpblB0cjxDR0RhdGFQcm92aWRlclJlZj4gZGF0YVByb3ZpZGVyOwog ICAgICAgICBkYXRhUHJvdmlkZXIgPSBhZG9wdENGKENHRGF0YVByb3ZpZGVyQ3JlYXRlV2l0aERh dGEoMCwgcHJlbXVsdGlwbGllZERhdGEtPmRhdGEoKSwgNCAqIGxvZ2ljYWxTaXplKCkud2lkdGgo KSAqIGxvZ2ljYWxTaXplKCkuaGVpZ2h0KCksIDApKTsKICAgICAgICAgaWYgKCFkYXRhUHJvdmlk ZXIpCi0gICAgICAgICAgICByZXR1cm4gImRhdGE6LCI7CisgICAgICAgICAgICByZXR1cm4gQVND SUlMaXRlcmFsKCJkYXRhOiwiKTsKIAogICAgICAgICBpbWFnZSA9IGFkb3B0Q0YoQ0dJbWFnZUNy ZWF0ZShsb2dpY2FsU2l6ZSgpLndpZHRoKCksIGxvZ2ljYWxTaXplKCkuaGVpZ2h0KCksIDgsIDMy LCA0ICogbG9naWNhbFNpemUoKS53aWR0aCgpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgc1JHQkNvbG9yU3BhY2VSZWYoKSwga0NHQml0bWFwQnl0ZU9yZGVyRGVmYXVsdCB8 IGtDR0ltYWdlQWxwaGFOb25lU2tpcExhc3QsCkBAIC01NTYsNyArNTU2LDcgQEAgU3RyaW5nIElt YWdlRGF0YVRvRGF0YVVSTChjb25zdCBJbWFnZURhdGEmIHNvdXJjZSwgY29uc3QgU3RyaW5nJiBt aW1lVHlwZSwgY29uc3QKICAgICAgICAgLy8gSlBFR3MgZG9uJ3QgaGF2ZSBhbiBhbHBoYSBjaGFu bmVsLCBzbyB3ZSBoYXZlIHRvIG1hbnVhbGx5IGNvbXBvc2l0ZSBvbiB0b3Agb2YgYmxhY2suCiAg ICAgICAgIHNpemVfdCBzaXplID0gNCAqIHNvdXJjZS53aWR0aCgpICogc291cmNlLmhlaWdodCgp OwogICAgICAgICBpZiAoIXByZW11bHRpcGxpZWREYXRhLnRyeVJlc2VydmVDYXBhY2l0eShzaXpl KSkKLSAgICAgICAgICAgIHJldHVybiAiZGF0YTosIjsKKyAgICAgICAgICAgIHJldHVybiBBU0NJ SUxpdGVyYWwoImRhdGE6LCIpOwogCiAgICAgICAgIHByZW11bHRpcGxpZWREYXRhLnJlc2l6ZShz aXplKTsKICAgICAgICAgdW5zaWduZWQgY2hhciAqYnVmZmVyID0gcHJlbXVsdGlwbGllZERhdGEu ZGF0YSgpOwpAQCAtNTgwLDcgKzU4MCw3IEBAIFN0cmluZyBJbWFnZURhdGFUb0RhdGFVUkwoY29u c3QgSW1hZ2VEYXRhJiBzb3VyY2UsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGNvbnN0CiAgICAg UmV0YWluUHRyPENHRGF0YVByb3ZpZGVyUmVmPiBkYXRhUHJvdmlkZXI7CiAgICAgZGF0YVByb3Zp ZGVyID0gYWRvcHRDRihDR0RhdGFQcm92aWRlckNyZWF0ZVdpdGhEYXRhKDAsIGRhdGEsIDQgKiBz b3VyY2Uud2lkdGgoKSAqIHNvdXJjZS5oZWlnaHQoKSwgMCkpOwogICAgIGlmICghZGF0YVByb3Zp ZGVyKQotICAgICAgICByZXR1cm4gImRhdGE6LCI7CisgICAgICAgIHJldHVybiBBU0NJSUxpdGVy YWwoImRhdGE6LCIpOwogCiAgICAgUmV0YWluUHRyPENHSW1hZ2VSZWY+IGltYWdlOwogICAgIGlt YWdlID0gYWRvcHRDRihDR0ltYWdlQ3JlYXRlKHNvdXJjZS53aWR0aCgpLCBzb3VyY2UuaGVpZ2h0 KCksIDgsIDMyLCA0ICogc291cmNlLndpZHRoKCksCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9zdmcvZ3JhcGhpY3MvU1ZHSW1hZ2UuY3BwIGIvU291cmNlL1dlYkNvcmUvc3ZnL2dyYXBoaWNz L1NWR0ltYWdlLmNwcAppbmRleCA4NTBmOTMxLi44NDRkMWFhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9zdmcvZ3JhcGhpY3MvU1ZHSW1hZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N2 Zy9ncmFwaGljcy9TVkdJbWFnZS5jcHAKQEAgLTQyMiw3ICs0MjIsNyBAQCBib29sIFNWR0ltYWdl OjpkYXRhQ2hhbmdlZChib29sIGFsbERhdGFSZWNlaXZlZCkKIAogU3RyaW5nIFNWR0ltYWdlOjpm aWxlbmFtZUV4dGVuc2lvbigpIGNvbnN0CiB7Ci0gICAgcmV0dXJuICJzdmciOworICAgIHJldHVy biBBU0NJSUxpdGVyYWwoInN2ZyIpOwogfQogCiBib29sIGlzSW5TVkdJbWFnZShjb25zdCBFbGVt ZW50KiBlbGVtZW50KQo=