99224 2012-10-12 17:56:40 -0700 StringImpl::findIgnoringCase() and reverseFindIgnoringCase() don't optimally handle a mix of 8 and 16 bit strings 2012-10-17 15:16:21 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 msaboff msaboff benjamin dglazkov webkit.review.bot oldest_to_newest 741357 0 msaboff 2012-10-12 17:56:40 -0700 findIgnoringCase() just uses characters() to access string data, thus up converting 8 bit strings. reverseFindIgnoringCase() handles the case where both strings are the same bites. Both of these methods should handle all combinations of 8 and 16 bit arguments. 741363 1 168522 msaboff 2012-10-12 18:06:26 -0700 Created attachment 168522 Patch 741394 2 168522 webkit.review.bot 2012-10-12 20:21:30 -0700 Comment on attachment 168522 Patch Attachment 168522 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/14294109 New failing tests: fast/encoding/parser-tests-100.html fast/encoding/parser-tests-80.html fast/encoding/parser-tests-90.html http/tests/xmlhttprequest/request-encoding2.html 741395 3 168522 buildbot 2012-10-12 20:42:27 -0700 Comment on attachment 168522 Patch Attachment 168522 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/14294111 New failing tests: fast/encoding/parser-tests-100.html fast/encoding/parser-tests-80.html fast/encoding/parser-tests-90.html http/tests/xmlhttprequest/request-encoding2.html 741407 4 168538 msaboff 2012-10-12 21:38:43 -0700 Created attachment 168538 Patch with fix test failures Wasn't passing index to findIgnoringCaseInner(). 744644 5 168538 ggaren 2012-10-17 14:49:00 -0700 Comment on attachment 168538 Patch with fix test failures r=me 744691 6 168538 webkit.review.bot 2012-10-17 15:16:16 -0700 Comment on attachment 168538 Patch with fix test failures Clearing flags on attachment: 168538 Committed r131655: <http://trac.webkit.org/changeset/131655> 744692 7 webkit.review.bot 2012-10-17 15:16:21 -0700 All reviewed patches have been landed. Closing bug. 168522 2012-10-12 18:06:26 -0700 2012-10-12 21:38:43 -0700 Patch 99224.patch text/plain 6335 msaboff SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxMzEyNDMpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDEyLTEwLTEyICBNaWNoYWVsIFNhYm9mZiAgPG1z YWJvZmZAYXBwbGUuY29tPgorCisgICAgICAgIFN0cmluZ0ltcGw6OmZpbmRJZ25vcmluZ0Nhc2Uo KSBhbmQgcmV2ZXJzZUZpbmRJZ25vcmluZ0Nhc2UoKSBkb24ndCBvcHRpbWFsbHkgaGFuZGxlIGEg bWl4IG9mIDggYW5kIDE2IGJpdCBzdHJpbmdzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD05OTIyNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEFkZGVkIGhlbHBlciB0ZW1wbGF0ZWQgZnVuY3Rpb25zIGFuZCBh bGwgZm91ciBjb21iaW5hdGlvbnMgc2ltaWxhciB0byBmaW5kKCkgYW5kIHJldmVyc2VGaW5kKCku CisKKyAgICAgICAgKFdURjo6ZmluZElnbm9yaW5nQ2FzZUlubmVyKToKKyAgICAgICAgKFdURjo6 U3RyaW5nSW1wbDo6ZmluZElnbm9yaW5nQ2FzZSk6CisgICAgICAgIChXVEY6OnJldmVyc2VGaW5k SWdub3JpbmdDYXNlSW5uZXIpOgorICAgICAgICAoV1RGOjpTdHJpbmdJbXBsOjpyZXZlcnNlRmlu ZElnbm9yaW5nQ2FzZSk6CisKIDIwMTItMTAtMTIgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmll dy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxMzEy MjQuCkluZGV4OiBTb3VyY2UvV1RGL3d0Zi90ZXh0L1N0cmluZ0ltcGwuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XVEYvd3RmL3RleHQvU3RyaW5nSW1wbC5jcHAJKHJldmlzaW9uIDEzMTIwMikK KysrIFNvdXJjZS9XVEYvd3RmL3RleHQvU3RyaW5nSW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTEwNTMsNiArMTA1MywyMiBAQCBzaXplX3QgU3RyaW5nSW1wbDo6ZmluZChTdHJpbmdJbXBsKiBt YXRjCiAgICAgcmV0dXJuIGZpbmRJbm5lcihjaGFyYWN0ZXJzMTYoKSArIGluZGV4LCBtYXRjaFN0 cmluZy0+Y2hhcmFjdGVyczE2KCksIGluZGV4LCBzZWFyY2hMZW5ndGgsIG1hdGNoTGVuZ3RoKTsK IH0KIAordGVtcGxhdGUgPHR5cGVuYW1lIFNlYXJjaENoYXJhY3RlclR5cGUsIHR5cGVuYW1lIE1h dGNoQ2hhcmFjdGVyVHlwZT4KK0FMV0FZU19JTkxJTkUgc3RhdGljIHNpemVfdCBmaW5kSWdub3Jp bmdDYXNlSW5uZXIoY29uc3QgU2VhcmNoQ2hhcmFjdGVyVHlwZSogc2VhcmNoQ2hhcmFjdGVycywg Y29uc3QgTWF0Y2hDaGFyYWN0ZXJUeXBlKiBtYXRjaENoYXJhY3RlcnMsIHVuc2lnbmVkIGluZGV4 LCB1bnNpZ25lZCBzZWFyY2hMZW5ndGgsIHVuc2lnbmVkIG1hdGNoTGVuZ3RoKQoreworICAgIC8v IGRlbHRhIGlzIHRoZSBudW1iZXIgb2YgYWRkaXRpb25hbCB0aW1lcyB0byB0ZXN0OyBkZWx0YSA9 PSAwIG1lYW5zIHRlc3Qgb25seSBvbmNlLgorICAgIHVuc2lnbmVkIGRlbHRhID0gc2VhcmNoTGVu Z3RoIC0gbWF0Y2hMZW5ndGg7CisKKyAgICB1bnNpZ25lZCBpID0gMDsKKyAgICAvLyBrZWVwIGxv b3BpbmcgdW50aWwgd2UgbWF0Y2gKKyAgICB3aGlsZSAoIWVxdWFsSWdub3JpbmdDYXNlKHNlYXJj aENoYXJhY3RlcnMgKyBpLCBtYXRjaENoYXJhY3RlcnMsIG1hdGNoTGVuZ3RoKSkgeworICAgICAg ICBpZiAoaSA9PSBkZWx0YSkKKyAgICAgICAgICAgIHJldHVybiBub3RGb3VuZDsKKyAgICAgICAg KytpOworICAgIH0KKyAgICByZXR1cm4gaW5kZXggKyBpOworfQorCiBzaXplX3QgU3RyaW5nSW1w bDo6ZmluZElnbm9yaW5nQ2FzZShTdHJpbmdJbXBsKiBtYXRjaFN0cmluZywgdW5zaWduZWQgaW5k ZXgpCiB7CiAgICAgLy8gQ2hlY2sgZm9yIG51bGwgb3IgZW1wdHkgc3RyaW5nIHRvIG1hdGNoIGFn YWluc3QKQEAgLTEwNjgsMjAgKzEwODQsMTcgQEAgc2l6ZV90IFN0cmluZ0ltcGw6OmZpbmRJZ25v cmluZ0Nhc2UoU3RyaQogICAgIHVuc2lnbmVkIHNlYXJjaExlbmd0aCA9IGxlbmd0aCgpIC0gaW5k ZXg7CiAgICAgaWYgKG1hdGNoTGVuZ3RoID4gc2VhcmNoTGVuZ3RoKQogICAgICAgICByZXR1cm4g bm90Rm91bmQ7Ci0gICAgLy8gZGVsdGEgaXMgdGhlIG51bWJlciBvZiBhZGRpdGlvbmFsIHRpbWVz IHRvIHRlc3Q7IGRlbHRhID09IDAgbWVhbnMgdGVzdCBvbmx5IG9uY2UuCi0gICAgdW5zaWduZWQg ZGVsdGEgPSBzZWFyY2hMZW5ndGggLSBtYXRjaExlbmd0aDsKIAotICAgIGNvbnN0IFVDaGFyKiBz ZWFyY2hDaGFyYWN0ZXJzID0gY2hhcmFjdGVycygpICsgaW5kZXg7Ci0gICAgY29uc3QgVUNoYXIq IG1hdGNoQ2hhcmFjdGVycyA9IG1hdGNoU3RyaW5nLT5jaGFyYWN0ZXJzKCk7Ci0KLSAgICB1bnNp Z25lZCBpID0gMDsKLSAgICAvLyBrZWVwIGxvb3BpbmcgdW50aWwgd2UgbWF0Y2gKLSAgICB3aGls ZSAoIWVxdWFsSWdub3JpbmdDYXNlKHNlYXJjaENoYXJhY3RlcnMgKyBpLCBtYXRjaENoYXJhY3Rl cnMsIG1hdGNoTGVuZ3RoKSkgewotICAgICAgICBpZiAoaSA9PSBkZWx0YSkKLSAgICAgICAgICAg IHJldHVybiBub3RGb3VuZDsKLSAgICAgICAgKytpOworICAgIGlmIChpczhCaXQoKSkgeworICAg ICAgICBpZiAobWF0Y2hTdHJpbmctPmlzOEJpdCgpKQorICAgICAgICAgICAgcmV0dXJuIGZpbmRJ Z25vcmluZ0Nhc2VJbm5lcihjaGFyYWN0ZXJzOCgpLCBtYXRjaFN0cmluZy0+Y2hhcmFjdGVyczgo KSwgMCwgbGVuZ3RoKCksIG1hdGNoTGVuZ3RoKTsKKyAgICAgICAgcmV0dXJuIGZpbmRJZ25vcmlu Z0Nhc2VJbm5lcihjaGFyYWN0ZXJzOCgpLCBtYXRjaFN0cmluZy0+Y2hhcmFjdGVyczE2KCksIDAs IGxlbmd0aCgpLCBtYXRjaExlbmd0aCk7CiAgICAgfQotICAgIHJldHVybiBpbmRleCArIGk7CisK KyAgICBpZiAobWF0Y2hTdHJpbmctPmlzOEJpdCgpKQorICAgICAgICByZXR1cm4gZmluZElnbm9y aW5nQ2FzZUlubmVyKGNoYXJhY3RlcnMxNigpLCBtYXRjaFN0cmluZy0+Y2hhcmFjdGVyczgoKSwg MCwgbGVuZ3RoKCksIG1hdGNoTGVuZ3RoKTsKKworICAgIHJldHVybiBmaW5kSWdub3JpbmdDYXNl SW5uZXIoY2hhcmFjdGVyczE2KCksIG1hdGNoU3RyaW5nLT5jaGFyYWN0ZXJzMTYoKSwgMCwgbGVu Z3RoKCksIG1hdGNoTGVuZ3RoKTsKIH0KIAogc2l6ZV90IFN0cmluZ0ltcGw6OnJldmVyc2VGaW5k KFVDaGFyIGMsIHVuc2lnbmVkIGluZGV4KQpAQCAtMTE1MSw0NCArMTE2NCw0NSBAQCBzaXplX3Qg U3RyaW5nSW1wbDo6cmV2ZXJzZUZpbmQoU3RyaW5nSW1wCiAgICAgcmV0dXJuIHJldmVyc2VGaW5k SW5uZXIoY2hhcmFjdGVyczE2KCksIG1hdGNoU3RyaW5nLT5jaGFyYWN0ZXJzMTYoKSwgaW5kZXgs IG91ckxlbmd0aCwgbWF0Y2hMZW5ndGgpOwogfQogCit0ZW1wbGF0ZSA8dHlwZW5hbWUgU2VhcmNo Q2hhcmFjdGVyVHlwZSwgdHlwZW5hbWUgTWF0Y2hDaGFyYWN0ZXJUeXBlPgorQUxXQVlTX0lOTElO RSBzdGF0aWMgc2l6ZV90IHJldmVyc2VGaW5kSWdub3JpbmdDYXNlSW5uZXIoY29uc3QgU2VhcmNo Q2hhcmFjdGVyVHlwZSogc2VhcmNoQ2hhcmFjdGVycywgY29uc3QgTWF0Y2hDaGFyYWN0ZXJUeXBl KiBtYXRjaENoYXJhY3RlcnMsIHVuc2lnbmVkIGluZGV4LCB1bnNpZ25lZCBsZW5ndGgsIHVuc2ln bmVkIG1hdGNoTGVuZ3RoKQoreworICAgIC8vIGRlbHRhIGlzIHRoZSBudW1iZXIgb2YgYWRkaXRp b25hbCB0aW1lcyB0byB0ZXN0OyBkZWx0YSA9PSAwIG1lYW5zIHRlc3Qgb25seSBvbmNlLgorICAg IHVuc2lnbmVkIGRlbHRhID0gbWluKGluZGV4LCBsZW5ndGggLSBtYXRjaExlbmd0aCk7CisKKyAg ICAvLyBrZWVwIGxvb3BpbmcgdW50aWwgd2UgbWF0Y2gKKyAgICB3aGlsZSAoIWVxdWFsSWdub3Jp bmdDYXNlKHNlYXJjaENoYXJhY3RlcnMgKyBkZWx0YSwgbWF0Y2hDaGFyYWN0ZXJzLCBtYXRjaExl bmd0aCkpIHsKKyAgICAgICAgaWYgKCFkZWx0YSkKKyAgICAgICAgICAgIHJldHVybiBub3RGb3Vu ZDsKKyAgICAgICAgZGVsdGEtLTsKKyAgICB9CisgICAgcmV0dXJuIGRlbHRhOworfQorCiBzaXpl X3QgU3RyaW5nSW1wbDo6cmV2ZXJzZUZpbmRJZ25vcmluZ0Nhc2UoU3RyaW5nSW1wbCogbWF0Y2hT dHJpbmcsIHVuc2lnbmVkIGluZGV4KQogewogICAgIC8vIENoZWNrIGZvciBudWxsIG9yIGVtcHR5 IHN0cmluZyB0byBtYXRjaCBhZ2FpbnN0CiAgICAgaWYgKCFtYXRjaFN0cmluZykKICAgICAgICAg cmV0dXJuIG5vdEZvdW5kOwogICAgIHVuc2lnbmVkIG1hdGNoTGVuZ3RoID0gbWF0Y2hTdHJpbmct Pmxlbmd0aCgpOworICAgIHVuc2lnbmVkIG91ckxlbmd0aCA9IGxlbmd0aCgpOwogICAgIGlmICgh bWF0Y2hMZW5ndGgpCi0gICAgICAgIHJldHVybiBtaW4oaW5kZXgsIGxlbmd0aCgpKTsKKyAgICAg ICAgcmV0dXJuIG1pbihpbmRleCwgb3VyTGVuZ3RoKTsKIAogICAgIC8vIENoZWNrIGluZGV4ICYg bWF0Y2hMZW5ndGggYXJlIGluIHJhbmdlLgotICAgIGlmIChtYXRjaExlbmd0aCA+IGxlbmd0aCgp KQorICAgIGlmIChtYXRjaExlbmd0aCA+IG91ckxlbmd0aCkKICAgICAgICAgcmV0dXJuIG5vdEZv dW5kOwotICAgIC8vIGRlbHRhIGlzIHRoZSBudW1iZXIgb2YgYWRkaXRpb25hbCB0aW1lcyB0byB0 ZXN0OyBkZWx0YSA9PSAwIG1lYW5zIHRlc3Qgb25seSBvbmNlLgotICAgIHVuc2lnbmVkIGRlbHRh ID0gbWluKGluZGV4LCBsZW5ndGgoKSAtIG1hdGNoTGVuZ3RoKTsKIAotICAgIGlmIChpczhCaXQo KSAmJiBtYXRjaFN0cmluZy0+aXM4Qml0KCkpIHsKLSAgICAgICAgY29uc3QgTENoYXIgKnNlYXJj aENoYXJhY3RlcnMgPSBjaGFyYWN0ZXJzOCgpOwotICAgICAgICBjb25zdCBMQ2hhciAqbWF0Y2hD aGFyYWN0ZXJzID0gbWF0Y2hTdHJpbmctPmNoYXJhY3RlcnM4KCk7Ci0KLSAgICAgICAgLy8ga2Vl cCBsb29waW5nIHVudGlsIHdlIG1hdGNoCi0gICAgICAgIHdoaWxlICghZXF1YWxJZ25vcmluZ0Nh c2Uoc2VhcmNoQ2hhcmFjdGVycyArIGRlbHRhLCBtYXRjaENoYXJhY3RlcnMsIG1hdGNoTGVuZ3Ro KSkgewotICAgICAgICAgICAgaWYgKCFkZWx0YSkKLSAgICAgICAgICAgICAgICByZXR1cm4gbm90 Rm91bmQ7Ci0gICAgICAgICAgICBkZWx0YS0tOwotICAgICAgICB9Ci0gICAgICAgIHJldHVybiBk ZWx0YTsKLSAgICB9Ci0KLSAgICBjb25zdCBVQ2hhciAqc2VhcmNoQ2hhcmFjdGVycyA9IGNoYXJh Y3RlcnMoKTsKLSAgICBjb25zdCBVQ2hhciAqbWF0Y2hDaGFyYWN0ZXJzID0gbWF0Y2hTdHJpbmct PmNoYXJhY3RlcnMoKTsKLQotICAgIC8vIGtlZXAgbG9vcGluZyB1bnRpbCB3ZSBtYXRjaAotICAg IHdoaWxlICghZXF1YWxJZ25vcmluZ0Nhc2Uoc2VhcmNoQ2hhcmFjdGVycyArIGRlbHRhLCBtYXRj aENoYXJhY3RlcnMsIG1hdGNoTGVuZ3RoKSkgewotICAgICAgICBpZiAoIWRlbHRhKQotICAgICAg ICAgICAgcmV0dXJuIG5vdEZvdW5kOwotICAgICAgICBkZWx0YS0tOworICAgIGlmIChpczhCaXQo KSkgeworICAgICAgICBpZiAobWF0Y2hTdHJpbmctPmlzOEJpdCgpKQorICAgICAgICAgICAgcmV0 dXJuIHJldmVyc2VGaW5kSWdub3JpbmdDYXNlSW5uZXIoY2hhcmFjdGVyczgoKSwgbWF0Y2hTdHJp bmctPmNoYXJhY3RlcnM4KCksIGluZGV4LCBvdXJMZW5ndGgsIG1hdGNoTGVuZ3RoKTsKKyAgICAg ICAgcmV0dXJuIHJldmVyc2VGaW5kSWdub3JpbmdDYXNlSW5uZXIoY2hhcmFjdGVyczgoKSwgbWF0 Y2hTdHJpbmctPmNoYXJhY3RlcnMxNigpLCBpbmRleCwgb3VyTGVuZ3RoLCBtYXRjaExlbmd0aCk7 CiAgICAgfQotICAgIHJldHVybiBkZWx0YTsKKworICAgIGlmIChtYXRjaFN0cmluZy0+aXM4Qml0 KCkpCisgICAgICAgIHJldHVybiByZXZlcnNlRmluZElnbm9yaW5nQ2FzZUlubmVyKGNoYXJhY3Rl cnMxNigpLCBtYXRjaFN0cmluZy0+Y2hhcmFjdGVyczgoKSwgaW5kZXgsIG91ckxlbmd0aCwgbWF0 Y2hMZW5ndGgpOworCisgICAgcmV0dXJuIHJldmVyc2VGaW5kSWdub3JpbmdDYXNlSW5uZXIoY2hh cmFjdGVyczE2KCksIG1hdGNoU3RyaW5nLT5jaGFyYWN0ZXJzMTYoKSwgaW5kZXgsIG91ckxlbmd0 aCwgbWF0Y2hMZW5ndGgpOwogfQogCiBBTFdBWVNfSU5MSU5FIHN0YXRpYyBib29sIGVxdWFsSW5u ZXIoY29uc3QgU3RyaW5nSW1wbCogc3RyaW5nSW1wbCwgdW5zaWduZWQgc3RhcnRPZmZzZXQsIGNv bnN0IGNoYXIqIG1hdGNoU3RyaW5nLCB1bnNpZ25lZCBtYXRjaExlbmd0aCwgYm9vbCBjYXNlU2Vu c2l0aXZlKQo= 168538 2012-10-12 21:38:43 -0700 2012-10-17 15:16:16 -0700 Patch with fix test failures 99224-2.patch text/plain 6379 msaboff SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxMzEyNDgpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDEyLTEwLTEyICBNaWNoYWVsIFNhYm9mZiAgPG1z YWJvZmZAYXBwbGUuY29tPgorCisgICAgICAgIFN0cmluZ0ltcGw6OmZpbmRJZ25vcmluZ0Nhc2Uo KSBhbmQgcmV2ZXJzZUZpbmRJZ25vcmluZ0Nhc2UoKSBkb24ndCBvcHRpbWFsbHkgaGFuZGxlIGEg bWl4IG9mIDggYW5kIDE2IGJpdCBzdHJpbmdzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD05OTIyNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEFkZGVkIGhlbHBlciB0ZW1wbGF0ZWQgZnVuY3Rpb25zIGFuZCBh bGwgZm91ciBjb21iaW5hdGlvbnMgc2ltaWxhciB0byBmaW5kKCkgYW5kIHJldmVyc2VGaW5kKCku CisKKyAgICAgICAgKFdURjo6ZmluZElnbm9yaW5nQ2FzZUlubmVyKToKKyAgICAgICAgKFdURjo6 U3RyaW5nSW1wbDo6ZmluZElnbm9yaW5nQ2FzZSk6CisgICAgICAgIChXVEY6OnJldmVyc2VGaW5k SWdub3JpbmdDYXNlSW5uZXIpOgorICAgICAgICAoV1RGOjpTdHJpbmdJbXBsOjpyZXZlcnNlRmlu ZElnbm9yaW5nQ2FzZSk6CisKIDIwMTItMTAtMTIgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmll dy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxMzEy MjQuCkluZGV4OiBTb3VyY2UvV1RGL3d0Zi90ZXh0L1N0cmluZ0ltcGwuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XVEYvd3RmL3RleHQvU3RyaW5nSW1wbC5jcHAJKHJldmlzaW9uIDEzMTIwMikK KysrIFNvdXJjZS9XVEYvd3RmL3RleHQvU3RyaW5nSW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTEwNTMsNiArMTA1MywyMiBAQCBzaXplX3QgU3RyaW5nSW1wbDo6ZmluZChTdHJpbmdJbXBsKiBt YXRjCiAgICAgcmV0dXJuIGZpbmRJbm5lcihjaGFyYWN0ZXJzMTYoKSArIGluZGV4LCBtYXRjaFN0 cmluZy0+Y2hhcmFjdGVyczE2KCksIGluZGV4LCBzZWFyY2hMZW5ndGgsIG1hdGNoTGVuZ3RoKTsK IH0KIAordGVtcGxhdGUgPHR5cGVuYW1lIFNlYXJjaENoYXJhY3RlclR5cGUsIHR5cGVuYW1lIE1h dGNoQ2hhcmFjdGVyVHlwZT4KK0FMV0FZU19JTkxJTkUgc3RhdGljIHNpemVfdCBmaW5kSWdub3Jp bmdDYXNlSW5uZXIoY29uc3QgU2VhcmNoQ2hhcmFjdGVyVHlwZSogc2VhcmNoQ2hhcmFjdGVycywg Y29uc3QgTWF0Y2hDaGFyYWN0ZXJUeXBlKiBtYXRjaENoYXJhY3RlcnMsIHVuc2lnbmVkIGluZGV4 LCB1bnNpZ25lZCBzZWFyY2hMZW5ndGgsIHVuc2lnbmVkIG1hdGNoTGVuZ3RoKQoreworICAgIC8v IGRlbHRhIGlzIHRoZSBudW1iZXIgb2YgYWRkaXRpb25hbCB0aW1lcyB0byB0ZXN0OyBkZWx0YSA9 PSAwIG1lYW5zIHRlc3Qgb25seSBvbmNlLgorICAgIHVuc2lnbmVkIGRlbHRhID0gc2VhcmNoTGVu Z3RoIC0gbWF0Y2hMZW5ndGg7CisKKyAgICB1bnNpZ25lZCBpID0gMDsKKyAgICAvLyBrZWVwIGxv b3BpbmcgdW50aWwgd2UgbWF0Y2gKKyAgICB3aGlsZSAoIWVxdWFsSWdub3JpbmdDYXNlKHNlYXJj aENoYXJhY3RlcnMgKyBpLCBtYXRjaENoYXJhY3RlcnMsIG1hdGNoTGVuZ3RoKSkgeworICAgICAg ICBpZiAoaSA9PSBkZWx0YSkKKyAgICAgICAgICAgIHJldHVybiBub3RGb3VuZDsKKyAgICAgICAg KytpOworICAgIH0KKyAgICByZXR1cm4gaW5kZXggKyBpOworfQorCiBzaXplX3QgU3RyaW5nSW1w bDo6ZmluZElnbm9yaW5nQ2FzZShTdHJpbmdJbXBsKiBtYXRjaFN0cmluZywgdW5zaWduZWQgaW5k ZXgpCiB7CiAgICAgLy8gQ2hlY2sgZm9yIG51bGwgb3IgZW1wdHkgc3RyaW5nIHRvIG1hdGNoIGFn YWluc3QKQEAgLTEwNjgsMjAgKzEwODQsMTcgQEAgc2l6ZV90IFN0cmluZ0ltcGw6OmZpbmRJZ25v cmluZ0Nhc2UoU3RyaQogICAgIHVuc2lnbmVkIHNlYXJjaExlbmd0aCA9IGxlbmd0aCgpIC0gaW5k ZXg7CiAgICAgaWYgKG1hdGNoTGVuZ3RoID4gc2VhcmNoTGVuZ3RoKQogICAgICAgICByZXR1cm4g bm90Rm91bmQ7Ci0gICAgLy8gZGVsdGEgaXMgdGhlIG51bWJlciBvZiBhZGRpdGlvbmFsIHRpbWVz IHRvIHRlc3Q7IGRlbHRhID09IDAgbWVhbnMgdGVzdCBvbmx5IG9uY2UuCi0gICAgdW5zaWduZWQg ZGVsdGEgPSBzZWFyY2hMZW5ndGggLSBtYXRjaExlbmd0aDsKLQotICAgIGNvbnN0IFVDaGFyKiBz ZWFyY2hDaGFyYWN0ZXJzID0gY2hhcmFjdGVycygpICsgaW5kZXg7Ci0gICAgY29uc3QgVUNoYXIq IG1hdGNoQ2hhcmFjdGVycyA9IG1hdGNoU3RyaW5nLT5jaGFyYWN0ZXJzKCk7CiAKLSAgICB1bnNp Z25lZCBpID0gMDsKLSAgICAvLyBrZWVwIGxvb3BpbmcgdW50aWwgd2UgbWF0Y2gKLSAgICB3aGls ZSAoIWVxdWFsSWdub3JpbmdDYXNlKHNlYXJjaENoYXJhY3RlcnMgKyBpLCBtYXRjaENoYXJhY3Rl cnMsIG1hdGNoTGVuZ3RoKSkgewotICAgICAgICBpZiAoaSA9PSBkZWx0YSkKLSAgICAgICAgICAg IHJldHVybiBub3RGb3VuZDsKLSAgICAgICAgKytpOworICAgIGlmIChpczhCaXQoKSkgeworICAg ICAgICBpZiAobWF0Y2hTdHJpbmctPmlzOEJpdCgpKQorICAgICAgICAgICAgcmV0dXJuIGZpbmRJ Z25vcmluZ0Nhc2VJbm5lcihjaGFyYWN0ZXJzOCgpICsgaW5kZXgsIG1hdGNoU3RyaW5nLT5jaGFy YWN0ZXJzOCgpLCBpbmRleCwgbGVuZ3RoKCksIG1hdGNoTGVuZ3RoKTsKKyAgICAgICAgcmV0dXJu IGZpbmRJZ25vcmluZ0Nhc2VJbm5lcihjaGFyYWN0ZXJzOCgpICsgaW5kZXgsIG1hdGNoU3RyaW5n LT5jaGFyYWN0ZXJzMTYoKSwgaW5kZXgsIGxlbmd0aCgpLCBtYXRjaExlbmd0aCk7CiAgICAgfQot ICAgIHJldHVybiBpbmRleCArIGk7CisKKyAgICBpZiAobWF0Y2hTdHJpbmctPmlzOEJpdCgpKQor ICAgICAgICByZXR1cm4gZmluZElnbm9yaW5nQ2FzZUlubmVyKGNoYXJhY3RlcnMxNigpICsgaW5k ZXgsIG1hdGNoU3RyaW5nLT5jaGFyYWN0ZXJzOCgpLCBpbmRleCwgbGVuZ3RoKCksIG1hdGNoTGVu Z3RoKTsKKworICAgIHJldHVybiBmaW5kSWdub3JpbmdDYXNlSW5uZXIoY2hhcmFjdGVyczE2KCkg KyBpbmRleCwgbWF0Y2hTdHJpbmctPmNoYXJhY3RlcnMxNigpLCBpbmRleCwgbGVuZ3RoKCksIG1h dGNoTGVuZ3RoKTsKIH0KIAogc2l6ZV90IFN0cmluZ0ltcGw6OnJldmVyc2VGaW5kKFVDaGFyIGMs IHVuc2lnbmVkIGluZGV4KQpAQCAtMTE1MSw0NCArMTE2NCw0NSBAQCBzaXplX3QgU3RyaW5nSW1w bDo6cmV2ZXJzZUZpbmQoU3RyaW5nSW1wCiAgICAgcmV0dXJuIHJldmVyc2VGaW5kSW5uZXIoY2hh cmFjdGVyczE2KCksIG1hdGNoU3RyaW5nLT5jaGFyYWN0ZXJzMTYoKSwgaW5kZXgsIG91ckxlbmd0 aCwgbWF0Y2hMZW5ndGgpOwogfQogCit0ZW1wbGF0ZSA8dHlwZW5hbWUgU2VhcmNoQ2hhcmFjdGVy VHlwZSwgdHlwZW5hbWUgTWF0Y2hDaGFyYWN0ZXJUeXBlPgorQUxXQVlTX0lOTElORSBzdGF0aWMg c2l6ZV90IHJldmVyc2VGaW5kSWdub3JpbmdDYXNlSW5uZXIoY29uc3QgU2VhcmNoQ2hhcmFjdGVy VHlwZSogc2VhcmNoQ2hhcmFjdGVycywgY29uc3QgTWF0Y2hDaGFyYWN0ZXJUeXBlKiBtYXRjaENo YXJhY3RlcnMsIHVuc2lnbmVkIGluZGV4LCB1bnNpZ25lZCBsZW5ndGgsIHVuc2lnbmVkIG1hdGNo TGVuZ3RoKQoreworICAgIC8vIGRlbHRhIGlzIHRoZSBudW1iZXIgb2YgYWRkaXRpb25hbCB0aW1l cyB0byB0ZXN0OyBkZWx0YSA9PSAwIG1lYW5zIHRlc3Qgb25seSBvbmNlLgorICAgIHVuc2lnbmVk IGRlbHRhID0gbWluKGluZGV4LCBsZW5ndGggLSBtYXRjaExlbmd0aCk7CisKKyAgICAvLyBrZWVw IGxvb3BpbmcgdW50aWwgd2UgbWF0Y2gKKyAgICB3aGlsZSAoIWVxdWFsSWdub3JpbmdDYXNlKHNl YXJjaENoYXJhY3RlcnMgKyBkZWx0YSwgbWF0Y2hDaGFyYWN0ZXJzLCBtYXRjaExlbmd0aCkpIHsK KyAgICAgICAgaWYgKCFkZWx0YSkKKyAgICAgICAgICAgIHJldHVybiBub3RGb3VuZDsKKyAgICAg ICAgZGVsdGEtLTsKKyAgICB9CisgICAgcmV0dXJuIGRlbHRhOworfQorCiBzaXplX3QgU3RyaW5n SW1wbDo6cmV2ZXJzZUZpbmRJZ25vcmluZ0Nhc2UoU3RyaW5nSW1wbCogbWF0Y2hTdHJpbmcsIHVu c2lnbmVkIGluZGV4KQogewogICAgIC8vIENoZWNrIGZvciBudWxsIG9yIGVtcHR5IHN0cmluZyB0 byBtYXRjaCBhZ2FpbnN0CiAgICAgaWYgKCFtYXRjaFN0cmluZykKICAgICAgICAgcmV0dXJuIG5v dEZvdW5kOwogICAgIHVuc2lnbmVkIG1hdGNoTGVuZ3RoID0gbWF0Y2hTdHJpbmctPmxlbmd0aCgp OworICAgIHVuc2lnbmVkIG91ckxlbmd0aCA9IGxlbmd0aCgpOwogICAgIGlmICghbWF0Y2hMZW5n dGgpCi0gICAgICAgIHJldHVybiBtaW4oaW5kZXgsIGxlbmd0aCgpKTsKKyAgICAgICAgcmV0dXJu IG1pbihpbmRleCwgb3VyTGVuZ3RoKTsKIAogICAgIC8vIENoZWNrIGluZGV4ICYgbWF0Y2hMZW5n dGggYXJlIGluIHJhbmdlLgotICAgIGlmIChtYXRjaExlbmd0aCA+IGxlbmd0aCgpKQorICAgIGlm IChtYXRjaExlbmd0aCA+IG91ckxlbmd0aCkKICAgICAgICAgcmV0dXJuIG5vdEZvdW5kOwotICAg IC8vIGRlbHRhIGlzIHRoZSBudW1iZXIgb2YgYWRkaXRpb25hbCB0aW1lcyB0byB0ZXN0OyBkZWx0 YSA9PSAwIG1lYW5zIHRlc3Qgb25seSBvbmNlLgotICAgIHVuc2lnbmVkIGRlbHRhID0gbWluKGlu ZGV4LCBsZW5ndGgoKSAtIG1hdGNoTGVuZ3RoKTsKLQotICAgIGlmIChpczhCaXQoKSAmJiBtYXRj aFN0cmluZy0+aXM4Qml0KCkpIHsKLSAgICAgICAgY29uc3QgTENoYXIgKnNlYXJjaENoYXJhY3Rl cnMgPSBjaGFyYWN0ZXJzOCgpOwotICAgICAgICBjb25zdCBMQ2hhciAqbWF0Y2hDaGFyYWN0ZXJz ID0gbWF0Y2hTdHJpbmctPmNoYXJhY3RlcnM4KCk7CiAKLSAgICAgICAgLy8ga2VlcCBsb29waW5n IHVudGlsIHdlIG1hdGNoCi0gICAgICAgIHdoaWxlICghZXF1YWxJZ25vcmluZ0Nhc2Uoc2VhcmNo Q2hhcmFjdGVycyArIGRlbHRhLCBtYXRjaENoYXJhY3RlcnMsIG1hdGNoTGVuZ3RoKSkgewotICAg ICAgICAgICAgaWYgKCFkZWx0YSkKLSAgICAgICAgICAgICAgICByZXR1cm4gbm90Rm91bmQ7Ci0g ICAgICAgICAgICBkZWx0YS0tOwotICAgICAgICB9Ci0gICAgICAgIHJldHVybiBkZWx0YTsKKyAg ICBpZiAoaXM4Qml0KCkpIHsKKyAgICAgICAgaWYgKG1hdGNoU3RyaW5nLT5pczhCaXQoKSkKKyAg ICAgICAgICAgIHJldHVybiByZXZlcnNlRmluZElnbm9yaW5nQ2FzZUlubmVyKGNoYXJhY3RlcnM4 KCksIG1hdGNoU3RyaW5nLT5jaGFyYWN0ZXJzOCgpLCBpbmRleCwgb3VyTGVuZ3RoLCBtYXRjaExl bmd0aCk7CisgICAgICAgIHJldHVybiByZXZlcnNlRmluZElnbm9yaW5nQ2FzZUlubmVyKGNoYXJh Y3RlcnM4KCksIG1hdGNoU3RyaW5nLT5jaGFyYWN0ZXJzMTYoKSwgaW5kZXgsIG91ckxlbmd0aCwg bWF0Y2hMZW5ndGgpOwogICAgIH0KIAotICAgIGNvbnN0IFVDaGFyICpzZWFyY2hDaGFyYWN0ZXJz ID0gY2hhcmFjdGVycygpOwotICAgIGNvbnN0IFVDaGFyICptYXRjaENoYXJhY3RlcnMgPSBtYXRj aFN0cmluZy0+Y2hhcmFjdGVycygpOworICAgIGlmIChtYXRjaFN0cmluZy0+aXM4Qml0KCkpCisg ICAgICAgIHJldHVybiByZXZlcnNlRmluZElnbm9yaW5nQ2FzZUlubmVyKGNoYXJhY3RlcnMxNigp LCBtYXRjaFN0cmluZy0+Y2hhcmFjdGVyczgoKSwgaW5kZXgsIG91ckxlbmd0aCwgbWF0Y2hMZW5n dGgpOwogCi0gICAgLy8ga2VlcCBsb29waW5nIHVudGlsIHdlIG1hdGNoCi0gICAgd2hpbGUgKCFl cXVhbElnbm9yaW5nQ2FzZShzZWFyY2hDaGFyYWN0ZXJzICsgZGVsdGEsIG1hdGNoQ2hhcmFjdGVy cywgbWF0Y2hMZW5ndGgpKSB7Ci0gICAgICAgIGlmICghZGVsdGEpCi0gICAgICAgICAgICByZXR1 cm4gbm90Rm91bmQ7Ci0gICAgICAgIGRlbHRhLS07Ci0gICAgfQotICAgIHJldHVybiBkZWx0YTsK KyAgICByZXR1cm4gcmV2ZXJzZUZpbmRJZ25vcmluZ0Nhc2VJbm5lcihjaGFyYWN0ZXJzMTYoKSwg bWF0Y2hTdHJpbmctPmNoYXJhY3RlcnMxNigpLCBpbmRleCwgb3VyTGVuZ3RoLCBtYXRjaExlbmd0 aCk7CiB9CiAKIEFMV0FZU19JTkxJTkUgc3RhdGljIGJvb2wgZXF1YWxJbm5lcihjb25zdCBTdHJp bmdJbXBsKiBzdHJpbmdJbXBsLCB1bnNpZ25lZCBzdGFydE9mZnNldCwgY29uc3QgY2hhciogbWF0 Y2hTdHJpbmcsIHVuc2lnbmVkIG1hdGNoTGVuZ3RoLCBib29sIGNhc2VTZW5zaXRpdmUpCg==