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

c0dc8f64 · Stefan Monnier · 8ba31f36 · c0dc8f64 · c0dc8f64
Commit c0dc8f64 authored Jun 05, 2008 by Stefan Monnier
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

src/ChangeLog src/ChangeLog +2 -0

src/character.h src/character.h +2 -1

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
 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):

--- 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