git.openwrt.org Git - feed/packages.git/blob

   1 commit b2219ae216a141acdf0e2a3f67d2c85aee2a2bc2
   2 Author: Dragan Dosen <ddosen@haproxy.com>
   3 Date:   Fri May 4 16:27:15 2018 +0200
   4
   5     BUG/MINOR: map: correctly track reference to the last ref_elt being dumped
   6
   7     The bug was introduced in the commit 8d85aa4 ("BUG/MAJOR: map: fix
   8     segfault during 'show map/acl' on cli").
   9
  10     This patch should be backported to 1.8, 1.7 and 1.6.
  11
  12     (cherry picked from commit 336a11f75571ad46f74a7c6247c13ed44f95da93)
  13     Signed-off-by: Willy Tarreau <w@1wt.eu>
  14
  15 diff --git a/src/map.c b/src/map.c
  16 index f40e4394..a9a1e53c 100644
  17 --- a/src/map.c
  18 +++ b/src/map.c
  19 @@ -307,9 +307,9 @@ static int cli_io_handler_pat_list(struct appctx *appctx)
  20                  * reference to the last ref_elt being dumped.
  21                  */
  22                 if (appctx->st2 == STAT_ST_LIST) {
  23 -                       if (!LIST_ISEMPTY(&appctx->ctx.sess.bref.users)) {
  24 -                               LIST_DEL(&appctx->ctx.sess.bref.users);
  25 -                               LIST_INIT(&appctx->ctx.sess.bref.users);
  26 +                       if (!LIST_ISEMPTY(&appctx->ctx.map.bref.users)) {
  27 +                               LIST_DEL(&appctx->ctx.map.bref.users);
  28 +                               LIST_INIT(&appctx->ctx.map.bref.users);
  29                         }
  30                 }
  31                 return 1;