src/usr.bin/ssh/sshbuf.c - diff

Return to sshbuf.c CVS log

Up to [local] / src / usr.bin / ssh

version 1.6, 2016/01/12 23:42:54

version 1.7, 2016/09/12 01:22:38

Line 15

* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

#include <sys/param.h> /* roundup */

#include <sys/types.h>

#include <signal.h>

#include <stdlib.h>

Line 25

Line 24

#include "ssherr.h"

#define SSHBUF_INTERNAL

#include "sshbuf.h"

#include "misc.h"

static inline int

sshbuf_check_sanity(const struct sshbuf *buf)

Line 248

if (buf->size < SSHBUF_SIZE_INIT)

rlen = SSHBUF_SIZE_INIT;

else

rlen = roundup(buf->size, SSHBUF_SIZE_INC);

rlen = ROUNDUP(buf->size, SSHBUF_SIZE_INC);

if (rlen > max_size)

rlen = max_size;

explicit_bzero(buf->d + buf->size, buf->alloc - buf->size);

Line 338

* allocate less if doing so would overflow max_size.

need = len + buf->size - buf->alloc;

rlen = roundup(buf->alloc + need, SSHBUF_SIZE_INC);

rlen = ROUNDUP(buf->alloc + need, SSHBUF_SIZE_INC);

SSHBUF_DBG(("need %zu initial rlen %zu", need, rlen));

if (rlen > buf->max_size)

rlen = buf->alloc + need;