===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/annotate.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -c -r1.64 -r1.65
*** src/usr.bin/cvs/annotate.c	2015/01/16 06:40:06	1.64
--- src/usr.bin/cvs/annotate.c	2015/11/05 09:48:21	1.65
***************
*** 1,4 ****
! /*	$OpenBSD: annotate.c,v 1.64 2015/01/16 06:40:06 deraadt Exp $	*/
  /*
   * Copyright (c) 2007 Tobias Stoeckmann <tobias@openbsd.org>
   * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: annotate.c,v 1.65 2015/11/05 09:48:21 nicm Exp $	*/
  /*
   * Copyright (c) 2007 Tobias Stoeckmann <tobias@openbsd.org>
   * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org>
***************
*** 235,241 ****
  			p[line->l_len] = '\0';
  
  			if (line->l_needsfree)
! 				xfree(line->l_line);
  			line->l_line = p;
  			line->l_len++;
  			line->l_needsfree = 1;
--- 235,241 ----
  			p[line->l_len] = '\0';
  
  			if (line->l_needsfree)
! 				free(line->l_line);
  			line->l_line = p;
  			line->l_len++;
  			line->l_needsfree = 1;
***************
*** 244,252 ****
  		    line->l_delta->rd_author, date, line->l_line);
  
  		if (line->l_needsfree)
! 			xfree(line->l_line);
! 		xfree(line);
  	}
  
! 	xfree(alines);
  }
--- 244,252 ----
  		    line->l_delta->rd_author, date, line->l_line);
  
  		if (line->l_needsfree)
! 			free(line->l_line);
! 		free(line);
  	}
  
! 	free(alines);
  }