From 532d4a24e2013262dfa41fd85c06a9715c99abf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 24 Oct 2022 21:03:42 +0200 Subject: New upstream version 4.7 --- src/map.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/map.c') diff --git a/src/map.c b/src/map.c index 6d89e36..a90a731 100644 --- a/src/map.c +++ b/src/map.c @@ -102,6 +102,8 @@ static void HXrbtree_free(struct HXrbtree *btree) EXPORT_SYMBOL void HXmap_free(struct HXmap *xmap) { + if (xmap == NULL) + return; void *vmap = xmap; const struct HXmap_private *map = vmap; -- cgit v1.2.3 From bfef0924f58eab930bdd826ac0132786abc32220 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 29 Jan 2023 16:17:51 +0100 Subject: New upstream version 4.10 --- src/map.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/map.c') diff --git a/src/map.c b/src/map.c index a90a731..40f376c 100644 --- a/src/map.c +++ b/src/map.c @@ -1304,11 +1304,12 @@ static struct HXrbnode *HXrbtrav_rewalk(struct HXrbtrav *trav) trav->current = trav->path[--trav->depth]; if (trav->current == NULL) fprintf(stderr, "btrav_rewalk: problem: current==NULL\n"); - HXrbtrav_checkpoint(trav, trav->current); + else + HXrbtrav_checkpoint(trav, trav->current); } trav->tid = btree->tid; - if (go_next) + if (trav->current != nullptr && go_next) return HXrbtrav_next(trav); else return trav->current; -- cgit v1.2.3