134571 2014-07-02 17:06:45 -0700 Stop using EncoderAdapter/DecoderAdapter for FormData 2014-07-03 11:31:05 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca bunhere cdumez cgarcia clopez commit-queue gyuyoung.kim ossy rego sergio oldest_to_newest 1020108 0 andersca 2014-07-02 17:06:45 -0700 Stop using EncoderAdapter/DecoderAdapter for FormData 1020109 1 234296 andersca 2014-07-02 17:07:24 -0700 Created attachment 234296 Patch 1020281 2 andersca 2014-07-03 10:06:02 -0700 Committed r170755: <http://trac.webkit.org/changeset/170755> 1020319 3 clopez 2014-07-03 11:31:05 -0700 (In reply to comment #2) > Committed r170755: <http://trac.webkit.org/changeset/170755> This broke both the GTK and EFL builds :( 234296 2014-07-02 17:07:24 -0700 2014-07-03 07:54:59 -0700 Patch bug-134571-20140702170705.patch text/plain 13514 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwNzI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzc0YTc4NjhiNDAwMjI2 ZTc2M2E0YTFkMDI2MmNlMTJmZDRiNjBlZS4uYTkwNWZmZDZmN2I4MTQwMDBjNzg5Y2IyOGQ1YTMy YjJiMGQ4N2IyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0IEBACiAyMDE0LTA3LTAyICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgU3RvcCB1c2luZyBF bmNvZGVyQWRhcHRlci9EZWNvZGVyQWRhcHRlciBmb3IgRm9ybURhdGEKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNDU3MQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViQ29yZS5leHAuaW46CisgICAg ICAgICogcGxhdGZvcm0vbmV0d29yay9Gb3JtRGF0YS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpl bmNvZGVFbGVtZW50KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OmRlY29kZUVsZW1lbnQp OiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6Rm9ybURhdGE6OmVuY29kZSk6IERlbGV0ZWQu CisgICAgICAgIChXZWJDb3JlOjpGb3JtRGF0YTo6ZGVjb2RlKTogRGVsZXRlZC4KKyAgICAgICAg KiBwbGF0Zm9ybS9uZXR3b3JrL0Zvcm1EYXRhLmg6CisgICAgICAgIChXZWJDb3JlOjpGb3JtRGF0 YUVsZW1lbnQ6OmVuY29kZSk6CisgICAgICAgIChXZWJDb3JlOjpGb3JtRGF0YUVsZW1lbnQ6OmRl Y29kZSk6CisgICAgICAgIChXZWJDb3JlOjpGb3JtRGF0YTo6ZW5jb2RlKToKKyAgICAgICAgKFdl YkNvcmU6OkZvcm1EYXRhOjpkZWNvZGUpOgorCisyMDE0LTA3LTAyICBBbmRlcnMgQ2FybHNzb24g IDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgUmVtb3ZlIGtleWVkIGNvZGluZyBmcm9t IEZvcm1EYXRhCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMzQ1NjUKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNl L1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IGZiNGNlZDgwMzZkY2U5MDJkMWUyN2M3OGJjOTMxYTUx MWViMGUxYmMuLjM3OTgyZTY1ZTJkMTdmMjdiYmM5ZGRlNDQzYTRmNWI5MTVhNDM2ZWIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cKQEAgLTEsNSArMSwxNiBAQAogMjAxNC0wNy0wMiAgQW5kZXJzIENhcmxzc29uICA8YW5k ZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIFN0b3AgdXNpbmcgRW5jb2RlckFkYXB0ZXIvRGVj b2RlckFkYXB0ZXIgZm9yIEZvcm1EYXRhCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMzQ1NzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIFNoYXJlZC9OZXR3b3JrL05ldHdvcmtSZXNvdXJjZUxvYWRQYXJh bWV0ZXJzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRl cnM6OmVuY29kZSk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0 ZXJzOjpkZWNvZGUpOgorCisyMDE0LTA3LTAyICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBh cHBsZS5jb20+CisKICAgICAgICAgUmlwIG91dCBtb3JlIGRlYWQgY29kZQogICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM0NTYyCiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5l eHAuaW4KaW5kZXggZDA3ZDI4MTU1NmJiYzgyMDA1ZDY2NTc3ZmI0ODYxZWM2YTZjYjM0Mi4uZWVl NDgwZmU4MGZlNmM5NTEzNmI3Y2MwN2E2ZGM1NjY4MjI0NTNmNSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAu aW4KQEAgLTEzMDMsNyArMTMwMyw2IEBAIF9fWk43V2ViQ29yZThGb3JtRGF0YTEwYXBwZW5kRGF0 YUVQS3ZtCiBfX1pON1dlYkNvcmU4Rm9ybURhdGExNWFwcGVuZEZpbGVSYW5nZUVSS04zV1RGNlN0 cmluZ0V4eGRiCiBfX1pON1dlYkNvcmU4Rm9ybURhdGE2Y3JlYXRlRXYKIF9fWk43V2ViQ29yZThG b3JtRGF0YTZjcmVhdGVFUEt2bQotX19aTjdXZWJDb3JlOEZvcm1EYXRhNmRlY29kZUVSTjNXVEY3 RGVjb2RlckUKIF9fWk43V2ViQ29yZThGb3JtRGF0YUQxRXYKIF9fWk43V2ViQ29yZThHcmFkaWVu dDEyYWRkQ29sb3JTdG9wRWZSS05TXzVDb2xvckUKIF9fWk43V2ViQ29yZThHcmFkaWVudEMxRVJL TlNfMTBGbG9hdFBvaW50RVMzXwpAQCAtMTk3MCw3ICsxOTY5LDYgQEAgX19aTks3V2ViQ29yZThE b2N1bWVudDR2aWV3RXYKIF9fWk5LN1dlYkNvcmU4RG9jdW1lbnQ2ZG9tYWluRXYKIF9fWk5LN1dl YkNvcmU4RG9jdW1lbnQ2bG9hZGVyRXYKIF9fWk5LN1dlYkNvcmU4RG9jdW1lbnQ4c2V0dGluZ3NF dgotX19aTks3V2ViQ29yZThGb3JtRGF0YTZlbmNvZGVFUk4zV1RGN0VuY29kZXJFCiBfX1pOSzdX ZWJDb3JlOEludFBvaW50Y3Y3Q0dQb2ludEV2CiBfX1pOSzdXZWJDb3JlOFBvc2l0aW9uMTBkb3du c3RyZWFtRU5TXzI3RWRpdGluZ0JvdW5kYXJ5Q3Jvc3NpbmdSdWxlRQogX19aTks3V2ViQ29yZThQ b3NpdGlvbjEzY29udGFpbmVyTm9kZUV2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL0Zvcm1EYXRhLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvRm9ybURhdGEuY3BwCmluZGV4IDcxMDllNDU2MDdhZTlhOWVkMTk3NzA3MWM3MzFjMTg4NDRh MDYzZmYuLjM1MjMwZDdiNTQ3YmI4ZWRhMTAxMTE4OGNkMThjM2QzZDNiNzkzMjUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvRm9ybURhdGEuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvRm9ybURhdGEuY3BwCkBAIC0zOTMsMTQzICsz OTMsNCBAQCB2b2lkIEZvcm1EYXRhOjpyZW1vdmVHZW5lcmF0ZWRGaWxlc0lmTmVlZGVkKCkKICAg ICB9CiB9CiAKLXN0YXRpYyB2b2lkIGVuY29kZUVsZW1lbnQoRW5jb2RlciYgZW5jb2RlciwgY29u c3QgRm9ybURhdGFFbGVtZW50JiBlbGVtZW50KQotewotICAgIGVuY29kZXIuZW5jb2RlVUludDMy KHN0YXRpY19jYXN0PHVpbnQzMl90PihlbGVtZW50Lm1fdHlwZSkpOwotCi0gICAgc3dpdGNoIChl bGVtZW50Lm1fdHlwZSkgewotICAgIGNhc2UgRm9ybURhdGFFbGVtZW50OjpUeXBlOjpEYXRhOgot ICAgICAgICBlbmNvZGVyLmVuY29kZUJ5dGVzKHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgdWludDhf dCo+KGVsZW1lbnQubV9kYXRhLmRhdGEoKSksIGVsZW1lbnQubV9kYXRhLnNpemUoKSk7Ci0gICAg ICAgIHJldHVybjsKLQotICAgIGNhc2UgRm9ybURhdGFFbGVtZW50OjpUeXBlOjpFbmNvZGVkRmls ZToKLSAgICAgICAgZW5jb2Rlci5lbmNvZGVTdHJpbmcoZWxlbWVudC5tX2ZpbGVuYW1lKTsKLSAg ICAgICAgZW5jb2Rlci5lbmNvZGVTdHJpbmcoZWxlbWVudC5tX2dlbmVyYXRlZEZpbGVuYW1lKTsK LSAgICAgICAgZW5jb2Rlci5lbmNvZGVCb29sKGVsZW1lbnQubV9zaG91bGRHZW5lcmF0ZUZpbGUp OwotICAgICAgICBlbmNvZGVyLmVuY29kZUludDY0KGVsZW1lbnQubV9maWxlU3RhcnQpOwotICAg ICAgICBlbmNvZGVyLmVuY29kZUludDY0KGVsZW1lbnQubV9maWxlTGVuZ3RoKTsKLSAgICAgICAg ZW5jb2Rlci5lbmNvZGVEb3VibGUoZWxlbWVudC5tX2V4cGVjdGVkRmlsZU1vZGlmaWNhdGlvblRp bWUpOwotICAgICAgICByZXR1cm47Ci0KLSAgICBjYXNlIEZvcm1EYXRhRWxlbWVudDo6VHlwZTo6 RW5jb2RlZEJsb2I6Ci0gICAgICAgIGVuY29kZXIuZW5jb2RlU3RyaW5nKGVsZW1lbnQubV91cmwu c3RyaW5nKCkpOwotICAgICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgQVNTRVJUX05PVF9SRUFD SEVEKCk7Ci19Ci0KLXN0YXRpYyBib29sIGRlY29kZUVsZW1lbnQoRGVjb2RlciYgZGVjb2Rlciwg Rm9ybURhdGFFbGVtZW50JiBlbGVtZW50KQotewotICAgIHVpbnQzMl90IHR5cGU7Ci0gICAgaWYg KCFkZWNvZGVyLmRlY29kZVVJbnQzMih0eXBlKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0g ICAgc3dpdGNoIChzdGF0aWNfY2FzdDxGb3JtRGF0YUVsZW1lbnQ6OlR5cGU+KHR5cGUpKSB7Ci0g ICAgY2FzZSBGb3JtRGF0YUVsZW1lbnQ6OlR5cGU6OkRhdGE6IHsKLSAgICAgICAgZWxlbWVudC5t X3R5cGUgPSBGb3JtRGF0YUVsZW1lbnQ6OlR5cGU6OkRhdGE7Ci0gICAgICAgIFZlY3Rvcjx1aW50 OF90PiBkYXRhOwotICAgICAgICBpZiAoIWRlY29kZXIuZGVjb2RlQnl0ZXMoZGF0YSkpCi0gICAg ICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgIHNpemVfdCBzaXplID0gZGF0YS5zaXplKCk7 Ci0gICAgICAgIGVsZW1lbnQubV9kYXRhLnJlc2l6ZShzaXplKTsKLSAgICAgICAgbWVtY3B5KGVs ZW1lbnQubV9kYXRhLmRhdGEoKSwgZGF0YS5kYXRhKCksIHNpemUpOwotICAgICAgICByZXR1cm4g dHJ1ZTsKLSAgICB9Ci0KLSAgICBjYXNlIEZvcm1EYXRhRWxlbWVudDo6VHlwZTo6RW5jb2RlZEZp bGU6IHsKLSAgICAgICAgZWxlbWVudC5tX3R5cGUgPSBzdGF0aWNfY2FzdDxGb3JtRGF0YUVsZW1l bnQ6OlR5cGU+KHR5cGUpOwotICAgICAgICBTdHJpbmcgZmlsZW5hbWVPclVSTDsKLSAgICAgICAg aWYgKCFkZWNvZGVyLmRlY29kZVN0cmluZyhmaWxlbmFtZU9yVVJMKSkKLSAgICAgICAgICAgIHJl dHVybiBmYWxzZTsKLSAgICAgICAgaWYgKHN0YXRpY19jYXN0PEZvcm1EYXRhRWxlbWVudDo6VHlw ZT4odHlwZSkgPT0gRm9ybURhdGFFbGVtZW50OjpUeXBlOjpFbmNvZGVkRmlsZSkgewotICAgICAg ICAgICAgaWYgKCFkZWNvZGVyLmRlY29kZVN0cmluZyhlbGVtZW50Lm1fZ2VuZXJhdGVkRmlsZW5h bWUpKQotICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgICAgIGlmICghZGVj b2Rlci5kZWNvZGVCb29sKGVsZW1lbnQubV9zaG91bGRHZW5lcmF0ZUZpbGUpKQotICAgICAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgfQotICAgICAgICBpbnQ2NF90IGZpbGVTdGFy dDsKLSAgICAgICAgaWYgKCFkZWNvZGVyLmRlY29kZUludDY0KGZpbGVTdGFydCkpCi0gICAgICAg ICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgIGlmIChmaWxlU3RhcnQgPCAwKQotICAgICAgICAg ICAgcmV0dXJuIGZhbHNlOwotICAgICAgICBpbnQ2NF90IGZpbGVMZW5ndGg7Ci0gICAgICAgIGlm ICghZGVjb2Rlci5kZWNvZGVJbnQ2NChmaWxlTGVuZ3RoKSkKLSAgICAgICAgICAgIHJldHVybiBm YWxzZTsKLSAgICAgICAgaWYgKGZpbGVMZW5ndGggIT0gQmxvYkRhdGFJdGVtOjp0b0VuZE9mRmls ZSAmJiBmaWxlTGVuZ3RoIDwgZmlsZVN0YXJ0KQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwot ICAgICAgICBkb3VibGUgZXhwZWN0ZWRGaWxlTW9kaWZpY2F0aW9uVGltZTsKLSAgICAgICAgaWYg KCFkZWNvZGVyLmRlY29kZURvdWJsZShleHBlY3RlZEZpbGVNb2RpZmljYXRpb25UaW1lKSkKLSAg ICAgICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgICAgICBlbGVtZW50Lm1fZmlsZW5hbWUgPSBm aWxlbmFtZU9yVVJMOwotICAgICAgICBlbGVtZW50Lm1fZmlsZVN0YXJ0ID0gZmlsZVN0YXJ0Owot ICAgICAgICBlbGVtZW50Lm1fZmlsZUxlbmd0aCA9IGZpbGVMZW5ndGg7Ci0gICAgICAgIGVsZW1l bnQubV9leHBlY3RlZEZpbGVNb2RpZmljYXRpb25UaW1lID0gZXhwZWN0ZWRGaWxlTW9kaWZpY2F0 aW9uVGltZTsKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgfQotCi0gICAgY2FzZSBGb3JtRGF0 YUVsZW1lbnQ6OlR5cGU6OkVuY29kZWRCbG9iOgotICAgICAgICBlbGVtZW50Lm1fdHlwZSA9IEZv cm1EYXRhRWxlbWVudDo6VHlwZTo6RW5jb2RlZEJsb2I7Ci0gICAgICAgIFN0cmluZyBibG9iVVJM U3RyaW5nOwotICAgICAgICBpZiAoIWRlY29kZXIuZGVjb2RlU3RyaW5nKGJsb2JVUkxTdHJpbmcp KQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICBlbGVtZW50Lm1fdXJsID0gVVJM KFVSTCgpLCBibG9iVVJMU3RyaW5nKTsKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0KLSAgICB9Ci0K LSAgICByZXR1cm4gZmFsc2U7Ci19Ci0KLXZvaWQgRm9ybURhdGE6OmVuY29kZShFbmNvZGVyJiBl bmNvZGVyKSBjb25zdAotewotICAgIGVuY29kZXIuZW5jb2RlQm9vbChtX2Fsd2F5c1N0cmVhbSk7 Ci0KLSAgICBlbmNvZGVyLmVuY29kZUJ5dGVzKHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgdWludDhf dCo+KG1fYm91bmRhcnkuZGF0YSgpKSwgbV9ib3VuZGFyeS5zaXplKCkpOwotCi0gICAgc2l6ZV90 IHNpemUgPSBtX2VsZW1lbnRzLnNpemUoKTsKLSAgICBlbmNvZGVyLmVuY29kZVVJbnQ2NChzaXpl KTsKLSAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHNpemU7ICsraSkKLSAgICAgICAgZW5jb2Rl RWxlbWVudChlbmNvZGVyLCBtX2VsZW1lbnRzW2ldKTsKLQotICAgIGVuY29kZXIuZW5jb2RlQm9v bChoYXNHZW5lcmF0ZWRGaWxlcygpKTsgLy8gRm9yIGJhY2t3YXJkIGNvbXBhdGliaWxpdHkuCi0K LSAgICBlbmNvZGVyLmVuY29kZUludDY0KG1faWRlbnRpZmllcik7Ci19Ci0KLVBhc3NSZWZQdHI8 Rm9ybURhdGE+IEZvcm1EYXRhOjpkZWNvZGUoRGVjb2RlciYgZGVjb2RlcikKLXsKLSAgICBSZWZQ dHI8Rm9ybURhdGE+IGRhdGEgPSBGb3JtRGF0YTo6Y3JlYXRlKCk7Ci0KLSAgICBpZiAoIWRlY29k ZXIuZGVjb2RlQm9vbChkYXRhLT5tX2Fsd2F5c1N0cmVhbSkpCi0gICAgICAgIHJldHVybiAwOwot Ci0gICAgVmVjdG9yPHVpbnQ4X3Q+IGJvdW5kYXJ5OwotICAgIGlmICghZGVjb2Rlci5kZWNvZGVC eXRlcyhib3VuZGFyeSkpCi0gICAgICAgIHJldHVybiAwOwotICAgIHNpemVfdCBzaXplID0gYm91 bmRhcnkuc2l6ZSgpOwotICAgIGRhdGEtPm1fYm91bmRhcnkucmVzaXplKHNpemUpOwotICAgIG1l bWNweShkYXRhLT5tX2JvdW5kYXJ5LmRhdGEoKSwgYm91bmRhcnkuZGF0YSgpLCBzaXplKTsKLQot ICAgIHVpbnQ2NF90IGVsZW1lbnRzU2l6ZTsKLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlVUludDY0 KGVsZW1lbnRzU2l6ZSkpCi0gICAgICAgIHJldHVybiAwOwotICAgIGZvciAoc2l6ZV90IGkgPSAw OyBpIDwgZWxlbWVudHNTaXplOyArK2kpIHsKLSAgICAgICAgRm9ybURhdGFFbGVtZW50IGVsZW1l bnQ7Ci0gICAgICAgIGlmICghZGVjb2RlRWxlbWVudChkZWNvZGVyLCBlbGVtZW50KSkKLSAgICAg ICAgICAgIHJldHVybiAwOwotICAgICAgICBkYXRhLT5tX2VsZW1lbnRzLmFwcGVuZChlbGVtZW50 KTsKLSAgICB9Ci0KLSAgICBib29sIGR1bW15OwotICAgIGlmICghZGVjb2Rlci5kZWNvZGVCb29s KGR1bW15KSkKLSAgICAgICAgcmV0dXJuIDA7Ci0KLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlSW50 NjQoZGF0YS0+bV9pZGVudGlmaWVyKSkKLSAgICAgICAgcmV0dXJuIDA7Ci0KLSAgICByZXR1cm4g ZGF0YS5yZWxlYXNlKCk7Ci19Ci0KIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvRm9ybURhdGEuaCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL25ldHdvcmsvRm9ybURhdGEuaAppbmRleCA0ZTE3YWEyOGE3NTM1MmVkMmZj NGU1NWNkMWRmYjExMjBjN2FmNzUxLi42ZWIzYTA1MDVmMmNiM2Q4OTE4MzJkNDYxMmY4ZWE1Zjk2 ZmEwMjYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0Zvcm1E YXRhLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9Gb3JtRGF0YS5oCkBA IC0yMCw2ICsyMCw3IEBACiAjaWZuZGVmIEZvcm1EYXRhX2gKICNkZWZpbmUgRm9ybURhdGFfaAog CisjaW5jbHVkZSAiQmxvYkRhdGEuaCIKICNpbmNsdWRlICJVUkwuaCIKICNpbmNsdWRlIDx3dGYv Rm9yd2FyZC5oPgogI2luY2x1ZGUgPHd0Zi9SZWZDb3VudGVkLmg+CkBAIC02OCw2ICs2OSwxMSBA QCBwdWJsaWM6CiAgICAgewogICAgIH0KIAorICAgIHRlbXBsYXRlPHR5cGVuYW1lIEVuY29kZXI+ CisgICAgdm9pZCBlbmNvZGUoRW5jb2RlciYpIGNvbnN0OworICAgIHRlbXBsYXRlPHR5cGVuYW1l IERlY29kZXI+CisgICAgc3RhdGljIGJvb2wgZGVjb2RlKERlY29kZXImLCBGb3JtRGF0YUVsZW1l bnQmIHJlc3VsdCk7CisKICAgICBUeXBlIG1fdHlwZTsKICAgICBWZWN0b3I8Y2hhcj4gbV9kYXRh OwogICAgIFN0cmluZyBtX2ZpbGVuYW1lOwpAQCAtMTA2LDYgKzExMiw3OSBAQCBpbmxpbmUgYm9v bCBvcGVyYXRvciE9KGNvbnN0IEZvcm1EYXRhRWxlbWVudCYgYSwgY29uc3QgRm9ybURhdGFFbGVt ZW50JiBiKQogICAgIHJldHVybiAhKGEgPT0gYik7CiB9CiAKKwordGVtcGxhdGU8dHlwZW5hbWUg RW5jb2Rlcj4KK3ZvaWQgRm9ybURhdGFFbGVtZW50OjplbmNvZGUoRW5jb2RlciYgZW5jb2Rlcikg Y29uc3QKK3sKKyAgICBlbmNvZGVyLmVuY29kZUVudW0obV90eXBlKTsKKworICAgIHN3aXRjaCAo bV90eXBlKSB7CisgICAgY2FzZSBUeXBlOjpEYXRhOgorICAgICAgICBlbmNvZGVyIDw8IG1fZGF0 YTsKKyAgICAgICAgYnJlYWs7CisKKyAgICBjYXNlIFR5cGU6OkVuY29kZWRGaWxlOgorICAgICAg ICBlbmNvZGVyIDw8IG1fZmlsZW5hbWU7CisgICAgICAgIGVuY29kZXIgPDwgbV9nZW5lcmF0ZWRG aWxlbmFtZTsKKyAgICAgICAgZW5jb2RlciA8PCBtX3Nob3VsZEdlbmVyYXRlRmlsZTsKKyAgICAg ICAgZW5jb2RlciA8PCBtX2ZpbGVTdGFydDsKKyAgICAgICAgZW5jb2RlciA8PCBtX2ZpbGVMZW5n dGg7CisgICAgICAgIGVuY29kZXIgPDwgbV9leHBlY3RlZEZpbGVNb2RpZmljYXRpb25UaW1lOwor ICAgICAgICBicmVhazsKKworICAgIGNhc2UgVHlwZTo6RW5jb2RlZEJsb2I6CisgICAgICAgIGVu Y29kZXIgPDwgbV91cmwuc3RyaW5nKCk7CisgICAgICAgIGJyZWFrOworICAgIH0KK30KKwordGVt cGxhdGU8dHlwZW5hbWUgRGVjb2Rlcj4KK2Jvb2wgRm9ybURhdGFFbGVtZW50OjpkZWNvZGUoRGVj b2RlciYgZGVjb2RlciwgRm9ybURhdGFFbGVtZW50JiByZXN1bHQpCit7CisgICAgaWYgKCFkZWNv ZGVyLmRlY29kZUVudW0ocmVzdWx0Lm1fdHlwZSkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKwor ICAgIHN3aXRjaCAocmVzdWx0Lm1fdHlwZSkgeworICAgIGNhc2UgVHlwZTo6RGF0YToKKyAgICAg ICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQubV9kYXRhKSkKKyAgICAgICAgICAgIHJldHVy biBmYWxzZTsKKworICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgIGNhc2UgVHlwZTo6RW5jb2Rl ZEZpbGU6CisgICAgICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0Lm1fZmlsZW5hbWUpKQor ICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJl c3VsdC5tX2dlbmVyYXRlZEZpbGVuYW1lKSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAg ICAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQubV9zaG91bGRHZW5lcmF0ZUZpbGUpKQor ICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJl c3VsdC5tX2ZpbGVTdGFydCkpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIGlm ICghZGVjb2Rlci5kZWNvZGUocmVzdWx0Lm1fZmlsZUxlbmd0aCkpCisgICAgICAgICAgICByZXR1 cm4gZmFsc2U7CisKKyAgICAgICAgaWYgKHJlc3VsdC5tX2ZpbGVMZW5ndGggIT0gQmxvYkRhdGFJ dGVtOjp0b0VuZE9mRmlsZSAmJiByZXN1bHQubV9maWxlTGVuZ3RoIDwgcmVzdWx0Lm1fZmlsZVN0 YXJ0KQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgICAgIGlmICghZGVjb2Rlci5k ZWNvZGUocmVzdWx0Lm1fZXhwZWN0ZWRGaWxlTW9kaWZpY2F0aW9uVGltZSkpCisgICAgICAgICAg ICByZXR1cm4gZmFsc2U7CisKKyAgICAgICAgcmV0dXJuIHRydWU7CisKKyAgICBjYXNlIFR5cGU6 OkVuY29kZWRCbG9iOiB7CisgICAgICAgIFN0cmluZyBibG9iVVJMU3RyaW5nOworICAgICAgICBp ZiAoIWRlY29kZXIuZGVjb2RlKGJsb2JVUkxTdHJpbmcpKQorICAgICAgICAgICAgcmV0dXJuIGZh bHNlOworCisgICAgICAgIHJlc3VsdC5tX3VybCA9IFVSTChVUkwoKSwgYmxvYlVSTFN0cmluZyk7 CisKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorICAgIH0KKworICAgIHJldHVybiBmYWxz ZTsKK30KKwogY2xhc3MgRm9ybURhdGEgOiBwdWJsaWMgUmVmQ291bnRlZDxGb3JtRGF0YT4gewog cHVibGljOgogICAgIGVudW0gRW5jb2RpbmdUeXBlIHsKQEAgLTEyNyw3ICsyMDYsOSBAQCBwdWJs aWM6CiAgICAgUGFzc1JlZlB0cjxGb3JtRGF0YT4gY29weSgpIGNvbnN0OwogICAgIFBhc3NSZWZQ dHI8Rm9ybURhdGE+IGRlZXBDb3B5KCkgY29uc3Q7CiAKKyAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBF bmNvZGVyPgogICAgIHZvaWQgZW5jb2RlKEVuY29kZXImKSBjb25zdDsKKyAgICB0ZW1wbGF0ZTx0 eXBlbmFtZSBEZWNvZGVyPgogICAgIHN0YXRpYyBQYXNzUmVmUHRyPEZvcm1EYXRhPiBkZWNvZGUo RGVjb2RlciYpOwogCiAgICAgdm9pZCBhcHBlbmREYXRhKGNvbnN0IHZvaWQqIGRhdGEsIHNpemVf dCk7CkBAIC0xOTcsNiArMjc4LDM1IEBAIGlubGluZSBib29sIG9wZXJhdG9yIT0oY29uc3QgRm9y bURhdGEmIGEsIGNvbnN0IEZvcm1EYXRhJiBiKQogICAgIHJldHVybiAhKGEgPT0gYik7CiB9CiAK K3RlbXBsYXRlPHR5cGVuYW1lIEVuY29kZXI+Cit2b2lkIEZvcm1EYXRhOjplbmNvZGUoRW5jb2Rl ciYgZW5jb2RlcikgY29uc3QKK3sKKyAgICBlbmNvZGVyIDw8IG1fYWx3YXlzU3RyZWFtOworICAg IGVuY29kZXIgPDwgbV9ib3VuZGFyeTsKKyAgICBlbmNvZGVyIDw8IG1fZWxlbWVudHM7CisgICAg ZW5jb2RlciA8PCBtX2lkZW50aWZpZXI7Cit9CisKK3RlbXBsYXRlPHR5cGVuYW1lIERlY29kZXI+ CitQYXNzUmVmUHRyPEZvcm1EYXRhPiBGb3JtRGF0YTo6ZGVjb2RlKERlY29kZXImIGRlY29kZXIp Cit7CisgICAgUmVmUHRyPEZvcm1EYXRhPiBkYXRhID0gRm9ybURhdGE6OmNyZWF0ZSgpOworCisg ICAgaWYgKCFkZWNvZGVyLmRlY29kZShkYXRhLT5tX2Fsd2F5c1N0cmVhbSkpCisgICAgICAgIHJl dHVybiBudWxscHRyOworCisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShkYXRhLT5tX2JvdW5kYXJ5 KSkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisKKyAgICBpZiAoIWRlY29kZXIuZGVjb2RlKGRh dGEtPm1fZWxlbWVudHMpKQorICAgICAgICByZXR1cm4gbnVsbHB0cjsKKworICAgIGlmICghZGVj b2Rlci5kZWNvZGUoZGF0YS0+bV9pZGVudGlmaWVyKSkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7 CisKKyAgICByZXR1cm4gZGF0YS5yZWxlYXNlKCk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNv cmUKIAogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvTmV0d29yay9O ZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQv TmV0d29yay9OZXR3b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycy5jcHAKaW5kZXggY2M2ZTM1ZmY5 Njg5ODkxYzJhNTNiMjQ2OTY3OWYzYjYwMmQ1MDY4My4uM2Y3ZDk5ZWMxZmU3ODBmOWY3M2YxMTZm NjM0ZmJjNTY1Y2VhYjBmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL05ldHdv cmsvTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQy L1NoYXJlZC9OZXR3b3JrL05ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzLmNwcApAQCAtMjgs OCArMjgsNiBAQAogCiAjaW5jbHVkZSAiQXJndW1lbnRDb2RlcnMuaCIKICNpbmNsdWRlICJEYXRh UmVmZXJlbmNlLmgiCi0jaW5jbHVkZSAiRGVjb2RlckFkYXB0ZXIuaCIKLSNpbmNsdWRlICJFbmNv ZGVyQWRhcHRlci5oIgogI2luY2x1ZGUgIldlYkNvcmVBcmd1bWVudENvZGVycy5oIgogCiAjaWYg RU5BQkxFKE5FVFdPUktfUFJPQ0VTUykKQEAgLTM3LDYgKzM1LDcgQEAKIHVzaW5nIG5hbWVzcGFj ZSBXZWJDb3JlOwogCiBuYW1lc3BhY2UgV2ViS2l0IHsKKwogTmV0d29ya1Jlc291cmNlTG9hZFBh cmFtZXRlcnM6Ok5ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzKCkKICAgICA6IGlkZW50aWZp ZXIoMCkKICAgICAsIHdlYlBhZ2VJRCgwKQpAQCAtNjIsOSArNjEsNyBAQCB2b2lkIE5ldHdvcmtS ZXNvdXJjZUxvYWRQYXJhbWV0ZXJzOjplbmNvZGUoSVBDOjpBcmd1bWVudEVuY29kZXImIGVuY29k ZXIpIGNvbnN0CiAKICAgICBlbmNvZGVyIDw8IHN0YXRpY19jYXN0PGJvb2w+KHJlcXVlc3QuaHR0 cEJvZHkoKSk7CiAgICAgaWYgKHJlcXVlc3QuaHR0cEJvZHkoKSkgewotICAgICAgICBFbmNvZGVy QWRhcHRlciBodHRwQm9keUVuY29kZXJBZGFwdGVyOwotICAgICAgICByZXF1ZXN0Lmh0dHBCb2R5 KCktPmVuY29kZShodHRwQm9keUVuY29kZXJBZGFwdGVyKTsKLSAgICAgICAgZW5jb2RlciA8PCBo dHRwQm9keUVuY29kZXJBZGFwdGVyLmRhdGFSZWZlcmVuY2UoKTsKKyAgICAgICAgcmVxdWVzdC5o dHRwQm9keSgpLT5lbmNvZGUoZW5jb2Rlcik7CiAKICAgICAgICAgY29uc3QgVmVjdG9yPEZvcm1E YXRhRWxlbWVudD4mIGVsZW1lbnRzID0gcmVxdWVzdC5odHRwQm9keSgpLT5lbGVtZW50cygpOwog ICAgICAgICBzaXplX3QgZmlsZUNvdW50ID0gMDsKQEAgLTEyMywxMSArMTIwLDEwIEBAIGJvb2wg TmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnM6OmRlY29kZShJUEM6OkFyZ3VtZW50RGVjb2Rl ciYgZGVjb2RlciwgTmV0d29yCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGlmIChoYXNI VFRQQm9keSkgewotICAgICAgICBJUEM6OkRhdGFSZWZlcmVuY2UgZm9ybURhdGE7Ci0gICAgICAg IGlmICghZGVjb2Rlci5kZWNvZGUoZm9ybURhdGEpKQorICAgICAgICBSZWZQdHI8Rm9ybURhdGE+ IGZvcm1EYXRhID0gRm9ybURhdGE6OmRlY29kZShkZWNvZGVyKTsKKyAgICAgICAgaWYgKCFmb3Jt RGF0YSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgRGVjb2RlckFkYXB0ZXIg aHR0cEJvZHlEZWNvZGVyQWRhcHRlcihmb3JtRGF0YS5kYXRhKCksIGZvcm1EYXRhLnNpemUoKSk7 Ci0gICAgICAgIHJlc3VsdC5yZXF1ZXN0LnNldEhUVFBCb2R5KEZvcm1EYXRhOjpkZWNvZGUoaHR0 cEJvZHlEZWNvZGVyQWRhcHRlcikpOworICAgICAgICByZXN1bHQucmVxdWVzdC5zZXRIVFRQQm9k eShmb3JtRGF0YS5yZWxlYXNlKCkpOwogCiAgICAgICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVz dWx0LnJlcXVlc3RCb2R5U2FuZGJveEV4dGVuc2lvbnMpKQogICAgICAgICAgICAgcmV0dXJuIGZh bHNlOwo=