From 9b4d06cbe6af3a85de26201cceb2f59ee4aeed73 Mon Sep 17 00:00:00 2001 From: Darth Vader Date: Fri, 6 Dec 2024 16:58:14 +0000 Subject: [PATCH] Squashed 'src/phast/PhreeqcRM/' changes from 632d95dc..7929211d 7929211d Merge commit '9d13958d3edb021992f3531f25933de212f3c766' 9d13958d Squashed 'src/' changes from 4b4092a6..6ad69f0b git-subtree-dir: src/phast/PhreeqcRM git-subtree-split: 7929211d9528ff7e781bbb854c9ca77e985b154d --- src/IPhreeqcPhast/IPhreeqc/phreeqcpp/tidy.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/IPhreeqcPhast/IPhreeqc/phreeqcpp/tidy.cpp b/src/IPhreeqcPhast/IPhreeqc/phreeqcpp/tidy.cpp index 9449e350..c6dc3ebf 100644 --- a/src/IPhreeqcPhast/IPhreeqc/phreeqcpp/tidy.cpp +++ b/src/IPhreeqcPhast/IPhreeqc/phreeqcpp/tidy.cpp @@ -2312,6 +2312,15 @@ tidy_species(void) } /* store sequence number in master structure */ master[i]->number = i; + if (master[i]->s == NULL) + { + input_error++; + error_string = sformatf( + "Species pointer is null for, %s. Check your _MASTER_ and _SPECIES definitions.", + master[i]->elt->name); + error_msg(error_string, STOP); + } + if (strcmp(master[i]->elt->name, "Alkalinity") != 0) { if (master[i]->primary == TRUE)