From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757474AbaFTXnQ (ORCPT ); Fri, 20 Jun 2014 19:43:16 -0400 Received: from mga02.intel.com ([134.134.136.20]:14506 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752351AbaFTXlf (ORCPT ); Fri, 20 Jun 2014 19:41:35 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.01,517,1400050800"; d="scan'208";a="560971543" From: Andi Kleen To: jolsa@redhat.com Cc: linux-kernel@vger.kernel.org, namhyung@kernel.org, acme@infradead.org, Andi Kleen Subject: [PATCH 9/9] tools, perf: Add asprintf replacement Date: Fri, 20 Jun 2014 16:41:31 -0700 Message-Id: <1403307691-30776-10-git-send-email-andi@firstfloor.org> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1403307691-30776-1-git-send-email-andi@firstfloor.org> References: <1403307691-30776-1-git-send-email-andi@firstfloor.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andi Kleen asprintf corrupts memory on some older glibc versions. Provide a replacement. This fixes various segfaults with --branch-history on older Fedoras. Signed-off-by: Andi Kleen --- tools/perf/Makefile.perf | 1 + tools/perf/util/asprintf.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 tools/perf/util/asprintf.c diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index ae20edf..57be4b7 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -372,6 +372,7 @@ LIB_OBJS += $(OUTPUT)util/vdso.o LIB_OBJS += $(OUTPUT)util/stat.o LIB_OBJS += $(OUTPUT)util/record.o LIB_OBJS += $(OUTPUT)util/srcline.o +LIB_OBJS += $(OUTPUT)util/asprintf.o LIB_OBJS += $(OUTPUT)util/data.o LIB_OBJS += $(OUTPUT)ui/setup.o diff --git a/tools/perf/util/asprintf.c b/tools/perf/util/asprintf.c new file mode 100644 index 0000000..9aafaca --- /dev/null +++ b/tools/perf/util/asprintf.c @@ -0,0 +1,28 @@ +/* Replacement for asprintf as it's buggy in older glibc versions */ +#include +#include +#include +#include + +int vasprintf(char **str, const char *fmt, va_list ap) +{ + char buf[1024]; + int len = vsnprintf(buf, sizeof buf, fmt, ap); + + *str = malloc(len + 1); + if (!*str) + return -1; + strcpy(*str, buf); + return len; +} + +int asprintf(char **str, const char *fmt, ...) +{ + va_list ap; + int ret; + + va_start(ap, fmt); + ret = vasprintf(str, fmt, ap); + va_end(ap); + return ret; +} -- 1.9.3