github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-02-10 05:45:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix potential buffer overflow; fixed #472

Browse Source
This commit is contained in:
Ian Bell
2015-02-18 20:31:52 -05:00
parent 6bf6e27e77
commit 4f63c8834f
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/CoolPropLib.cpp
View File

@@ -15,6 +15,15 @@
#include <string.h>
bool str2buf(const std::string& str, char * buf, int n)
{
if (str.size() < static_cast<unsigned int>(n)) {
strcpy(buf, str.c_str());
return true;
}
return false;
}
// In Microsoft Excel, they seem to check the FPU exception bits and error out because of it.
// By calling the _clearfp(), we can reset these bits, and not get the error
// See also http://stackoverflow.com/questions/11685441/floating-point-error-when-calling-dll-function-from-vba/27336496#27336496
@@ -263,16 +272,10 @@ EXPORT_CODE long CONVENTION get_parameter_information_string(const char *param,
}
if (key >= 0){
std::string s = CoolProp::get_parameter_information(key, Output);
if (s.size() < static_cast<unsigned int>(n)){
strcpy(Output, s.c_str());
return 1;
}
else{
return 0;
}
return str2buf(s, Output, n) ? 1 : 0;
}
else{
strcpy(Output, format("parameter is invalid: %s", param).c_str());
str2buf(format("parameter is invalid: %s", param), Output, n);
return 0;
}
}