You are viewing a plain text version of this content. The canonical link for it is here.
Posted to c-commits@axis.apache.org by bi...@apache.org on 2020/04/08 01:56:39 UTC

[axis-axis2-c-core] branch master updated (5921557 -> f905330)

This is an automated email from the ASF dual-hosted git repository.

billblough pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-c-core.git.


    from 5921557  Fix autotools warnings about INCLUDES
     new 2fa03e4  Install axutil platform-specific headers into correct directory
     new 3245725  Fix crash in test_deployment due to misplaced null check
     new f905330  Set dep_engine->repos_listener to NULL after free

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/core/deployment/dep_engine.c        |  7 +++++++
 test/core/deployment/test_deployment.cc |  2 +-
 util/Makefile.am                        | 15 ++++++++++++++-
 util/configure.ac                       |  1 -
 util/include/Makefile.am                | 18 ------------------
 5 files changed, 22 insertions(+), 21 deletions(-)
 delete mode 100644 util/include/Makefile.am


[axis-axis2-c-core] 03/03: Set dep_engine->repos_listener to NULL after free

Posted by bi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

billblough pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-c-core.git

commit f9053301d2607e110bcc550cff17512c6f29cb28
Author: Bill Blough <de...@blough.us>
AuthorDate: Tue Apr 7 21:52:41 2020 -0400

    Set dep_engine->repos_listener to NULL after free
    
    Set dep_engine->repos_listener to NULL after freeing to avoid double-frees
    JIRA: AXIS2C-1570
---
 src/core/deployment/dep_engine.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/core/deployment/dep_engine.c b/src/core/deployment/dep_engine.c
