getEnigmaVersionString() returns a pointer to an invalid memory locat…

…ion, as std::string goes out of scope
Hains · Oct 16, 2013 · 868779c · 868779c
1 parent 26db75f
commit 868779c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/main/enigma.cpp b/main/enigma.cpp
@@ -313,9 +313,7 @@ void runMainloop()
 
 const char *getEnigmaVersionString()
 {
-	std::string date = enigma2_date;
-	std::string branch = enigma2_branch;
-	return std::string(date + '-' + branch).c_str();
+	return enigma2_version;
 }
 
 const char *getBoxType()

diff --git a/main/version_info.cpp b/main/version_info.cpp
@@ -16,3 +16,4 @@ const char *enigma2_branch = ENIGMA2_BRANCH;
 #endif
 const char *enigma2_rev = ENIGMA2_REV;
 
+const char *enigma2_version = (ENIGMA2_COMMIT_DATE "-" ENIGMA2_BRANCH);
diff --git a/main/version_info.h b/main/version_info.h
@@ -4,5 +4,6 @@
 extern const char *enigma2_date;
 extern const char *enigma2_branch;
 extern const char *enigma2_rev;
+extern const char *enigma2_version;
 
 #endif
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,3 +16,4 @@ const char *enigma2_branch = ENIGMA2_BRANCH;
		#endif
		const char *enigma2_rev = ENIGMA2_REV;

		const char *enigma2_version = (ENIGMA2_COMMIT_DATE "-" ENIGMA2_BRANCH);