Skip to content

Commit 9f76fcf

Browse files
committed
Fixed Cppcheck warning
1 parent 137f262 commit 9f76fcf

1 file changed

Lines changed: 12 additions & 4 deletions

File tree

cli/cppcheckexecutor.cpp

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -215,15 +215,23 @@ int CppCheckExecutor::check(int argc, const char* const argv[])
215215
mSettings = &settings;
216216

217217
if (!parseFromArgs(&cppCheck, argc, argv)) {
218+
mSettings = nullptr;
218219
return EXIT_FAILURE;
219220
}
220221
if (Settings::terminated()) {
222+
mSettings = nullptr;
221223
return EXIT_SUCCESS;
222224
}
223-
if (cppCheck.settings().exceptionHandling) {
224-
return check_wrapper(cppCheck, argc, argv);
225-
}
226-
return check_internal(cppCheck, argc, argv);
225+
226+
int ret;
227+
228+
if (cppCheck.settings().exceptionHandling)
229+
ret = check_wrapper(cppCheck, argc, argv);
230+
else
231+
ret = check_internal(cppCheck, argc, argv);
232+
233+
mSettings = nullptr;
234+
return ret;
227235
}
228236

229237
void CppCheckExecutor::setSettings(const Settings &settings)

0 commit comments

Comments
 (0)