===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/modules.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -c -r1.10 -r1.11
*** src/usr.bin/cvs/modules.c	2008/02/06 22:43:22	1.10
--- src/usr.bin/cvs/modules.c	2008/02/26 20:20:49	1.11
***************
*** 1,4 ****
! /*	$OpenBSD: modules.c,v 1.10 2008/02/06 22:43:22 joris Exp $	*/
  /*
   * Copyright (c) 2008 Joris Vink <joris@openbsd.org>
   *
--- 1,4 ----
! /*	$OpenBSD: modules.c,v 1.11 2008/02/26 20:20:49 joris Exp $	*/
  /*
   * Copyright (c) 2008 Joris Vink <joris@openbsd.org>
   *
***************
*** 57,62 ****
--- 57,63 ----
  	char *bline, *val, *p, *module, *sp, *dp;
  	char *dirname, fpath[MAXPATHLEN], *prog;
  
+ 	prog = NULL;
  	bline = xstrdup(line);
  
  	flags = 0;
***************
*** 80,86 ****
  	while (!isspace(*p) && *p != '\0')
  		p++;
  
- 	prog = NULL;
  	while (val[0] == '-') {
  		p = val;
  		while (!isspace(*p) && *p != '\0')
--- 81,86 ----
***************
*** 95,108 ****
  		case 'a':
  			if (flags & MODULE_TARGETDIR) {
  				cvs_log(LP_NOTICE, "cannot use -a with -d");
! 				return;
  			}
  			flags |= MODULE_ALIAS;
  			break;
  		case 'd':
  			if (flags & MODULE_ALIAS) {
  				cvs_log(LP_NOTICE, "cannot use -d with -a");
! 				return;
  			}
  			flags |= MODULE_TARGETDIR;
  			break;
--- 95,108 ----
  		case 'a':
  			if (flags & MODULE_TARGETDIR) {
  				cvs_log(LP_NOTICE, "cannot use -a with -d");
! 				goto bad;
  			}
  			flags |= MODULE_ALIAS;
  			break;
  		case 'd':
  			if (flags & MODULE_ALIAS) {
  				cvs_log(LP_NOTICE, "cannot use -d with -a");
! 				goto bad;
  			}
  			flags |= MODULE_TARGETDIR;
  			break;
***************
*** 113,119 ****
  			if (flags != 0 || prog != NULL) {
  				cvs_log(LP_NOTICE,
  				    "-o cannot be used with other flags");
! 				return;
  			}
  
  			val = p;
--- 113,119 ----
  			if (flags != 0 || prog != NULL) {
  				cvs_log(LP_NOTICE,
  				    "-o cannot be used with other flags");
! 				goto bad;
  			}
  
  			val = p;
***************
*** 131,137 ****
  			if (flags != 0 || prog != NULL) {
  				cvs_log(LP_NOTICE,
  				    "-i cannot be used with other flags");
! 				return;
  			}
  
  			if ((val = strchr(p, ' ' )) == NULL)
--- 131,137 ----
  			if (flags != 0 || prog != NULL) {
  				cvs_log(LP_NOTICE,
  				    "-i cannot be used with other flags");
! 				goto bad;
  			}
  
  			if ((val = strchr(p, ' ' )) == NULL)
***************
*** 202,207 ****
--- 202,210 ----
  	return;
  
  bad:
+ 	if (prog != NULL)
+ 		xfree(prog);
+ 	xfree(bline);
  	cvs_log(LP_NOTICE, "malformed line in CVSROOT/modules: %d", lineno);
  }
  
***************
*** 215,221 ****
  
  	TAILQ_FOREACH(mi, &modules, m_list) {
  		if (!strcmp(name, mi->mi_name)) {
- 			mc = xmalloc(sizeof(*mc));
  			mc->mc_modules = mi->mi_modules;
  			mc->mc_ignores = mi->mi_ignores;
  			mc->mc_canfree = 0;
--- 218,223 ----