aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schwab2013-12-16 17:14:45 +0100
committerAndreas Schwab2013-12-16 17:14:45 +0100
commit0fa30f3361e5876a7d0734e891f7386675775c8e (patch)
treeb0f0634f0934d44e1e534e827c2b6a379c961362
parent5b9b750ae038c45377d04355739477c6dae37cb1 (diff)
downloademacs-0fa30f3361e5876a7d0734e891f7386675775c8e.tar.gz
emacs-0fa30f3361e5876a7d0734e891f7386675775c8e.zip
* gnutls.c (Fgnutls_boot): Properly check Flistp return value.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/gnutls.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 52ceb13eb14..e21ccc28996 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12013-12-16 Andreas Schwab <schwab@suse.de>
2
3 * gnutls.c (Fgnutls_boot): Properly check Flistp return value.
4
12013-12-16 Teodor Zlatanov <tzz@lifelogs.com> 52013-12-16 Teodor Zlatanov <tzz@lifelogs.com>
2 6
3 * gnutls.c (Fgnutls_boot): Use `Flistp' instead of 7 * gnutls.c (Fgnutls_boot): Use `Flistp' instead of
diff --git a/src/gnutls.c b/src/gnutls.c
index f04d9c44b41..a20665ab408 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -825,7 +825,7 @@ 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 if (!Flistp (verify_error)) 828 if (NILP (Flistp (verify_error)))
829 error ("gnutls-boot: invalid :verify_error parameter (not a list)"); 829 error ("gnutls-boot: invalid :verify_error parameter (not a list)");
830 830
831 if (!STRINGP (hostname)) 831 if (!STRINGP (hostname))