aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTed Zlatanov2011-04-26 07:59:12 -0500
committerTed Zlatanov2011-04-26 07:59:12 -0500
commit6a7a1b0b746d9e07f98183a0abb1298464dd1f29 (patch)
treee2ef7934b2782279bb43ae4bbf08a9d54c474305 /src
parent17519c905078b21eba56dd740f1ebccb2b6098a3 (diff)
downloademacs-6a7a1b0b746d9e07f98183a0abb1298464dd1f29.tar.gz
emacs-6a7a1b0b746d9e07f98183a0abb1298464dd1f29.zip
Don't return in emacs_gnutls_handshake without an explicit value.
* gnutls.c (emacs_gnutls_handshake): Return an error if we're not supposed to be handshaking. Reported by Paul Eggert <eggert@cs.ucla.edu>.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/gnutls.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 04f2e6a5752..c91ed1dc74a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12011-04-26 Teodor Zlatanov <tzz@lifelogs.com>
2
3 * gnutls.c (emacs_gnutls_handshake): Return an error if we're not
4 supposed to be handshaking.
5 Reported by Paul Eggert <eggert@cs.ucla.edu>.
6
12011-04-26 Daniel Colascione <dan.colascione@gmail.com> 72011-04-26 Daniel Colascione <dan.colascione@gmail.com>
2 8
3 * lisp.h (Qdebug): List symbol. 9 * lisp.h (Qdebug): List symbol.
diff --git a/src/gnutls.c b/src/gnutls.c
index 975fe655072..60a4949f431 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -74,7 +74,7 @@ emacs_gnutls_handshake (struct Lisp_Process *proc)
74 int ret; 74 int ret;
75 75
76 if (proc->gnutls_initstage < GNUTLS_STAGE_HANDSHAKE_CANDO) 76 if (proc->gnutls_initstage < GNUTLS_STAGE_HANDSHAKE_CANDO)
77 return; 77 return -1;
78 78
79 if (proc->gnutls_initstage < GNUTLS_STAGE_TRANSPORT_POINTERS_SET) 79 if (proc->gnutls_initstage < GNUTLS_STAGE_TRANSPORT_POINTERS_SET)
80 { 80 {