From 655119962b0100380bfb4a005d89814f26e9afa6 Mon Sep 17 00:00:00 2001
From: Krzysztof Dynowski <k.dynowski@samsung.com>
Date: Mon, 23 Oct 2017 17:41:12 +0200
Subject: [PATCH] SVACE: fix UNINIT.CTOR

Change-Id: I4029146e8b408e931b0555bd7e9ac8d61722741f
---
 TEEStub/PropertyAccess/Property.h                         | 2 +-
 TEEStub/PropertyAccess/rapidxml/rapidxml.hpp              | 7 ++++---
 TEEStub/TEEStubServer/ConnectionSession.h                 | 2 +-
 simulatordaemon/inc/ConnectionSession.h                   | 2 +-
 simulatordaemon/src/TABinaryManager/rapidxml/rapidxml.hpp | 7 ++++---
 simulatordaemon/src/TAInstance.cpp                        | 4 +++-
 ssflib/dep/cryptocore/source/base/cc_bignum.c             | 7 +++----
 7 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/TEEStub/PropertyAccess/Property.h b/TEEStub/PropertyAccess/Property.h
index f7413ea..80ecb4c 100644
--- a/TEEStub/PropertyAccess/Property.h
+++ b/TEEStub/PropertyAccess/Property.h
@@ -54,7 +54,7 @@ public:
 	void setPropSet(uintptr_t propset) {
 		this->propset = propset;
 	};
