55317 2011-02-27 04:35:58 -0800 Remove registerBaseEncodingNames and registerBaseCodecs from TextCodecWinCE 2011-02-27 22:54:02 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 paroga paroga commit-queue oldest_to_newest 358665 0 paroga 2011-02-27 04:35:58 -0800 Remove registerBaseEncodingNames and registerBaseCodecs from TextCodecWinCE 358667 1 83973 paroga 2011-02-27 04:42:11 -0800 Created attachment 83973 Patch 358671 2 83973 paroga 2011-02-27 04:56:49 -0800 Comment on attachment 83973 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=83973&action=review > Source/WebCore/ChangeLog:9 > + Also remove the "fast path" for UTF-8 data, because we now have a separate TextCodec. This patch only removes the obsolete code. I'll do some additional cleanup in a follow-up patch. 358901 3 83973 commit-queue 2011-02-27 22:53:58 -0800 Comment on attachment 83973 Patch Clearing flags on attachment: 83973 Committed r79842: <http://trac.webkit.org/changeset/79842> 358902 4 commit-queue 2011-02-27 22:54:02 -0800 All reviewed patches have been landed. Closing bug. 83973 2011-02-27 04:42:11 -0800 2011-02-27 22:53:57 -0800 Patch bug-55317-20110227134208.patch text/plain 10661 paroga U3VidmVyc2lvbiBSZXZpc2lvbjogNzk4MTYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0ZGMxZTZjZjE3YmVhMWRj MTdlMDc3ZDNhYjQzOTY3ZWYxOTBiNjc5Li44NGVhMThlZGVmNDhiMWUwMTZiODhiNTE4NTY2M2Yy Mzg3NDEzNDk4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDItMjcgIFBhdHJp Y2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIHJlZ2lzdGVyQmFzZUVuY29kaW5nTmFt ZXMgYW5kIHJlZ2lzdGVyQmFzZUNvZGVjcyBmcm9tIFRleHRDb2RlY1dpbkNFCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NTMxNworCisgICAgICAgIFRo aXMgZnVuY3Rpb25zIGFyZSBvYnNvbGV0ZSwgc2luY2Ugcjc4NDk5IGFkZGVkIFRleHRDb2RlY1VU RjguCisgICAgICAgIEFsc28gcmVtb3ZlIHRoZSAiZmFzdCBwYXRoIiBmb3IgVVRGLTggZGF0YSwg YmVjYXVzZSB3ZSBub3cgaGF2ZSBhIHNlcGFyYXRlIFRleHRDb2RlYy4KKworICAgICAgICAqIHBs YXRmb3JtL3RleHQvVGV4dEVuY29kaW5nUmVnaXN0cnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 YnVpbGRCYXNlVGV4dENvZGVjTWFwcyk6CisgICAgICAgICogcGxhdGZvcm0vdGV4dC93aW5jZS9U ZXh0Q29kZWNXaW5DRS5jcHA6CisgICAgICAgICogcGxhdGZvcm0vdGV4dC93aW5jZS9UZXh0Q29k ZWNXaW5DRS5oOgorCiAyMDExLTAyLTI2ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS90ZXh0L1RleHRFbmNvZGluZ1JlZ2lzdHJ5LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL3RleHQvVGV4dEVuY29kaW5nUmVnaXN0cnkuY3BwCmluZGV4IDRmODE2 NTYxNWQ5ZGFjZTQ4ZTQ0MjhlMzFhOTY4ZTlhNDhjMjIxOWMuLmY2MDQyMjc0ODliMzRjMzYzM2Zl ZGRjMzBhMGQ0MjJlYzk1Nzc2YjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L3RleHQvVGV4dEVuY29kaW5nUmVnaXN0cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL3RleHQvVGV4dEVuY29kaW5nUmVnaXN0cnkuY3BwCkBAIC0yMzksMTIgKzIzOSw2IEBAIHN0 YXRpYyB2b2lkIGJ1aWxkQmFzZVRleHRDb2RlY01hcHMoKQogICAgIFRleHRDb2RlY0d0azo6cmVn aXN0ZXJCYXNlRW5jb2RpbmdOYW1lcyhhZGRUb1RleHRFbmNvZGluZ05hbWVNYXApOwogICAgIFRl eHRDb2RlY0d0azo6cmVnaXN0ZXJCYXNlQ29kZWNzKGFkZFRvVGV4dENvZGVjTWFwKTsKICNlbmRp ZgotCi0jaWYgT1MoV0lOQ0UpICYmICFQTEFURk9STShRVCkKLSAgICAvLyBGSVhNRTogVGhpcyBp cyBub3QgbmVlZGVkLiBUaGUgY29kZSBhYm92ZSBjb3ZlcnMgYWxsIHRoZSBiYXNlIGNvZGVjcy4K LSAgICBUZXh0Q29kZWNXaW5DRTo6cmVnaXN0ZXJCYXNlRW5jb2RpbmdOYW1lcyhhZGRUb1RleHRF bmNvZGluZ05hbWVNYXApOwotICAgIFRleHRDb2RlY1dpbkNFOjpyZWdpc3RlckJhc2VDb2RlY3Mo YWRkVG9UZXh0Q29kZWNNYXApOwotI2VuZGlmCiB9CiAKIHN0YXRpYyB2b2lkIGFkZEVuY29kaW5n TmFtZShIYXNoU2V0PGNvbnN0IGNoYXIqPiogc2V0LCBjb25zdCBjaGFyKiBuYW1lKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC93aW5jZS9UZXh0Q29kZWNXaW5DRS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L3dpbmNlL1RleHRDb2RlY1dpbkNFLmNw cAppbmRleCAzNTMyZTc0NjhkY2JmODkyMzA4OTg4MzMyMDdjZmNiNmJjYmM4ODdmLi44OGFiOGZj ZWRmNDZjNTU3ODkyODgyN2QxMzI5OTZiYzIyOGU1ZWJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS90ZXh0L3dpbmNlL1RleHRDb2RlY1dpbkNFLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS90ZXh0L3dpbmNlL1RleHRDb2RlY1dpbkNFLmNwcApAQCAtMSw2ICsx LDYgQEAKIC8qCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDctMjAwOSBUb3JjaCBNb2JpbGUsIEluYy4g QWxsIHJpZ2h0cyByZXNlcnZlZC4KLSAqIENvcHlyaWdodCAoQykgMjAxMCBQYXRyaWNrIEdhbnN0 ZXJlciA8cGFyb2dhQHBhcm9nYS5jb20+CisgKiBDb3B5cmlnaHQgKEMpIDIwMTAtMjAxMSBQYXRy aWNrIEdhbnN0ZXJlciA8cGFyb2dhQHBhcm9nYS5jb20+CiAgKgogICogUmVkaXN0cmlidXRpb24g YW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBt b2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNv bmRpdGlvbnMKQEAgLTM1LDcgKzM1LDYgQEAKICNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+ CiAjaW5jbHVkZSA8d3RmL3RleHQvU3RyaW5nQ29uY2F0ZW5hdGUuaD4KICNpbmNsdWRlIDx3dGYv dGV4dC9TdHJpbmdIYXNoLmg+Ci0jaW5jbHVkZSA8d3RmL3VuaWNvZGUvVVRGOC5oPgogCiBuYW1l c3BhY2UgV2ViQ29yZSB7CiAKQEAgLTEyMiw5ICsxMjEsNiBAQCBMYW5ndWFnZU1hbmFnZXI6Okxh bmd1YWdlTWFuYWdlcigpCiAKIHN0YXRpYyBVSU5UIGdldENvZGVQYWdlKGNvbnN0IGNoYXIqIG5h bWUpCiB7Ci0gICAgaWYgKCFzdHJjbXAobmFtZSwgIlVURi04IikpCi0gICAgICAgIHJldHVybiBD UF9VVEY4OwotCiAgICAgLy8gRXhwbGljaXRseSB1c2UgYSAiY29uc3QiIHJlZmVyZW5jZSB0byBm aXggdGhlIHNpbGx5IFZTIGJ1aWxkIGVycm9yCiAgICAgLy8gc2F5aW5nICI9PSIgaXMgbm90IGZv dW5kIGZvciBjb25zdF9pdGVyYXRvciBhbmQgaXRlcmF0b3IKICAgICBjb25zdCBIYXNoTWFwPFN0 cmluZywgQ2hhcnNldEluZm8+JiBjaGFyc2V0cyA9IGtub3duQ2hhcnNldHMoKTsKQEAgLTE0Niwx NiArMTQyLDYgQEAgVGV4dENvZGVjV2luQ0U6On5UZXh0Q29kZWNXaW5DRSgpCiB7CiB9CiAKLXZv aWQgVGV4dENvZGVjV2luQ0U6OnJlZ2lzdGVyQmFzZUVuY29kaW5nTmFtZXMoRW5jb2RpbmdOYW1l UmVnaXN0cmFyIHJlZ2lzdHJhcikKLXsKLSAgICByZWdpc3RyYXIoIlVURi04IiwgIlVURi04Iik7 Ci19Ci0KLXZvaWQgVGV4dENvZGVjV2luQ0U6OnJlZ2lzdGVyQmFzZUNvZGVjcyhUZXh0Q29kZWNS ZWdpc3RyYXIgcmVnaXN0cmFyKQotewotICAgIHJlZ2lzdHJhcigiVVRGLTgiLCBuZXdUZXh0Q29k ZWNXaW5DRSwgMCk7Ci19Ci0KIHZvaWQgVGV4dENvZGVjV2luQ0U6OnJlZ2lzdGVyRXh0ZW5kZWRF bmNvZGluZ05hbWVzKEVuY29kaW5nTmFtZVJlZ2lzdHJhciByZWdpc3RyYXIpCiB7CiAgICAgbGFu Z3VhZ2VNYW5hZ2VyKCk7CkBAIC0xODEsOSArMTY3LDYgQEAgdm9pZCBUZXh0Q29kZWNXaW5DRTo6 cmVnaXN0ZXJFeHRlbmRlZENvZGVjcyhUZXh0Q29kZWNSZWdpc3RyYXIgcmVnaXN0cmFyKQogCiBz dGF0aWMgRFdPUkQgZ2V0Q29kZVBhZ2VGbGFncyhVSU5UIGNvZGVQYWdlKQogewotICAgIGlmIChj b2RlUGFnZSA9PSBDUF9VVEY4KQotICAgICAgICByZXR1cm4gTUJfRVJSX0lOVkFMSURfQ0hBUlM7 Ci0KICAgICBpZiAoY29kZVBhZ2UgPT0gNDIpIC8vIFN5bWJvbAogICAgICAgICByZXR1cm4gMDsK IApAQCAtMjEzLDcgKzE5Niw3IEBAIHN0YXRpYyBpbmxpbmUgY29uc3QgY2hhciogZmluZEZpcnN0 Tm9uQXNjaWlDaGFyYWN0ZXIoY29uc3QgY2hhciogYnl0ZXMsIHNpemVfdCBsCiAgICAgcmV0dXJu IGJ5dGVzOwogfQogCi1zdGF0aWMgdm9pZCBkZWNvZGUoVmVjdG9yPFVDaGFyLCA4MTkyPiYgcmVz dWx0LCBVSU5UIGNvZGVQYWdlLCBjb25zdCBjaGFyKiBieXRlcywgc2l6ZV90IGxlbmd0aCwgc2l6 ZV90KiBsZWZ0LCBib29sIGNhbkJlRmlyc3RUaW1lLCBib29sJiBzYXdJbnZhbGlkQ2hhcikKK3N0 YXRpYyB2b2lkIGRlY29kZUludGVybmFsKFZlY3RvcjxVQ2hhciwgODE5Mj4mIHJlc3VsdCwgVUlO VCBjb2RlUGFnZSwgY29uc3QgY2hhciogYnl0ZXMsIHNpemVfdCBsZW5ndGgsIHNpemVfdCogbGVm dCkKIHsKICAgICAqbGVmdCA9IGxlbmd0aDsKICAgICBpZiAoIWJ5dGVzIHx8ICFsZW5ndGgpCkBA IC0yMjEsOTMgKzIwNCwzMiBAQCBzdGF0aWMgdm9pZCBkZWNvZGUoVmVjdG9yPFVDaGFyLCA4MTky PiYgcmVzdWx0LCBVSU5UIGNvZGVQYWdlLCBjb25zdCBjaGFyKiBieXRlcwogCiAgICAgRFdPUkQg ZmxhZ3MgPSBnZXRDb2RlUGFnZUZsYWdzKGNvZGVQYWdlKTsKIAotICAgIGlmIChjb2RlUGFnZSA9 PSBDUF9VVEY4KSB7Ci0gICAgICAgIGlmIChjYW5CZUZpcnN0VGltZSkgewotICAgICAgICAgICAg Ly8gSGFuZGxlIEJPTS4KLSAgICAgICAgICAgIGlmIChsZW5ndGggPiAzKSB7Ci0gICAgICAgICAg ICAgICAgaWYgKGJ5dGVzWzBdID09IChjaGFyKTB4RUYgJiYgYnl0ZXNbMV0gPT0gKGNoYXIpMHhC QiAmJiBieXRlc1syXSA9PSAoY2hhcikweEJGKSB7Ci0gICAgICAgICAgICAgICAgICAgIC8vIEJP TSBmb3VuZCEKLSAgICAgICAgICAgICAgICAgICAgbGVuZ3RoIC09IDM7Ci0gICAgICAgICAgICAg ICAgICAgIGJ5dGVzICs9IDM7Ci0gICAgICAgICAgICAgICAgICAgICpsZWZ0ID0gbGVuZ3RoOwot ICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIH0gZWxzZSBpZiAoYnl0ZXNbMF0gPT0gMHhF RiAmJiAobGVuZ3RoIDwgMiB8fCBieXRlc1sxXSA9PSAoY2hhcikweEJCKSAmJiAobGVuZ3RoIDwg MyB8fCBieXRlc1syXSA9PSAoY2hhcikweEJGKSkgewotICAgICAgICAgICAgICAgIGlmIChsZW5n dGggPT0gMykKLSAgICAgICAgICAgICAgICAgICAgKmxlZnQgPSAwOwotICAgICAgICAgICAgICAg IHJldHVybjsKLSAgICAgICAgICAgIH0KLSAgICAgICAgfQotCi0gICAgICAgIC8vIFByb2Nlc3Mg QVNDSUkgY2hhcmFjdGVycyBhdCBiZWdpbm5pbmcuCi0gICAgICAgIGNvbnN0IGNoYXIqIGZpcnN0 Tm9uQXNjaWlDaGFyID0gZmluZEZpcnN0Tm9uQXNjaWlDaGFyYWN0ZXIoYnl0ZXMsIGxlbmd0aCk7 Ci0gICAgICAgIGludCBudW1Bc2NpaUNoYXJhY3RlcnMgPSBmaXJzdE5vbkFzY2lpQ2hhciAtIGJ5 dGVzOwotICAgICAgICBpZiAobnVtQXNjaWlDaGFyYWN0ZXJzKSB7Ci0gICAgICAgICAgICByZXN1 bHQuYXBwZW5kKGJ5dGVzLCBudW1Bc2NpaUNoYXJhY3RlcnMpOwotICAgICAgICAgICAgbGVuZ3Ro IC09IG51bUFzY2lpQ2hhcmFjdGVyczsKLSAgICAgICAgICAgIGlmICghbGVuZ3RoKSB7Ci0gICAg ICAgICAgICAgICAgKmxlZnQgPSAwOwotICAgICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAg ICAgIH0KLSAgICAgICAgICAgIGJ5dGVzID0gZmlyc3ROb25Bc2NpaUNoYXI7Ci0gICAgICAgIH0K LQotICAgICAgICBpbnQgb2xkU2l6ZSA9IHJlc3VsdC5zaXplKCk7Ci0gICAgICAgIHJlc3VsdC5y ZXNpemUob2xkU2l6ZSArIGxlbmd0aCk7Ci0gICAgICAgIFVDaGFyKiByZXN1bHRTdGFydCA9IHJl c3VsdC5kYXRhKCkgKyBvbGRTaXplOwotICAgICAgICBjb25zdCBjaGFyKiBzb3VyY2VTdGFydCA9 IGJ5dGVzOwotICAgICAgICBjb25zdCBjaGFyKiBjb25zdCBzb3VyY2VFbmQgPSBieXRlcyArIGxl bmd0aDsKLSAgICAgICAgZm9yICg7OykgewotICAgICAgICAgICAgdXNpbmcgbmFtZXNwYWNlIFdU Rjo6VW5pY29kZTsKLSAgICAgICAgICAgIENvbnZlcnNpb25SZXN1bHQgY29udlJlcyA9IGNvbnZl cnRVVEY4VG9VVEYxNigmc291cmNlU3RhcnQKLSAgICAgICAgICAgICAgICAsIHNvdXJjZUVuZAot ICAgICAgICAgICAgICAgICwgJnJlc3VsdFN0YXJ0Ci0gICAgICAgICAgICAgICAgLCByZXN1bHQu ZGF0YSgpICsgcmVzdWx0LnNpemUoKQotICAgICAgICAgICAgICAgICwgdHJ1ZSk7Ci0KLSAgICAg ICAgICAgIC8vIEZJWE1FOiBpcyBpdCBwb3NzaWJsZT8KLSAgICAgICAgICAgIGlmIChjb252UmVz ID09IHRhcmdldEV4aGF1c3RlZCAmJiBzb3VyY2VTdGFydCA8IHNvdXJjZUVuZCkgewotICAgICAg ICAgICAgICAgIG9sZFNpemUgPSByZXN1bHQuc2l6ZSgpOwotICAgICAgICAgICAgICAgIHJlc3Vs dC5yZXNpemUob2xkU2l6ZSArIDI1Nik7Ci0gICAgICAgICAgICAgICAgcmVzdWx0U3RhcnQgPSBy ZXN1bHQuZGF0YSgpICsgb2xkU2l6ZTsKLSAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAg ICAgICAgIH0KKyAgICBpbnQgdGVzdExlbmd0aCA9IGxlbmd0aDsKKyAgICBpbnQgdW50ZXN0ZWRM ZW5ndGggPSBsZW5ndGg7CisgICAgZm9yICg7OykgeworICAgICAgICBpbnQgcmVzdWx0TGVuZ3Ro ID0gTXVsdGlCeXRlVG9XaWRlQ2hhcihjb2RlUGFnZSwgZmxhZ3MsIGJ5dGVzLCB0ZXN0TGVuZ3Ro LCAwLCAwKTsKIAotICAgICAgICAgICAgaWYgKGNvbnZSZXMgIT0gY29udmVyc2lvbk9LKQotICAg ICAgICAgICAgICAgIHNhd0ludmFsaWRDaGFyID0gdHJ1ZTsKKyAgICAgICAgaWYgKHJlc3VsdExl bmd0aCA+IDApIHsKKyAgICAgICAgICAgIGludCBvbGRTaXplID0gcmVzdWx0LnNpemUoKTsKKyAg ICAgICAgICAgIHJlc3VsdC5yZXNpemUob2xkU2l6ZSArIHJlc3VsdExlbmd0aCk7CiAKLSAgICAg ICAgICAgIGJyZWFrOwotICAgICAgICB9CisgICAgICAgICAgICBNdWx0aUJ5dGVUb1dpZGVDaGFy KGNvZGVQYWdlLCBmbGFncywgYnl0ZXMsIHRlc3RMZW5ndGgsIHJlc3VsdC5kYXRhKCkgKyBvbGRT aXplLCByZXN1bHRMZW5ndGgpOwogCi0gICAgICAgICpsZWZ0ID0gc291cmNlRW5kIC0gc291cmNl U3RhcnQ7Ci0gICAgICAgIHJlc3VsdC5yZXNpemUocmVzdWx0U3RhcnQgLSByZXN1bHQuZGF0YSgp KTsKLSAgICB9IGVsc2UgewotICAgICAgICBpbnQgdGVzdExlbmd0aCA9IGxlbmd0aDsKLSAgICAg ICAgaW50IHVudGVzdGVkTGVuZ3RoID0gbGVuZ3RoOwotICAgICAgICBmb3IgKDs7KSB7Ci0gICAg ICAgICAgICBpbnQgcmVzdWx0TGVuZ3RoID0gTXVsdGlCeXRlVG9XaWRlQ2hhcihjb2RlUGFnZSwg ZmxhZ3MsIGJ5dGVzLCB0ZXN0TGVuZ3RoLCAwLCAwKTsKLQotICAgICAgICAgICAgaWYgKHJlc3Vs dExlbmd0aCA+IDApIHsKLSAgICAgICAgICAgICAgICBpbnQgb2xkU2l6ZSA9IHJlc3VsdC5zaXpl KCk7Ci0gICAgICAgICAgICAgICAgcmVzdWx0LnJlc2l6ZShvbGRTaXplICsgcmVzdWx0TGVuZ3Ro KTsKLQotICAgICAgICAgICAgICAgIE11bHRpQnl0ZVRvV2lkZUNoYXIoY29kZVBhZ2UsIGZsYWdz LCBieXRlcywgdGVzdExlbmd0aCwgcmVzdWx0LmRhdGEoKSArIG9sZFNpemUsIHJlc3VsdExlbmd0 aCk7Ci0KLSAgICAgICAgICAgICAgICBpZiAodGVzdExlbmd0aCA9PSB1bnRlc3RlZExlbmd0aCkg ewotICAgICAgICAgICAgICAgICAgICAqbGVmdCA9IGxlbmd0aCAtIHRlc3RMZW5ndGg7Ci0gICAg ICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAg ICB1bnRlc3RlZExlbmd0aCAtPSB0ZXN0TGVuZ3RoOwotICAgICAgICAgICAgICAgIGxlbmd0aCAt PSB0ZXN0TGVuZ3RoOwotICAgICAgICAgICAgICAgIGJ5dGVzICs9IHRlc3RMZW5ndGg7Ci0gICAg ICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAgIHVudGVzdGVkTGVuZ3RoID0gdGVzdExl bmd0aCAtIDE7Ci0gICAgICAgICAgICAgICAgaWYgKCF1bnRlc3RlZExlbmd0aCkgewotICAgICAg ICAgICAgICAgICAgICAqbGVmdCA9IGxlbmd0aDsKLSAgICAgICAgICAgICAgICAgICAgYnJlYWs7 Ci0gICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgaWYgKHRlc3RMZW5ndGggPT0gdW50ZXN0 ZWRMZW5ndGgpIHsKKyAgICAgICAgICAgICAgICAqbGVmdCA9IGxlbmd0aCAtIHRlc3RMZW5ndGg7 CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICB9CisgICAgICAgICAgICB1bnRl c3RlZExlbmd0aCAtPSB0ZXN0TGVuZ3RoOworICAgICAgICAgICAgbGVuZ3RoIC09IHRlc3RMZW5n dGg7CisgICAgICAgICAgICBieXRlcyArPSB0ZXN0TGVuZ3RoOworICAgICAgICB9IGVsc2Ugewor ICAgICAgICAgICAgdW50ZXN0ZWRMZW5ndGggPSB0ZXN0TGVuZ3RoIC0gMTsKKyAgICAgICAgICAg IGlmICghdW50ZXN0ZWRMZW5ndGgpIHsKKyAgICAgICAgICAgICAgICAqbGVmdCA9IGxlbmd0aDsK KyAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIHRlc3RM ZW5ndGggPSAodW50ZXN0ZWRMZW5ndGggKyAxKSAvIDI7CiAgICAgICAgIH0KKyAgICAgICAgdGVz dExlbmd0aCA9ICh1bnRlc3RlZExlbmd0aCArIDEpIC8gMjsKICAgICB9CiB9CiAKQEAgLTMyMiwx MiArMjQ0LDExIEBAIFN0cmluZyBUZXh0Q29kZWNXaW5DRTo6ZGVjb2RlKGNvbnN0IGNoYXIqIGJ5 dGVzLCBzaXplX3QgbGVuZ3RoLCBib29sIGZsdXNoLCBib29sCiAgICAgc2l6ZV90IGxlZnQ7CiAg ICAgVmVjdG9yPFVDaGFyLCA4MTkyPiByZXN1bHQ7CiAgICAgZm9yICg7OykgewotICAgICAgICBi b29sIHNhd0ludmFsaWRDaGFyID0gZmFsc2U7Ci0gICAgICAgIFdlYkNvcmU6OmRlY29kZShyZXN1 bHQsIG1fY29kZVBhZ2UsIGJ5dGVzLCBsZW5ndGgsICZsZWZ0LCBtX2RlY29kZUJ1ZmZlci5pc0Vt cHR5KCksIHNhd0ludmFsaWRDaGFyKTsKKyAgICAgICAgZGVjb2RlSW50ZXJuYWwocmVzdWx0LCBt X2NvZGVQYWdlLCBieXRlcywgbGVuZ3RoLCAmbGVmdCk7CiAgICAgICAgIGlmICghbGVmdCkKICAg ICAgICAgICAgIGJyZWFrOwogCi0gICAgICAgIGlmICghc2F3SW52YWxpZENoYXIgJiYgIWZsdXNo ICYmIGxlZnQgPCAxNikKKyAgICAgICAgaWYgKCFmbHVzaCAmJiBsZWZ0IDwgMTYpCiAgICAgICAg ICAgICBicmVhazsKIAogICAgICAgICByZXN1bHQuYXBwZW5kKEwnPycpOwpAQCAtMzU5LDkgKzI4 MCw3IEBAIENTdHJpbmcgVGV4dENvZGVjV2luQ0U6OmVuY29kZShjb25zdCBVQ2hhciogY2hhcmFj dGVycywgc2l6ZV90IGxlbmd0aCwgVW5lbmNvZGFiCiAgICAgaWYgKCFjaGFyYWN0ZXJzIHx8ICFs ZW5ndGgpCiAgICAgICAgIHJldHVybiBDU3RyaW5nKCk7CiAKLSAgICBEV09SRCBmbGFncyA9IG1f Y29kZVBhZ2UgPT0gQ1BfVVRGOCA/IDAgOiBXQ19DT01QT1NJVEVDSEVDSzsKLQotICAgIGludCBy ZXN1bHRMZW5ndGggPSBXaWRlQ2hhclRvTXVsdGlCeXRlKG1fY29kZVBhZ2UsIGZsYWdzLCBjaGFy YWN0ZXJzLCBsZW5ndGgsIDAsIDAsIDAsIDApOworICAgIGludCByZXN1bHRMZW5ndGggPSBXaWRl Q2hhclRvTXVsdGlCeXRlKG1fY29kZVBhZ2UsIFdDX0NPTVBPU0lURUNIRUNLLCBjaGFyYWN0ZXJz LCBsZW5ndGgsIDAsIDAsIDAsIDApOwogCiAgICAgLy8gRklYTUU6IFdlIG5lZWQgdG8gaW1wbGVt ZW50IFVuZW5jb2RhYmxlSGFuZGxpbmc6IFF1ZXN0aW9uTWFya3NGb3JVbmVuY29kYWJsZXMsIEVu dGl0aWVzRm9yVW5lbmNvZGFibGVzLCBhbmQgVVJMRW5jb2RlZEVudGl0aWVzRm9yVW5lbmNvZGFi bGVzLgogCkBAIC0zNzEsNyArMjkwLDcgQEAgQ1N0cmluZyBUZXh0Q29kZWNXaW5DRTo6ZW5jb2Rl KGNvbnN0IFVDaGFyKiBjaGFyYWN0ZXJzLCBzaXplX3QgbGVuZ3RoLCBVbmVuY29kYWIKICAgICBj aGFyKiBjaGFyYWN0ZXJCdWZmZXI7CiAgICAgQ1N0cmluZyByZXN1bHQgPSBDU3RyaW5nOjpuZXdV bmluaXRpYWxpemVkKHJlc3VsdExlbmd0aCwgY2hhcmFjdGVyQnVmZmVyKTsKIAotICAgIFdpZGVD aGFyVG9NdWx0aUJ5dGUobV9jb2RlUGFnZSwgZmxhZ3MsIGNoYXJhY3RlcnMsIGxlbmd0aCwgY2hh cmFjdGVyQnVmZmVyLCByZXN1bHRMZW5ndGgsIDAsIDApOworICAgIFdpZGVDaGFyVG9NdWx0aUJ5 dGUobV9jb2RlUGFnZSwgV0NfQ09NUE9TSVRFQ0hFQ0ssIGNoYXJhY3RlcnMsIGxlbmd0aCwgY2hh cmFjdGVyQnVmZmVyLCByZXN1bHRMZW5ndGgsIDAsIDApOwogCiAgICAgcmV0dXJuIHJlc3VsdDsK IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvd2luY2UvVGV4dENv ZGVjV2luQ0UuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvd2luY2UvVGV4dENvZGVj V2luQ0UuaAppbmRleCA4ZDMzMmE2OGQyNjc4YmIyNWY4ODEyZThiNmEyMTE0NmY5YWEwZmRiLi41 MDBhOGNkZDkzNWIwZTBmNjMwMmY0NDgwOTE2MmU2NGI1ZWQ5YzNiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L3dpbmNlL1RleHRDb2RlY1dpbkNFLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC93aW5jZS9UZXh0Q29kZWNXaW5DRS5oCkBAIC0zOSw5 ICszOSw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogY2xhc3MgVGV4dENvZGVjV2luQ0UgOiBw dWJsaWMgVGV4dENvZGVjIHsKIHB1YmxpYzoKLSAgICBzdGF0aWMgdm9pZCByZWdpc3RlckJhc2VF bmNvZGluZ05hbWVzKEVuY29kaW5nTmFtZVJlZ2lzdHJhcik7Ci0gICAgc3RhdGljIHZvaWQgcmVn aXN0ZXJCYXNlQ29kZWNzKFRleHRDb2RlY1JlZ2lzdHJhcik7Ci0KICAgICBzdGF0aWMgdm9pZCBy ZWdpc3RlckV4dGVuZGVkRW5jb2RpbmdOYW1lcyhFbmNvZGluZ05hbWVSZWdpc3RyYXIpOwogICAg IHN0YXRpYyB2b2lkIHJlZ2lzdGVyRXh0ZW5kZWRDb2RlY3MoVGV4dENvZGVjUmVnaXN0cmFyKTsK IAo=