Fix clang static analyzer on potential memory leak.

Rationale:
This was not really a leak, but the combination of stack/heap
allocated data structures with a single re-allocation was a bit
complex for static analysis.

BUG=30040701

Change-Id: Ia5a6fda9d146a0a27e65fe146e6cedda212ae8c7