Remove the malloc from the master branch