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

Squashed 'phreeqcpp/' changes from ceab9a1..798f8f9

Browse Source 
798f8f9 Merge commit '3eaa057b5d2bbc9327f2ab3adfd52577c687cfca'
3eaa057 Squashed 'common/' changes from 6abe004..399aba2
4cad3d5 [iphreeqc] Fixed for R

git-subtree-dir: phreeqcpp
git-subtree-split: 798f8f9d827d6ba7cf6a6d0c9a1fd3c7e806c72c
This commit is contained in:
Darth Vader 2024-06-11 00:58:17 +00:00
parent 8024ee1289
commit a9c4ef8324
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Serializer.cxx
View File

@ -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;
}

8
common/Utils.cxx
View File

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