summaryrefslogtreecommitdiff
path: root/usr.bin/cvs/checkout.c
diff options
context:
space:
mode:
authorTobias Stoeckmann <tobias@cvs.openbsd.org>2008-06-12 16:55:49 +0000
committerTobias Stoeckmann <tobias@cvs.openbsd.org>2008-06-12 16:55:49 +0000
commit8ecc89486821aae21f2133a4645bb54b339e9695 (patch)
treef0316cb10d9967534ef9b2be64f97b9dc9d99c4f /usr.bin/cvs/checkout.c
parentc43956b615fb7f4bd9476d37f26e2ce4f4039eb5 (diff)
Fixed a memory leak in export noticed by joris.
ok joris
Diffstat (limited to 'usr.bin/cvs/checkout.c')
-rw-r--r--usr.bin/cvs/checkout.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/cvs/checkout.c b/usr.bin/cvs/checkout.c
index dde80cdb3c4..6afb5230cee 100644
--- a/usr.bin/cvs/checkout.c
+++ b/usr.bin/cvs/checkout.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: checkout.c,v 1.151 2008/06/12 07:16:14 joris Exp $ */
+/* $OpenBSD: checkout.c,v 1.152 2008/06/12 16:55:48 tobias Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
*
@@ -567,7 +567,6 @@ cvs_checkout_file(struct cvs_file *cf, RCSNUM *rnum, char *tag, int co_flags)
cvs_ent_add(ent, entry);
cvs_ent_close(ent, ENT_SYNC);
cf->file_ent = cvs_ent_parse(entry);
- xfree(entry);
}
} else {
if (co_flags & CO_MERGE) {
@@ -588,7 +587,6 @@ cvs_checkout_file(struct cvs_file *cf, RCSNUM *rnum, char *tag, int co_flags)
if (!(co_flags & CO_REMOVE)) {
cvs_remote_output(entry);
- xfree(entry);
if (!(co_flags & CO_MERGE)) {
mode = cf->file_rcs->rf_mode;
@@ -601,4 +599,6 @@ cvs_checkout_file(struct cvs_file *cf, RCSNUM *rnum, char *tag, int co_flags)
}
}
}
+
+ xfree(entry);
}