===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/col/col.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -c -r1.11 -r1.12
*** src/usr.bin/col/col.c	2009/10/27 23:59:36	1.11
--- src/usr.bin/col/col.c	2014/10/08 19:59:58	1.12
***************
*** 1,4 ****
! /*	$OpenBSD: col.c,v 1.11 2009/10/27 23:59:36 deraadt Exp $	*/
  /*	$NetBSD: col.c,v 1.7 1995/09/02 05:48:50 jtc Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: col.c,v 1.12 2014/10/08 19:59:58 deraadt Exp $	*/
  /*	$NetBSD: col.c,v 1.7 1995/09/02 05:48:50 jtc Exp $	*/
  
  /*-
***************
*** 85,91 ****
  void	flush_blanks(void);
  void	free_line(LINE *);
  void	usage(void);
! void   *xmalloc(void *, size_t);
  
  CSET	last_set;		/* char_set of last char printed */
  LINE   *lines;
--- 85,91 ----
  void	flush_blanks(void);
  void	free_line(LINE *);
  void	usage(void);
! void   *xreallocarray(void *, size_t, size_t);
  
  CSET	last_set;		/* char_set of last char printed */
  LINE   *lines;
***************
*** 263,272 ****
  		if (l->l_line_len + 1 >= l->l_lsize) {
  			int need;
  
! 			need = l->l_lsize ? l->l_lsize * 2 : 90;
! 			l->l_line = (CHAR *)xmalloc((void *) l->l_line,
! 			    (unsigned) need * sizeof(CHAR));
! 			l->l_lsize = need;
  		}
  		c = &l->l_line[l->l_line_len++];
  		c->c_char = ch;
--- 263,272 ----
  		if (l->l_line_len + 1 >= l->l_lsize) {
  			int need;
  
! 			need = l->l_lsize ? l->l_lsize : 45;
! 			l->l_line = xreallocarray(l->l_line,
! 			    need, 2 * sizeof(CHAR));
! 			l->l_lsize = need * 2;
  		}
  		c = &l->l_line[l->l_line_len++];
  		c->c_char = ch;
***************
*** 379,391 ****
  		 */
  		if (l->l_lsize > sorted_size) {
  			sorted_size = l->l_lsize;
! 			sorted = (CHAR *)xmalloc((void *)sorted,
! 			    (unsigned)sizeof(CHAR) * sorted_size);
  		}
  		if (l->l_max_col >= count_size) {
  			count_size = l->l_max_col + 1;
! 			count = (int *)xmalloc((void *)count,
! 			    (unsigned)sizeof(int) * count_size);
  		}
  		memset((char *)count, 0, sizeof(int) * l->l_max_col + 1);
  		for (i = nchars, c = l->l_line; --i >= 0; c++)
--- 379,391 ----
  		 */
  		if (l->l_lsize > sorted_size) {
  			sorted_size = l->l_lsize;
! 			sorted = xreallocarray(sorted,
! 			    sorted_size, sizeof(CHAR));
  		}
  		if (l->l_max_col >= count_size) {
  			count_size = l->l_max_col + 1;
! 			count = xreallocarray(count,
! 			    count_size, sizeof(int));
  		}
  		memset((char *)count, 0, sizeof(int) * l->l_max_col + 1);
  		for (i = nchars, c = l->l_line; --i >= 0; c++)
***************
*** 466,472 ****
  	int i;
  
  	if (!line_freelist) {
! 		l = (LINE *)xmalloc(NULL, sizeof(LINE) * NALLOC);
  		line_freelist = l;
  		for (i = 1; i < NALLOC; i++, l++)
  			l->l_next = l + 1;
--- 466,472 ----
  	int i;
  
  	if (!line_freelist) {
! 		l = xreallocarray(NULL, NALLOC, sizeof(LINE));
  		line_freelist = l;
  		for (i = 1; i < NALLOC; i++, l++)
  			l->l_next = l + 1;
***************
*** 488,497 ****
  }
  
  void *
! xmalloc(void *p, size_t size)
  {
  
! 	if (!(p = (void *)realloc(p, size)))
  		err(1, "realloc failed");
  	return (p);
  }
--- 488,497 ----
  }
  
  void *
! xreallocarray(void *p, size_t n, size_t size)
  {
  
! 	if (!(p = reallocarray(p, n, size)))
  		err(1, "realloc failed");
  	return (p);
  }