emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r104017: Don't return in emacs_gnutls


From: Ted Zlatanov
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r104017: Don't return in emacs_gnutls_handshake without an explicit value.
Date: Tue, 26 Apr 2011 07:59:12 -0500
User-agent: Bazaar (2.3.1)

------------------------------------------------------------
revno: 104017
committer: Ted Zlatanov <address@hidden>
branch nick: quickfixes
timestamp: Tue 2011-04-26 07:59:12 -0500
message:
  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 <address@hidden>.
modified:
  src/ChangeLog
  src/gnutls.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-04-26 11:26:05 +0000
+++ b/src/ChangeLog     2011-04-26 12:59:12 +0000
@@ -1,3 +1,9 @@
+2011-04-26  Teodor Zlatanov  <address@hidden>
+
+       * gnutls.c (emacs_gnutls_handshake): Return an error if we're not
+       supposed to be handshaking.
+       Reported by Paul Eggert <address@hidden>.
+
 2011-04-26  Daniel Colascione <address@hidden>
 
        * lisp.h (Qdebug): List symbol.

=== modified file 'src/gnutls.c'
--- a/src/gnutls.c      2011-04-25 10:42:57 +0000
+++ b/src/gnutls.c      2011-04-26 12:59:12 +0000
@@ -74,7 +74,7 @@
   int ret;
 
   if (proc->gnutls_initstage < GNUTLS_STAGE_HANDSHAKE_CANDO)
-    return;
+    return -1;
 
   if (proc->gnutls_initstage < GNUTLS_STAGE_TRANSPORT_POINTERS_SET)
     {


reply via email to

[Prev in Thread] Current Thread [Next in Thread]