Merge branch 'android-mem-leak'

graeme-hill · Jun 18, 2017 · 5c30454 · 5c30454
2 parents ef91787 + e1318d7
commit 5c30454
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.5.1)
 project(CrossGuid)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
 
 option(XG_TESTS "Build test runner" ON)
 

diff --git a/Guid.cpp b/Guid.cpp
@@ -184,7 +184,8 @@ unsigned char hexPairToChar(char a, char b)
 // create a guid from string
 Guid::Guid(const std::string &fromString)
 {
-	char charOne, charTwo;
+	char charOne = '\0';
+	char charTwo = '\0';
 	bool lookingForFirstChar = true;
 	unsigned nextByte = 0;