- Fix memory leak in sldns_buffer_new_frm_data.

git-svn-id: file:///svn/unbound/trunk@4230 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index e1f1c19ffd14cefa8baf0a3c34dae8bea9aa847d..290cf4f8663c114e859dbd8f38a69ae73e7928e4 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 16 June 2017: Wouter
        - Fix #1301: memory leak in respip and tests.
        - Free callback in edns-subnetmod on exit and restart.
+       - Fix memory leak in sldns_buffer_new_frm_data.
 
 15 June 2017: Wouter
        - Fix stub zone queries leaking to the internet for

diff --git a/sldns/sbuffer.c b/sldns/sbuffer.c
index a04b9b65563310134384988bbc44e970cde04a10..4ac83977eecbad6783995608ea1aed56dae5de59 100644 (file)
--- a/sldns/sbuffer.c
+++ b/sldns/sbuffer.c
@@ -50,6 +50,8 @@ sldns_buffer_new_frm_data(sldns_buffer *buffer, void *data, size_t size)
        buffer->_limit = buffer->_capacity = size;
        buffer->_fixed = 0;
        buffer->_vfixed = 0;
+       if (!buffer->_fixed && buffer->_data)
+               free(buffer->_data);
        buffer->_data = malloc(size);
        if(!buffer->_data) {
                buffer->_status_err = 1;