Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com> (cherry picked from commit b7b149d14e5151de48fbee2d43c12bdf9dd829cc)
1. fix memory leak 2. fix bugs of code review Signed-off-by: leizhongkai <leizhongkai@huawei.com> (cherry picked from commit 4f3018c5a2d22b6e06668aa74688da9fca4e1935)