===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/diff_internals.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -c -r1.34 -r1.35
*** src/usr.bin/cvs/diff_internals.c	2011/04/01 17:25:26	1.34
--- src/usr.bin/cvs/diff_internals.c	2014/12/01 21:58:46	1.35
***************
*** 1,4 ****
! /*	$OpenBSD: diff_internals.c,v 1.34 2011/04/01 17:25:26 nicm Exp $	*/
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: diff_internals.c,v 1.35 2014/12/01 21:58:46 deraadt Exp $	*/
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
   * All rights reserved.
***************
*** 377,387 ****
  
  	member = (int *)file[1];
  	equiv(sfile[0], slen[0], sfile[1], slen[1], member);
! 	member = xrealloc(member, slen[1] + 2, sizeof(*member));
  
  	class = (int *)file[0];
  	unsort(sfile[0], slen[0], class);
! 	class = xrealloc(class, slen[0] + 2, sizeof(*class));
  
  	klist = xcalloc(slen[0] + 2, sizeof(*klist));
  	clen = 0;
--- 377,387 ----
  
  	member = (int *)file[1];
  	equiv(sfile[0], slen[0], sfile[1], slen[1], member);
! 	member = xreallocarray(member, slen[1] + 2, sizeof(*member));
  
  	class = (int *)file[0];
  	unsort(sfile[0], slen[0], class);
! 	class = xreallocarray(class, slen[0] + 2, sizeof(*class));
  
  	klist = xcalloc(slen[0] + 2, sizeof(*klist));
  	clen = 0;
***************
*** 391,403 ****
  	xfree(member);
  	xfree(class);
  
! 	J = xrealloc(J, len[0] + 2, sizeof(*J));
  	unravel(klist[i]);
  	xfree(clist);
  	xfree(klist);
  
! 	ixold = xrealloc(ixold, len[0] + 2, sizeof(*ixold));
! 	ixnew = xrealloc(ixnew, len[1] + 2, sizeof(*ixnew));
  	check(f1, f2, flags);
  	output(f1, f2, flags);
  
--- 391,403 ----
  	xfree(member);
  	xfree(class);
  
! 	J = xreallocarray(J, len[0] + 2, sizeof(*J));
  	unravel(klist[i]);
  	xfree(clist);
  	xfree(klist);
  
! 	ixold = xreallocarray(ixold, len[0] + 2, sizeof(*ixold));
! 	ixnew = xreallocarray(ixnew, len[1] + 2, sizeof(*ixnew));
  	check(f1, f2, flags);
  	output(f1, f2, flags);
  
***************
*** 458,464 ****
  	for (j = 0; (h = readhash(fd, flags));) {
  		if (j == sz) {
  			sz = sz * 3 / 2;
! 			p = xrealloc(p, sz + 3, sizeof(*p));
  		}
  		p[++j].value = h;
  	}
--- 458,464 ----
  	for (j = 0; (h = readhash(fd, flags));) {
  		if (j == sz) {
  			sz = sz * 3 / 2;
! 			p = xreallocarray(p, sz + 3, sizeof(*p));
  		}
  		p[++j].value = h;
  	}
***************
*** 589,595 ****
  
  	if (clen == clistlen) {
  		clistlen = clistlen * 11 / 10;
! 		clist = xrealloc(clist, clistlen, sizeof(*clist));
  	}
  	q = clist + clen;
  	q->x = x;
--- 589,595 ----
  
  	if (clen == clistlen) {
  		clistlen = clistlen * 11 / 10;
! 		clist = xreallocarray(clist, clistlen, sizeof(*clist));
  	}
  	q = clist + clen;
  	q->x = x;
***************
*** 999,1005 ****
  		if (context_vec_ptr == context_vec_end - 1) {
  			ptrdiff_t offset = context_vec_ptr - context_vec_start;
  			max_context <<= 1;
! 			context_vec_start = xrealloc(context_vec_start,
  			    max_context, sizeof(*context_vec_start));
  			context_vec_end = context_vec_start + max_context;
  			context_vec_ptr = context_vec_start + offset;
--- 999,1005 ----
  		if (context_vec_ptr == context_vec_end - 1) {
  			ptrdiff_t offset = context_vec_ptr - context_vec_start;
  			max_context <<= 1;
! 			context_vec_start = xreallocarray(context_vec_start,
  			    max_context, sizeof(*context_vec_start));
  			context_vec_end = context_vec_start + max_context;
  			context_vec_ptr = context_vec_start + offset;