diff options
| -rw-r--r-- | usr.bin/cvs/commit.c | 8 | ||||
| -rw-r--r-- | usr.bin/cvs/trigger.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/usr.bin/cvs/commit.c b/usr.bin/cvs/commit.c index bcf4c24c7c9..be4b72d7454 100644 --- a/usr.bin/cvs/commit.c +++ b/usr.bin/cvs/commit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: commit.c,v 1.137 2008/06/10 01:00:34 joris Exp $ */ +/* $OpenBSD: commit.c,v 1.138 2008/06/10 02:07:57 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org> @@ -211,7 +211,7 @@ cvs_commit(int argc, char **argv) &d->files_added, &d->files_removed, &d->files_modified); } - + if (cvs_logmsg_verify(logmsg)) goto end; @@ -226,10 +226,10 @@ cvs_commit(int argc, char **argv) if (line_list != NULL) { cvs_commit_loginfo(repo, d); - + cvs_trigger_handle(CVS_TRIGGER_LOGINFO, repo, loginfo, line_list, &files_info); - + xfree(loginfo); cvs_trigger_freelist(line_list); cvs_trigger_freeinfo(&files_info); diff --git a/usr.bin/cvs/trigger.c b/usr.bin/cvs/trigger.c index 945b364c0aa..c694ae5a252 100644 --- a/usr.bin/cvs/trigger.c +++ b/usr.bin/cvs/trigger.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trigger.c,v 1.1 2008/06/10 01:00:35 joris Exp $ */ +/* $OpenBSD: trigger.c,v 1.2 2008/06/10 02:07:58 joris Exp $ */ /* * Copyright (c) 2008 Tobias Stoeckmann <tobias@openbsd.org> * Copyright (c) 2008 Jonathan Armani <dbd@asystant.net> @@ -310,8 +310,7 @@ cvs_trigger_getlines(char * file, char * repo) lineno = 0; nline = NULL; - while ((currentline = fgetln(fp, &len)) != NULL) - { + while ((currentline = fgetln(fp, &len)) != NULL) { if (currentline[len - 1] == '\n') { currentline[len - 1] = '\0'; } else { @@ -369,6 +368,7 @@ cvs_trigger_getlines(char * file, char * repo) regfree(&preg); } } + if (nline != NULL) xfree(nline); |