From 0abda87cff61b9d6d4dfdbac39b11a11d26ace21 Mon Sep 17 00:00:00 2001
From: Darth Vader <darth@empire.com>
Date: Tue, 11 Jun 2024 01:06:26 +0000
Subject: [PATCH] Squashed 'src/phast/PhreeqcRM/' changes from
 fa8d13b0..b24b855c

b24b855c Merge commit '0b34432c41c334f1bc7a227cbd8f0a169f2d5eb0'
0b34432c Squashed 'src/' changes from d50815e4..dc753eb6

git-subtree-dir: src/phast/PhreeqcRM
git-subtree-split: b24b855cb7f98261cb4dc755117f92b68fa6604e
---
 src/IPhreeqcPhast/IPhreeqc/phreeqcpp/Serializer.cxx   | 4 ++++
 src/IPhreeqcPhast/IPhreeqc/phreeqcpp/common/Utils.cxx | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/src/IPhreeqcPhast/IPhreeqc/phreeqcpp/Serializer.cxx b/src/IPhreeqcPhast/IPhreeqc/phreeqcpp/Serializer.cxx
index b4ebab76f..fab11a378 100644
--- a/src/IPhreeqcPhast/IPhreeqc/phreeqcpp/Serializer.cxx
+++ b/src/IPhreeqcPhast/IPhreeqc/phreeqcpp/Serializer.cxx
@@ -201,6 +201,10 @@ Serializer::Deserialize(Phreeqc &phreeqc_ref, Dictionary &dictionary, std::vecto
 #if !defined(R_SO)
 			std::cerr << "Unknown pack type in deserialize " << type << std::endl;
 			exit(4);
+#else
+			std::ostringstream oss;
+			oss << "Unknown pack type in deserialize " << type << std::endl;
+			phreeqc_ref.error_msg(oss.str().c_str(), STOP);
 #endif
 			break;
 		}
diff --git a/src/IPhreeqcPhast/IPhreeqc/phreeqcpp/common/Utils.cxx b/src/IPhreeqcPhast/IPhreeqc/phreeqcpp/common/Utils.cxx
index 6738fa9d4..b2585a565 100644
--- a/src/IPhreeqcPhast/IPhreeqc/phreeqcpp/common/Utils.cxx
+++ b/src/IPhreeqcPhast/IPhreeqc/phreeqcpp/common/Utils.cxx
@@ -199,13 +199,17 @@ strcpy_safe(char* dest, size_t max, const char* src)
 	{
 		if (dest == nullptr || src == nullptr)
 		{
+#if !defined(R_SO)
 			std::cerr << "nullptr in Utilities::strcpy_safe." << std::endl;
+#endif
 			throw;
 		}
 		lsrc = strlen(src);
 		if (lsrc + 1 > max)
 		{
+#if !defined(R_SO)
 			std::cerr << "Buffer overrun in Utilities::strcpy_safe." << std::endl;
+#endif
 			throw;
 		}
 		memcpy(dest, src, (lsrc + 1) * sizeof(char));
@@ -224,14 +228,18 @@ strcat_safe(char* dest, size_t max, const char* src)
 	{
 		if (dest == nullptr || src == nullptr)
 		{
+#if !defined(R_SO)
 			std::cerr << "nullptr in Utilities::strcat_safe." << std::endl;
+#endif
 			throw;
 		}
 		lsrc = strlen(src);
 		ldest = strlen(dest);
 		if (ldest + lsrc + 1 > max)
 		{
+#if !defined(R_SO)
 			std::cerr << "Buffer overrun in Utilities::strcat_safe." << std::endl;
+#endif
 			throw;
 		}
 		memcpy(&dest[ldest], src, (lsrc + 1) * sizeof(char));