=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/rcsmerge.c,v retrieving revision 1.10 retrieving revision 1.11 diff -c -r1.10 -r1.11 *** src/usr.bin/rcs/rcsmerge.c 2005/11/28 14:43:59 1.10 --- src/usr.bin/rcs/rcsmerge.c 2005/12/10 20:27:46 1.11 *************** *** 1,4 **** ! /* $OpenBSD: rcsmerge.c,v 1.10 2005/11/28 14:43:59 xsa Exp $ */ /* * Copyright (c) 2005 Xavier Santolaria * All rights reserved. --- 1,4 ---- ! /* $OpenBSD: rcsmerge.c,v 1.11 2005/12/10 20:27:46 joris Exp $ */ /* * Copyright (c) 2005 Xavier Santolaria * All rights reserved. *************** *** 136,142 **** fcont = cvs_buf_release(bp); printf("%s", fcont); ! free(fcont); } else { /* XXX mode */ if (cvs_buf_write(bp, argv[i], 0644) < 0) --- 136,142 ---- fcont = cvs_buf_release(bp); printf("%s", fcont); ! xfree(fcont); } else { /* XXX mode */ if (cvs_buf_write(bp, argv[i], 0644) < 0)