Attachment #6160 for bug #36162





		if (c1 == INVALID_CODEPOINT ||
		    c2 == INVALID_CODEPOINT) {
			/*
			 * Fall back to byte
			 * comparison. We must
			 * step back by the codepoint
			 * length we just incremented
			 * - otherwise we are not
			 * checking the bytes that
			 * failed the conversion.
			 */
			s1 -= size1;
			s2 -= size2;
			return strcasecmp(s1, s2);
		}

- 
--
lib/util/charset/util_str.c |   29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)





		if (c1 == INVALID_CODEPOINT ||
		    c2 == INVALID_CODEPOINT) {
			/*
			 * Fall back to byte
			 * comparison. We must
			 * step back by the codepoint
			 * length we just incremented
			 * by - otherwise we are not
			 * checking the bytes that
			 * failed the conversion.
			 */
			s1 -= size1;
			s2 -= size2;
			/*
			 * n was specified in characters,
			 * now we must convert it to bytes.
			 * As bytes are the smallest
			 * character unit, the following
			 * increment and strncasecmp is always
			 * safe.
			 *
			 * The source string was already known
			 * to be n characters long, so we are
			 * guaranteed to be able to look at the
			 * (n remaining + size1) bytes from the
			 * new (s1 - size1) position).
			 */
			n += size1;
			return strncasecmp(s1, s2, n);
		}

		if (toupper_m(c1) != toupper_m(c2)) {
- 
--
lib/util/charset/tests/charset.c |   12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)

(-)a/lib/util/charset/tests/charset.c (-1 / +12 lines)

Lines 50-61 static bool test_codepoint_cmpi(struct torture_context *tctx)	Link Here

static bool test_strcasecmp_m(struct torture_context *tctx)

static bool test_strcasecmp_m(struct torture_context *tctx)

	/* file.{accented e} in iso8859-1 */

	const char file_iso8859_1[7] = { 0x66, 0x69, 0x6c, 0x65, 0x2d, 0xe9, 0 };

	/* file.{accented e} in utf8 */

	const char file_utf8[8] =      { 0x66, 0x69, 0x6c, 0x65, 0x2d, 0xc3, 0xa9, 0 };

	torture_assert(tctx, strcasecmp_m("foo", "bar") != 0, "different strings");

	torture_assert(tctx, strcasecmp_m("foo", "bar") != 0, "different strings");

	torture_assert(tctx, strcasecmp_m("foo", "foo") == 0, "same case strings");

	torture_assert(tctx, strcasecmp_m("foo", "foo") == 0, "same case strings");

	torture_assert(tctx, strcasecmp_m("foo", "Foo") == 0, "different case strings");

	torture_assert(tctx, strcasecmp_m("foo", "Foo") == 0, "different case strings");

	torture_assert(tctx, strcasecmp_m(NULL, "Foo") != 0, "one NULL");

	torture_assert(tctx, strcasecmp_m(NULL, "Foo") != 0, "one NULL");

	torture_assert(tctx, strcasecmp_m("foo", NULL) != 0, "other NULL");

	torture_assert(tctx, strcasecmp_m("foo", NULL) != 0, "other NULL");

	torture_assert(tctx, strcasecmp_m(NULL, NULL) == 0, "both NULL");

	torture_assert(tctx, strcasecmp_m(NULL, NULL) == 0, "both NULL");

	torture_assert(tctx, strcasecmp_m(file_iso8859_1, file_utf8) != 0,

		"file.{accented e} should differ");

	return true;

	return true;

Lines 102-107 static bool test_string_replace_m(struct torture_context *tctx)	Link Here

102

108

103

static bool test_strncasecmp_m(struct torture_context *tctx)

109

static bool test_strncasecmp_m(struct torture_context *tctx)

104

110

111

	/* file.{accented e} in iso8859-1 */

112

	const char file_iso8859_1[7] = { 0x66, 0x69, 0x6c, 0x65, 0x2d, 0xe9, 0 };

113

	/* file.{accented e} in utf8 */

114

	const char file_utf8[8] =      { 0x66, 0x69, 0x6c, 0x65, 0x2d, 0xc3, 0xa9, 0 };

105

	torture_assert(tctx, strncasecmp_m("foo", "bar", 3) != 0, "different strings");

115

	torture_assert(tctx, strncasecmp_m("foo", "bar", 3) != 0, "different strings");

106

	torture_assert(tctx, strncasecmp_m("foo", "foo", 3) == 0, "same case strings");

116

	torture_assert(tctx, strncasecmp_m("foo", "foo", 3) == 0, "same case strings");

107

	torture_assert(tctx, strncasecmp_m("foo", "Foo", 3) == 0, "different case strings");

117

	torture_assert(tctx, strncasecmp_m("foo", "Foo", 3) == 0, "different case strings");

Lines 111-116 static bool test_strncasecmp_m(struct torture_context *tctx)	Link Here

111

	torture_assert(tctx, strncasecmp_m(NULL, "Foo", 3) != 0, "one NULL");

121

	torture_assert(tctx, strncasecmp_m(NULL, "Foo", 3) != 0, "one NULL");

112

	torture_assert(tctx, strncasecmp_m("foo", NULL, 3) != 0, "other NULL");

122

	torture_assert(tctx, strncasecmp_m("foo", NULL, 3) != 0, "other NULL");

113

	torture_assert(tctx, strncasecmp_m(NULL, NULL, 3) == 0, "both NULL");

123

	torture_assert(tctx, strncasecmp_m(NULL, NULL, 3) == 0, "both NULL");

124

	torture_assert(tctx, strncasecmp_m(file_iso8859_1, file_utf8, 6) != 0,

125

		"file.{accented e} should differ");

114

	return true;

126

	return true;

115

127

116

128

117

Return to bug 36162