From: Tomas Mraz <tmraz@fedoraproject.org>
Date: Tue, 11 Jun 2019 13:10:21 +0000 (+0200)
Subject: resolved: Fix incorrect use of OpenSSL BUF_MEM
X-Git-Tag: v243-rc1~298
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=18bddeaaf225d5becfc10cd2c6a1d037c90574a2;p=thirdparty%2Fsystemd.git

resolved: Fix incorrect use of OpenSSL BUF_MEM

Fixes: #12763
---

diff --git a/src/resolve/resolved-dnstls-openssl.c b/src/resolve/resolved-dnstls-openssl.c
index f269e4d6487..5d922300758 100644
--- a/src/resolve/resolved-dnstls-openssl.c
+++ b/src/resolve/resolved-dnstls-openssl.c
@@ -6,6 +6,7 @@
 
 #include <openssl/bio.h>
 #include <openssl/err.h>
+#include <string.h>
 
 #include "io-util.h"
 #include "resolved-dns-stream.h"
@@ -34,9 +35,11 @@ static int dnstls_flush_write_buffer(DnsStream *stream) {
                         return ss;
                 } else {
                         stream->dnstls_data.write_buffer->length -= ss;
-                        stream->dnstls_data.write_buffer->data += ss;
 
                         if (stream->dnstls_data.write_buffer->length > 0) {
+                                memmove(stream->dnstls_data.write_buffer->data,
+                                        stream->dnstls_data.write_buffer->data + ss,
+                                        stream->dnstls_data.write_buffer->length);
                                 stream->dnstls_events |= EPOLLOUT;
                                 return -EAGAIN;
                         }