aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTed Zlatanov2013-12-16 10:47:09 -0500
committerTed Zlatanov2013-12-16 10:47:09 -0500
commit82cf20e4526663712e0316e060a85c6cb2733b51 (patch)
tree4c355ab0d513c5a3662901b50c485c8857e202bd /src
parentd144ef069cf0b05c528ad9725ca0c06763be6d5b (diff)
downloademacs-82cf20e4526663712e0316e060a85c6cb2733b51.tar.gz
emacs-82cf20e4526663712e0316e060a85c6cb2733b51.zip
Fix bug#16161: CHECK_LIST_CONS fails on nil
* src/gnutls.c (Fgnutls_boot): Use `Flistp' instead of `CHECK_LIST_CONS`.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/gnutls.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index dbd2298985b..52ceb13eb14 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12013-12-16 Teodor Zlatanov <tzz@lifelogs.com>
2
3 * gnutls.c (Fgnutls_boot): Use `Flistp' instead of
4 `CHECK_LIST_CONS`.
5
12013-12-16 Martin Rudalics <rudalics@gmx.at> 62013-12-16 Martin Rudalics <rudalics@gmx.at>
2 7
3 * w32term.c (w32_enable_frame_resize_hack): Default to 1. 8 * 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). */)
825 verify_error = Fplist_get (proplist, QCgnutls_bootprop_verify_error); 825 verify_error = Fplist_get (proplist, QCgnutls_bootprop_verify_error);
826 prime_bits = Fplist_get (proplist, QCgnutls_bootprop_min_prime_bits); 826 prime_bits = Fplist_get (proplist, QCgnutls_bootprop_min_prime_bits);
827 827
828 CHECK_LIST_CONS (verify_error, verify_error); 828 if (!Flistp (verify_error))
829 error ("gnutls-boot: invalid :verify_error parameter (not a list)");
829 830
830 if (!STRINGP (hostname)) 831 if (!STRINGP (hostname))
831 error ("gnutls-boot: invalid :hostname parameter (not a string)"); 832 error ("gnutls-boot: invalid :hostname parameter (not a string)");