In combination with the previous patch all crashes (double free()) are solved.
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit 1651d75c07ae1795cf78b0e3e4ac753b7703a8e6)