commit 193b8054e11239736ba4c9d01ee9ed0b88da08bd
author Prasad J Pandit <pjp@fedoraproject.org> Tue Jun 05 23:38:35 2018 +0530
committer Samuel Thibault <samuel.thibault@ens-lyon.org> Fri Jun 08 09:08:30 2018 +0300
tree 6a979fbf56323673e5c939bc0b7d5b65c7a28638
parent 48b6c898f33297a9bb731ff719c678b2aebff474

slirp: reformat m_inc routine

Coding style changes to the m_inc routine and minor refactoring.

Reported-by: ZDI Disclosures <zdi-disclosures@trendmicro.com>
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>

mbuf.c

diff --git a/mbuf.c b/mbuf.c
index 46c4db1..2b1ef63 100644
--- a/mbuf.c
+++ b/mbuf.c
@@ -147,25 +147,22 @@
 {
     int datasize;
 
-    /* some compiles throw up on gotos.  This one we can fake. */
-    if (m->m_size > size)
+    /* some compilers throw up on gotos.  This one we can fake. */
+    if (m->m_size > size) {
         return;
+    }
 
     if (m->m_flags & M_EXT) {
         datasize = m->m_data - m->m_ext;
         m->m_ext = g_realloc(m->m_ext, size + datasize);
-        m->m_data = m->m_ext + datasize;
     } else {
-        char *dat;
         datasize = m->m_data - m->m_dat;
-        dat = g_malloc(size + datasize);
-        memcpy(dat, m->m_dat, m->m_size);
-
-        m->m_ext = dat;
-        m->m_data = m->m_ext + datasize;
+        m->m_ext = g_malloc(size + datasize);
+        memcpy(m->m_ext, m->m_dat, m->m_size);
         m->m_flags |= M_EXT;
     }
 
+    m->m_data = m->m_ext + datasize;
     m->m_size = size + datasize;
 }