Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer

src/libslic3r/Format/OBJ.cpp

@@ -7,6 +7,8 @@
 
 #include <string>
 
+#include <boost/log/trivial.hpp>
+
 #ifdef _WIN32
 #define DIR_SEPARATOR '\\'
 #else
@@ -22,7 +24,7 @@ bool load_obj(const char *path, TriangleMesh *meshptr)
     // Parse the OBJ file.
     ObjParser::ObjData data;
     if (! ObjParser::objparse(path, data)) {
-        //    die "Failed to parse $file\n" if !-e $path;
+        BOOST_LOG_TRIVIAL(error) << "load_obj: failed to parse " << path;
         return false;
     }
     
@@ -70,7 +72,8 @@ bool load_obj(const char *path, TriangleMesh *meshptr)
                 ++ num_normals;
             }
         }
-        if (data.vertices[i].coordIdx != -1) {
+        // Result of obj_parseline() call is not checked, thus not all vertices are necessarily finalized with coord_Idx == -1.
+        if (i < data.vertices.size() && data.vertices[i].coordIdx != -1) {
             // This is a quad. Produce the other triangle.
             stl_facet &facet2 = stl.facet_start[i_face++];
             facet2.vertex[0] = facet.vertex[0];
@@ -102,7 +105,7 @@ bool load_obj(const char *path, TriangleMesh *meshptr)
     stl_get_size(&stl);
     mesh.repair();
     if (mesh.facets_count() == 0) {
-        // die "This OBJ file couldn't be read because it's empty.\n"
+        BOOST_LOG_TRIVIAL(error) << "load_obj: This OBJ file couldn't be read because it's empty. " << path;
         return false;
     }
     

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;