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

Return to xmalloc.c CVS log

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

Diff for /src/usr.bin/ssh/xmalloc.c between version 1.6.2.4 and 1.7

version 1.6.2.4, 2001/03/21 18:53:21

version 1.7, 2000/06/20 01:39:45

Line 2

* Author: Tatu Ylonen <ylo@cs.hut.fi>

* Created: Mon Mar 20 21:23:10 1995 ylo

* Versions of malloc and friends that check their results, and never return

* failure (they call fatal if they encounter an error).

* As far as I am concerned, the code I have written for this software

* can be used freely for any purpose. Any derived versions of this

* software must be clearly marked as such, and if the derived work is

* incompatible with the protocol description in the RFC file, it must be

* called by a name other than "ssh" or "Secure Shell".

#include "includes.h"

RCSID("$OpenBSD$");

#include "xmalloc.h"

#include "ssh.h"

#include "log.h"

void *

xmalloc(size_t size)

{

void *ptr;

void *ptr = malloc(size);

if (size == 0)

fatal("xmalloc: zero size");

ptr = malloc(size);

if (ptr == NULL)

fatal("xmalloc: out of memory (allocating %lu bytes)", (u_long) size);

fatal("xmalloc: out of memory (allocating %d bytes)", (int) size);

return ptr;

}

Line 36

Line 26

{

void *new_ptr;

if (new_size == 0)

fatal("xrealloc: zero size");

if (ptr == NULL)

fatal("xrealloc: NULL pointer given as argument");

new_ptr = realloc(ptr, new_size);

if (new_ptr == NULL)

fatal("xrealloc: out of memory (new_size %lu bytes)", (u_long) new_size);

fatal("xrealloc: out of memory (new_size %d bytes)", (int) new_size);

return new_ptr;

}

Line 57

Line 45

char *

xstrdup(const char *str)

{

size_t len = strlen(str) + 1;

int len = strlen(str) + 1;

char *cp;

if (len == 0)

char *cp = xmalloc(len);

fatal("xstrdup: zero size");

cp = xmalloc(len);

strlcpy(cp, str, len);

return cp;

}