Fixes some valgrind warnings.
Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit 8cd8c833)