GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: Support non-thread-safe getenv.

Browse Source 
* src/get-env.c (_gpgme_getenv): Use gpgrt_lock_lock
and gpgrt_lock_unlock to protect call of getnev.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2018-02-27 18:43:40 +09:00
parent c58f61e922
commit 59fe3f26c1
1 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/get-env.c
View File

@ -28,29 +28,11 @@
#include "util.h" #include "util.h"
#if defined(HAVE_THREAD_SAFE_GETENV)
/* We prefer using getenv() if it is thread-safe. */
/* Retrieve the environment variable NAME and return a copy of it in a /* Retrieve the environment variable NAME and return a copy of it in a
malloc()'ed buffer in *VALUE. If the environment variable is not malloc()'ed buffer in *VALUE. If the environment variable is not
set, return NULL in *VALUE. */ set, return NULL in *VALUE. */
gpgme_error_t
_gpgme_getenv (const char *name, char **value)
{
char *env_value;
env_value = getenv (name); #ifdef HAVE_GETENV_R
if (!env_value)
*value = NULL;
else
{
*value = strdup (env_value);
if (!*value)
return gpg_error_from_syserror ();
}
return 0;
}
#elif defined (HAVE_GETENV_R)
#define INITIAL_GETENV_SIZE 32 #define INITIAL_GETENV_SIZE 32
gpgme_error_t gpgme_error_t
@ -91,7 +73,41 @@ _gpgme_getenv (const char *name, char **value)
return 0; return 0;
} }
#else #else
#ifndef HAVE_THREAD_SAFE_GETENV
#error No thread-safe getenv nor getenv_r GPGRT_LOCK_DEFINE (environ_lock);
#endif
gpgme_error_t
_gpgme_getenv (const char *name, char **value)
{
char *env_value;
gpgme_error_t err = 0;
#ifndef HAVE_THREAD_SAFE_GETENV
gpg_err_code_t rc;
rc= gpgrt_lock_lock (&environ_lock);
if (rc)
{
err = gpg_error (rc);
goto leave;
}
#endif
env_value = getenv (name);
if (!env_value)
*value = NULL;
else
{
*value = strdup (env_value);
if (!*value)
err = gpg_error_from_syserror ();
}
#ifndef HAVE_THREAD_SAFE_GETENV
rc = gpgrt_lock_unlock (&environ_lock);
if (rc)
err = gpg_error (rc);
leave:
#endif
return err;
}
#endif #endif