[OpenSIPS-Devel] [OpenSIPS/opensips] 2aa0f8: HP_MALLOC: Fix bad merge conflict solve
Liviu Chircu
noreply at github.com
Mon Jul 13 10:44:29 EST 2020
Branch: refs/heads/2.4
Home: https://github.com/OpenSIPS/opensips
Commit: 2aa0f807e8086db67ce79288234439dc1eaf609a
https://github.com/OpenSIPS/opensips/commit/2aa0f807e8086db67ce79288234439dc1eaf609a
Author: Liviu Chircu <liviu at opensips.org>
Date: 2020-07-13 (Mon, 13 Jul 2020)
Changed paths:
M Makefile.test
M mem/hp_malloc.c
M mem/test/test_hp_malloc.c
Log Message:
-----------
HP_MALLOC: Fix bad merge conflict solve
It seems the 25eec9f5f backport was not properly done, as the
re-scanning logic ended up _inside_ the main loop, rather than
_outside_ it.
Also improve the default unit test settings, so the HP_MALLOC stress
tests can be more easily launched.
Credits to Ryan Bullock for the report
Fixes #2168
More information about the Devel
mailing list