===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/diff/diffreg.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -c -r1.86 -r1.87
*** src/usr.bin/diff/diffreg.c	2015/04/29 04:00:25	1.86
--- src/usr.bin/diff/diffreg.c	2015/09/25 16:16:26	1.87
***************
*** 1,4 ****
! /*	$OpenBSD: diffreg.c,v 1.86 2015/04/29 04:00:25 deraadt Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
--- 1,4 ----
! /*	$OpenBSD: diffreg.c,v 1.87 2015/09/25 16:16:26 tedu Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
***************
*** 385,391 ****
  		case -1:
  			warnx("No more processes");
  			status |= 2;
! 			xfree(header);
  			rval = D_ERROR;
  			goto closem;
  		case 0:
--- 385,391 ----
  		case -1:
  			warnx("No more processes");
  			status |= 2;
! 			free(header);
  			rval = D_ERROR;
  			goto closem;
  		case 0:
***************
*** 406,412 ****
  			}
  			close(pfd[0]);
  			rewind(stdout);
! 			xfree(header);
  		}
  	}
  	prepare(0, f1, stb1.st_size, flags);
--- 406,412 ----
  			}
  			close(pfd[0]);
  			rewind(stdout);
! 			free(header);
  		}
  	}
  	prepare(0, f1, stb1.st_size, flags);
***************
*** 429,441 ****
  	clistlen = 100;
  	clist = xcalloc(clistlen, sizeof(*clist));
  	i = stone(class, slen[0], member, klist, flags);
! 	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));
--- 429,441 ----
  	clistlen = 100;
  	clist = xcalloc(clistlen, sizeof(*clist));
  	i = stone(class, slen[0], member, klist, flags);
! 	free(member);
! 	free(class);
  
  	J = xreallocarray(J, len[0] + 2, sizeof(*J));
  	unravel(klist[i]);
! 	free(clist);
! 	free(klist);
  
  	ixold = xreallocarray(ixold, len[0] + 2, sizeof(*ixold));
  	ixnew = xreallocarray(ixnew, len[1] + 2, sizeof(*ixnew));
***************
*** 899,905 ****
  		a[f[i].serial] = f[i].value;
  	for (i = 1; i <= l; i++)
  		b[i] = a[i];
! 	xfree(a);
  }
  
  static int
--- 899,905 ----
  		a[f[i].serial] = f[i].value;
  	for (i = 1; i <= l; i++)
  		b[i] = a[i];
! 	free(a);
  }
  
  static int
***************
*** 1006,1012 ****
  	int ret;
  
  	ret = regexec(&ignore_re, line, 0, NULL, 0);
! 	xfree(line);
  	return (ret == 0);	/* if it matched, it should be ignored. */
  }
  
--- 1006,1012 ----
  	int ret;
  
  	ret = regexec(&ignore_re, line, 0, NULL, 0);
! 	free(line);
  	return (ret == 0);	/* if it matched, it should be ignored. */
  }