Module Name: src
Committed By: christos
Date: Wed Nov 27 21:16:10 UTC 2013
Modified Files:
src/external/bsd/nvi/dist/ex: ex_global.c
Log Message:
CID 1062355: Fix resource leak
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/nvi/dist/ex/ex_global.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/nvi/dist/ex/ex_global.c
diff -u src/external/bsd/nvi/dist/ex/ex_global.c:1.3 src/external/bsd/nvi/dist/ex/ex_global.c:1.4
--- src/external/bsd/nvi/dist/ex/ex_global.c:1.3 Mon Nov 25 17:43:46 2013
+++ src/external/bsd/nvi/dist/ex/ex_global.c Wed Nov 27 16:16:10 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ex_global.c,v 1.3 2013/11/25 22:43:46 christos Exp $ */
+/* $NetBSD: ex_global.c,v 1.4 2013/11/27 21:16:10 christos Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
@@ -171,7 +171,7 @@ usage: ex_emsg(sp, cmdp->cmd->usage, EX
len = 1;
}
- MALLOC_RET(sp, ecp->cp, CHAR_T *, (len * 2) * sizeof(CHAR_T));
+ MALLOC_GOTO(sp, ecp->cp, CHAR_T *, (len * 2) * sizeof(CHAR_T));
ecp->o_cp = ecp->cp;
ecp->o_clen = len;
MEMCPYW(ecp->cp + len, p, len);
@@ -241,6 +241,9 @@ usage: ex_emsg(sp, cmdp->cmd->usage, EX
}
search_busy(sp, BUSY_OFF);
return (0);
+alloc_err:
+ free(ecp);
+ return 1;
}
/*