From: Paul Eggert <eggert@cs.ucla.edu>
To: 8556@debbugs.gnu.org
Cc: Ted Zlatanov <tzz@lifelogs.com>
Subject: bug#8556: recent gnutls.c changes broke build on Ubuntu 10.10
Date: Tue, 26 Apr 2011 00:18:16 -0700 [thread overview]
Message-ID: <4DB671B8.5010702@cs.ucla.edu> (raw)
bzr 103998 introduced a bug in emacs_gnutls_handshake: it has
a 'return;' statement in a function returning an integer, which
violates the C standard. I plan to fix this with the following
patch, for lack of a better idea, but it would be nice if someone
with more expertise in gnutls could double-check this.
* gnutls.c (emacs_gnutls_handshake): Always return a value.
Expect the caller to check whether GNUTLS_STAGE_HANDSHAKE_CANDO <=
proc->gnutls_initstage, if the check is needed. The check isn't
needed for one caller, Fgnutls_boot.
(emacs_gnutls_read): Do that check. This is the other caller.
=== modified file 'src/gnutls.c'
--- src/gnutls.c 2011-04-26 06:17:52 +0000
+++ src/gnutls.c 2011-04-26 07:05:42 +0000
@@ -73,9 +73,6 @@
gnutls_session_t state = proc->gnutls_state;
int ret;
- if (proc->gnutls_initstage < GNUTLS_STAGE_HANDSHAKE_CANDO)
- return;
-
if (proc->gnutls_initstage < GNUTLS_STAGE_TRANSPORT_POINTERS_SET)
{
#ifdef WINDOWSNT
@@ -179,7 +176,8 @@
if (proc->gnutls_initstage != GNUTLS_STAGE_READY)
{
- emacs_gnutls_handshake (proc);
+ if (GNUTLS_STAGE_HANDSHAKE_CANDO <= proc->gnutls_initstage)
+ emacs_gnutls_handshake (proc);
return -1;
}
rtnval = gnutls_read (state, buf, nbyte);
next reply other threads:[~2011-04-26 7:18 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-26 7:18 Paul Eggert [this message]
2011-04-26 13:05 ` bug#8556: recent gnutls.c changes broke build on Ubuntu 10.10 Ted Zlatanov
2011-04-26 17:57 ` Paul Eggert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4DB671B8.5010702@cs.ucla.edu \
--to=eggert@cs.ucla.edu \
--cc=8556@debbugs.gnu.org \
--cc=tzz@lifelogs.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.