From 6aece8ea060fc331cf376ed8fd78b066e2d8f70f Mon Sep 17 00:00:00 2001 From: Daria Phoebe Brashear Date: Thu, 22 Mar 2018 09:42:01 -0700 Subject: [PATCH] getauxval: fall through to auxv gfter getauxval errno test if when we need to determine if getauxval sets errno, we determine it doesn't after getting a 0 return code, make sure we return a value, since we didn't previously. fall through to code we'd otherwise have called in this case above. --- lib/roken/getauxval.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/roken/getauxval.c b/lib/roken/getauxval.c index 2463f0a02..254b2f82f 100644 --- a/lib/roken/getauxval.c +++ b/lib/roken/getauxval.c @@ -159,6 +159,7 @@ rk_getprocauxval(unsigned long type) ROKEN_LIB_FUNCTION unsigned long ROKEN_LIB_CALL rk_getauxval(unsigned long type) { + const auxv_t *a; #ifdef HAVE_GETAUXVAL #ifdef GETAUXVAL_SETS_ERRNO if (rk_injected_auxv) @@ -184,8 +185,6 @@ rk_getauxval(unsigned long type) } if (getauxval_sets_errno == 0) { - const auxv_t *a; - errno = save_errno; a = rk_getauxv(type); if (a == NULL) { @@ -214,15 +213,12 @@ rk_getauxval(unsigned long type) getauxval_sets_errno = 0; errno = save_errno; #endif -#else - const auxv_t *a; - +#endif if ((a = rk_getauxv(type)) == NULL) { errno = ENOENT; return 0; } return a->a_un.a_val; -#endif } /**