Merge "Fix a memory leak found by the static analyzer."