summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Schleef <ds@schleef.org>2009-02-26 11:48:05 -0800
committerDavid Schleef <ds@schleef.org>2009-02-26 11:48:05 -0800
commit77af7ee8900013d47c1568737625e156faf2f463 (patch)
tree35270007d397e36f8ffe4d30c252fcfbcacc0249
parent2234088a4a2da1b2f7a779c58c868eebb45a0bee (diff)
downloadliboil-77af7ee8900013d47c1568737625e156faf2f463.tar.gz
Fix double free on failed arm_init
Fixes: #17482. Patch from Stefan Kost <ensonic@hora-obscura.de>
-rw-r--r--liboil/liboilcpu-arm.c5
-rw-r--r--liboil/liboilcpu.c1
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");