Merge branch 'v2.0.x'

mdboom · mdboom · commit 94e94e382554 · 2015-11-02T08:14:46.000-05:00
diff --git a/src/_image_wrapper.cpp b/src/_image_wrapper.cpp
@@ -177,8 +177,8 @@ static PyObject *PyImage_color_conv(PyImage *self, PyObject *args, PyObject *kwd
                      free(buff));
 
     PyObject *result = PyByteArray_FromStringAndSize((const char *)buff, size);
+    free(buff);
     if (result == NULL) {
-        free(buff);
         return NULL;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -177,8 +177,8 @@ static PyObject PyImage_color_conv(PyImage self, PyObject args, PyObject kwd`
`177`	`177`	`free(buff));`
`178`	`178`
`179`	`179`	`PyObject result = PyByteArray_FromStringAndSize((const char )buff, size);`
	`180`	`+ free(buff);`
`180`	`181`	`if (result == NULL) {`
`181`		`- free(buff);`
`182`	`182`	`return NULL;`
`183`	`183`	`}`
`184`	`184`