From 4f7b8393ec8a3abd59649c2ba669e951fb61f3d2 Mon Sep 17 00:00:00 2001
From: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Date: Wed, 20 Oct 2021 22:55:55 +0100
Subject: Plug some large leaks, deprecate `Segment="128"` (#204)

* Fix freeing an uninitialised camData

* exporter leaks

* vtx leak fix

* Fix ZSkeleton OOB reading

* Improve segment assignment checking and add a default
Also prevents non-segmented files not being freed

* Plug leak in MakeDlist

* More segment improvements: deprecate 128

* add externalfile to extraction reference

* whoops

* format

* Document new Segment behaviour

* Use deprecation ifdef

Co-authored-by: angie <angheloalf95@gmail.com>
---
 ZAPD/ZFile.cpp | 54 +++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 43 insertions(+), 11 deletions(-)

(limited to 'ZAPD/ZFile.cpp')

diff --git a/ZAPD/ZFile.cpp b/ZAPD/ZFile.cpp
index 82cb84f..7cbfeba 100644
--- a/ZAPD/ZFile.cpp
+++ b/ZAPD/ZFile.cpp
@@ -5,13 +5,14 @@
 #include <string_view>
 #include <unordered_set>
 
-#include <Utils/BinaryWriter.h>
-#include <Utils/MemoryStream.h>
 #include "Globals.h"
 #include "OutputFormatter.h"
+#include "Utils/BinaryWriter.h"
 #include "Utils/Directory.h"
 #include "Utils/File.h"
+#include "Utils/MemoryStream.h"
 #include "Utils/Path.h"
+#include "Utils/StringHelper.h"
 #include "ZAnimation.h"
 #include "ZArray.h"
 #include "ZBackground.h"
@@ -129,17 +130,47 @@ void ZFile::ParseXML(tinyxml2::XMLElement* reader, const std::string& filename)
 	if (rangeStart > rangeEnd)
 		throw std::runtime_error("Error: RangeStart must be before than RangeEnd.");
 
-	// Not every XML may have a segment number, so this doesn't make much sense anymore.
-	// if (reader->Attribute("Segment") == nullptr)
-	// 	throw std::runtime_error(
-	// 		StringHelper::Sprintf("ZFile::ParseXML: Error in '%s'.\n"
-	// 	                          "\t Missing 'Segment' attribute in File node. \n",
-	// 	                          name.c_str()));
+	const char* segmentXml = reader->Attribute("Segment");
+	if (segmentXml != nullptr)
+	{
+		if (!StringHelper::HasOnlyDigits(segmentXml))
+		{
+			throw std::runtime_error(StringHelper::Sprintf(
+				"error: Invalid segment value '%s': must be a decimal between 0 and 15 inclusive",
+				segmentXml));
+		}
+
+		segment = StringHelper::StrToL(segmentXml, 10);
+		if (segment > 15)
+		{
+			if (segment == 128)
+			{
+#ifdef DEPRECATION_ON
+				fprintf(stderr, "warning: segment 128 is deprecated.\n\tRemove "
+				                "'Segment=\"128\"' from the xml to use virtual addresses\n");
+#endif
+			}
+			else
+			{
+				throw std::runtime_error(
+					StringHelper::Sprintf("error: invalid segment value '%s': must be a decimal "
+				                          "number between 0 and 15 inclusive",
+				                          segmentXml));
+			}
+		}
+	}
+	Globals::Instance->AddSegment(segment, this);
 
-	if (reader->Attribute("Segment") != nullptr)
+	if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_INFO)
 	{
-		segment = StringHelper::StrToL(reader->Attribute("Segment"), 10);
-		Globals::Instance->AddSegment(segment, this);
+		if (segment == 0x80)
+		{
+			printf("File '%s' using virtual addresses.\n", GetName().c_str());
+		}
+		else
+		{
+			printf("File '%s' using segment %X.\n", GetName().c_str(), segment);
+		}
 	}
 
 	if (mode == ZFileMode::Extract || mode == ZFileMode::ExternalFile)
@@ -938,6 +969,7 @@ std::string ZFile::ProcessDeclarations()
 							lastItem.second->text += "\n" + curItem.second->text;
 							declarations.erase(curItem.first);
 							declarationKeys.erase(declarationKeys.begin() + i);
+							delete curItem.second;
 							i--;
 							continue;
 						}
-- 
cgit v1.2.3