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;
-}
+}
+