(MAKE_CHAR_MULTIBYTE): Check the arg is a (uni)byte.

diff --git a/src/ChangeLog b/src/ChangeLog
index 178e5b3896961908ef2310e09568fb5c3632bd7f..c564066d0b216e35a59012c63e34ff585f3eb222 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2008-06-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * character.h (MAKE_CHAR_MULTIBYTE): Check the arg is a (uni)byte.
+
        * keymap.c (Vminibuffer_local_filename_must_match_map):
        Rename from Vminibuffer_local_must_match_filename_map.
        (syms_of_keymap):

diff --git a/src/character.h b/src/character.h
index ce36cdf85ff80861f24e30c94caa888bcf3f76dc..ae87b3885d94434903c34c98d71c4146835240e4 100644 (file)
--- a/src/character.h
+++ b/src/character.h
@@ -95,7 +95,8 @@ extern char unibyte_has_multibyte_table[256];
 
 
 /* If C is not ASCII, make it multibyte.  It assumes C < 256.  */
-#define MAKE_CHAR_MULTIBYTE(c) ((c) = unibyte_to_multibyte_table[(c)])
+#define MAKE_CHAR_MULTIBYTE(c) \
+  (eassert ((c) >= 0 && (c) < 256), (c) = unibyte_to_multibyte_table[(c)])
 
 /* This is the maximum byte length of multibyte form.  */
 #define MAX_MULTIBYTE_LENGTH 5