Fix CLI memory leak (bug #5035)