skalibs

commit 3c5f5aea891c85dbdfc4d287d7ebf2bb813d6405
parent 2858f5c4b1fe40d0970b18e8d155acf3d900ab6e
Author: Laurent Bercot <ska-skaware@skarnet.org>
Date:   Sun, 30 Jul 2017 14:05:39 +0000

 Fix a case where socket_deadlineconnstamp* could modify errno on success (thanks jlyo)

Diffstat:
M
src/libstddjb/socket_deadlineconnstamp4.c
 | 
2
++
M
src/libstddjb/socket_deadlineconnstamp46.c
 | 
2
++
M
src/libstddjb/socket_deadlineconnstamp6.c
 | 
2
++

3 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/libstddjb/socket_deadlineconnstamp4.c b/src/libstddjb/socket_deadlineconnstamp4.c
@@ -6,7 +6,9 @@
 
 int socket_deadlineconnstamp (int s, char const *ip, uint16_t port, tain_t const *deadline, tain_t *stamp)
 {
+  int e = errno ;
   if (socket_connect4(s, ip, port) >= 0) return 1 ;
   if (!error_isagain(errno) && !error_isalready(errno)) return 0 ;
+  errno = e ;
   return socket_waitconn(s, deadline, stamp) ;
 }
diff --git a/src/libstddjb/socket_deadlineconnstamp46.c b/src/libstddjb/socket_deadlineconnstamp46.c
@@ -7,7 +7,9 @@
 
 int socket_deadlineconnstamp46 (int s, ip46_t const *i, uint16_t port, tain_t const *deadline, tain_t *stamp)
 {
+  int e = errno ;
   if (socket_connect46(s, i, port) >= 0) return 1 ;
   if (!error_isagain(errno) && !error_isalready(errno)) return 0 ;
+  errno = e ;
   return socket_waitconn(s, deadline, stamp) ;
 }
diff --git a/src/libstddjb/socket_deadlineconnstamp6.c b/src/libstddjb/socket_deadlineconnstamp6.c
@@ -6,7 +6,9 @@
 
 int socket_deadlineconnstamp6 (int s, char const *ip, uint16_t port, tain_t const *deadline, tain_t *stamp)
 {
+  int e = errno ;
   if (socket_connect6(s, ip, port) >= 0) return 1 ;
   if (!error_isagain(errno) && !error_isalready(errno)) return 0 ;
+  errno = e ;
   return socket_waitconn(s, deadline, stamp) ;
 }