PR feedback

Author: justsmth

crypto/bio/dgram.c

@@ -161,7 +161,8 @@ static int dgram_read(BIO *bp, char *out, const int out_len) {
                                   BIO_ADDR_sockaddr_noconst(&peer), &len);
 
   if (result < INT_MIN || result > INT_MAX) {
-    abort();
+    OPENSSL_PUT_ERROR(BIO, BIO_R_SYS_LIB);
+    return -1;
   }
   const int ret = result;
 
@@ -194,6 +195,7 @@ static int dgram_free(BIO *bp) {
     }
   }
   bp->init = 0;
+  bp->num = -1;
   bp->flags = 0;
   OPENSSL_free(bp->ptr);
   bp->ptr = NULL;

crypto/bio/internal.h

@@ -98,7 +98,7 @@ int bio_socket_nbio(int sock, int on);
 // bio_clear_socket_error clears the last socket error on |sock|.
 void bio_clear_socket_error(int sock);
 
-// bio_sock_error returns the last socket error on |sock|.
+// bio_sock_error_get_and_clear clears and returns the last socket error on |sock|.
 int bio_sock_error_get_and_clear(int sock);
 
 // bio_socket_should_retry returns non-zero if |return_value| indicates an error

include/openssl/bio.h

@@ -723,7 +723,7 @@ typedef union bio_addr_st {
 #endif
 } BIO_ADDR;
 
-#define BIO_CTRL_DGRAM_CONNECT       31// BIO dgram special
+#define BIO_CTRL_DGRAM_CONNECT       31 // BIO dgram special
 #define BIO_CTRL_DGRAM_SET_CONNECTED 32 /* allow for an externally connected
                                           * socket to be passed in */
 
@@ -765,12 +765,14 @@ OPENSSL_EXPORT int BIO_ctrl_dgram_connect(BIO *bp, const BIO_ADDR *peer);
 OPENSSL_EXPORT int BIO_ctrl_set_connected(BIO* bp, const BIO_ADDR *peer);
 
 // BIO_dgram_recv_timedout returns 1 if the most recent datagram receive
-// operation on |bp| timed out, and a non-positive value otherwise.
+// operation on |bp| timed out, and a non-positive value otherwise. Any error
+// for this socket gets reset by this call.
 OPENSSL_EXPORT int BIO_dgram_recv_timedout(BIO* bp);
 
 // BIO_dgram_send_timedout returns 1 if the most recent datagram send
-// operation on |bp| timed out, and a non-positive value otherwise.
-OPENSSL_EXPORT int BIO_dgram_send_timedout(BIO* bp);
+// operation on |bp| timed out, and a non-positive value otherwise. Any error
+// for this socket gets reset by this call.
+OPENSSL_EXPORT int BIO_dgram_send_timedout(BIO *bp);
 
 // BIO_dgram_get_peer stores the address of the peer the datagram BIO is
 // connected to in |peer|. It returns 1 on success and a non-positive value on error.