Revert "POSIX: don't allocate memory after forking."

Appears to break tlslite on the Mac.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41190 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 24 deletions

diff --git a/base/file_descriptor_shuffle.cc b/base/file_descriptor_shuffle.cc
index 2bb156b..e722a29 100644
--- a/base/file_descriptor_shuffle.cc
+++ b/base/file_descriptor_shuffle.cc
@@ -12,36 +12,28 @@
 
 namespace base {
 
-bool PerformInjectiveMultimapDestructive(
-    InjectiveMultimap* m, InjectionDelegate* delegate) {
-  static const size_t kMaxExtraFDs = 16;
-  int extra_fds[kMaxExtraFDs];
-  unsigned next_extra_fd = 0;
-
-  // DANGER: this function may not allocate.
+bool PerformInjectiveMultimap(const InjectiveMultimap& m_in,
+                              InjectionDelegate* delegate) {
+  InjectiveMultimap m(m_in);
+  std::vector<int> extra_fds;
 
-  for (InjectiveMultimap::iterator i = m->begin(); i != m->end(); ++i) {
+  for (InjectiveMultimap::iterator i = m.begin(); i != m.end(); ++i) {
     int temp_fd = -1;
 
     // We DCHECK the injectiveness of the mapping.
-    for (InjectiveMultimap::iterator j = i + 1; j != m->end(); ++j) {
+    for (InjectiveMultimap::iterator j = i + 1; j != m.end(); ++j) {
       DCHECK(i->dest != j->dest) << "Both fd " << i->source
           << " and " << j->source << " map to " << i->dest;
     }
 
     const bool is_identity = i->source == i->dest;
 
-    for (InjectiveMultimap::iterator j = i + 1; j != m->end(); ++j) {
+    for (InjectiveMultimap::iterator j = i + 1; j != m.end(); ++j) {
       if (!is_identity && i->dest == j->source) {
         if (temp_fd == -1) {
           if (!delegate->Duplicate(&temp_fd, i->dest))
             return false;
-          if (next_extra_fd < kMaxExtraFDs) {
-            extra_fds[next_extra_fd++] = temp_fd;
-          } else {
-            RAW_LOG(ERROR, "PerformInjectiveMultimapDestructive overflowed "
-                           "extra_fds. Leaking file descriptors!");
-          }
+          extra_fds.push_back(temp_fd);
         }
 
         j->source = temp_fd;
@@ -66,18 +58,14 @@ bool PerformInjectiveMultimapDestructive(
       delegate->Close(i->source);
   }
 
-  for (unsigned i = 0; i < next_extra_fd; i++)
-    delegate->Close(extra_fds[i]);
+  for (std::vector<int>::const_iterator
+       i = extra_fds.begin(); i != extra_fds.end(); ++i) {
+    delegate->Close(*i);
+  }
 
   return true;
 }
 
-bool PerformInjectiveMultimap(const InjectiveMultimap& m_in,
-                              InjectionDelegate* delegate) {
-  InjectiveMultimap m(m_in);
-  return PerformInjectiveMultimapDestructive(&m, delegate);
-}
-
 bool FileDescriptorTableInjection::Duplicate(int* result, int fd) {
   *result = HANDLE_EINTR(dup(fd));
   return *result >= 0;