missing free
fix was incorrect
bzero + missing free
unnecessary free
Merge branch 'master' into portable