aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2013-09-29 18:36:11 +0000
committerMike Frysinger <vapier@gentoo.org>2013-09-29 18:36:11 +0000
commitf65713c2bd1e8e4ee3346b2228ddf6c3f2120a96 (patch)
tree57f6acc909d9f1484c8385075487aab74267826d
parentqcache: do not warn when we cannot open a source dir as people can create cat... (diff)
downloadportage-utils-f65713c2bd1e8e4ee3346b2228ddf6c3f2120a96.tar.gz
portage-utils-f65713c2bd1e8e4ee3346b2228ddf6c3f2120a96.tar.bz2
portage-utils-f65713c2bd1e8e4ee3346b2228ddf6c3f2120a96.zip
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
-rw-r--r--qcache.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/qcache.c b/qcache.c
index b2c99ee..25be63f 100644
--- a/qcache.c
+++ b/qcache.c
@@ -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@gentoo.org>
*/
@@ -47,7 +47,7 @@ static const char * const qcache_opts_help[] = {
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 @@ void qcache_stats(qcache_data *data)
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;
}