Merge pull request #5084 from cgohlke/patch-6

jkseppan · jkseppan · commit 8f53402541c5 · 2015-09-18T12:20:53.000+03:00
Fix segfault in ft2font
diff --git a/src/ft2font_wrapper.cpp b/src/ft2font_wrapper.cpp
@@ -10,7 +10,11 @@
 static PyObject *convert_xys_to_array(std::vector<double> &xys)
 {
     npy_intp dims[] = {(npy_intp)xys.size() / 2, 2 };
-    return PyArray_SimpleNewFromData(2, dims, NPY_DOUBLE, &xys[0]);
+    if (dims[0] > 0) {
+        return PyArray_SimpleNewFromData(2, dims, NPY_DOUBLE, &xys[0]);
+    } else {
+        return PyArray_SimpleNew(2, dims, NPY_DOUBLE);
+    }
 }
 
 /**********************************************************************
@@ -664,7 +668,11 @@ static PyObject *PyFT2Font_set_text(PyFT2Font *self, PyObject *args, PyObject *k
         return NULL;
     }
 
-    CALL_CPP("set_text", self->x->set_text(size, &codepoints[0], angle, flags, xys));
+    uint32_t* codepoints_array = NULL;
+    if (size > 0) {
+        codepoints_array = &codepoints[0];
+    }
+    CALL_CPP("set_text", self->x->set_text(size, codepoints_array, angle, flags, xys));
 
     return convert_xys_to_array(xys);
 }

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,11 @@`
`10`	`10`	`static PyObject *convert_xys_to_array(std::vector<double> &xys)`
`11`	`11`	`{`
`12`	`12`	`npy_intp dims[] = {(npy_intp)xys.size() / 2, 2 };`
`13`		`- return PyArray_SimpleNewFromData(2, dims, NPY_DOUBLE, &xys[0]);`
	`13`	`+ if (dims[0] > 0) {`
	`14`	`+ return PyArray_SimpleNewFromData(2, dims, NPY_DOUBLE, &xys[0]);`
	`15`	`+ } else {`
	`16`	`+ return PyArray_SimpleNew(2, dims, NPY_DOUBLE);`
	`17`	`+ }`
`14`	`18`	`}`
`15`	`19`
`16`	`20`	`/**********************************************************************`
`@@ -664,7 +668,11 @@ static PyObject PyFT2Font_set_text(PyFT2Font self, PyObject args, PyObject k`
`664`	`668`	`return NULL;`
`665`	`669`	`}`
`666`	`670`
`667`		`- CALL_CPP("set_text", self->x->set_text(size, &codepoints[0], angle, flags, xys));`
	`671`	`+ uint32_t* codepoints_array = NULL;`
	`672`	`+ if (size > 0) {`
	`673`	`+ codepoints_array = &codepoints[0];`
	`674`	`+ }`
	`675`	`+ CALL_CPP("set_text", self->x->set_text(size, codepoints_array, angle, flags, xys));`
`668`	`676`
`669`	`677`	`return convert_xys_to_array(xys);`
`670`	`678`	`}`