Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 2 Jan 2015 18:31:13 +0000 (UTC)
From:      Xin LI <delphij@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r276548 - stable/10/lib/libc/regex
Message-ID:  <201501021831.t02IVD1x058242@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: delphij
Date: Fri Jan  2 18:31:12 2015
New Revision: 276548
URL: https://svnweb.freebsd.org/changeset/base/276548

Log:
  MFC r275930:
  
  Plug a memory leak.
  
  Obtained from:	DragonFlyBSD (commit 5119ece)

Modified:
  stable/10/lib/libc/regex/regcomp.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libc/regex/regcomp.c
==============================================================================
--- stable/10/lib/libc/regex/regcomp.c	Fri Jan  2 18:27:32 2015	(r276547)
+++ stable/10/lib/libc/regex/regcomp.c	Fri Jan  2 18:31:12 2015	(r276548)
@@ -1716,8 +1716,10 @@ computematchjumps(struct parse *p, struc
 	}
 
 	g->matchjump = (int*) malloc(g->mlen * sizeof(unsigned int));
-	if (g->matchjump == NULL)	/* Not a fatal error */
+	if (g->matchjump == NULL) {	/* Not a fatal error */
+		free(pmatches);
 		return;
+	}
 
 	/* Set maximum possible jump for each character in the pattern */
 	for (mindex = 0; mindex < g->mlen; mindex++)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501021831.t02IVD1x058242>