am 183f97b7: am 1c12f9e7: malloc some advances

* commit '183f97b72faf7a0f45ad66e1b3fd9a4343cc7482':
  malloc some advances