max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 16:44:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bad input for SURFACE_SPECIES and SURFACE_MASTER_SPECIES generated a NULL pointer.

Browse Source 
Added additional error checks. 

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9507 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2015-04-13 23:23:13 +00:00
parent 18f0512be6
commit c66718096b
1 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
tidy.cpp
View File

@ -4172,6 +4172,14 @@ tidy_kin_surface(void)
if (!surface_ptr->Get_related_rate())
continue;
kinetics_ptr = Utilities::Rxn_find(Rxn_kinetics_map, n);
if (kinetics_ptr == NULL)
{
input_error++;
error_string = sformatf(
"Error in SURFACE related to KINETICS. ");
error_msg(error_string, CONTINUE);
continue;
}
for (size_t k = 0; k < kinetics_ptr->Get_kinetics_comps().size(); k++)
{
cxxKineticsComp *kin_comp_ptr = &(kinetics_ptr->Get_kinetics_comps()[k]);
@ -4237,6 +4245,34 @@ tidy_kin_surface(void)
}
for (int j = 0; j < count_elts; j++)
{
if (elt_list[j].elt == NULL)
{
input_error++;
error_string = sformatf(
"Cannot identify elements in kinetics component %s.",
comp_ptr_save->Get_formula().c_str());
error_msg(error_string, CONTINUE);
continue;
}
if (elt_list[j].elt->primary == NULL )
{
input_error++;
error_string = sformatf(
"Cannot identify primary element in kinetics component %s.",
comp_ptr_save->Get_formula().c_str());
error_msg(error_string, CONTINUE);
continue;
}
if (elt_list[j].elt->primary->s == NULL)
{
input_error++;
error_string = sformatf(
"Cannot identify primary species for an element in kinetics component %s.",
comp_ptr_save->Get_formula().c_str());
error_msg(error_string, CONTINUE);
continue;
}
if (elt_list[j].elt->primary->s->type <= H2O)
{
int l;