From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Tue, 2 Apr 2013 20:06:35 +0000 (+0200)
Subject: Corrected bug in heartbeat send (reported by Joke de Buhr).
X-Git-Tag: gnutls_3_2_0~86
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c2793ea302bc5e499c19f8969ca473045ca8d768;p=thirdparty%2Fgnutls.git

Corrected bug in heartbeat send (reported by Joke de Buhr).
---

diff --git a/lib/ext/heartbeat.c b/lib/ext/heartbeat.c
index 494b25fc5c..eba24f89c9 100644
--- a/lib/ext/heartbeat.c
+++ b/lib/ext/heartbeat.c
@@ -94,12 +94,16 @@ heartbeat_send_data (gnutls_session_t session, const void *data,
   int ret, pos;
   uint8_t * response;
 
-  response = gnutls_malloc(1+data_size+DEFAULT_PAYLOAD_SIZE);
+  response = gnutls_malloc(1+2+data_size+DEFAULT_PAYLOAD_SIZE);
   if (response == NULL)
     return gnutls_assert_val(GNUTLS_E_MEMORY_ERROR);
   
   pos = 0;
-  response[pos++] = 1;
+  response[pos++] = type;
+  
+  _gnutls_write_uint16(data_size, &response[pos]);
+  pos += 2;
+  
   memcpy(&response[pos], data, data_size);
   pos += data_size;