Merge pull request #800 from appneta/Bug_#780_assert_tcpedit_dlt_cleanup

Bug #780 assert tcpedit dlt cleanup
appneta · Jun 4, 2023 · 6f9a61c · 6f9a61c
2 parents bcb107a + 91009a5
commit 6f9a61c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/configure.ac b/configure.ac
@@ -4,7 +4,7 @@ dnl $Id$
 AC_PREREQ([2.69])
 
 dnl Set version info here!
-AC_INIT([tcpreplay],[4.4.3],[https://github.com/appneta/tcpreplay/issues],[tcpreplay],[http:https://tcpreplay.sourceforge.net/])
+AC_INIT([tcpreplay],[4.4.4-Beta1],[https://github.com/appneta/tcpreplay/issues],[tcpreplay],[http:https://tcpreplay.sourceforge.net/])
 AC_CONFIG_SRCDIR([src/tcpreplay.c])
 AC_CONFIG_HEADERS([src/config.h])
 AC_CONFIG_AUX_DIR(config)

diff --git a/docs/CHANGELOG b/docs/CHANGELOG
@@ -1,3 +1,6 @@
+06/04/2023 Version 4.4.4-Beta1
+ - CVE-2023-27783 reachable assert in tcpedit_dlt_cleanup (#780)
+
 01/01/2023 Version 4.4.3
  - upgrade autogen/libopts to version 5.18.16 (#759)
  - avoid implicit int in configure.ac (#757)

diff --git a/src/tcpedit/plugins/dlt_jnpr_ether/jnpr_ether.c b/src/tcpedit/plugins/dlt_jnpr_ether/jnpr_ether.c
@@ -168,7 +168,8 @@ dlt_jnpr_ether_cleanup(tcpeditdlt_t *ctx)
  jnpr_ether_config_t *config;
 
  config = (jnpr_ether_config_t *)ctx->encoder->config;
- tcpedit_dlt_cleanup(config->subctx);
+ if (config->subctx != NULL)
+ tcpedit_dlt_cleanup(config->subctx);
  safe_free(plugin->config);
  plugin->config = NULL;
  plugin->config_size = 0;