cmhi
/
secgateway
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mod aaa-12 解决配置管理-页面跳转内存泄漏 

RCA：
SOL：
修改人：chenling
检视人：
This commit is contained in:
ChenLing 2019-07-08 16:53:40 +08:00
parent 78ce31f91f
commit 6ba69649fe
4 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Common/compile.h
View File

@ -1,11 +1,11 @@
/* This file is auto generated,for sGATE version info */ /* This file is auto generated,for sGATE version info */
/* Used readelf to get this information form driver of application */ /* Used readelf to get this information form driver of application */
/* "readelf --debug-dump=macro <filename>" */ /* "readelf --debug-dump=macro <filename>" */
#define sGATE_COMPILE_DATE "2019-07-04" #define sGATE_COMPILE_DATE "2019-07-08"
#define sGATE_COMPILE_TIME "16:24:06" #define sGATE_COMPILE_TIME "16:43:21"
#define sGATE_COMPILE_MAJOR "20190704" #define sGATE_COMPILE_MAJOR "20190708"
#define sGATE_COMPILE_SUB "162406" #define sGATE_COMPILE_SUB "164321"
#define sGATE_COMPILE_BY "zza" #define sGATE_COMPILE_BY "cl"
#define sGATE_COMPILE_HOST "esgwdev01" #define sGATE_COMPILE_HOST "esgwdev01"
#define sGATE_GIT_TAGS "8ab4e9178-dev" #define sGATE_GIT_TAGS "422ab40d7-dev"
#define sGATE_GIT_VERS "8ab4e9178e1bfa02cef1e2de1991daf1c7593b86" #define sGATE_GIT_VERS "422ab40d72986d1bba93e7eba5379cd61f5d9c24"

13
Makefile
View File

@ -28,9 +28,9 @@ MAKE_FLAGS += -j$(shell cat /proc/cpuinfo | grep processor | wc -l)
endif endif
endif endif
.PHONY : demo conntrack netlink trace openrpc usermanager configm redismq .PHONY : demo conntrack netlink trace openrpc usermanager configm redismq userlockdemo
all: demo conntrack netlink trace openrpc usermanager configm redismq all: demo conntrack netlink trace openrpc usermanager configm redismq userlockdemo
ifeq ($(OPT), install) ifeq ($(OPT), install)
#$(shell `find ../release -name "*.zip" -delete`) #$(shell `find ../release -name "*.zip" -delete`)
@ -156,3 +156,12 @@ else ifeq ($(OPT), install)
else else
$(MLOG)make all $(MAKE_FLAGS) -C Platform/build -f user.redismq.Makefile MLOG=$(MLOG) DISABLE_WARRING=$(DIS_BUILD_WARRING) MAKE_TARGET=redismq $(MLOG)make all $(MAKE_FLAGS) -C Platform/build -f user.redismq.Makefile MLOG=$(MLOG) DISABLE_WARRING=$(DIS_BUILD_WARRING) MAKE_TARGET=redismq
endif endif
userlockdemo:
ifeq ($(OPT), clean)
$(MLOG)make $(MAKE_FLAGS) -C Platform/build -f user.authfree.Makefile cleanall MLOG=$(MLOG) MAKE_TARGET=userlock
else ifeq ($(OPT), install)
$(MLOG)make $(MAKE_FLAGS) -C Platform/build -f user.authfree.Makefile install DIR=$(DIR) MLOG=$(MLOG) MAKE_TARGET=userlock
else
$(MLOG)make all $(MAKE_FLAGS) -C Platform/build -f user.authfree.Makefile MLOG=$(MLOG) DISABLE_WARRING=$(DIS_BUILD_WARRING) MAKE_TARGET=userlock
endif

7
Platform/build/user.authfree.Makefile
View File

@ -1,6 +1,6 @@
# target name, the target name must have the same name of c source file # target name, the target name must have the same name of c source file
TARGET_NAME=authfree TARGET_NAME=userlock
# target # target
# for linux module driver: KO # for linux module driver: KO
@ -22,13 +22,13 @@ DEBUG = TRUE
PLAT_LINUX ?= TRUE PLAT_LINUX ?= TRUE
PLAT_ARM64 ?= FALSE PLAT_ARM64 ?= FALSE
VPATH = ../user/configm/config-server/authfree_config/ VPATH = ../user/configm/config-server/userlock_config/
# source code # source code
# set the source file, don't used .o because of ... # set the source file, don't used .o because of ...
COMMON_SRCS = authfree.c COMMON_SRCS = userlock.c
# MRS Board Source Files # MRS Board Source Files
PLAT_LINUX_SRCS = $(COMMON_SRCS) PLAT_LINUX_SRCS = $(COMMON_SRCS)
@ -36,6 +36,7 @@ PLAT_ARM64_SRCS = $(COMMON_SRCS)
# gcc CFLAGS # gcc CFLAGS
PLAT_ARM64_CFLAGS := -I../user/configm/config-server/include -I../../Common -I../common/configm -I../common/rpc -I../common/rpc/hashtable PLAT_ARM64_CFLAGS := -I../user/configm/config-server/include -I../../Common -I../common/configm -I../common/rpc -I../common/rpc/hashtable
PLAT_ARM64_CFLAGS += -I../include/
PLAT_LINUX_CFLAGS := $(PLAT_ARM64_CFLAGS) PLAT_LINUX_CFLAGS := $(PLAT_ARM64_CFLAGS)

1
Platform/user/configm/config-server/jumppage_config/jumppage.c
View File

@ -65,6 +65,7 @@ ret_code jumppage_config_proc(uint source, uint config_type,
ret_char = cJSON_PrintUnformatted(res); ret_char = cJSON_PrintUnformatted(res);
memcpy(output, ret_char, sizeof(ret_char)+1); memcpy(output, ret_char, sizeof(ret_char)+1);
cJSON_Delete(ret_char);
cJSON_Delete(res); cJSON_Delete(res);
return RET_OK; return RET_OK;