From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Mon, 5 Jan 2015 14:08:28 +0000 (+0100)
Subject: Give precedence to vector push function
X-Git-Tag: gnutls_3_4_0~388
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cb4ea413569803cbbf291abb27d30d14bfa971c5;p=thirdparty%2Fgnutls.git

Give precedence to vector push function
---

diff --git a/lib/gnutls_buffers.c b/lib/gnutls_buffers.c
index ef2ad236b3..e4279a229e 100644
--- a/lib/gnutls_buffers.c
+++ b/lib/gnutls_buffers.c
@@ -483,11 +483,13 @@ _gnutls_writev(gnutls_session_t session, const giovec_t * giovec,
 		}
 	}
 
-	if (session->internals.push_func != NULL || no_writev != 0)
-		i = _gnutls_writev_emu(session, fd, giovec, giovec_cnt);
-	else
+	if (session->internals.vec_push_func != NULL && no_writev == 0)
 		i = session->internals.vec_push_func(fd, giovec,
 						     giovec_cnt);
+	else if (session->internals.push_func)
+		i = _gnutls_writev_emu(session, fd, giovec, giovec_cnt);
+	else
+		return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
 
 	if (i == -1) {
 		int err = get_errno(session);