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));