From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 3 Oct 2015 12:39:17 +0000 (+0300)
Subject: Avoid crashes in coding_inherit_eol_type
X-Git-Tag: emacs-25.0.90~1223^2~21
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=272ca096356e30c67ce337855da7531994040255;p=emacs.git

Avoid crashes in coding_inherit_eol_type

* src/coding.c (coding_inherit_eol_type): Check the validity of
the arguments.  Suggested by Andreas Schwab <schwab@linux-m68k.org>.
(Bug#21602)
---

diff --git a/src/coding.c b/src/coding.c
index 3fc6fb684c6..d2655310cd3 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -6004,6 +6004,7 @@ coding_inherit_eol_type (Lisp_Object coding_system, Lisp_Object parent)
 
   if (NILP (coding_system))
     coding_system = Qraw_text;
+  CHECK_CODING_SYSTEM (coding_system);
   spec = CODING_SYSTEM_SPEC (coding_system);
   eol_type = AREF (spec, 2);
   if (VECTORP (eol_type))
@@ -6014,6 +6015,7 @@ coding_inherit_eol_type (Lisp_Object coding_system, Lisp_Object parent)
 	{
 	  Lisp_Object parent_spec;
 
+	  CHECK_CODING_SYSTEM (parent);
 	  parent_spec = CODING_SYSTEM_SPEC (parent);
 	  parent_eol_type = AREF (parent_spec, 2);
 	  if (VECTORP (parent_eol_type))