diff options
| author | Kris De Gussem <kris.degussem@gmail.com> | 2012-02-02 19:14:23 +0000 |
|---|---|---|
| committer | Kris <Kris.De.Gussem@hotmail.com> | 2012-02-02 19:14:23 +0000 |
| commit | a46bd933f843701e45b51b1529ac17d5355039ef (patch) | |
| tree | 2565bf2e46c7d817233cf4d8a98eacd68fcf54d8 /src/util/units.cpp | |
| parent | Fill x and y fields in the fake GdkEventMotion struct used when cancelling (diff) | |
| download | inkscape-a46bd933f843701e45b51b1529ac17d5355039ef.tar.gz inkscape-a46bd933f843701e45b51b1529ac17d5355039ef.zip | |
cppcheck tells us: scanf without field width limits can crash with huge input data.
(bzr r10928)
Diffstat (limited to 'src/util/units.cpp')
| -rw-r--r-- | src/util/units.cpp | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/src/util/units.cpp b/src/util/units.cpp index b79bbc9cc..87dfa0daf 100644 --- a/src/util/units.cpp +++ b/src/util/units.cpp @@ -2,9 +2,11 @@ # include <config.h> #endif +#include <cerrno> #include <cmath> #include <cerrno> #include <glib.h> +#include <sstream> #include "io/simple-sax.h" #include "util/units.h" @@ -156,9 +158,9 @@ bool UnitTable::loadText(Glib::ustring const &filename) { // bypass current locale in order to make // sscanf read floats with '.' as a separator // set locate to 'C' and keep old locale - char *old_locale; - old_locale = g_strdup (setlocale (LC_NUMERIC, NULL)); - setlocale (LC_NUMERIC, "C"); + // char *old_locale; + // old_locale = g_strdup (setlocale (LC_NUMERIC, NULL)); + // setlocale (LC_NUMERIC, "C"); while (fgets(buf, BUFSIZE, f) != NULL) { char name[BUFSIZE]; @@ -170,12 +172,21 @@ bool UnitTable::loadText(Glib::ustring const &filename) { int nchars = 0; // locate is set to C, scanning %lf should work _everywhere_ - if (sscanf(buf, "%s %s %s %s %lf %s %n", +/* if (sscanf(buf, "%s %s %s %s %lf %s %n", name, plural, abbr, type, &factor, primary, &nchars) != 6) { // Skip the line - doesn't appear to be valid continue; - } + }*/ + std::stringstream ss; + ss << buf; + ss >> name; + ss >> plural; + ss >> abbr; + ss >> type; + ss >> factor; + ss >> primary; + ss >> nchars; g_assert(nchars < BUFSIZE); char *desc = buf; @@ -209,8 +220,8 @@ bool UnitTable::loadText(Glib::ustring const &filename) { } // set back the saved locale - setlocale (LC_NUMERIC, old_locale); - g_free (old_locale); + // setlocale (LC_NUMERIC, old_locale); + // g_free (old_locale); // close file if (fclose(f) != 0) { |