Add codes to avoid memory leak