From 77af7ee8900013d47c1568737625e156faf2f463 Mon Sep 17 00:00:00 2001 From: David Schleef Date: Thu, 26 Feb 2009 11:48:05 -0800 Subject: Fix double free on failed arm_init Fixes: #17482. Patch from Stefan Kost --- liboil/liboilcpu-arm.c | 5 +---- liboil/liboilcpu.c | 1 + 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/liboil/liboilcpu-arm.c b/liboil/liboilcpu-arm.c index 583bf64..b985cc1 100644 --- a/liboil/liboilcpu-arm.c +++ b/liboil/liboilcpu-arm.c @@ -67,10 +67,7 @@ oil_cpu_arm_getflags_cpuinfo (char *cpuinfo) char **f; cpuinfo_flags = get_cpuinfo_line(cpuinfo, "Features"); - if (cpuinfo_flags == NULL) { - free (cpuinfo); - return; - } + if (cpuinfo_flags == NULL) return; flags = strsplit(cpuinfo_flags); for (f = flags; *f; f++) { diff --git a/liboil/liboilcpu.c b/liboil/liboilcpu.c index 8fc88ae..155acf9 100644 --- a/liboil/liboilcpu.c +++ b/liboil/liboilcpu.c @@ -103,6 +103,7 @@ _oil_cpu_init (void) { const char *envvar; + OIL_INFO ("checking architecture"); oil_cpu_detect_arch(); envvar = getenv ("OIL_CPU_FLAGS"); -- cgit v1.2.1