From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 9 Aug 1998 05:28:02 +0000 (+0000)
Subject: (CHARSET_OK): Check that coding_system_table[IDX] != 0.
X-Git-Tag: emacs-20.3~115
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f024b6aac03b2c6fb6c457bb8e2e40039177879f;p=emacs.git

(CHARSET_OK): Check that coding_system_table[IDX] != 0.
---

diff --git a/src/coding.c b/src/coding.c
index 7c693b86b1c..7e00f4a60fa 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -652,11 +652,12 @@ detect_coding_emacs_mule (src, src_end)
 
 enum iso_code_class_type iso_code_class[256];
 
-#define CHARSET_OK(idx, charset)			\
-  (coding_system_table[idx]->safe_charsets[charset]	\
-   || (CODING_SPEC_ISO_REQUESTED_DESIGNATION		\
-       (coding_system_table[idx], charset)		\
-       != CODING_SPEC_ISO_NO_REQUESTED_DESIGNATION))
+#define CHARSET_OK(idx, charset)				\
+  (coding_system_table[idx]					\
+   && (coding_system_table[idx]->safe_charsets[charset]		\
+       || (CODING_SPEC_ISO_REQUESTED_DESIGNATION		\
+            (coding_system_table[idx], charset)			\
+           != CODING_SPEC_ISO_NO_REQUESTED_DESIGNATION)))
 
 #define SHIFT_OUT_OK(idx) \
   (CODING_SPEC_ISO_INITIAL_DESIGNATION (coding_system_table[idx], 1) >= 0)