Merge branch 'develop' into 'master'

修复内存泄漏

See merge request tango/fw_dns_plug!2

cmake/Version.cmake

@@ -1,4 +1,3 @@
-
 # Using autorevision.sh to generate version information
 
 set(__SOURCE_AUTORESIVISION ${CMAKE_SOURCE_DIR}/autorevision.sh)
@@ -38,16 +37,7 @@ set(VERSION_BUILD "${VCS_SHORT_HASH}")
 # print information
 message(STATUS "Version: ${VERSION}-${VERSION_BUILD}")
 
-if(NOT DEFINE_GIT_VERSION)
-    option(DEFINE_GIT_VERSION "Set DEFINE_GIT_VERSION to OFF" OFF)
-
 set(GIT_VERSION
     "${VERSION}-${CMAKE_BUILD_TYPE}-${VERSION_BUILD}-${VCS_BRANCH}-${VCS_TAG}-${VCS_DATE}")
 string(REGEX REPLACE "[-:+/\\.]" "_" GIT_VERSION ${GIT_VERSION})
-
-if(DEFINE_GIT_VERSION)
-    add_definitions(-DGIT_VERSION=${GIT_VERSION})
-    option(DEFINE_GIT_VERSION "Set DEFINE_GIT_VERSION to OFF" ON)
-endif()
-
-endif()
+add_definitions(-DGIT_VERSION=${GIT_VERSION})

src/fw_dns_plug.cpp

@@ -435,6 +435,11 @@ extern "C" char FW_DNS_PLUG_ENTRY(stSessionInfo* session_info,  void **pme, int
 		}
 	}
 
+	if(mid!=NULL)
+	{
+		Maat_clean_status(&mid);
+		mid=NULL;
+	}
 
 	return state;
 }