Merge pull request #27 from CyberSource/future

Sync Future To Master

Author: mahendya1002

BaseClient/BaseClient.vcxproj

@@ -22,32 +22,32 @@
     <ProjectGuid>{E5D6E166-C770-4B63-9501-4274E29D56E2}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>BaseClient</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

BaseClient/kvs.c

@@ -53,6 +53,11 @@ static void resize_pairs(CybsMap *store) {
 	store->pairs = (CybsTable*)realloc(store->pairs, kvs_pair_size * store->length);
 }
 
+static void mem_alloc_error()
+{
+    fprintf(stderr, "Failed to allocate memory");
+}
+
 static void create_pair(CybsMap *store, const void *key, void *value) {
 	CybsTable *pair;
     if (!store) {
@@ -70,6 +75,10 @@ static void create_pair(CybsMap *store, const void *key, void *value) {
     //pair->key = key;
     //pair->value = value;
 	pair->value = (char *) malloc(valueCopy.size() + sizeof(char));
+    if(!pair->value) {
+         mem_alloc_error();
+         exit(0);
+    }
 	valueCopy.copy((char *)pair->value, valueCopy.size(), 0);
 	((char *) pair->value)[valueCopy.size()]='\0';
     sort_pairs(store);
@@ -88,7 +97,11 @@ static void remove_pair(CybsMap *store, CybsTable *pair) {
 }
 
 CybsMap *cybs_create_map(void) {
-	CybsMap *store = (CybsMap *)malloc(kvs_store_size);
+    CybsMap *store = (CybsMap *)malloc(kvs_store_size);
+    if(!store) {
+       mem_alloc_error();
+       exit(0);
+    }
     store->pairs = NULL;
     store->length = 0;
 	store->totallength = 0;
@@ -137,6 +150,10 @@ void cybs_add(CybsMap *store, const void *key, void *value) {
 			free (pair->value);
 			string valueCopy((char *)value);
 			pair->value = (char *) malloc(valueCopy.size() + sizeof(char));
+            if(!pair->value) {
+                mem_alloc_error();
+                exit(0);
+            }
 			valueCopy.copy((char *) pair->value, valueCopy.size(), 0);
 			((char *) pair->value)[valueCopy.size()]='\0';
         } else {
@@ -152,6 +169,7 @@ void cybs_add(CybsMap *store, const void *key, void *value) {
 }
 
 void *cybs_get(CybsMap *store, const void *key) {
-	CybsTable *pair = get_pair(store, key);
+    CybsTable *pair = get_pair(store, key);
     return pair ? pair->value : NULL;
-}
+}
+

BaseClient/util.c

@@ -5,6 +5,7 @@
 	#include "string.h"
 #endif
 #include "iostream"
+#include "fstream"
 #include "stdio.h"
 #include "util.h"
 #include "string"
@@ -61,30 +62,33 @@ static void trim( char **pszString )
 }
 
 void cybs_load_config (const char *configFilename, CybsMap *map) {
-	FILE *f;
 	char szLine[256];
 	char *szName, *szValue;
+    std::string nextLine;
 	int i = 0;
-	f = fopen( configFilename, "rt" );
-	if (!f) {
-		(CybsMap *) 0;
-	}
-
-	//CybsMap *cybsConfig = cybs_create_map();
-	while (fgets( szLine, 256, f )) {
-		split( szLine, &szName, &szValue );
-		string szValueCopy(szValue);
-		if (szValue && !szValueCopy.size() == 0)
-		{
-			trim( &szName );
-			if (szName[0] != INI_COMMENT_CHAR) 
-			{
-				trim( &szValue );
-				cybs_add(map, szName, szValue);
-				i = i + 1;
-			}
-		} 
-	}
 
-	fclose( f );
+    std::ifstream f(configFilename);
+    if(!f.is_open()) {
+        (CybsMap *) 0;
+	}else {
+  	   //CybsMap *cybsConfig = cybs_create_map();
+  	    while (getline(f, nextLine)) {
+  	        strcpy(szLine, nextLine.c_str());
+		    split( szLine, &szName, &szValue );
+		    string szValueCopy(szValue);
+		    if (szValue && !szValueCopy.size() == 0)
+		    {
+			    trim( &szName );
+			    if (szName[0] != INI_COMMENT_CHAR)
+			    {
+				    trim( &szValue );
+				    cybs_add(map, szName, szValue);
+				    i = i + 1;
+			    }
+		    }
+	    }
+	    f.close();
+    }
 }
+
+

BaseClient/util.h

@@ -30,10 +30,8 @@ extern "C" {
 #endif
 #endif
 
-
 #include <stdlib.h>
 
-	
 #define CYBS_NUM_BUCKETS 256;
 
 #define CYBS_MAX_NAMESPACE_URI	64
@@ -68,7 +66,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.3";
+static const wchar_t CLIENT_LIBRARY_VERSION_VALUE[] = L"6.0.4";
 static const wchar_t CLIENT_LIBRARY_VALUE[] = L"C SOAP";
 static const wchar_t CLIENT_APPLICATION_VALUE[] = L"Simple Order API";
 
@@ -116,6 +114,7 @@ BASECLIENT_API void cybs_load_config (const char *configFilename, CybsMap *map);
 
 void printdata(CybsMap *store);
 
+
 #ifdef __cplusplus
 }
 #endif

Makefile

@@ -1,4 +1,4 @@
-API_VERSION    = 6.0.3
+API_VERSION    = 6.0.4
 PROD_NAME      = simapi-c
 ZIP_NAME       = $(PROD_NAME)-linux
 DIST_BASE      = builds
@@ -21,6 +21,22 @@ clean:
 	$(MAKE) -C NVPClient clean
 	$(MAKE) -C XMLClient clean
 
+dist64:
+	$(MAKE) dist
+	cp lib/libxml2/linux64/lib/libxml2.a $(DIST)/lib
+	cp lib/libxml2/linux64/lib/libxml2.so.2.9.11  $(DIST)/lib
+	cp lib/openssl-1.1.1l/linux64/lib/libssl.so.1.1 $(DIST)/lib
+	cp lib/openssl-1.1.1l/linux64/lib/libcrypto.so.1.1 $(DIST)/lib
+	@echo Done building package: $(DIST_BASE)/$(ZIP_NAME)-$(API_VERSION).tar.gz
+        
+dist32: 
+	$(MAKE) dist
+	cp lib/libxml2/linux32/lib/libxml2.a $(DIST)/lib
+	cp lib/libxml2/linux32/lib/libxml2.so.2.9.11  $(DIST)/lib
+	cp lib/openssl-1.1.1l/linux32/lib/libssl.so.1.1 $(DIST)/lib
+	cp lib/openssl-1.1.1l/linux32/lib/libcrypto.so.1.1 $(DIST)/lib
+	@echo Done building package: $(DIST_BASE)/$(ZIP_NAME)-$(API_VERSION).tar.gz
+		
 dist:
 	mkdir -p $(DIST_BASE)
 	mkdir -p $(DIST)
@@ -41,8 +57,7 @@ dist:
 	cp xml/xml $(DIST)/samples/xml
 
 	mkdir -p $(DIST)/lib
-	cp lib/libxml2/linux32/lib/libxml2.a $(DIST)/lib
-	cp lib/libxml2/linux32/lib/libxml2.so.2.9.3  $(DIST)/lib
+        
 	cp NVPClient/libNVPClient.so $(DIST)/lib
 	cp XMLClient/libXMLClient.so $(DIST)/lib
 	cp BaseClient/libbaseclient.so $(DIST)/lib
@@ -70,4 +85,3 @@ dist:
 	rm -f $(ZIP_NAME)-$(API_VERSION).tar.gz
 	cd $(DIST_BASE); tar -zcvf $(ZIP_NAME)-$(API_VERSION).tar.gz $(PROD_NAME)-$(API_VERSION)
 
-	@echo Done building package: $(DIST_BASE)/$(ZIP_NAME)-$(API_VERSION).tar.gz