From: Nelson Ferreira <nelson.ferreira@ieee.org>
Date: Sat, 21 Jan 2012 04:04:34 +0000 (-0500)
Subject: Coverity: Resource leak: CID 178
X-Git-Tag: v22.1.15~32^2~15
X-Git-Url: http://cgit.sxemacs.org/?p=sxemacs;a=commitdiff_plain;h=f17895f80d0334664e757a53e0ffeefe1e79be1a

Coverity: Resource leak: CID 178

	* lib-src/etags.c (regex_tag_multiline): Make it clear a non-null
	name was allocated in substitute and always free it :)

Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>
---

diff --git a/lib-src/etags.c b/lib-src/etags.c
index 4ef628d..53e8dc8 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -6214,7 +6214,7 @@ regex_tag_multiline ()
 {
 	char *buffer = filebuf.buffer;
 	regexp *rp;
-	char *name;
+	char *name = NULL;
 
 	for (rp = p_head; rp != NULL; rp = rp->p_next)
 	{
@@ -6267,15 +6267,16 @@ regex_tag_multiline ()
 				while (charno < rp->regs.end[0])
 					if (buffer[charno++] == '\n')
 						lineno++, linecharno = charno;
-				name = rp->name;
-				if (name[0] == '\0')
+				if (rp->name && rp->name[0] == '\0')
 					name = NULL;
 				else /* make a named tag */
 					name = substitute (buffer, rp->name, &rp->regs);
 				if (rp->force_explicit_name)
-					/* Force explicit tag name, if a name is there. */
+					/* Force explicit tag name, if a name
+					   is there. */
 					pfnote (name, TRUE, buffer + linecharno,
-						charno - linecharno + 1, lineno, linecharno);
+						charno - linecharno + 1, lineno, 
+						linecharno);
 				else if(name == NULL)
 					abort();
 				else 
@@ -6283,6 +6284,8 @@ regex_tag_multiline ()
 						  buffer + linecharno,
 						  charno - linecharno + 1, 
 						  lineno, linecharno);
+				free(name);
+				name = NULL;
 				break;
 			}
 		}