Fix for bug where 64-bit executables were processed as 32-bit executables....

courgette/ensemble.cc

 // Copyright (c) 2009 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.
 
 // *** File comments
 
 #include "courgette/ensemble.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ skipping 45 matching lines @@
   while (position < length) {
     // Quick test; Windows executables begin with 'MZ'.
     if (start[position] == 'M' &&
         position + 1 < length && start[position + 1] == 'Z') {
       courgette::PEInfo *info = new courgette::PEInfo();
       info->Init(start + position, length - position);
       if (info->ParseHeader()) {
         Region region(start + position, info->length());
 
         if (info->has_text_section()) {
-          Element* element = new ElementWinPE(Element::WIN32_X86_WITH_CODE,
-                                              this, region, info);
-          owned_elements_.push_back(element);
-          elements_.push_back(element);
-          position += region.length();
-          continue;
+          if (info->is_32bit()) {
+            Element* element = new ElementWinPE(Element::WIN32_X86_WITH_CODE,
+                                                this, region, info);
+            owned_elements_.push_back(element);
+            elements_.push_back(element);
+            position += region.length();
+            continue;
+          }
+          // TODO(sra): Extend to 64-bit executables.
         }
 
         // If we had a clever transformation for resource-only executables we
         // should identify the suitable elements here:
         if (!info->has_text_section() && false) {
           Element* element = new ElementWinPE(Element::WIN32_NOCODE,
                                               this, region, info);
           owned_elements_.push_back(element);
           elements_.push_back(element);
           position += region.length();
@@ skipping 11 matching lines @@
   }
   return C_OK;
 }
 
 Ensemble::~Ensemble() {
   for (size_t i = 0;  i < owned_elements_.size();  ++i)
     delete owned_elements_[i];
 }
 
 }  // namespace