svn commit: r1713703 [2/2] - in /axis/axis2/c/core/trunk: axiom/include/ axiom/src/om/ src/core/deployment/ src/core/transport/http/sender/ src/modules/mod_addr/ util/src/

[nadiramra]

Modified: axis/axis2/c/core/trunk/util/src/env.c
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/util/src/env.c?rev=1713703&r1=1713702&r2=1713703&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/util/src/env.c (original)
+++ axis/axis2/c/core/trunk/util/src/env.c Tue Nov 10 17:30:28 2015
@@ -212,13 +212,11 @@ axutil_env_free(
 {
     axutil_allocator_t *allocator = NULL;
 
-    if(!env)
+    if (!env)
         return;
 
-    if(--(env->ref) > 0)
-    {
+    if (--(env->ref) > 0)
         return;
-    }
 
     allocator = env->allocator;
 
@@ -227,27 +225,25 @@ axutil_env_free(
         AXIS2_LOG_FREE(env->allocator, env->log);
     }
 
-    if(env->error)
+    if (env->error)
     {
         AXIS2_ERROR_FREE(env->error);
     }
 
-    if(env->thread_pool)
+    if (env->thread_pool)
     {
         axutil_thread_pool_free(env->thread_pool);
     }
 
-    if(env->allocator)
+    if (env->allocator)
     {
         AXIS2_FREE(env->allocator, env);
     }
 
-    if(allocator)
+    if (allocator)
     {
         AXIS2_FREE(allocator, allocator);
     }
-
-    return;
 }
 
 AXIS2_EXTERN void AXIS2_CALL
@@ -258,27 +254,25 @@ axutil_env_free_masked(
     if(!env)
         return;
 
-    if(--(env->ref) > 0)
-    {
+    if (--(env->ref) > 0)
         return;
-    }
 
-    if(mask & AXIS_ENV_FREE_LOG)
+    if (mask & AXIS_ENV_FREE_LOG)
     {
         AXIS2_LOG_FREE(env->allocator, env->log);
     }
 
-    if(mask & AXIS_ENV_FREE_ERROR)
+    if (mask & AXIS_ENV_FREE_ERROR)
     {
         AXIS2_ERROR_FREE(env->error);
     }
 
-    if(mask & AXIS_ENV_FREE_THREADPOOL)
+    if (mask & AXIS_ENV_FREE_THREADPOOL)
     {
         axutil_thread_pool_free(env->thread_pool);
     }
 
-    if(env)
+    if (env)
         AXIS2_FREE(env->allocator, env);
 
     return;

Modified: axis/axis2/c/core/trunk/util/src/hash.c
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/util/src/hash.c?rev=1713703&r1=1713702&r2=1713703&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/util/src/hash.c (original)
+++ axis/axis2/c/core/trunk/util/src/hash.c Tue Nov 10 17:30:28 2015
@@ -82,8 +82,13 @@ axutil_hash_alloc_array(
     axutil_hash_t *ht,
     unsigned int max)
 {
-    return memset(AXIS2_MALLOC(ht->env->allocator, sizeof(*ht->array) * (max + 
1)), 0,
-        sizeof(*ht->array) * (max + 1));
+    axutil_hash_entry_t **he = AXIS2_MALLOC(ht->env->allocator, 
sizeof(*ht->array) * (max + 1));
+
+    if (!he)
+        return NULL;
+
+    memset(he, 0, sizeof(*ht->array) * (max + 1));
+    return he;
 }
 
 AXIS2_EXTERN axutil_hash_t *AXIS2_CALL