Merge branch 'master' of github.com:openscad/openscad

scripts/release-common.sh

@@ -255,7 +255,7 @@ case $OS in
             exit
         fi
         # make console pipe-able openscad.com - see winconsole.pro for info
-        qmake ../winconsole.pro
+        qmake ../winconsole/winconsole.pro
         make
         if [ ! -e $TARGET/openscad.com ]; then
             echo "cant find $TARGET/openscad.com. build failed. stopping."

src/fileutils.cc

@@ -22,7 +22,7 @@ std::string lookup_file(const std::string &filename,
 
 		if (!fs::exists(absfile) && fs::exists(absfile_fallback)) {
 			resultfile = absfile_fallback.string();
-			PRINT_DEPRECATION("DEPRECATED: Imported file (%s) found in document root instead of relative to the importing module. This behavior is deprecated", filename);
+			PRINT_DEPRECATION("Imported file (%s) found in document root instead of relative to the importing module. This behavior is deprecated", filename);
 		}
 		else {
 			resultfile = absfile.string();

src/func.cc

@@ -712,7 +712,7 @@ ValuePtr builtin_lookup(const Context *, const EvalContext *evalctx)
 */
 
 static Value::VectorType search(const std::string &find, const std::string &table,
-																unsigned int num_returns_per_match, unsigned int index_col_num)
+																unsigned int num_returns_per_match)
 {
 	Value::VectorType returnvec;
 	//Unicode glyph count for the length
@@ -761,7 +761,12 @@ static Value::VectorType search(const std::string &find, const Value::VectorType
 		Value::VectorType resultvec;
 		const gchar *ptr_ft = g_utf8_offset_to_pointer(find.c_str(), i);
 		for (size_t j = 0; j < searchTableSize; j++) {
-			const gchar *ptr_st = g_utf8_offset_to_pointer(table[j].toVector()[index_col_num].toString().c_str(), 0);
+			Value::VectorType entryVec = table[j].toVector();
+			if (entryVec.size() <= index_col_num) {
+				PRINTB("WARNING: Invalid entry in search vector at index %d, required number of values in the entry: %d. Invalid entry: %s", j % (index_col_num + 1) % table[j]);
+				return Value::VectorType();
+			}
+			const gchar *ptr_st = g_utf8_offset_to_pointer(entryVec[index_col_num].toString().c_str(), 0);
 			if (ptr_ft && ptr_st && (g_utf8_get_char(ptr_ft) == g_utf8_get_char(ptr_st)) ) {
 				matchCount++;
 				if (num_returns_per_match == 1) {
@@ -814,7 +819,7 @@ ValuePtr builtin_search(const Context *, const EvalContext *evalctx)
 		}
 	} else if (findThis->type() == Value::STRING) {
 		if (searchTable->type() == Value::STRING) {
-			returnvec = search(findThis->toString(), searchTable->toString(), num_returns_per_match, index_col_num);
+			returnvec = search(findThis->toString(), searchTable->toString(), num_returns_per_match);
 		}
 		else {
 			returnvec = search(findThis->toString(), searchTable->toVector(), num_returns_per_match, index_col_num);

src/modcontext.cc

@@ -116,7 +116,7 @@ const AbstractModule *ModuleContext::findLocalModule(const std::string &name) co
 		}
 		std::string replacement = Builtins::instance()->isDeprecated(name);
 		if (!replacement.empty()) {
-			PRINT_DEPRECATION("DEPRECATED: The %s() module will be removed in future releases. Use %s instead.", name % replacement);
+			PRINT_DEPRECATION("The %s() module will be removed in future releases. Use %s instead.", name % replacement);
 		}
 		return m;
 	}

testdata/scad/bugs/issue1105d.scad

@@ -0,0 +1,8 @@
+difference() {
+    rotate_extrude(convexity=2, $fn=8)
+    translate([5,0,0]) difference() {
+        circle(r=2);
+        circle(r=1);
+    }
+    translate([-5,-5,5]) cube(10, center=true);
+}

tests/CMakeLists.txt

@@ -1221,7 +1221,8 @@ list(APPEND BUGS_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/bugs/issue584.scad
                        ${CMAKE_SOURCE_DIR}/../testdata/scad/bugs/issue945d.scad
                        ${CMAKE_SOURCE_DIR}/../testdata/scad/bugs/issue1105.scad
                        ${CMAKE_SOURCE_DIR}/../testdata/scad/bugs/issue1105b.scad
-                       ${CMAKE_SOURCE_DIR}/../testdata/scad/bugs/issue1105c.scad)
+                       ${CMAKE_SOURCE_DIR}/../testdata/scad/bugs/issue1105c.scad
+                       ${CMAKE_SOURCE_DIR}/../testdata/scad/bugs/issue1105d.scad)
 list(APPEND EXPORT3D_TEST_FILES ${BUGS_FILES})
 list(REMOVE_ITEM EXPORT3D_TEST_FILES
                        ${CMAKE_SOURCE_DIR}/../testdata/scad/bugs/issue899.scad

winconsole/winconsole.pro

@@ -11,13 +11,13 @@
 # properly
 
 TEMPLATE = app
-TARGET = openscad_winconsole
+TARGET = winconsole
 FORMS =
 HEADERS =
 FLEXSOURCES =
 BISONSOURCES =
 RESOURCES =
-SOURCES = src/winconsole.c
+SOURCES = winconsole.c
 CONFIG -= qt
 CONFIG += console # sets IMAGE_SUBSYSTEM_WINDOWS_CUI in binary
-QMAKE_POST_LINK = cd $(DESTDIR) && mv openscad_winconsole.exe openscad.com
+QMAKE_POST_LINK = cd $(DESTDIR) && mv winconsole.exe openscad.com