-	Property() {
+	Property() : propset(0) {
 	}
 	;
 	virtual ~Property() {
diff --git a/TEEStub/PropertyAccess/rapidxml/rapidxml.hpp b/TEEStub/PropertyAccess/rapidxml/rapidxml.hpp
index 73a2b78..f1aa61e 100644
--- a/TEEStub/PropertyAccess/rapidxml/rapidxml.hpp
+++ b/TEEStub/PropertyAccess/rapidxml/rapidxml.hpp
@@ -617,7 +617,7 @@ public:
 
 	// Construct a base with empty name, value and parent
 	xml_base() :
-			m_name(0), m_value(0), m_parent(0) {
+			m_name(0), m_value(0), m_name_size(0), m_value_size(0), m_parent(0) {
 	}
 
 	///////////////////////////////////////////////////////////////////////////
@@ -756,7 +756,7 @@ public:
 
 	//! Constructs an empty attribute with the specified type. 
 	//! Consider using memory_pool of appropriate xml_document if allocating attributes manually.
-	xml_attribute() {
+	xml_attribute() : m_prev_attribute(0), m_next_attribute(0) {
 	}
 
 	///////////////////////////////////////////////////////////////////////////
@@ -839,7 +839,8 @@ public:
 	//! Consider using memory_pool of appropriate document to allocate nodes manually.
 	//! \param type Type of node to construct.
 	xml_node(node_type type) :
-			m_type(type), m_first_node(0), m_first_attribute(0) {
+			m_type(type), m_first_node(0), m_last_node(0), m_first_attribute(0), m_last_attribute(0),
+			m_prev_sibling(0), m_next_sibling(0) {
 	}
 
 	///////////////////////////////////////////////////////////////////////////
diff --git a/TEEStub/TEEStubServer/ConnectionSession.h b/TEEStub/TEEStubServer/ConnectionSession.h
index 08df68c..0d7b453 100644
--- a/TEEStub/TEEStubServer/ConnectionSession.h
+++ b/TEEStub/TEEStubServer/ConnectionSession.h
@@ -52,7 +52,7 @@ class ConnectionSession: public boost::enable_shared_from_this<ConnectionSession
 {
 public:
 	ConnectionSession(boost::asio::io_service& io_service) :
-	clientSocket(io_service), command((SIM_COMMAND) -1), taskThread(0)
+	clientSocket(io_service), clientData(), command((SIM_COMMAND) -1), taskThread(0)
 	{
 	}
 	stream_protocol::socket& socket()
diff --git a/simulatordaemon/inc/ConnectionSession.h b/simulatordaemon/inc/ConnectionSession.h
index a4794be..055bfe8 100644
--- a/simulatordaemon/inc/ConnectionSession.h
+++ b/simulatordaemon/inc/ConnectionSession.h
@@ -59,7 +59,7 @@ public:
 		return session_ptr(new ConnectionSession(io_service));
 	}
 	ConnectionSession(boost::asio::io_service& io_service):
-	clientSocket(io_service)
+	clientSocket(io_service), clientData()
 	{
 		pthread_mutex_init(&connLock, NULL);
 		currentState = CMD_READ;
diff --git a/simulatordaemon/src/TABinaryManager/rapidxml/rapidxml.hpp b/simulatordaemon/src/TABinaryManager/rapidxml/rapidxml.hpp
index e3e8981..0cb3162 100644
--- a/simulatordaemon/src/TABinaryManager/rapidxml/rapidxml.hpp
+++ b/simulatordaemon/src/TABinaryManager/rapidxml/rapidxml.hpp
@@ -617,7 +617,7 @@ public:
 
 	// Construct a base with empty name, value and parent
 	xml_base() :
-			m_name(0), m_value(0), m_parent(0) {
+			m_name(0), m_value(0), m_name_size(0), m_value_size(0), m_parent(0) {
 	}
 
 	///////////////////////////////////////////////////////////////////////////
@@ -756,7 +756,7 @@ public:
 
 	//! Constructs an empty attribute with the specified type. 
 	//! Consider using memory_pool of appropriate xml_document if allocating attributes manually.
-	xml_attribute() {
+	xml_attribute() : m_prev_attribute(0), m_next_attribute(0) {
 	}
 
 	///////////////////////////////////////////////////////////////////////////
@@ -839,7 +839,8 @@ public:
 	//! Consider using memory_pool of appropriate document to allocate nodes manually.
 	//! \param type Type of node to construct.
 	xml_node(node_type type) :
-			m_type(type), m_first_node(0), m_first_attribute(0) {
+			m_type(type), m_first_node(0), m_last_node(0), m_first_attribute(0), m_last_attribute(0),
+			m_prev_sibling(0), m_next_sibling(0) {
 	}
 
 	///////////////////////////////////////////////////////////////////////////
diff --git a/simulatordaemon/src/TAInstance.cpp b/simulatordaemon/src/TAInstance.cpp
index 0fecf8f..7a6f443 100644
--- a/simulatordaemon/src/TAInstance.cpp
+++ b/simulatordaemon/src/TAInstance.cpp
@@ -35,7 +35,7 @@
  * @param client_io_service IO service to handle the connection with TA
  */
 TAInstance::TAInstance(uint32_t pid, bool alive, bool debug, uint32_t InstID, boost::asio::io_service& client_io_service) :
-mTAConnectionSocket(client_io_service) {
+mTAConnectionSocket(client_io_service),readData() {
 	LOGD(SIM_DAEMON, "Entry");
 
 	// Initialize the lock for Session map (mSessionMap)
@@ -51,6 +51,8 @@ mTAConnectionSocket(client_io_service) {
 	mPID = pid;
 	mTAInstanceID = InstID;
 	mCommandMap.clear();
+	command = COMMANDINVALID;
+	currentState = CMD_READ;
 }
 
 bool TAInstance::checkKeepAlive() {
diff --git a/ssflib/dep/cryptocore/source/base/cc_bignum.c b/ssflib/dep/cryptocore/source/base/cc_bignum.c
index 5dc6043..f36508b 100644
--- a/ssflib/dep/cryptocore/source/base/cc_bignum.c
+++ b/ssflib/dep/cryptocore/source/base/cc_bignum.c
@@ -1077,15 +1077,14 @@ SDRM_BIG_NUM *SDRM_BN_Alloc(cc_u8* pbSrc, cc_u32 dSize)
 SDRM_BIG_NUM *SDRM_BN_Init(cc_u32 dSize)
 {
 	cc_u32			AllocSize = sizeof(SDRM_BIG_NUM) + dSize * SDRM_SIZE_OF_DWORD;
-	cc_u8			*pbBuf = (cc_u8*)malloc(AllocSize);
-	SDRM_BIG_NUM	*BN_Src = (SDRM_BIG_NUM*)(void*)pbBuf;
+	SDRM_BIG_NUM	*BN_Src = (SDRM_BIG_NUM*)malloc(AllocSize);
 	if (BN_Src == NULL)
 	{
 		return NULL;
 	}
 
 	memset(BN_Src, 0, AllocSize);
-	BN_Src->pData = (cc_u32*)(void*)(pbBuf + sizeof(SDRM_BIG_NUM));
+	BN_Src->pData = (cc_u32*)(void*)((char*)BN_Src + sizeof(SDRM_BIG_NUM));
 	BN_Src->Size = dSize;
 
 	return BN_Src;
@@ -3107,8 +3106,8 @@ cc_u8 * SDRM_BN2STRFOUR(cc_u32 *numberBits, SDRM_BIG_NUM *BN_Src)
 	num = SDRM_BN_Init(BN_Src->Size);
     if( num == NULL)//fix prevent cid = 89093 by guoxing.xu
     {
-		free(num);
 		free(strDestTemp);
+		SDRM_BN_FREE(tempREM);
         SDRM_BN_FREE(d);
         return NULL;
     }
-- 
2.34.1