===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/file/xmalloc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -c -r1.2 -r1.3
*** src/usr.bin/file/xmalloc.c	2015/06/17 18:51:11	1.2
--- src/usr.bin/file/xmalloc.c	2015/11/17 18:25:03	1.3
***************
*** 1,4 ****
! /* $OpenBSD: xmalloc.c,v 1.2 2015/06/17 18:51:11 nicm Exp $ */
  /*
   * Author: Tatu Ylonen <ylo@cs.hut.fi>
   * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
--- 1,4 ----
! /* $OpenBSD: xmalloc.c,v 1.3 2015/11/17 18:25:03 tobias Exp $ */
  /*
   * Author: Tatu Ylonen <ylo@cs.hut.fi>
   * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
***************
*** 31,39 ****
  		errx(1, "xmalloc: zero size");
  	ptr = malloc(size);
  	if (ptr == NULL)
! 		errx(1,
! 		    "xmalloc: out of memory (allocating %zu bytes)",
! 		    size);
  	return ptr;
  }
  
--- 31,37 ----
  		errx(1, "xmalloc: zero size");
  	ptr = malloc(size);
  	if (ptr == NULL)
! 		err(1, "xmalloc: allocating %zu bytes", size);
  	return ptr;
  }
  
***************
*** 44,55 ****
  
  	if (size == 0 || nmemb == 0)
  		errx(1, "xcalloc: zero size");
- 	if (SIZE_MAX / nmemb < size)
- 		errx(1, "xcalloc: nmemb * size > SIZE_MAX");
  	ptr = calloc(nmemb, size);
  	if (ptr == NULL)
! 		errx(1, "xcalloc: out of memory (allocating %zu bytes)",
! 		    (size * nmemb));
  	return ptr;
  }
  
--- 42,50 ----
  
  	if (size == 0 || nmemb == 0)
  		errx(1, "xcalloc: zero size");
  	ptr = calloc(nmemb, size);
  	if (ptr == NULL)
! 		err(1, "xcalloc: allocating %zu * %zu bytes", nmemb, size);
  	return ptr;
  }
  
***************
*** 60,67 ****
  
  	new_ptr = reallocarray(ptr, nmemb, size);
  	if (new_ptr == NULL)
! 		errx(1, "xreallocarray: out of memory (new_size %zu bytes)",
! 		    nmemb * size);
  	return new_ptr;
  }
  
--- 55,62 ----
  
  	new_ptr = reallocarray(ptr, nmemb, size);
  	if (new_ptr == NULL)
! 		err(1, "xreallocarray: allocating %zu * %zu bytes",
! 		    nmemb, size);
  	return new_ptr;
  }
  
***************
*** 86,92 ****
  	va_end(ap);
  
  	if (i < 0 || *ret == NULL)
! 		errx(1, "xasprintf: could not allocate memory");
  
! 	return (i);
  }
--- 81,87 ----
  	va_end(ap);
  
  	if (i < 0 || *ret == NULL)
! 		err(1, "xasprintf");
  
! 	return i;
  }