[gentoo-commits] gentoo-projects commit in portage-utils: qcache.c

[Mike Frysinger (vapier)]

vapier      13/09/29 18:36:11

  Modified:             qcache.c
  Log:
  qcache: fix crash with stats generation -- we allocate keywords once in this func, so freeing it in the middle is wrong #486488 by Markos Chandras

Revision  Changes    Path
1.45                 portage-utils/qcache.c

file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/qcache.c?rev=1.45&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/qcache.c?rev=1.45&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/qcache.c?r1=1.44&r2=1.45

Index: qcache.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/qcache.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- qcache.c	29 Sep 2013 18:33:22 -0000	1.44
+++ qcache.c	29 Sep 2013 18:36:11 -0000	1.45
@@ -1,7 +1,7 @@
 /*
  * Copyright 2005-2010 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qcache.c,v 1.44 2013/09/29 18:33:22 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qcache.c,v 1.45 2013/09/29 18:36:11 vapier Exp $
  *
  * Copyright 2006 Thomas A. Cort - <tcort@g.o>
  */
@@ -47,7 +47,7 @@
 	COMMON_OPTS_HELP
 };
 
-static const char qcache_rcsid[] = "$Id: qcache.c,v 1.44 2013/09/29 18:33:22 vapier Exp $";
+static const char qcache_rcsid[] = "$Id: qcache.c,v 1.45 2013/09/29 18:36:11 vapier Exp $";
 #define qcache_usage(ret) usage(ret, QCACHE_FLAGS, qcache_long_opts, qcache_opts_help, lookup_applet_idx("qcache"))
 
 /********************************************************************/
@@ -789,7 +789,6 @@
 	memset(keywords, 0, archlist_count * sizeof(*keywords));
 	if (read_keywords(data->cache_data->KEYWORDS, keywords) < 0) {
 		warn("Failed to read keywords for %s%s/%s%s%s", BOLD, data->category, BLUE, data->ebuild, NORM);
-		free(keywords);
 		return;
 	}