Browse Source

AP_Param: correct possible use of nullptr during param count

::first can return nullptr
master
Peter Barker 7 years ago committed by Randy Mackay
parent
commit
32795f0a8f
  1. 7
      libraries/AP_Param/AP_Param.cpp

7
libraries/AP_Param/AP_Param.cpp

@ -2095,10 +2095,11 @@ uint16_t AP_Param::count_parameters(void) @@ -2095,10 +2095,11 @@ uint16_t AP_Param::count_parameters(void)
AP_Param *vp;
AP_Param::ParamToken token;
vp = AP_Param::first(&token, nullptr);
do {
for (vp = AP_Param::first(&token, nullptr);
vp != nullptr;
vp = AP_Param::next_scalar(&token, nullptr)) {
ret++;
} while (nullptr != (vp = AP_Param::next_scalar(&token, nullptr)));
}
_parameter_count = ret;
}
return ret;

Loading…
Cancel
Save