fix memory leak issue #2871 #1639

Job	Run time
gcc-compile-with-bazel	18m 0s
gcc-compile-with-boringssl	17m 55s
gcc-compile-with-cmake	4m 0s
gcc-compile-with-cmake-all-options	5m 32s
gcc-compile-with-make	3m 20s
gcc-compile-with-make-all-options	5m 0s
clang-compile-with-bazel	15m 55s
clang-compile-with-bazel-all-options	16m 46s
clang-compile-with-boringssl	16m 49s
clang-compile-with-cmake	2m 53s
clang-compile-with-cmake-all-options	5m 13s
clang-compile-with-make	3m 6s
clang-compile-with-make-all-options	5m 20s
gcc-compile-with-bazel-all-options	18m 15s
clang-unittest	17m 13s
	2h 35m 17s

Provide feedback