From e07fdb30894146c4c9a70395098b06ccadb730fb Mon Sep 17 00:00:00 2001 From: Olof hagsand Date: Tue, 12 Mar 2024 15:07:57 +0100 Subject: [PATCH] Start of 7.1.0.PRE Fixed memleak --- CHANGELOG.md | 6 +++++- configure | 4 ++-- configure.ac | 4 ++-- lib/src/clixon_path.c | 2 ++ lib/src/clixon_proto.c | 4 +--- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dda2ed27..d464b3d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Clixon Changelog -* [7.0.0](#660) 8 March 2024 +* [7.1.0](#710) Expected: May 2024 +* [7.0.0](#700) 8 March 2024 * [6.5.0](#650) 6 December 2023 * [6.4.0](#640) 30 September 2023 * [6.3.0](#630) 29 July 2023 @@ -8,6 +9,9 @@ * [6.1.0](#610) 19 Feb 2023 * [6.0.0](#600) 29 Nov 2022 +## 7.1.0 +Expected: May 2024 + ## 7.0.0 8 March 2024 diff --git a/configure b/configure index fbb13da8..8c972c87 100755 --- a/configure +++ b/configure @@ -2812,9 +2812,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu CLIXON_VERSION_MAJOR="7" -CLIXON_VERSION_MINOR="0" +CLIXON_VERSION_MINOR="1" CLIXON_VERSION_PATCH="0" -CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}\"" +CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}.PRE\"" # Debug flag # Check whether --enable-debug was given. diff --git a/configure.ac b/configure.ac index 730442e9..ecba85d4 100644 --- a/configure.ac +++ b/configure.ac @@ -49,9 +49,9 @@ AC_CONFIG_SRCDIR([lib/clixon/clixon.h.in]) AC_CONFIG_AUX_DIR(config-aux) CLIXON_VERSION_MAJOR="7" -CLIXON_VERSION_MINOR="0" +CLIXON_VERSION_MINOR="1" CLIXON_VERSION_PATCH="0" -CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}\"" +CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}.PRE\"" # Debug flag AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug],[Build with debug symbols, default: no]),[ diff --git a/lib/src/clixon_path.c b/lib/src/clixon_path.c index 16b4bdaa..6f3d3437 100644 --- a/lib/src/clixon_path.c +++ b/lib/src/clixon_path.c @@ -476,6 +476,8 @@ api_path_fmt_subst_list_key(cbuf *cb, } retval = 0; done: + if (xtop) + xml_free(xtop); return retval; } diff --git a/lib/src/clixon_proto.c b/lib/src/clixon_proto.c index be1f57e3..1c99d103 100644 --- a/lib/src/clixon_proto.c +++ b/lib/src/clixon_proto.c @@ -643,10 +643,8 @@ clixon_msg_rcv11(int s, cbuf_reset(cbmsg); break; } - if (eom == 0){ + if (eom == 0) continue; - } - clixon_debug(CLIXON_DBG_MSG, "Recv ext: %s", cbuf_get(cbmsg)); } } clixon_debug(CLIXON_DBG_MSG, "Recv: %s", cbuf_get(cbmsg));