summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2014-04-15 16:40:48 +0200
committerWerner Koch <wk@gnupg.org>2014-04-30 21:14:28 +0200
commitecea94461ed40f3f6ef662c2501e1d56ec284022 (patch)
tree879b26008b6ee4027997c46785c3345b5dcf0efc
parentestream: Add debug code to the lock functions. (diff)
downloadgnupg2-ecea94461ed40f3f6ef662c2501e1d56ec284022.tar.xz
gnupg2-ecea94461ed40f3f6ef662c2501e1d56ec284022.zip
estream: Fix deadlock in es_fileno.
* src/estream.c (es_fileno_unlocked): Call the unlocked functions.
-rw-r--r--common/estream.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/estream.c b/common/estream.c
index 33195b739..a20d6d4e3 100644
--- a/common/estream.c
+++ b/common/estream.c
@@ -3300,7 +3300,7 @@ es_fileno_unlocked (estream_t stream)
{
es_syshd_t syshd;
- if (es_syshd (stream, &syshd))
+ if (es_syshd_unlocked (stream, &syshd))
return -1;
switch (syshd.type)
{