summaryrefslogtreecommitdiffstats
path: root/courgette
diff options
context:
space:
mode:
Diffstat (limited to 'courgette')
-rw-r--r--courgette/disassembler_win32_x64.cc2
-rw-r--r--courgette/disassembler_win32_x64_unittest.cc2
-rw-r--r--courgette/disassembler_win32_x86.cc2
-rw-r--r--courgette/disassembler_win32_x86_unittest.cc2
4 files changed, 4 insertions, 4 deletions
diff --git a/courgette/disassembler_win32_x64.cc b/courgette/disassembler_win32_x64.cc
index 6f35ca5..58e787b 100644
--- a/courgette/disassembler_win32_x64.cc
+++ b/courgette/disassembler_win32_x64.cc
@@ -372,8 +372,6 @@ bool DisassemblerWin32X64::ParseAbs32Relocs() {
if (!ParseRelocs(&abs32_locations_))
return false;
- std::sort(abs32_locations_.begin(), abs32_locations_.end());
-
#if COURGETTE_HISTOGRAM_TARGETS
for (size_t i = 0; i < abs32_locations_.size(); ++i) {
RVA rva = abs32_locations_[i];
diff --git a/courgette/disassembler_win32_x64_unittest.cc b/courgette/disassembler_win32_x64_unittest.cc
index 345d416..f67e800 100644
--- a/courgette/disassembler_win32_x64_unittest.cc
+++ b/courgette/disassembler_win32_x64_unittest.cc
@@ -5,6 +5,7 @@
#include "courgette/disassembler_win32_x64.h"
#include "base/memory/scoped_ptr.h"
+#include "base/stl_util.h"
#include "courgette/base_test_unittest.h"
class DisassemblerWin32X64Test : public BaseTest {
@@ -41,6 +42,7 @@ void DisassemblerWin32X64Test::TestExe() const {
std::vector<courgette::RVA> relocs;
bool can_parse_relocs = disassembler->ParseRelocs(&relocs);
EXPECT_TRUE(can_parse_relocs);
+ EXPECT_TRUE(base::STLIsSorted(relocs));
const uint8* offset_p = disassembler->OffsetToPointer(0);
EXPECT_EQ(reinterpret_cast<const void*>(file1.c_str()),
diff --git a/courgette/disassembler_win32_x86.cc b/courgette/disassembler_win32_x86.cc
index 8490fcb..dd3dd5e 100644
--- a/courgette/disassembler_win32_x86.cc
+++ b/courgette/disassembler_win32_x86.cc
@@ -377,8 +377,6 @@ bool DisassemblerWin32X86::ParseAbs32Relocs() {
if (!ParseRelocs(&abs32_locations_))
return false;
- std::sort(abs32_locations_.begin(), abs32_locations_.end());
-
#if COURGETTE_HISTOGRAM_TARGETS
for (size_t i = 0; i < abs32_locations_.size(); ++i) {
RVA rva = abs32_locations_[i];
diff --git a/courgette/disassembler_win32_x86_unittest.cc b/courgette/disassembler_win32_x86_unittest.cc
index 1161327..40cc412 100644
--- a/courgette/disassembler_win32_x86_unittest.cc
+++ b/courgette/disassembler_win32_x86_unittest.cc
@@ -5,6 +5,7 @@
#include "courgette/disassembler_win32_x86.h"
#include "base/memory/scoped_ptr.h"
+#include "base/stl_util.h"
#include "courgette/base_test_unittest.h"
class DisassemblerWin32X86Test : public BaseTest {
@@ -41,6 +42,7 @@ void DisassemblerWin32X86Test::TestExe() const {
std::vector<courgette::RVA> relocs;
bool can_parse_relocs = disassembler->ParseRelocs(&relocs);
EXPECT_TRUE(can_parse_relocs);
+ EXPECT_TRUE(base::STLIsSorted(relocs));
const uint8* offset_p = disassembler->OffsetToPointer(0);
EXPECT_EQ(reinterpret_cast<const void*>(file1.c_str()),