From cee46984503f9fa0b00f043bbc2aacfb5a0ce2d1 Mon Sep 17 00:00:00 2001
From: Darth Vader <darth@empire.com>
Date: Tue, 11 Jun 2024 01:02:04 +0000
Subject: [PATCH] Squashed 'src/' changes from ceab9a10..798f8f9d

798f8f9d Merge commit '3eaa057b5d2bbc9327f2ab3adfd52577c687cfca'
3eaa057b Squashed 'common/' changes from 6abe004..399aba2
4cad3d5a [iphreeqc] Fixed for R

git-subtree-dir: src
git-subtree-split: 798f8f9d827d6ba7cf6a6d0c9a1fd3c7e806c72c
---
 Serializer.cxx   | 4 ++++
 common/Utils.cxx | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/Serializer.cxx b/Serializer.cxx
index b4ebab76f..fab11a378 100644
--- a/Serializer.cxx
+++ b/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/common/Utils.cxx b/common/Utils.cxx
index 6738fa9d4..b2585a565 100644
--- a/common/Utils.cxx
+++ b/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));