index 2ccbb83..6b03bb8 100644
--- a/src/core/deployment/dep_engine.c
+++ b/src/core/deployment/dep_engine.c
@@ -563,6 +563,7 @@ axis2_dep_engine_free(
     if(dep_engine->repos_listener)
     {
         axis2_repos_listener_free(dep_engine->repos_listener, env);
+        dep_engine->repos_listener = NULL;
     }
 
     if(dep_engine->module_dir)
@@ -777,6 +778,7 @@ axis2_dep_engine_load(
     if(dep_engine->repos_listener)
     {
         axis2_repos_listener_free(dep_engine->repos_listener, env);
+        dep_engine->repos_listener = NULL;
     }
 
     dep_engine->repos_listener = axis2_repos_listener_create_with_folder_name_and_dep_engine(env,
@@ -798,6 +800,7 @@ axis2_dep_engine_load(
     if(AXIS2_SUCCESS != status)
     {
         axis2_repos_listener_free(dep_engine->repos_listener, env);
+        dep_engine->repos_listener = NULL;
         axis2_conf_free(dep_engine->conf, env);
         dep_engine->conf = NULL;
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_MODULE_VALIDATION_FAILED, AXIS2_FAILURE);
@@ -809,6 +812,7 @@ axis2_dep_engine_load(
     if(AXIS2_SUCCESS != status)
     {
         axis2_repos_listener_free(dep_engine->repos_listener, env);
+        dep_engine->repos_listener = NULL;
         axis2_conf_free(dep_engine->conf, env);
         dep_engine->conf = NULL;
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
@@ -825,6 +829,7 @@ axis2_dep_engine_load(
     if(AXIS2_SUCCESS != status)
     {
         axis2_repos_listener_free(dep_engine->repos_listener, env);
+        dep_engine->repos_listener = NULL;
         axis2_conf_free(dep_engine->conf, env);
         dep_engine->conf = NULL;
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
@@ -964,6 +969,7 @@ axis2_dep_engine_load_client(
         if(dep_engine->repos_listener)
         {
             axis2_repos_listener_free(dep_engine->repos_listener, env);
+            dep_engine->repos_listener = NULL;
         }
 
         dep_engine->repos_listener = axis2_repos_listener_create_with_folder_name_and_dep_engine(
@@ -979,6 +985,7 @@ axis2_dep_engine_load_client(
     if(AXIS2_SUCCESS != status)
     {
         axis2_repos_listener_free(dep_engine->repos_listener, env);
+        dep_engine->repos_listener = NULL;
         /* Set the dep_engine to NULL before freeing conf in order to
               avoid deleting it twice*/
         axis2_conf_set_dep_engine(dep_engine->conf,env,NULL);


[axis-axis2-c-core] 01/03: Install axutil platform-specific headers into correct directory

Posted by bi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

billblough pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-c-core.git

commit 2fa03e4abf82eb0593d569ba368ae7051bac36a1
Author: Bill Blough <de...@blough.us>
AuthorDate: Mon Apr 6 21:48:58 2020 -0400

    Install axutil platform-specific headers into correct directory
---
 util/Makefile.am         | 15 ++++++++++++++-
 util/configure.ac        |  1 -
 util/include/Makefile.am | 18 ------------------
 3 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/util/Makefile.am b/util/Makefile.am
index 7e40e19..99a565a 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -15,8 +15,21 @@
 datadir=$(prefix)
 tmpincludedir=$(prefix)/include/axis2-${PACKAGE_VERSION}/
 includedir=$(prefix)/include/axis2-${PACKAGE_VERSION}/
-SUBDIRS = src $(GTEST) $(TESTDIR) include
+SUBDIRS = src $(GTEST) $(TESTDIR)
 include_HEADERS=$(top_srcdir)/include/*.h
+
+platformincludedir=$(includedir)/platforms/
+platforminclude_HEADERS=$(top_srcdir)/include/platforms/*.h
+
+unixincludedir=$(platformincludedir)/unix/
+unixinclude_HEADERS= $(top_srcdir)/include/platforms/unix/*.h
+
+os400includedir=$(platformincludedir)/os400/
+os400include_HEADERS= $(top_srcdir)/include/platforms/os400/*.h
+
+windowsincludedir=$(platformincludedir)/windows/
+windowsinclude_HEADERS= $(top_srcdir)/include/platforms/windows/*.h
+
 tmpinclude_DATA=config.h
 data_DATA= INSTALL README AUTHORS NEWS CREDITS LICENSE COPYING
 EXTRA_DIST = build.sh autogen.sh CREDITS LICENSE
diff --git a/util/configure.ac b/util/configure.ac
index b8726bd..453d1c6 100644
--- a/util/configure.ac
+++ b/util/configure.ac
@@ -352,7 +352,6 @@ AC_CONFIG_FILES([Makefile \
     src/Makefile \
     src/platforms/unix/Makefile \
     src/minizip/Makefile \
-    include/Makefile \
     gtest/Makefile \
     test/Makefile \
     test/util/Makefile \
diff --git a/util/include/Makefile.am b/util/include/Makefile.am
deleted file mode 100644
index 6dd3027..0000000
--- a/util/include/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-includedir=$(prefix)/include/axis2-${PACKAGE_VERSION}/
-nobase_include_HEADERS= $(top_srcdir)/include/platforms/axutil_platform_auto_sense.h \
-						$(top_srcdir)/include/platforms/unix/*.h \
-						$(top_srcdir)/include/platforms/windows/*.h


[axis-axis2-c-core] 02/03: Fix crash in test_deployment due to misplaced null check

Posted by bi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

billblough pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-c-core.git

commit 32457258dde17d28abb8060aaf1f1d18e5d06518
Author: Bill Blough <de...@blough.us>
AuthorDate: Tue Apr 7 21:48:34 2020 -0400

    Fix crash in test_deployment due to misplaced null check
---
 test/core/deployment/test_deployment.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/core/deployment/test_deployment.cc b/test/core/deployment/test_deployment.cc
index 67b1fe6..3847feb 100644
--- a/test/core/deployment/test_deployment.cc
+++ b/test/core/deployment/test_deployment.cc
@@ -77,8 +77,8 @@ TEST_F(TestDeployment, test_dep_engine_load)
     dep_engine = axis2_dep_engine_create_with_repos_name(m_env, axis2c_home);
     ASSERT_NE(dep_engine, nullptr);
     conf = axis2_dep_engine_load(dep_engine, m_env);
-    axis2_conf_set_dep_engine(conf, m_env, dep_engine);
     ASSERT_NE(conf, nullptr);
+    axis2_conf_set_dep_engine(conf, m_env, dep_engine);
     svc_map = axis2_conf_get_all_svcs(conf, m_env);
     ASSERT_NE(svc_map, nullptr);
     if (svc_map)