Run NaClEnvCleanser in standalone sel_ldr (in addition to sel_main_chrome). Add a couple of ld.so...

src/trusted/nonnacl_util/sel_ldr_launcher.cc

 /*
  * Copyright (c) 2011 The Native Client Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include <assert.h>
 
 #include <algorithm>
 #include <iterator>
@@ skipping 66 matching lines @@
   }
   // Check that there was exactly one descriptor passed.
   if (1 != header.ndescv_length) {
     return NULL;
   }
 
   return descs[0];
 }
 
 bool SelLdrLauncher::LoadModule(NaClSrpcChannel* command, DescWrapper* nexe) {
-
   NaClLog(4, "Entered SelLdrLauncher::LoadModule\n");
   NaClSrpcResultCodes rpc_result = NaClSrpcInvokeBySignature(command,
                                                              "load_module:hs:",
                                                              nexe->desc(),
                                                              "place holder");
   NaClLog(4, "SelLdrLauncher::LoadModule rpc result %d\n", (int) rpc_result);
   return NACL_SRPC_RESULT_OK == rpc_result;
 }
 
 bool SelLdrLauncher::StartModule(NaClSrpcChannel* command,
@@ skipping 117 matching lines @@
     return false;
   }
   if (!SetupApplicationChannel(out_app_chan)) {
     return false;
   }
 
   return true;
 }
 
 #ifdef NACL_STANDALONE
+/* @IGNORE_LINES_FOR_CODE_HYGIENE[1] */
 extern "C" char **environ;
 
 static char **GetEnviron() {
 #if NACL_OSX
   /* Mac dynamic libraries cannot access the environ variable directly. */
   return *_NSGetEnviron();
 #else
   return environ;
 #endif
 }
@@ skipping 19 matching lines @@
   command->insert(command->end(), sel_ldr_argv_.begin(), sel_ldr_argv_.end());
 
   // Our use of "environ" above fails to link in the "shared" (DLL)
   // build of Chromium on Windows.  However, we do not use
   // BuildCommandLine() when integrated into Chromium anyway -- we use
   // sel_main_chrome.c -- so it is safe to disable this code, which is
   // largely for debugging.
   // TODO(mseaborn): Tidy this up so that we do not need a conditional.
 #ifdef NACL_STANDALONE
   struct NaClEnvCleanser env_cleanser;
-  NaClEnvCleanserCtor(&env_cleanser);
-  if (!NaClEnvCleanserInit(&env_cleanser, GetEnviron())) {
+  NaClEnvCleanserCtor(&env_cleanser, 1);
+  if (!NaClEnvCleanserInit(&env_cleanser, GetEnviron(), NULL)) {
     NaClLog(LOG_FATAL, "Failed to initialise env cleanser\n");
   }
   for (const char* const* env = NaClEnvCleanserEnvironment(&env_cleanser);
        *env != NULL;
        ++env) {
     command->push_back("-E");
     command->push_back(*env);
   }
   NaClEnvCleanserDtor(&env_cleanser);
 #endif
@@ skipping 35 matching lines @@
   CHECK(factory_ != NULL);
   return factory_->MakeGeneric(raw_desc);
 }
 
 DescWrapper* SelLdrLauncher::WrapCleanup(NaClDesc* raw_desc) {
   CHECK(factory_ != NULL);
   return factory_->MakeGenericCleanup(raw_desc);
 }
 
 }  // namespace nacl