Commit84f3a6f

committed

Merge pull request#6666 from mdboom/limit-image-size

Guard against too-large figures

1 parent588b748 commit84f3a6fCopy full SHA for 84f3a6f

File tree

+18

-0

lines changed

+18

-0

lines changed

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@`
`9`	`9`	`importnumpyasnp`
`10`	`10`	`fromnumpy.testingimportassert_array_almost_equal`
`11`	`11`
	`12`	`+fromnose.toolsimportassert_raises`
	`13`	`+`
`12`	`14`	`frommatplotlib.imageimportimread`
`13`	`15`	`frommatplotlib.backends.backend_aggimportFigureCanvasAggasFigureCanvas`
`14`	`16`	`frommatplotlib.figureimportFigure`
`@@ -155,6 +157,13 @@ def test_long_path():`
`155`	`157`	`fig.savefig(buff,format='png')`
`156`	`158`
`157`	`159`
	`160`	`+@cleanup`
	`161`	`+deftest_too_large_image():`
	`162`	`+fig=plt.figure(figsize=(300,1000))`
	`163`	`+buff=io.BytesIO()`
	`164`	`+assert_raises(ValueError,fig.savefig,buff)`
	`165`	`+`
	`166`	`+`
`158`	`167`	`if__name__=="__main__":`
`159`	`168`	`importnose`
`160`	`169`	`nose.runmodule(argv=['-s','--with-doctest'],exit=False)`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -177,6 +177,15 @@ static int PyRendererAgg_init(PyRendererAgg self, PyObject args, PyObject *kwd`
`177`	`177`	`return -1;`
`178`	`178`	`}`
`179`	`179`
	`180`	`+if (width >=1 <<16 \|\| height >=1 <<16) {`
	`181`	`+PyErr_Format(`
	`182`	`+ PyExc_ValueError,`
	`183`	`+"Image size of %dx%d pixels is too large."`
	`184`	`+"It must be less than 2^16 in each direction.",`
	`185`	`+ width, height);`
	`186`	`+return -1;`
	`187`	`+ }`
	`188`	`+`
`180`	`189`	`CALL_CPP_INIT("RendererAgg", self->x =newRendererAgg(width, height, dpi))`
`181`	`190`
`182`	`191`	`return0;`

Comments

(0)