50123 2010-11-27 09:14:26 -0800 Add an overload to makeString for Vector<char> 2010-12-11 04:49:13 -0800 1 1 1 Unclassified WebKit Web Template Framework 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 paroga paroga commit-queue darin eric webkit.review.bot oldest_to_newest 314132 0 paroga 2010-11-27 09:14:26 -0800 see patch 314144 1 74963 paroga 2010-11-27 12:06:01 -0800 Created attachment 74963 Patch 319970 2 eric 2010-12-09 23:53:26 -0800 Darin or or Maciej are better reviewers here. 320236 3 74963 darin 2010-12-10 10:40:41 -0800 Comment on attachment 74963 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=74963&action=review > JavaScriptCore/wtf/text/StringConcatenate.h:124 > + unsigned length() { return m_buffer.size(); } > + > + void writeTo(UChar* destination) > + { > + for (unsigned i = 0; i < m_buffer.size(); ++i) > + destination[i] = m_buffer[i]; It’s better style to use size_t, which makes the type of vector’s size than unsigned, which can be narrower. This will widen characters to UChar based on the signed-ness of characters on a particular platform. If the characters are all ASCII, that’s OK, but if there are non-ASCII characters we probably want the characters treated as Latin-1 as we do in most other contexts. To accomplish that, we will need to cast the characters to unsigned char before letting them get widened to UChar. The same applies for const char*. We should either have an isASCII assertion or a typecast to unsigned char. 320634 4 76299 paroga 2010-12-11 03:29:00 -0800 Created attachment 76299 Patch for landing 320658 5 76299 webkit.review.bot 2010-12-11 04:49:07 -0800 Comment on attachment 76299 Patch for landing Clearing flags on attachment: 76299 Committed r73853: <http://trac.webkit.org/changeset/73853> 320659 6 webkit.review.bot 2010-12-11 04:49:13 -0800 All reviewed patches have been landed. Closing bug. 74963 2010-11-27 12:06:01 -0800 2010-12-11 03:28:50 -0800 Patch bug-50123.patch text/plain 6628 paroga ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCA3OWZkZWRmLi41YjFmZDk3IDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQg QEAKKzIwMTAtMTEtMjcgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGFuIG92 ZXJsb2FkIHRvIG1ha2VTdHJpbmcgZm9yIFZlY3RvcjxjaGFyPgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTAxMjMKKworICAgICAgICBBbHNvIGNsZWFu dXAgU3RyaW5nVHlwZUFkYXB0ZXIuCisKKyAgICAgICAgKiB3dGYvdGV4dC9TdHJpbmdDb25jYXRl bmF0ZS5oOgorCiAyMDEwLTExLTI0ICBQYXRyaWNrIEdhbnN0ZXJlciAgPHBhcm9nYUB3ZWJraXQu b3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IENzYWJhIE9zenRyb2dvbsOhYy4KZGlmZiAtLWdp dCBhL0phdmFTY3JpcHRDb3JlL3d0Zi90ZXh0L1N0cmluZ0NvbmNhdGVuYXRlLmggYi9KYXZhU2Ny aXB0Q29yZS93dGYvdGV4dC9TdHJpbmdDb25jYXRlbmF0ZS5oCmluZGV4IGI1NGExMDguLmE3OTlj ODcgMTAwNjQ0Ci0tLSBhL0phdmFTY3JpcHRDb3JlL3d0Zi90ZXh0L1N0cmluZ0NvbmNhdGVuYXRl LmgKKysrIGIvSmF2YVNjcmlwdENvcmUvd3RmL3RleHQvU3RyaW5nQ29uY2F0ZW5hdGUuaApAQCAt NjcsOCArNjcsOCBAQCBwcml2YXRlOgogdGVtcGxhdGU8PgogY2xhc3MgU3RyaW5nVHlwZUFkYXB0 ZXI8Y2hhcio+IHsKIHB1YmxpYzoKLSAgICBTdHJpbmdUeXBlQWRhcHRlcjxjaGFyKj4oY2hhciog YnVmZmVyKQotICAgICAgICA6IG1fYnVmZmVyKCh1bnNpZ25lZCBjaGFyKilidWZmZXIpCisgICAg U3RyaW5nVHlwZUFkYXB0ZXI8Y2hhcio+KGNvbnN0IGNoYXIqIGJ1ZmZlcikKKyAgICAgICAgOiBt X2J1ZmZlcihidWZmZXIpCiAgICAgICAgICwgbV9sZW5ndGgoc3RybGVuKGJ1ZmZlcikpCiAgICAg ewogICAgIH0KQEAgLTgyLDcgKzgyLDcgQEAgcHVibGljOgogICAgIH0KIAogcHJpdmF0ZToKLSAg ICBjb25zdCB1bnNpZ25lZCBjaGFyKiBtX2J1ZmZlcjsKKyAgICBjb25zdCBjaGFyKiBtX2J1ZmZl cjsKICAgICB1bnNpZ25lZCBtX2xlbmd0aDsKIH07CiAKQEAgLTkwLDcgKzkwLDcgQEAgdGVtcGxh dGU8PgogY2xhc3MgU3RyaW5nVHlwZUFkYXB0ZXI8Y29uc3QgY2hhcio+IHsKIHB1YmxpYzoKICAg ICBTdHJpbmdUeXBlQWRhcHRlcjxjb25zdCBjaGFyKj4oY29uc3QgY2hhciogYnVmZmVyKQotICAg ICAgICA6IG1fYnVmZmVyKCh1bnNpZ25lZCBjaGFyKilidWZmZXIpCisgICAgICAgIDogbV9idWZm ZXIoYnVmZmVyKQogICAgICAgICAsIG1fbGVuZ3RoKHN0cmxlbihidWZmZXIpKQogICAgIHsKICAg ICB9CkBAIC0xMDQsMzAgKzEwNCw1MCBAQCBwdWJsaWM6CiAgICAgfQogCiBwcml2YXRlOgotICAg IGNvbnN0IHVuc2lnbmVkIGNoYXIqIG1fYnVmZmVyOworICAgIGNvbnN0IGNoYXIqIG1fYnVmZmVy OwogICAgIHVuc2lnbmVkIG1fbGVuZ3RoOwogfTsKIAogdGVtcGxhdGU8PgorY2xhc3MgU3RyaW5n VHlwZUFkYXB0ZXI8VmVjdG9yPGNoYXI+ID4geworcHVibGljOgorICAgIFN0cmluZ1R5cGVBZGFw dGVyPFZlY3RvcjxjaGFyPiA+KGNvbnN0IFZlY3RvcjxjaGFyPiYgYnVmZmVyKQorICAgICAgICA6 IG1fYnVmZmVyKGJ1ZmZlcikKKyAgICB7CisgICAgfQorCisgICAgdW5zaWduZWQgbGVuZ3RoKCkg eyByZXR1cm4gbV9idWZmZXIuc2l6ZSgpOyB9CisKKyAgICB2b2lkIHdyaXRlVG8oVUNoYXIqIGRl c3RpbmF0aW9uKQorICAgIHsKKyAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG1fYnVm ZmVyLnNpemUoKTsgKytpKQorICAgICAgICAgICAgZGVzdGluYXRpb25baV0gPSBtX2J1ZmZlcltp XTsKKyAgICB9CisKK3ByaXZhdGU6CisgICAgY29uc3QgVmVjdG9yPGNoYXI+JiBtX2J1ZmZlcjsK K307CisKK3RlbXBsYXRlPD4KIGNsYXNzIFN0cmluZ1R5cGVBZGFwdGVyPFN0cmluZz4gewogcHVi bGljOgotICAgIFN0cmluZ1R5cGVBZGFwdGVyPFN0cmluZz4oU3RyaW5nJiBzdHJpbmcpCi0gICAg ICAgIDogbV9kYXRhKHN0cmluZy5jaGFyYWN0ZXJzKCkpCi0gICAgICAgICwgbV9sZW5ndGgoc3Ry aW5nLmxlbmd0aCgpKQorICAgIFN0cmluZ1R5cGVBZGFwdGVyPFN0cmluZz4oY29uc3QgU3RyaW5n JiBzdHJpbmcpCisgICAgICAgIDogbV9idWZmZXIoc3RyaW5nKQogICAgIHsKICAgICB9CiAKLSAg ICB1bnNpZ25lZCBsZW5ndGgoKSB7IHJldHVybiBtX2xlbmd0aDsgfQorICAgIHVuc2lnbmVkIGxl bmd0aCgpIHsgcmV0dXJuIG1fYnVmZmVyLmxlbmd0aCgpOyB9CiAKICAgICB2b2lkIHdyaXRlVG8o VUNoYXIqIGRlc3RpbmF0aW9uKQogICAgIHsKLSAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsg aSA8IG1fbGVuZ3RoOyArK2kpCi0gICAgICAgICAgICBkZXN0aW5hdGlvbltpXSA9IG1fZGF0YVtp XTsKKyAgICAgICAgY29uc3QgVUNoYXIqIGRhdGEgPSBtX2J1ZmZlci5jaGFyYWN0ZXJzKCk7Cisg ICAgICAgIHVuc2lnbmVkIGxlbmd0aCA9IG1fYnVmZmVyLmxlbmd0aCgpOworICAgICAgICBmb3Ig KHVuc2lnbmVkIGkgPSAwOyBpIDwgbGVuZ3RoOyArK2kpCisgICAgICAgICAgICBkZXN0aW5hdGlv bltpXSA9IGRhdGFbaV07CiAgICAgfQogCiBwcml2YXRlOgotICAgIGNvbnN0IFVDaGFyKiBtX2Rh dGE7Ci0gICAgdW5zaWduZWQgbV9sZW5ndGg7CisgICAgY29uc3QgU3RyaW5nJiBtX2J1ZmZlcjsK IH07CiAKIGlubGluZSB2b2lkIHN1bVdpdGhPdmVyZmxvdyh1bnNpZ25lZCYgdG90YWwsIHVuc2ln bmVkIGFkZGVuZCwgYm9vbCYgb3ZlcmZsb3cpCmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxv ZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDJjYmVmMDQuLjFiNWJjZmUgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTAtMTEtMjcgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGFuIG92 ZXJsb2FkIHRvIG1ha2VTdHJpbmcgZm9yIFZlY3RvcjxjaGFyPgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTAxMjMKKworICAgICAgICBUaGlzIGFsc28g Y29udGFpbnMgYSBzZWdmYXVsdCBmaXggZm9yIEltYWdlQnVmZmVyOjp0b0RhdGFVUkwgb2YgdGhl IEhhaWt1IHBvcnQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jZy9JbWFnZUJ1ZmZl ckNHLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlQnVmZmVyOjp0b0RhdGFVUkwpOgorICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2d0ay9JbWFnZUJ1ZmZlckd0ay5jcHA6CisgICAgICAg IChXZWJDb3JlOjpJbWFnZUJ1ZmZlcjo6dG9EYXRhVVJMKToKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9oYWlrdS9JbWFnZUJ1ZmZlckhhaWt1LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Oklt YWdlQnVmZmVyOjp0b0RhdGFVUkwpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3NraWEv SW1hZ2VCdWZmZXJTa2lhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlQnVmZmVyOjp0b0Rh dGFVUkwpOgorCiAyMDEwLTExLTI2ICBSb2IgQnVpcyAgPHJ3bGJ1aXNAZ21haWwuY29tPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEZyYXNlci4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2cvSW1hZ2VCdWZmZXJDRy5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2NnL0ltYWdlQnVmZmVyQ0cuY3BwCmluZGV4IDY0MDY5MmEuLmYwODUyMmMgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvSW1hZ2VCdWZmZXJDRy5jcHAKKysr IGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9JbWFnZUJ1ZmZlckNHLmNwcApAQCAtMzYx LDkgKzM2MSw4IEBAIFN0cmluZyBJbWFnZUJ1ZmZlcjo6dG9EYXRhVVJMKGNvbnN0IFN0cmluZyYg bWltZVR5cGUsIGNvbnN0IGRvdWJsZSogcXVhbGl0eSkgY29uCiAKICAgICBWZWN0b3I8Y2hhcj4g b3V0OwogICAgIGJhc2U2NEVuY29kZShyZWludGVycHJldF9jYXN0PGNvbnN0IGNoYXIqPihDRkRh dGFHZXRCeXRlUHRyKGRhdGEuZ2V0KCkpKSwgQ0ZEYXRhR2V0TGVuZ3RoKGRhdGEuZ2V0KCkpLCBv dXQpOwotICAgIG91dC5hcHBlbmQoJ1wwJyk7CiAKLSAgICByZXR1cm4gbWFrZVN0cmluZygiZGF0 YToiLCBtaW1lVHlwZSwgIjtiYXNlNjQsIiwgb3V0LmRhdGEoKSk7CisgICAgcmV0dXJuIG1ha2VT dHJpbmcoImRhdGE6IiwgbWltZVR5cGUsICI7YmFzZTY0LCIsIG91dCk7CiB9CiAKIH0gLy8gbmFt ZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3Rr L0ltYWdlQnVmZmVyR3RrLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL0ltYWdl QnVmZmVyR3RrLmNwcAppbmRleCA0ODZhMzE3Li5jZjA0NzBmIDEwMDY0NAotLS0gYS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9JbWFnZUJ1ZmZlckd0ay5jcHAKKysrIGIvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9ndGsvSW1hZ2VCdWZmZXJHdGsuY3BwCkBAIC02Niw5ICs2Niw4IEBA IFN0cmluZyBJbWFnZUJ1ZmZlcjo6dG9EYXRhVVJMKGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGNv bnN0IGRvdWJsZSogcXVhbGl0eSkgY29uCiAKICAgICBWZWN0b3I8Y2hhcj4gb3V0OwogICAgIGJh c2U2NEVuY29kZShyZWludGVycHJldF9jYXN0PGNvbnN0IGNoYXIqPihidWZmZXIuZ2V0KCkpLCBi dWZmZXJTaXplLCBvdXQpOwotICAgIG91dC5hcHBlbmQoJ1wwJyk7CiAKLSAgICByZXR1cm4gbWFr ZVN0cmluZygiZGF0YToiLCBtaW1lVHlwZSwgIjtiYXNlNjQsIiwgb3V0LmRhdGEoKSk7CisgICAg cmV0dXJuIG1ha2VTdHJpbmcoImRhdGE6IiwgbWltZVR5cGUsICI7YmFzZTY0LCIsIG91dCk7CiB9 CiAKIH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvaGFpa3UvSW1hZ2VC dWZmZXJIYWlrdS5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2hhaWt1L0ltYWdlQnVm ZmVySGFpa3UuY3BwCmluZGV4IGQxYjA2ZjMuLjQ2YmE0ZWYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvaGFpa3UvSW1hZ2VCdWZmZXJIYWlrdS5jcHAKKysrIGIvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9oYWlrdS9JbWFnZUJ1ZmZlckhhaWt1LmNwcApAQCAtMzY4LDcg KzM2OCw3IEBAIFN0cmluZyBJbWFnZUJ1ZmZlcjo6dG9EYXRhVVJMKGNvbnN0IFN0cmluZyYgbWlt ZVR5cGUsIGNvbnN0IGRvdWJsZSopIGNvbnN0CiAgICAgYmFzZTY0RW5jb2RlKHJlaW50ZXJwcmV0 X2Nhc3Q8Y29uc3QgY2hhcio+KHRyYW5zbGF0ZWRTdHJlYW0uQnVmZmVyKCkpLAogICAgICAgICAg ICAgICAgICB0cmFuc2xhdGVkU3RyZWFtLkJ1ZmZlckxlbmd0aCgpLCBlbmNvZGVkQnVmZmVyKTsK IAotICAgIHJldHVybiBtYWtlU3RyaW5nKCJkYXRhOiIsIG1pbWVUeXBlLCAiO2Jhc2U2NCwiLCBl bmNvZGVkQnVmZmVyLmRhdGEoKSk7CisgICAgcmV0dXJuIG1ha2VTdHJpbmcoImRhdGE6IiwgbWlt ZVR5cGUsICI7YmFzZTY0LCIsIGVuY29kZWRCdWZmZXIpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBX ZWJDb3JlCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvSW1hZ2VC dWZmZXJTa2lhLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFnZUJ1ZmZl clNraWEuY3BwCmluZGV4IGFkYjczMmIuLjY4MGIyMDkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFnZUJ1ZmZlclNraWEuY3BwCisrKyBiL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFnZUJ1ZmZlclNraWEuY3BwCkBAIC0zMjcsMTEgKzMyNyw5 IEBAIFN0cmluZyBJbWFnZUJ1ZmZlcjo6dG9EYXRhVVJMKGNvbnN0IFN0cmluZyYsIGNvbnN0IGRv dWJsZSopIGNvbnN0CiAgICAgLy8gQ29udmVydCBpdCBpbnRvIGJhc2U2NC4KICAgICBWZWN0b3I8 Y2hhcj4gYmFzZTY0RW5jb2RlZERhdGE7CiAgICAgYmFzZTY0RW5jb2RlKCpyZWludGVycHJldF9j YXN0PFZlY3RvcjxjaGFyPio+KCZwbmdFbmNvZGVkRGF0YSksIGJhc2U2NEVuY29kZWREYXRhKTsK LSAgICAvLyBBcHBlbmQgd2l0aCBhIFwwIHNvIHRoYXQgaXQncyBhIHZhbGlkIHN0cmluZy4KLSAg ICBiYXNlNjRFbmNvZGVkRGF0YS5hcHBlbmQoJ1wwJyk7CiAKICAgICAvLyBBbmQgdGhlIHJlc3Vs dGluZyBzdHJpbmcuCi0gICAgcmV0dXJuIG1ha2VTdHJpbmcoImRhdGE6aW1hZ2UvcG5nO2Jhc2U2 NCwiLCBiYXNlNjRFbmNvZGVkRGF0YS5kYXRhKCkpOworICAgIHJldHVybiBtYWtlU3RyaW5nKCJk YXRhOmltYWdlL3BuZztiYXNlNjQsIiwgYmFzZTY0RW5jb2RlZERhdGEpOwogfQogCiB9IC8vIG5h bWVzcGFjZSBXZWJDb3JlCg== 76299 2010-12-11 03:29:00 -0800 2010-12-11 04:49:07 -0800 Patch for landing bug-50123-20101211122857.patch text/plain 7489 paroga ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCA2Y2IwYmI2MjA0YjQ0OWRmMGU4YTY4ODc0OWIxNTY0MTViMTk0MzM2Li4y YjgwOGM3OGJlZjRjMzViZmYwZjQ5YmUwNjhmYTYwMTc0YmNiYjMyIDEwMDY0NAotLS0gYS9KYXZh U2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTQgQEAKKzIwMTAtMTItMTEgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtp dC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgQWRk IGFuIG92ZXJsb2FkIHRvIG1ha2VTdHJpbmcgZm9yIFZlY3RvcjxjaGFyPgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTAxMjMKKworICAgICAgICBBbHNv IGNsZWFudXAgU3RyaW5nVHlwZUFkYXB0ZXIuCisKKyAgICAgICAgKiB3dGYvdGV4dC9TdHJpbmdD b25jYXRlbmF0ZS5oOgorCiAyMDEwLTEyLTEwICBTaWRkaGFydGggTWF0aHVyICA8c2lkZGhhcnRo Lm1hdGh1ckBub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCmRp ZmYgLS1naXQgYS9KYXZhU2NyaXB0Q29yZS93dGYvdGV4dC9TdHJpbmdDb25jYXRlbmF0ZS5oIGIv SmF2YVNjcmlwdENvcmUvd3RmL3RleHQvU3RyaW5nQ29uY2F0ZW5hdGUuaAppbmRleCBiNTRhMTA4 N2EzMDAxZWVlYWZjMmIwY2U5ZTA0Mzg1YjJlZTRjZTg5Li45MmEyZDA2NDliOGEwYzMwMmQwMDVj OGVhNTJmZWYwZTc5NzZlMzI5IDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29yZS93dGYvdGV4dC9T dHJpbmdDb25jYXRlbmF0ZS5oCisrKyBiL0phdmFTY3JpcHRDb3JlL3d0Zi90ZXh0L1N0cmluZ0Nv bmNhdGVuYXRlLmgKQEAgLTY4LDcgKzY4LDcgQEAgdGVtcGxhdGU8PgogY2xhc3MgU3RyaW5nVHlw ZUFkYXB0ZXI8Y2hhcio+IHsKIHB1YmxpYzoKICAgICBTdHJpbmdUeXBlQWRhcHRlcjxjaGFyKj4o Y2hhciogYnVmZmVyKQotICAgICAgICA6IG1fYnVmZmVyKCh1bnNpZ25lZCBjaGFyKilidWZmZXIp CisgICAgICAgIDogbV9idWZmZXIoYnVmZmVyKQogICAgICAgICAsIG1fbGVuZ3RoKHN0cmxlbihi dWZmZXIpKQogICAgIHsKICAgICB9CkBAIC03NywxMiArNzcsMTQgQEAgcHVibGljOgogCiAgICAg dm9pZCB3cml0ZVRvKFVDaGFyKiBkZXN0aW5hdGlvbikKICAgICB7Ci0gICAgICAgIGZvciAodW5z aWduZWQgaSA9IDA7IGkgPCBtX2xlbmd0aDsgKytpKQotICAgICAgICAgICAgZGVzdGluYXRpb25b aV0gPSBtX2J1ZmZlcltpXTsKKyAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG1fbGVu Z3RoOyArK2kpIHsKKyAgICAgICAgICAgIHVuc2lnbmVkIGNoYXIgYyA9IG1fYnVmZmVyW2ldOwor ICAgICAgICAgICAgZGVzdGluYXRpb25baV0gPSBjOworICAgICAgICB9CiAgICAgfQogCiBwcml2 YXRlOgotICAgIGNvbnN0IHVuc2lnbmVkIGNoYXIqIG1fYnVmZmVyOworICAgIGNvbnN0IGNoYXIq IG1fYnVmZmVyOwogICAgIHVuc2lnbmVkIG1fbGVuZ3RoOwogfTsKIApAQCAtOTAsNyArOTIsNyBA QCB0ZW1wbGF0ZTw+CiBjbGFzcyBTdHJpbmdUeXBlQWRhcHRlcjxjb25zdCBjaGFyKj4gewogcHVi bGljOgogICAgIFN0cmluZ1R5cGVBZGFwdGVyPGNvbnN0IGNoYXIqPihjb25zdCBjaGFyKiBidWZm ZXIpCi0gICAgICAgIDogbV9idWZmZXIoKHVuc2lnbmVkIGNoYXIqKWJ1ZmZlcikKKyAgICAgICAg OiBtX2J1ZmZlcihidWZmZXIpCiAgICAgICAgICwgbV9sZW5ndGgoc3RybGVuKGJ1ZmZlcikpCiAg ICAgewogICAgIH0KQEAgLTk5LDM1ICsxMDEsNTkgQEAgcHVibGljOgogCiAgICAgdm9pZCB3cml0 ZVRvKFVDaGFyKiBkZXN0aW5hdGlvbikKICAgICB7Ci0gICAgICAgIGZvciAodW5zaWduZWQgaSA9 IDA7IGkgPCBtX2xlbmd0aDsgKytpKQotICAgICAgICAgICAgZGVzdGluYXRpb25baV0gPSBtX2J1 ZmZlcltpXTsKKyAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG1fbGVuZ3RoOyArK2kp IHsKKyAgICAgICAgICAgIHVuc2lnbmVkIGNoYXIgYyA9IG1fYnVmZmVyW2ldOworICAgICAgICAg ICAgZGVzdGluYXRpb25baV0gPSBjOworICAgICAgICB9CiAgICAgfQogCiBwcml2YXRlOgotICAg IGNvbnN0IHVuc2lnbmVkIGNoYXIqIG1fYnVmZmVyOworICAgIGNvbnN0IGNoYXIqIG1fYnVmZmVy OwogICAgIHVuc2lnbmVkIG1fbGVuZ3RoOwogfTsKIAogdGVtcGxhdGU8PgorY2xhc3MgU3RyaW5n VHlwZUFkYXB0ZXI8VmVjdG9yPGNoYXI+ID4geworcHVibGljOgorICAgIFN0cmluZ1R5cGVBZGFw dGVyPFZlY3RvcjxjaGFyPiA+KGNvbnN0IFZlY3RvcjxjaGFyPiYgYnVmZmVyKQorICAgICAgICA6 IG1fYnVmZmVyKGJ1ZmZlcikKKyAgICB7CisgICAgfQorCisgICAgc2l6ZV90IGxlbmd0aCgpIHsg cmV0dXJuIG1fYnVmZmVyLnNpemUoKTsgfQorCisgICAgdm9pZCB3cml0ZVRvKFVDaGFyKiBkZXN0 aW5hdGlvbikKKyAgICB7CisgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbV9idWZmZXIu c2l6ZSgpOyArK2kpIHsKKyAgICAgICAgICAgIHVuc2lnbmVkIGNoYXIgYyA9IG1fYnVmZmVyW2ld OworICAgICAgICAgICAgZGVzdGluYXRpb25baV0gPSBjOworICAgICAgICB9CisgICAgfQorCitw cml2YXRlOgorICAgIGNvbnN0IFZlY3RvcjxjaGFyPiYgbV9idWZmZXI7Cit9OworCit0ZW1wbGF0 ZTw+CiBjbGFzcyBTdHJpbmdUeXBlQWRhcHRlcjxTdHJpbmc+IHsKIHB1YmxpYzoKLSAgICBTdHJp bmdUeXBlQWRhcHRlcjxTdHJpbmc+KFN0cmluZyYgc3RyaW5nKQotICAgICAgICA6IG1fZGF0YShz dHJpbmcuY2hhcmFjdGVycygpKQotICAgICAgICAsIG1fbGVuZ3RoKHN0cmluZy5sZW5ndGgoKSkK KyAgICBTdHJpbmdUeXBlQWRhcHRlcjxTdHJpbmc+KGNvbnN0IFN0cmluZyYgc3RyaW5nKQorICAg ICAgICA6IG1fYnVmZmVyKHN0cmluZykKICAgICB7CiAgICAgfQogCi0gICAgdW5zaWduZWQgbGVu Z3RoKCkgeyByZXR1cm4gbV9sZW5ndGg7IH0KKyAgICB1bnNpZ25lZCBsZW5ndGgoKSB7IHJldHVy biBtX2J1ZmZlci5sZW5ndGgoKTsgfQogCiAgICAgdm9pZCB3cml0ZVRvKFVDaGFyKiBkZXN0aW5h dGlvbikKICAgICB7Ci0gICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBtX2xlbmd0aDsg KytpKQotICAgICAgICAgICAgZGVzdGluYXRpb25baV0gPSBtX2RhdGFbaV07CisgICAgICAgIGNv bnN0IFVDaGFyKiBkYXRhID0gbV9idWZmZXIuY2hhcmFjdGVycygpOworICAgICAgICB1bnNpZ25l ZCBsZW5ndGggPSBtX2J1ZmZlci5sZW5ndGgoKTsKKyAgICAgICAgZm9yICh1bnNpZ25lZCBpID0g MDsgaSA8IGxlbmd0aDsgKytpKQorICAgICAgICAgICAgZGVzdGluYXRpb25baV0gPSBkYXRhW2ld OwogICAgIH0KIAogcHJpdmF0ZToKLSAgICBjb25zdCBVQ2hhciogbV9kYXRhOwotICAgIHVuc2ln bmVkIG1fbGVuZ3RoOworICAgIGNvbnN0IFN0cmluZyYgbV9idWZmZXI7CiB9OwogCiBpbmxpbmUg dm9pZCBzdW1XaXRoT3ZlcmZsb3codW5zaWduZWQmIHRvdGFsLCB1bnNpZ25lZCBhZGRlbmQsIGJv b2wmIG92ZXJmbG93KQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlZjE1Y2FmZTIyMmVlNzVhN2I0MzUxYTViY2QyMTllNzkwMDAxODhjLi43 NTc1ZDg1ZDM2ZGMzYmVlMWVjOWQwMGVhNDQ0OWJlNTFiMzdjZjM5IDEwMDY0NAotLS0gYS9XZWJD b3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisy MDEwLTEyLTExICBQYXRyaWNrIEdhbnN0ZXJlciAgPHBhcm9nYUB3ZWJraXQub3JnPgorCisgICAg ICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgIEFkZCBhbiBvdmVybG9hZCB0 byBtYWtlU3RyaW5nIGZvciBWZWN0b3I8Y2hhcj4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTUwMTIzCisKKyAgICAgICAgVGhpcyBhbHNvIGNvbnRhaW5z IGEgc2VnZmF1bHQgZml4IGZvciBJbWFnZUJ1ZmZlcjo6dG9EYXRhVVJMIG9mIHRoZSBIYWlrdSBw b3J0LgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2cvSW1hZ2VCdWZmZXJDRy5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUJ1ZmZlcjo6dG9EYXRhVVJMKToKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9ndGsvSW1hZ2VCdWZmZXJHdGsuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6SW1hZ2VCdWZmZXI6OnRvRGF0YVVSTCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv aGFpa3UvSW1hZ2VCdWZmZXJIYWlrdS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUJ1ZmZl cjo6dG9EYXRhVVJMKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9za2lhL0ltYWdlQnVm ZmVyU2tpYS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUJ1ZmZlcjo6dG9EYXRhVVJMKToK KwogMjAxMC0xMi0xMCAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAg ICAgICBNYWMgYnVpbGQgZml4LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jZy9JbWFnZUJ1ZmZlckNHLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvSW1h Z2VCdWZmZXJDRy5jcHAKaW5kZXggNjQwNjkyYTdiZWZkNjllMDQzOTg0YWFiYmJmYjUyNTBhNTkw ZDFlZi4uZjA4NTIyYzVmMWEyM2VhNjZhNWRjMzJkYjdjMTFmMTdjNjk3NTM3ZSAxMDA2NDQKLS0t IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9JbWFnZUJ1ZmZlckNHLmNwcAorKysgYi9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0ltYWdlQnVmZmVyQ0cuY3BwCkBAIC0zNjEsOSAr MzYxLDggQEAgU3RyaW5nIEltYWdlQnVmZmVyOjp0b0RhdGFVUkwoY29uc3QgU3RyaW5nJiBtaW1l VHlwZSwgY29uc3QgZG91YmxlKiBxdWFsaXR5KSBjb24KIAogICAgIFZlY3RvcjxjaGFyPiBvdXQ7 CiAgICAgYmFzZTY0RW5jb2RlKHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgY2hhcio+KENGRGF0YUdl dEJ5dGVQdHIoZGF0YS5nZXQoKSkpLCBDRkRhdGFHZXRMZW5ndGgoZGF0YS5nZXQoKSksIG91dCk7 Ci0gICAgb3V0LmFwcGVuZCgnXDAnKTsKIAotICAgIHJldHVybiBtYWtlU3RyaW5nKCJkYXRhOiIs IG1pbWVUeXBlLCAiO2Jhc2U2NCwiLCBvdXQuZGF0YSgpKTsKKyAgICByZXR1cm4gbWFrZVN0cmlu ZygiZGF0YToiLCBtaW1lVHlwZSwgIjtiYXNlNjQsIiwgb3V0KTsKIH0KIAogfSAvLyBuYW1lc3Bh Y2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsvSW1h Z2VCdWZmZXJHdGsuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsvSW1hZ2VCdWZm ZXJHdGsuY3BwCmluZGV4IDQ4NmEzMTczZGQ4NmVmYWM3NjAxNzJiN2UwNjM4YTI2YzRmODIzYmUu LmNmMDQ3MGZmZmRiOWFmMjA4YzdhMDhhMjdiNmFkZWVlNjA5YTZlOTQgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL0ltYWdlQnVmZmVyR3RrLmNwcAorKysgYi9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9JbWFnZUJ1ZmZlckd0ay5jcHAKQEAgLTY2LDkgKzY2 LDggQEAgU3RyaW5nIEltYWdlQnVmZmVyOjp0b0RhdGFVUkwoY29uc3QgU3RyaW5nJiBtaW1lVHlw ZSwgY29uc3QgZG91YmxlKiBxdWFsaXR5KSBjb24KIAogICAgIFZlY3RvcjxjaGFyPiBvdXQ7CiAg ICAgYmFzZTY0RW5jb2RlKHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgY2hhcio+KGJ1ZmZlci5nZXQo KSksIGJ1ZmZlclNpemUsIG91dCk7Ci0gICAgb3V0LmFwcGVuZCgnXDAnKTsKIAotICAgIHJldHVy biBtYWtlU3RyaW5nKCJkYXRhOiIsIG1pbWVUeXBlLCAiO2Jhc2U2NCwiLCBvdXQuZGF0YSgpKTsK KyAgICByZXR1cm4gbWFrZVN0cmluZygiZGF0YToiLCBtaW1lVHlwZSwgIjtiYXNlNjQsIiwgb3V0 KTsKIH0KIAogfQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9oYWlrdS9J bWFnZUJ1ZmZlckhhaWt1LmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvaGFpa3UvSW1h Z2VCdWZmZXJIYWlrdS5jcHAKaW5kZXggZDFiMDZmMzRjYWI3ZmVmNjQ3ZjViNGRiNzU5N2Q2YTA1 YTk1NzBhYy4uNDZiYTRlZmZmZGYxMmVlNzhiNWU4ODk5MmVlNzA4MmM2YzVhNjI0OSAxMDA2NDQK LS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9oYWlrdS9JbWFnZUJ1ZmZlckhhaWt1LmNw cAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2hhaWt1L0ltYWdlQnVmZmVySGFpa3Uu Y3BwCkBAIC0zNjgsNyArMzY4LDcgQEAgU3RyaW5nIEltYWdlQnVmZmVyOjp0b0RhdGFVUkwoY29u c3QgU3RyaW5nJiBtaW1lVHlwZSwgY29uc3QgZG91YmxlKikgY29uc3QKICAgICBiYXNlNjRFbmNv ZGUocmVpbnRlcnByZXRfY2FzdDxjb25zdCBjaGFyKj4odHJhbnNsYXRlZFN0cmVhbS5CdWZmZXIo KSksCiAgICAgICAgICAgICAgICAgIHRyYW5zbGF0ZWRTdHJlYW0uQnVmZmVyTGVuZ3RoKCksIGVu Y29kZWRCdWZmZXIpOwogCi0gICAgcmV0dXJuIG1ha2VTdHJpbmcoImRhdGE6IiwgbWltZVR5cGUs ICI7YmFzZTY0LCIsIGVuY29kZWRCdWZmZXIuZGF0YSgpKTsKKyAgICByZXR1cm4gbWFrZVN0cmlu ZygiZGF0YToiLCBtaW1lVHlwZSwgIjtiYXNlNjQsIiwgZW5jb2RlZEJ1ZmZlcik7CiB9CiAKIH0g Ly8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3Mvc2tpYS9JbWFnZUJ1ZmZlclNraWEuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9z a2lhL0ltYWdlQnVmZmVyU2tpYS5jcHAKaW5kZXggYjcxNGVmNDQwNTE2MWU2MjUzZjBjNDUzYWYw NGZkN2RmMzlmYjBiYi4uNjZhNWFhMWQxMzVkOTVmODBmZDYxZjVhNjY3NmRmMDk0ODlmYWU1MCAx MDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL0ltYWdlQnVmZmVyU2tp YS5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL0ltYWdlQnVmZmVyU2tp YS5jcHAKQEAgLTMzOSw5ICszMzksOCBAQCBTdHJpbmcgSW1hZ2VCdWZmZXI6OnRvRGF0YVVSTChj b25zdCBTdHJpbmcmIG1pbWVUeXBlLCBjb25zdCBkb3VibGUqIHF1YWxpdHkpIGNvbgogCiAgICAg VmVjdG9yPGNoYXI+IGJhc2U2NERhdGE7CiAgICAgYmFzZTY0RW5jb2RlKCpyZWludGVycHJldF9j YXN0PFZlY3RvcjxjaGFyPio+KCZlbmNvZGVkSW1hZ2UpLCBiYXNlNjREYXRhKTsKLSAgICBiYXNl NjREYXRhLmFwcGVuZCgnXDAnKTsKIAotICAgIHJldHVybiBtYWtlU3RyaW5nKCJkYXRhOiIsIG1p bWVUeXBlLCAiO2Jhc2U2NCwiLCBiYXNlNjREYXRhLmRhdGEoKSk7CisgICAgcmV0dXJuIG1ha2VT dHJpbmcoImRhdGE6IiwgbWltZVR5cGUsICI7YmFzZTY0LCIsIGJhc2U2NERhdGEpOwogfQogCiB9 IC8vIG5hbWVzcGFjZSBXZWJDb3JlCg==