Skip to content

Commit

Permalink
slirp: reformat m_inc routine
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Prasad J Pandit authored and sthibaul committed Jun 8, 2018
1 parent 864036e commit c22098c
Showing 1 changed file with 16 additions and 18 deletions.
34 changes: 16 additions & 18 deletions slirp/mbuf.c
Expand Up @@ -151,27 +151,25 @@ m_cat(struct mbuf *m, struct mbuf *n)
void
m_inc(struct mbuf *m, int size)
{
int datasize;
int datasize;

/* some compiles throw up on gotos. This one we can fake. */
if(m->m_size>size) return;
/* 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_flags |= M_EXT;
}
if (m->m_flags & M_EXT) {
datasize = m->m_data - m->m_ext;
m->m_ext = g_realloc(m->m_ext, size + datasize);
} else {
datasize = m->m_data - m->m_dat;
m->m_ext = g_malloc(size + datasize);
memcpy(m->m_ext, m->m_dat, m->m_size);
m->m_flags |= M_EXT;
}

m->m_size = size + datasize;
m->m_data = m->m_ext + datasize;
m->m_size = size + datasize;
}


Expand Down

0 comments on commit c22098c

Please sign in to comment.