Merge pull request #17 from vyagarwa/future

Promoting Checkmarx Violations Fixes

Author: SumiteshRSrivastava

BaseClient/kvs.c

@@ -1,8 +1,11 @@
+#include "iostream"
 #include "util.h"
 #include "stdio.h"
 #include "string.h"
 #include "time.h"
 
+using namespace std;
+
 static const size_t kvs_pair_size = sizeof(CybsTable);
 
 static const size_t kvs_store_size = sizeof(CybsMap);
@@ -55,27 +58,32 @@ static void create_pair(CybsMap *store, const void *key, void *value) {
     if (!store) {
         return;
     }
+	string keyCopy((char *)key);
+    string valueCopy((char *)value);
     ++store->length;
-	store->totallength = store->totallength + (strlen((const char *)key) + strlen((const char *)value));
+	store->totallength = store->totallength + (keyCopy.size()) + valueCopy.size();
     resize_pairs(store);
     pair = &store->pairs[store->length - 1];
-	pair->key = (char *) malloc(strlen((const char *)key) + sizeof(char));
-	strcpy((char *)pair->key, (const char *)key);
+	pair->key = (char *) malloc(keyCopy.size() + sizeof(char));
+	keyCopy.copy((char *)pair->key, keyCopy.size(), 0);
+	((char *)pair->key)[keyCopy.size()]='\0';
     //pair->key = key;
     //pair->value = value;
-	pair->value = (char *) malloc(strlen((char *)value) + sizeof(char));
-	strcpy((char *)pair->value, (const char *)value);
+	pair->value = (char *) malloc(valueCopy.size() + sizeof(char));
+	valueCopy.copy((char *)pair->value, valueCopy.size(), 0);
+	((char *) pair->value)[valueCopy.size()]='\0';
     sort_pairs(store);
 }
 
 static void remove_pair(CybsMap *store, CybsTable *pair) {
     if ((!store) || (!pair)) {
         return;
     }
-    pair->key = NULL;
     sort_pairs(store);
     --store->length;
-	store->totallength = store->totallength - ((strlen((const char *)pair->key) + strlen((const char *)pair->value)));
+	string pairKeyCopy((char *)pair->key);
+	string pairKeyValue((char *)pair->value);
+	store->totallength = store->totallength - (pairKeyCopy.size() + pairKeyValue.size());
     resize_pairs(store);
 }
 
@@ -107,12 +115,14 @@ void cybs_destroy_map(CybsMap *store) {
 
 char *cybs_strdup( const char * szStringToDup )
 {
+	string szStringToDupCopy(szStringToDup);
 	char *szDup
-		= (char *) malloc( strlen( szStringToDup ) + sizeof( char ) );
+		= (char *) malloc( szStringToDupCopy.size() + sizeof( char ) );
 
 	if (szDup)
 	{
-		strcpy( szDup, szStringToDup );
+		szStringToDupCopy.copy(szDup, szStringToDupCopy.size(), 0);
+		szDup[szStringToDupCopy.size()]='\0';
 		return( szDup );
 	}
 
@@ -125,8 +135,10 @@ void cybs_add(CybsMap *store, const void *key, void *value) {
     if (pair) {
 		if (value) {
 			free (pair->value);
-			pair->value = (char *) malloc(strlen((const char *)value) + sizeof(char));
-            strcpy((char *)pair->value, (const char *)value);
+			string valueCopy((char *)value);
+			pair->value = (char *) malloc(valueCopy.size() + sizeof(char));
+			valueCopy.copy((char *) pair->value, valueCopy.size(), 0);
+			((char *) pair->value)[valueCopy.size()]='\0';
         } else {
             remove_pair(store, pair);
         }

BaseClient/util.c

@@ -4,8 +4,12 @@
 	#include "ctype.h"
 	#include "string.h"
 #endif
+#include "iostream"
 #include "stdio.h"
 #include "util.h"
+#include "string"
+
+using namespace std;
 
 static const char EQUALS[] = "=";
 #define NULL_STRING	(char *) 0;
@@ -46,7 +50,9 @@ static void trim( char **pszString )
 		++(*pszString);
 	}
 
-	nIndex = strlen( *pszString ) - 1;
+	string pszStringCopy(*pszString);
+
+	nIndex = pszStringCopy.size() - 1;
 	while (nIndex >= 0 && isspace( (*pszString)[nIndex] ))
 	{
 		(*pszString)[nIndex] = '\0';
@@ -67,7 +73,8 @@ void cybs_load_config (const char *configFilename, CybsMap *map) {
 	//CybsMap *cybsConfig = cybs_create_map();
 	while (fgets( szLine, 256, f )) {
 		split( szLine, &szName, &szValue );
-		if (szValue && !strlen(szValue) == 0)
+		string szValueCopy(szValue);
+		if (szValue && !szValueCopy.size() == 0)
 		{
 			trim( &szName );
 			if (szName[0] != INI_COMMENT_CHAR) 

BaseClient/util.h

@@ -68,7 +68,7 @@ const char CYBS_C_USE_AKAMAI[]              = "sendToAkamai";
 
 
 /* Please do not modify these values */
-static const wchar_t CLIENT_LIBRARY_VERSION_VALUE[] = L"6.0.1";
+static const wchar_t CLIENT_LIBRARY_VERSION_VALUE[] = L"6.0.2";
 static const wchar_t CLIENT_LIBRARY_VALUE[] = L"C SOAP";
 static const wchar_t CLIENT_APPLICATION_VALUE[] = L"Simple Order API";
 

Makefile

@@ -1,4 +1,4 @@
-API_VERSION    = 6.0.1
+API_VERSION    = 6.0.2
 PROD_NAME      = simapi-c
 ZIP_NAME       = $(PROD_NAME)-linux
 DIST_BASE      = builds