mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-15 12:40:35 +00:00
Code Issues Releases Wiki Activity

Finally get rid of Coverity Scan tainted data issue

Browse Source
This commit is contained in:
Carles Fernandez 2018-05-22 20:55:03 +02:00
parent bc86d7d665
commit 9b5907b62d
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/tests/common-files/gnuplot_i.h
View File

@ -59,6 +59,7 @@
#include <cstring> // for strncpy #include <cstring> // for strncpy
#include <cmath> #include <cmath>
#include <list> // for std::list #include <list> // for std::list
#include <sys/stat.h>
#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__TOS_WIN__) #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__TOS_WIN__)
@ -1960,21 +1961,16 @@ bool Gnuplot::get_program_path()
// //
// second look in PATH for Gnuplot // second look in PATH for Gnuplot
// //
char *path; const char *path;
// Retrieves a C string containing the value of environment variable PATH // Retrieves a C string containing the value of environment variable PATH
path = std::getenv("PATH"); path = std::getenv("PATH");
char secured_path[4096]; std::stringstream s;
size_t len = strlen(path); s << path;
if (len > 0 && len < 4046 * sizeof(char)) if (s.fail())
{ {
strncpy(secured_path, path, sizeof(secured_path)); throw GnuplotException("Path is not set");
} }
else std::string path_str = s.str();
{
throw GnuplotException("Path is not set or it is too long");
}
secured_path[len] = '\0';
std::string path_str(secured_path);
std::list<std::string> ls; std::list<std::string> ls;
@ -2106,17 +2102,24 @@ std::string Gnuplot::create_tmpfile(std::ofstream &tmp)
// //
// open temporary files for output // open temporary files for output
// //
#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__TOS_WIN__) #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__TOS_WIN__)
if (_mktemp(name) == NULL) if (_mktemp(name) == NULL)
#elif defined(unix) || defined(__unix) || defined(__unix__) || defined(__APPLE__) #elif defined(unix) || defined(__unix) || defined(__unix__) || defined(__APPLE__)
mode_t mask = umask(S_IXUSR | S_IRWXG | S_IRWXO);
if (mkstemp(name) == -1) if (mkstemp(name) == -1)
#endif #endif
{ {
std::ostringstream except; std::ostringstream except;
except << "Cannot create temporary file \"" << name << "\""; except << "Cannot create temporary file \"" << name << "\"";
#if defined(unix) || defined(__unix) || defined(__unix__) || defined(__APPLE__)
umask(mask);
#endif
throw GnuplotException(except.str()); throw GnuplotException(except.str());
} }
#if defined(unix) || defined(__unix) || defined(__unix__) || defined(__APPLE__)
umask(mask);
#endif
tmp.open(name); tmp.open(name);
if (tmp.bad()) if (tmp.bad())
{ {