generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "linker: use libc's environ variable to store envp"

Browse Source
This commit is contained in:
Dmitriy Ivanov
2015-04-28 21:35:58 +00:00
committed by Gerrit Code Review
parent 6fa65e7cd5 a85bcc2e99
commit bed7a7e5eb
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
linker/linker_environ.cpp
View File

@@ -36,7 +36,6 @@
#include "private/KernelArgumentBlock.h" #include "private/KernelArgumentBlock.h"
static char** _envp;
static bool _AT_SECURE_value = true; static bool _AT_SECURE_value = true;
bool get_AT_SECURE() { bool get_AT_SECURE() {
@@ -150,8 +149,8 @@ static bool __is_unsafe_environment_variable(const char* name) {
} }
static void __sanitize_environment_variables() { static void __sanitize_environment_variables() {
char** src = _envp; char** src = environ;
char** dst = _envp; char** dst = environ;
for (; src[0] != nullptr; ++src) { for (; src[0] != nullptr; ++src) {
if (!__is_valid_environment_variable(src[0])) { if (!__is_valid_environment_variable(src[0])) {
continue; continue;
@@ -168,7 +167,7 @@ static void __sanitize_environment_variables() {
void linker_env_init(KernelArgumentBlock& args) { void linker_env_init(KernelArgumentBlock& args) {
// Store environment pointer - can't be null. // Store environment pointer - can't be null.
_envp = args.envp; environ = args.envp;
__init_AT_SECURE(args); __init_AT_SECURE(args);
__sanitize_environment_variables(); __sanitize_environment_variables();
@@ -179,7 +178,7 @@ const char* linker_env_get(const char* name) {
return nullptr; return nullptr;
} }
for (char** p = _envp; p[0] != nullptr; ++p) { for (char** p = environ; p[0] != nullptr; ++p) {
const char* val = env_match(p[0], name); const char* val = env_match(p[0], name);
if (val != nullptr) { if (val != nullptr) {
if (val[0] == '\0') { if (val[0] == '\0') {