(STRING_CHAR_AND_LENGTH): Return correct value in

ACTUAL_LEN even if LEN is too short to have a valid multibyte
form.
(STRING_CHAR_AND_CHAR_LENGTH): Likewise.

1 files changed, 3 insertions, 5 deletions

diff --git a/src/charset.h b/src/charset.h
index d2fd94e6ade..b25e66a5632 100644
--- a/src/charset.h
+++ b/src/charset.h
@@ -587,16 +587,14 @@ extern int iso_charset_table[2][2][128];
    MULTIBYTE_FORM_LENGTH.  */
 
 #define STRING_CHAR_AND_LENGTH(str, len, actual_len)            \
-  ((BYTES_BY_CHAR_HEAD ((unsigned char) *(str)) == 1            \
-    || BYTES_BY_CHAR_HEAD ((unsigned char) *(str)) > (len))     \
+  (BYTES_BY_CHAR_HEAD ((unsigned char) *(str)) == 1             \
    ? (actual_len = 1), (unsigned char) *(str)                   \
    : string_to_non_ascii_char (str, len, &actual_len, 0))
 
 /* This is like STRING_CHAR_AND_LENGTH but the third arg ACTUAL_LEN
    does not include garbage bytes following the multibyte character.  */
-#define STRING_CHAR_AND_CHAR_LENGTH(str, len, actual_len)               \
-  ((BYTES_BY_CHAR_HEAD ((unsigned char) *(str)) == 1            \
-    || BYTES_BY_CHAR_HEAD ((unsigned char) *(str)) > (len))     \
+#define STRING_CHAR_AND_CHAR_LENGTH(str, len, actual_len)       \
+  (BYTES_BY_CHAR_HEAD ((unsigned char) *(str)) == 1             \
    ? (actual_len = 1), (unsigned char) *(str)                   \
    : string_to_non_ascii_char (str, len, &actual_len, 1))