Skip to content

Add a configure probe for setenv() and enable PERL_USE_SAFE_PUTENV on the platforms that have it #19514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
May 28, 2022
Merged

Add a configure probe for setenv() and enable PERL_USE_SAFE_PUTENV on the platforms that have it #19514

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
85500e2
probe for setenv in Configure
xenu Apr 19, 2022
b59baa1
util.c: small refactoring of my_setenv and my_clearenv
xenu Apr 19, 2022
e5c90b3
util.c: POSIX doesn't allow calling setenv() with a NULL value
xenu Apr 19, 2022
156fc35
perl.c: duplicate environ when PERL_USE_SAFE_PUTENV is defined
xenu Apr 19, 2022
916a038
make PERL_USE_SAFE_PUTENV the default and the only option
xenu Apr 19, 2022
51d0017
don't use environ on Windows
xenu Apr 19, 2022
d55b837
util.c: merge the win32 and non-win32 implementations of my_setenv
xenu Apr 19, 2022
3b4ef43
make PL_origenviron global
xenu Apr 19, 2022
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
util.c: merge the win32 and non-win32 implementations of my_setenv
  • Loading branch information
@xenu
xenu committed May 28, 2022
commit d55b837b7c98ed2638b64b093cbd6ae30cc6c732
48 changes: 13 additions & 35 deletions util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2423,7 +2423,7 @@ Perl_new_warnings_bitfield(pTHX_ STRLEN *buffer, const char *const bits,



#ifdef USE_ENVIRON_ARRAY
#if defined(USE_ENVIRON_ARRAY) || defined(WIN32)
/* NB: VMS' my_setenv() is in vms.c */

/* small wrapper for use by Perl_my_setenv that mallocs, or reallocs if
Expand Down Expand Up @@ -2457,9 +2457,6 @@ S_env_alloc(void *current, Size_t l1, Size_t l2, Size_t l3, Size_t size)
}
# endif


# if !defined(WIN32)

/*
=for apidoc_section $utility
=for apidoc my_setenv
Expand All @@ -2473,21 +2470,21 @@ version has desirable safeguards
void
Perl_my_setenv(pTHX_ const char *nam, const char *val)
{
# ifdef USE_ITHREADS
# if defined(USE_ITHREADS) && !defined(WIN32)
/* only parent thread can modify process environment, so no need to use a
* mutex */
if (PL_curinterp != aTHX)
return;
# endif
# endif

# if defined(HAS_SETENV) && defined(HAS_UNSETENV)
# if defined(HAS_SETENV) && defined(HAS_UNSETENV)
if (val == NULL) {
unsetenv(nam);
} else {
setenv(nam, val, 1);
}

# elif defined(HAS_UNSETENV)
# elif defined(HAS_UNSETENV)

if (val == NULL) {
if (environ) /* old glibc can crash with null environ */
Expand All @@ -2500,7 +2497,7 @@ Perl_my_setenv(pTHX_ const char *nam, const char *val)
putenv(new_env);
}

# else /* ! HAS_UNSETENV */
# else /* ! HAS_UNSETENV */

const Size_t nlen = strlen(nam);
if (!val) {
Expand All @@ -2510,36 +2507,17 @@ Perl_my_setenv(pTHX_ const char *nam, const char *val)
char *new_env = S_env_alloc(NULL, nlen, vlen, 2, 1);
/* all that work just for this */
my_setenv_format(new_env, nam, nlen, val, vlen);
# ifndef WIN32
putenv(new_env);
# else
PerlEnv_putenv(new_env);
safesysfree(new_env);
# endif

# endif /* HAS_SETENV */
}

# else /* WIN32 */

void
Perl_my_setenv(pTHX_ const char *nam, const char *val)
{
char *envstr;
const Size_t nlen = strlen(nam);
Size_t vlen;

if (!val) {
val = "";
}
vlen = strlen(val);
envstr = S_env_alloc(NULL, nlen, vlen, 2, 1);
my_setenv_format(envstr, nam, nlen, val, vlen);
(void)PerlEnv_putenv(envstr);
safesysfree(envstr);
# endif /* HAS_SETENV */
}

# endif /* WIN32 */

#endif /* USE_ENVIRON_ARRAY */



#endif /* USE_ENVIRON_ARRAY || WIN32 */

#ifdef UNLINK_ALL_VERSIONS
I32
Expand Down