Merge "Possible null pointer miss on realloc"