diff options
Diffstat (limited to 'src/libslic3r/Format/objparser.cpp')
| -rw-r--r-- | src/libslic3r/Format/objparser.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/libslic3r/Format/objparser.cpp b/src/libslic3r/Format/objparser.cpp index 8c1a53459..12cee350d 100644 --- a/src/libslic3r/Format/objparser.cpp +++ b/src/libslic3r/Format/objparser.cpp @@ -1,6 +1,7 @@ #include <stdlib.h> #include <string.h> +#include <boost/log/trivial.hpp> #include <boost/nowide/cstdio.hpp> #include "objparser.hpp" @@ -312,7 +313,7 @@ static bool obj_parseline(const char *line, ObjData &data) break; } default: - printf("ObjParser: Unknown command: %c\r\n", c1); + BOOST_LOG_TRIVIAL(error) << "ObjParser: Unknown command: " << c1; break; } @@ -338,15 +339,22 @@ bool objparse(const char *path, ObjData &data) char *c = buf + lastLine; while (*c == ' ' || *c == '\t') ++ c; + //FIXME check the return value and exit on error? + // Will it break parsing of some obj files? obj_parseline(c, data); lastLine = i + 1; } lenPrev = len - lastLine; + if (lenPrev > 65536) { + BOOST_LOG_TRIVIAL(error) << "ObjParser: Excessive line length"; + ::fclose(pFile); + return false; + } memmove(buf, buf + lastLine, lenPrev); } } catch (std::bad_alloc&) { - printf("Out of memory\r\n"); + BOOST_LOG_TRIVIAL(error) << "ObjParser: Out of memory"; } ::fclose(pFile); @@ -378,7 +386,8 @@ bool objparse(std::istream &stream, ObjData &data) } } catch (std::bad_alloc&) { - printf("Out of memory\r\n"); + BOOST_LOG_TRIVIAL(error) << "ObjParser: Out of memory"; + return false; } return true; |