Continuing changes for lpc proxy

sandbox/win/src/sandbox_nt_util.cc

 // Copyright (c) 2012 The Chromium 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 "sandbox/win/src/sandbox_nt_util.h"
 
 #include "base/win/pe_image.h"
 #include "sandbox/win/src/sandbox_factory.h"
 #include "sandbox/win/src/target_services.h"
 
@@ skipping 288 matching lines @@
   NTSTATUS ret = STATUS_UNSUCCESSFUL;
   __try {
     do {
       if (in_object->RootDirectory != static_cast<HANDLE>(0) && !root)
         break;
       if (NULL == in_object->ObjectName)
         break;
       if (NULL == in_object->ObjectName->Buffer)
         break;
 
-      size_t size = in_object->ObjectName->Length + sizeof(wchar_t);
-      *out_name = new(NT_ALLOC) wchar_t[size/sizeof(wchar_t)];
-      if (NULL == *out_name)
-        break;
-
-      ret = CopyData(*out_name, in_object->ObjectName->Buffer,
-                     size - sizeof(wchar_t));
+      ret = AllocAndCopyUnicodeString(in_object->ObjectName, out_name);
       if (!NT_SUCCESS(ret))
         break;
 
-      (*out_name)[size / sizeof(wchar_t) - 1] = L'\0';
-
       if (attributes)
         *attributes = in_object->Attributes;
 
       if (root)
         *root = in_object->RootDirectory;
       ret = STATUS_SUCCESS;
     } while (false);
   } __except(EXCEPTION_EXECUTE_HANDLER) {
     ret = GetExceptionCode();
   }
@@ skipping 279 matching lines @@
 
   if (file_info->FileName[0] != kPathPrefix[0] ||
       file_info->FileName[1] != kPathPrefix[1] ||
       file_info->FileName[2] != kPathPrefix[2] ||
       file_info->FileName[3] != kPathPrefix[3])
     return false;
 
   return true;
 }
 
+NTSTATUS AllocAndCopyUnicodeString(const UNICODE_STRING* in_string,
+    wchar_t** out_string) {
+  if (!in_string)
+    return STATUS_INVALID_PARAMETER;
+
+  size_t size = in_string->Length + sizeof(wchar_t);
+  *out_string = new(NT_ALLOC) wchar_t[size/sizeof(wchar_t)];
+  if (NULL == *out_string)
+    return STATUS_UNSUCCESSFUL;
+
+  NTSTATUS ret = CopyData(*out_string, in_string->Buffer,
+      size - sizeof(wchar_t));
+  if (!NT_SUCCESS(ret))
+    return ret;
+
+  (*out_string)[size / sizeof(wchar_t) - 1] = L'\0';
+  return STATUS_SUCCESS;
+}
+
 }  // namespace sandbox
 
 void* operator new(size_t size, sandbox::AllocationType type,
                    void* near_to) {
   using namespace sandbox;
 
   void* result = NULL;
   if (NT_ALLOC == type) {
     if (InitHeap()) {
       // Use default flags for the allocation.
@@ skipping 40 matching lines @@
   UNREFERENCED_PARAMETER(type);
   return buffer;
 }
 
 void __cdecl operator delete(void* memory, void* buffer,
                              sandbox::AllocationType type) {
   UNREFERENCED_PARAMETER(memory);
   UNREFERENCED_PARAMETER(buffer);
   UNREFERENCED_PARAMETER(type);
 }