You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

32 lines
954 B

  1. From e9607769d56373cf29c4df040f605191603beb50 Mon Sep 17 00:00:00 2001
  2. From: Nenad Merdanovic <nmerdan@haproxy.com>
  3. Date: Sun, 12 Mar 2017 22:01:35 +0100
  4. Subject: [PATCH 5/7] BUG/MEDIUM: cli: Prevent double free in CLI ACL lookup
  5. The memory is released by cli_release_mlook, which also properly sets the
  6. pointer to NULL. This was introduced with a big code reorganization
  7. involving moving to the new keyword registration form in commit ad8be61c7.
  8. This fix needs to be backported to 1.7.
  9. Signed-off-by: Nenad Merdanovic <nmerdan@haproxy.com>
  10. (cherry picked from commit 24f45d8e34797ed9c16ac3fa6d89f3eed435e706)
  11. ---
  12. src/map.c | 1 -
  13. 1 file changed, 1 deletion(-)
  14. diff --git a/src/map.c b/src/map.c
  15. index b6fce4d..90deb08 100644
  16. --- a/src/map.c
  17. +++ b/src/map.c
  18. @@ -524,7 +524,6 @@ static int cli_io_handler_map_lookup(struct appctx *appctx)
  19. default:
  20. appctx->st2 = STAT_ST_FIN;
  21. - free(appctx->ctx.map.chunk.str);
  22. return 1;
  23. }
  24. }
  25. --
  26. 2.10.2