(svn r18418) -Fix [FS#3298]: under some circumstances a pointer could be left untouched and then freed. Make sure this doesn't happen by ensuring it starts out as NULL instead of 'garbage'.

3 files changed, 9 insertions, 0 deletions

diff --git a/src/ai/ai_info.cpp b/src/ai/ai_info.cpp
index d6337d511..be16a4966 100644
--- a/src/ai/ai_info.cpp
+++ b/src/ai/ai_info.cpp
@@ -131,6 +131,13 @@ bool AIInfo::GetSettings()
 	return this->engine->CallMethod(*this->SQ_instance, "GetSettings", NULL, -1);
 }
 
+AIInfo::AIInfo() :
+	min_loadable_version(0),
+	use_as_random(false),
+	api_version(NULL)
+{
+}
+
 AIInfo::~AIInfo()
 {
 	/* Free all allocated strings */
diff --git a/src/ai/ai_info.hpp b/src/ai/ai_info.hpp
index 6716cf95e..605664fbb 100644
--- a/src/ai/ai_info.hpp
+++ b/src/ai/ai_info.hpp
@@ -58,6 +58,7 @@ class AIInfo : public AIFileInfo {
 public:
 	static const char *GetClassName() { return "AIInfo"; }
 
+	AIInfo();
 	~AIInfo();
 
 	/**
diff --git a/src/script/script_info.hpp b/src/script/script_info.hpp
index 931a4caf8..a812df3e5 100644
--- a/src/script/script_info.hpp
+++ b/src/script/script_info.hpp
@@ -25,6 +25,7 @@ public:
 		description(NULL),
 		date(NULL),
 		instance_name(NULL),
+		version(0),
 		url(NULL)
 	{}
 	~ScriptFileInfo();