fixed something stupid

Author: StanHash

core/binary_file.cpp

@@ -24,7 +24,7 @@ void binary_file::load_from_other(const binary_file &other, unsigned int start,
 		return; // TODO: throw exception
 
 	mData.clear();
-	mData.reserve(size - start);
+	mData.reserve(size);
 
 	std::copy(
 		std::next(other.mData.begin(), start),
@@ -51,6 +51,19 @@ const char* binary_file::cstr_at(int pos) const {
 	return reinterpret_cast<const char*>(&mData[pos]);
 }
 
+void binary_file::combine_with(const binary_file& other) {
+	// move combination here wouldn't be that useful, since we're dealing with standard raw data
+	// there's no allocation overhead in copying over moving
+
+	data().reserve(size() + other.size());
+
+	std::copy(
+		other.data().begin(),
+		other.data().end(),
+		std::back_inserter(data())
+	);
+}
+
 binary_file::byte_t binary_file::read_byte(int& pos) const {
 	if (pos >= mData.size())
 		throw std::out_of_range("tried to read byte out of range of data");

core/binary_file.h

@@ -27,6 +27,8 @@ class binary_file {
 	std::vector<byte_t>&       data()       { return mData; }
 	const std::vector<byte_t>& data() const { return mData; }
 
+	void combine_with(const binary_file& other);
+
 	template<typename T, int byte_count = sizeof(T)>
 	T read(int& pos) const;
 

core/section_data.cpp

@@ -108,13 +108,7 @@ void section_data::combine_with(const section_data& other) {
 		mRelocations.push_back(relocation);
 	}
 
-	data().reserve(size() + other.size());
-
-	std::copy(
-		other.data().begin(),
-		other.data().end(),
-		std::back_inserter(data())
-	);
+	binary_file::combine_with(other);
 }
 
 void section_data::combine_with(section_data&& other) {
@@ -137,13 +131,7 @@ void section_data::combine_with(section_data&& other) {
 		mRelocations.push_back(std::move(relocation));
 	}
 
-	data().reserve(size() + other.size());
-
-	std::copy(
-		other.data().begin(),
-		other.data().end(),
-		std::back_inserter(data())
-	);
+	binary_file::combine_with(other);
 }
 
 void section_data::remove_temp_symbols() {