diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2005-10-04 23:02:57 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2005-10-04 23:02:57 +0000 |
| commit | f777fae58df7c98e80932d50125ba7d19d779c30 (patch) | |
| tree | 198a9e130b705fd3e276a9cd3291a1cbdaf53941 | |
| parent | c080b6227e3dee039c382bfec0d0988bf848fa22 (diff) | |
correctly parse the lock section in an RCS file;
| -rw-r--r-- | usr.bin/cvs/rcs.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/usr.bin/cvs/rcs.c b/usr.bin/cvs/rcs.c index bc8fe0cd71f..6412ba66d01 100644 --- a/usr.bin/cvs/rcs.c +++ b/usr.bin/cvs/rcs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcs.c,v 1.75 2005/10/04 14:55:36 joris Exp $ */ +/* $OpenBSD: rcs.c,v 1.76 2005/10/04 23:02:56 joris Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -2367,8 +2367,16 @@ rcs_parse_locks(RCSFILE *rfp) cvs_log(LP_ERRNO, "failed to allocate RCS lock"); return (-1); } + + if ((lkp->rl_name = cvs_strdup(RCS_TOKSTR(rfp))) == NULL) { + cvs_log(LP_ERR, "failed to save locking user"); + free(lkp); + return (-1); + } + lkp->rl_num = rcsnum_alloc(); if (lkp->rl_num == NULL) { + cvs_strfree(lkp->rl_name); free(lkp); return (-1); } @@ -2379,6 +2387,7 @@ rcs_parse_locks(RCSFILE *rfp) cvs_log(LP_ERR, "unexpected token `%s' in symbol list", RCS_TOKSTR(rfp)); rcsnum_free(lkp->rl_num); + cvs_strfree(lkp->rl_name); free(lkp); return (-1); } @@ -2389,6 +2398,7 @@ rcs_parse_locks(RCSFILE *rfp) cvs_log(LP_ERR, "unexpected token `%s' in symbol list", RCS_TOKSTR(rfp)); rcsnum_free(lkp->rl_num); + cvs_strfree(lkp->rl_name); free(lkp); return (-1); } @@ -2397,6 +2407,7 @@ rcs_parse_locks(RCSFILE *rfp) cvs_log(LP_ERR, "failed to parse RCS NUM `%s'", RCS_TOKSTR(rfp)); rcsnum_free(lkp->rl_num); + cvs_strfree(lkp->rl_name); free(lkp); return (-1); } |