===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/diff.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -c -r1.70 -r1.71
*** src/usr.bin/cvs/diff.c	2005/12/05 19:53:00	1.70
--- src/usr.bin/cvs/diff.c	2005/12/10 20:27:45	1.71
***************
*** 1,4 ****
! /*	$OpenBSD: diff.c,v 1.70 2005/12/05 19:53:00 niallo Exp $	*/
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: diff.c,v 1.71 2005/12/10 20:27:45 joris Exp $	*/
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
   * All rights reserved.
***************
*** 357,365 ****
  {
  	int ch;
  
! 	dap = (struct diff_arg *)malloc(sizeof(*dap));
! 	if (dap == NULL)
! 		return (CVS_EX_DATA);
  	dap->date1 = dap->date2 = dap->rev1 = dap->rev2 = NULL;
  	strlcpy(diffargs, argv[0], sizeof(diffargs));
  
--- 357,363 ----
  {
  	int ch;
  
! 	dap = (struct diff_arg *)xmalloc(sizeof(*dap));
  	dap->date1 = dap->date2 = dap->rev1 = dap->rev2 = NULL;
  	strlcpy(diffargs, argv[0], sizeof(diffargs));
  
***************
*** 434,440 ****
  cvs_diff_cleanup(void)
  {
  	if (dap != NULL) {
! 		free(dap);
  		dap = NULL;
  	}
  	return (0);
--- 432,438 ----
  cvs_diff_cleanup(void)
  {
  	if (dap != NULL) {
! 		xfree(dap);
  		dap = NULL;
  	}
  	return (0);
***************
*** 767,831 ****
  
  	member = (int *)file[1];
  	equiv(sfile[0], slen[0], sfile[1], slen[1], member);
! 	if ((tmp = realloc(member, (slen[1] + 2) * sizeof(int))) == NULL) {
! 		free(member);
! 		member = NULL;
! 		cvs_log(LP_ERRNO, "failed to resize member");
! 		goto closem;
! 	}
  	member = (int *)tmp;
  
  	class = (int *)file[0];
  	unsort(sfile[0], slen[0], class);
! 	if ((tmp = realloc(class, (slen[0] + 2) * sizeof(int))) == NULL) {
! 		free(class);
! 		class = NULL;
! 		cvs_log(LP_ERRNO, "failed to resize class");
! 		goto closem;
! 	}
  	class = (int *)tmp;
  
! 	if ((klist = malloc((slen[0] + 2) * sizeof(int))) == NULL) {
! 		cvs_log(LP_ERRNO, "failed to allocate klist");
! 		goto closem;
! 	}
  	clen = 0;
  	clistlen = 100;
! 	if ((clist = malloc(clistlen * sizeof(cand))) == NULL) {
! 		cvs_log(LP_ERRNO, "failed to allocate clist");
! 		goto closem;
! 	}
  
  	if ((i = stone(class, slen[0], member, klist)) < 0)
  		goto closem;
  
! 	free(member);
! 	free(class);
  
! 	if ((tmp = realloc(J, (diff_len[0] + 2) * sizeof(int))) == NULL) {
! 		free(J);
! 		J = NULL;
! 		cvs_log(LP_ERRNO, "failed to resize J");
! 		goto closem;
! 	}
  	J = (int *)tmp;
  	unravel(klist[i]);
! 	free(clist);
! 	free(klist);
  
! 	if ((tmp = realloc(ixold, (diff_len[0] + 2) * sizeof(long))) == NULL) {
! 		free(ixold);
! 		ixold = NULL;
! 		cvs_log(LP_ERRNO, "failed to resize ixold");
! 		goto closem;
! 	}
  	ixold = (long *)tmp;
! 	if ((tmp = realloc(ixnew, (diff_len[1] + 2) * sizeof(long))) == NULL) {
! 		free(ixnew);
! 		ixnew = NULL;
! 		cvs_log(LP_ERRNO, "failed to resize ixnew");
! 		goto closem;
! 	}
  	ixnew = (long *)tmp;
  	check(f1, f2);
  	output(file1, f1, file2, f2);
--- 765,799 ----
  
  	member = (int *)file[1];
  	equiv(sfile[0], slen[0], sfile[1], slen[1], member);
! 	tmp = xrealloc(member, (slen[1] + 2) * sizeof(int));
  	member = (int *)tmp;
  
  	class = (int *)file[0];
  	unsort(sfile[0], slen[0], class);
! 	tmp = xrealloc(class, (slen[0] + 2) * sizeof(int));
  	class = (int *)tmp;
  
! 	klist = xmalloc((slen[0] + 2) * sizeof(int));
  	clen = 0;
  	clistlen = 100;
! 	clist = xmalloc(clistlen * sizeof(cand));
  
  	if ((i = stone(class, slen[0], member, klist)) < 0)
  		goto closem;
  
! 	xfree(member);
! 	xfree(class);
  
! 	tmp = xrealloc(J, (diff_len[0] + 2) * sizeof(int));
  	J = (int *)tmp;
  	unravel(klist[i]);
! 	xfree(clist);
! 	xfree(klist);
  
! 	tmp = xrealloc(ixold, (diff_len[0] + 2) * sizeof(long));
  	ixold = (long *)tmp;
! 
! 	tmp = xrealloc(ixnew, (diff_len[1] + 2) * sizeof(long));
  	ixnew = (long *)tmp;
  	check(f1, f2);
  	output(file1, f1, file2, f2);
***************
*** 885,904 ****
  	if (sz < 100)
  		sz = 100;
  
! 	p = (struct line *)malloc((sz + 3) * sizeof(struct line));
! 	if (p == NULL) {
! 		cvs_log(LP_ERRNO, "failed to prepare line array");
! 		return (-1);
! 	}
  	for (j = 0; (h = readhash(fd));) {
  		if (j == (int)sz) {
  			sz = sz * 3 / 2;
! 			tmp = realloc(p, (sz + 3) * sizeof(struct line));
! 			if (tmp == NULL) {
! 				cvs_log(LP_ERRNO, "failed to grow line array");
! 				free(p);
! 				return (-1);
! 			}
  			p = (struct line *)tmp;
  		}
  		p[++j].value = h;
--- 853,863 ----
  	if (sz < 100)
  		sz = 100;
  
! 	p = (struct line *)xmalloc((sz + 3) * sizeof(struct line));
  	for (j = 0; (h = readhash(fd));) {
  		if (j == (int)sz) {
  			sz = sz * 3 / 2;
! 			tmp = xrealloc(p, (sz + 3) * sizeof(struct line));
  			p = (struct line *)tmp;
  		}
  		p[++j].value = h;
***************
*** 1038,1048 ****
  
  	if (clen == clistlen) {
  		newclistlen = clistlen * 11 / 10;
! 		tmp = realloc(clist, newclistlen * sizeof(cand));
! 		if (tmp == NULL) {
! 			cvs_log(LP_ERRNO, "failed to resize clist");
! 			return (-1);
! 		}
  		clist = tmp;
  		clistlen = newclistlen;
  	}
--- 997,1003 ----
  
  	if (clen == clistlen) {
  		newclistlen = clistlen * 11 / 10;
! 		tmp = xrealloc(clist, newclistlen * sizeof(cand));
  		clist = tmp;
  		clistlen = newclistlen;
  	}
***************
*** 1232,1246 ****
  {
  	int *a, i;
  
! 	if ((a = (int *)malloc((l + 1) * sizeof(int))) == NULL) {
! 		cvs_log(LP_ERRNO, "failed to allocate sort array");
! 		return;
! 	}
  	for (i = 1; i <= l; i++)
  		a[f[i].serial] = f[i].value;
  	for (i = 1; i <= l; i++)
  		b[i] = a[i];
! 	free(a);
  }
  
  static int
--- 1187,1198 ----
  {
  	int *a, i;
  
! 	a = (int *)xmalloc((l + 1) * sizeof(int));
  	for (i = 1; i <= l; i++)
  		a[f[i].serial] = f[i].value;
  	for (i = 1; i <= l; i++)
  		b[i] = a[i];
! 	xfree(a);
  }
  
  static int
***************
*** 1318,1328 ****
  	char *line;
  	ssize_t nr;
  
! 	line = malloc(rlen + 1);
! 	if (line == NULL) {
! 		cvs_log(LP_ERRNO, "failed to allocate line");
! 		return (NULL);
! 	}
  	if ((nr = pread(fd, line, rlen, off)) < 0) {
  		cvs_log(LP_ERRNO, "preadline failed");
  		return (NULL);
--- 1270,1276 ----
  	char *line;
  	ssize_t nr;
  
! 	line = xmalloc(rlen + 1);
  	if ((nr = pread(fd, line, rlen, off)) < 0) {
  		cvs_log(LP_ERRNO, "preadline failed");
  		return (NULL);
***************
*** 1337,1343 ****
  	int ret;
  
  	ret = regexec(&ignore_re, line, (size_t)0, NULL, 0);
! 	free(line);
  	return (ret == 0);	/* if it matched, it should be ignored. */
  }
  
--- 1285,1291 ----
  	int ret;
  
  	ret = regexec(&ignore_re, line, (size_t)0, NULL, 0);
! 	xfree(line);
  	return (ret == 0);	/* if it matched, it should be ignored. */
  }
  
***************
*** 1391,1404 ****
  			struct context_vec *tmp;
  			ptrdiff_t offset = context_vec_ptr - context_vec_start;
  			max_context <<= 1;
! 			if ((tmp = realloc(context_vec_start, max_context *
! 			    sizeof(struct context_vec))) == NULL) {
! 				free(context_vec_start);
! 				context_vec_start = NULL;
! 				cvs_log(LP_ERRNO,
! 				    "failed to resize context_vec_start");
! 				return;
! 			}
  			context_vec_start = tmp;
  			context_vec_end = context_vec_start + max_context;
  			context_vec_ptr = context_vec_start + offset;
--- 1339,1346 ----
  			struct context_vec *tmp;
  			ptrdiff_t offset = context_vec_ptr - context_vec_start;
  			max_context <<= 1;
! 			tmp = xrealloc(context_vec_start, max_context *
! 			    sizeof(struct context_vec));
  			context_vec_start = tmp;
  			context_vec_end = context_vec_start + max_context;
  			context_vec_ptr = context_vec_start + offset;
***************
*** 1836,1841 ****
  		cvs_buf_append(diffbuf, str, strlen(str));
  	else
  		cvs_printf("%s", str);
! 	free(str);
  	va_end(vap);
  }
--- 1778,1783 ----
  		cvs_buf_append(diffbuf, str, strlen(str));
  	else
  		cvs_printf("%s", str);
! 	xfree(str);
  	va_end(vap);
  }