===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/diff3.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -c -r1.58 -r1.59
*** src/usr.bin/cvs/diff3.c	2015/09/05 09:47:08	1.58
--- src/usr.bin/cvs/diff3.c	2015/11/05 09:48:21	1.59
***************
*** 1,4 ****
! /*	$OpenBSD: diff3.c,v 1.58 2015/09/05 09:47:08 jsg Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
--- 1,4 ----
! /*	$OpenBSD: diff3.c,v 1.59 2015/11/05 09:48:21 nicm Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
***************
*** 257,276 ****
  
  	cvs_freelines(dlines);
  
! 	if (data != NULL)
! 		xfree(data);
! 	xfree(patch);
  
  	for (i = 0; i < 3; i++)
  		fclose(fp[i]);
  
  	worklist_run(&temp_files, worklist_unlink);
  
! 	xfree(path1);
! 	xfree(path2);
! 	xfree(path3);
! 	xfree(dp13);
! 	xfree(dp23);
  }
  
  static int
--- 257,275 ----
  
  	cvs_freelines(dlines);
  
! 	free(data);
! 	free(patch);
  
  	for (i = 0; i < 3; i++)
  		fclose(fp[i]);
  
  	worklist_run(&temp_files, worklist_unlink);
  
! 	free(path1);
! 	free(path2);
! 	free(path3);
! 	free(dp13);
! 	free(dp23);
  }
  
  static int
***************
*** 291,307 ****
  	szchanges = 0;
  	memset(last, 0, sizeof(last));
  	memset(cline, 0, sizeof(cline));
! 	if (d13 != NULL)
! 		xfree(d13);
! 	if (d23 != NULL)
! 		xfree(d23);
! 	if (overlap != NULL)
! 		xfree(overlap);
! 	if (de != NULL)
! 		xfree(de);
  
! 	overlap = NULL;
! 	de = d13 = d23 = NULL;
  
  	increase();
  
--- 290,301 ----
  	szchanges = 0;
  	memset(last, 0, sizeof(last));
  	memset(cline, 0, sizeof(cline));
! 	free(d13);
! 	free(d23);
! 	free(overlap);
! 	free(de);
  
! 	de = d13 = d23 = overlap = NULL;
  
  	increase();