From: Ted Zlatanov <tzz@lifelogs.com>
Date: Mon, 16 Dec 2013 15:47:09 +0000 (-0500)
Subject: Fix bug#16161: CHECK_LIST_CONS fails on nil
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~392
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=82cf20e4526663712e0316e060a85c6cb2733b51;p=emacs.git

Fix bug#16161: CHECK_LIST_CONS fails on nil

* src/gnutls.c (Fgnutls_boot): Use `Flistp' instead of
`CHECK_LIST_CONS`.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index dbd2298985b..52ceb13eb14 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-16  Teodor Zlatanov  <tzz@lifelogs.com>
+
+	* gnutls.c (Fgnutls_boot): Use `Flistp' instead of
+	`CHECK_LIST_CONS`.
+
 2013-12-16  Martin Rudalics  <rudalics@gmx.at>
 
 	* w32term.c (w32_enable_frame_resize_hack): Default to 1.
diff --git a/src/gnutls.c b/src/gnutls.c
index dd9f30f4de9..f04d9c44b41 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -825,7 +825,8 @@ one trustfile (usually a CA bundle).  */)
   verify_error          = Fplist_get (proplist, QCgnutls_bootprop_verify_error);
   prime_bits            = Fplist_get (proplist, QCgnutls_bootprop_min_prime_bits);
 
-  CHECK_LIST_CONS (verify_error, verify_error);
+  if (!Flistp (verify_error))
+    error ("gnutls-boot: invalid :verify_error parameter (not a list)");
 
   if (!STRINGP (hostname))
     error ("gnutls-boot: invalid :hostname parameter (not a string)");