Guard against too-large figures #6666

Merged
merged 1 commit into from Jun 29, 2016

Conversation

Projects
None yet
4 participants
Owner

mdboom commented Jun 29, 2016

Agg buffers must have a max size of 2^16 pixels in each dimension. This guards against that (and related segfaults from allocating too much memory).

Fixes ipython/ipython#9676

@mdboom mdboom Guard against too-large figures
604e06e

mdboom added the needs_review label Jun 29, 2016

Member

WeatherGod commented Jun 29, 2016

Do we want to keep waiting for the macos test to start? I think this all looks good to me.

Owner

jenshnielsen commented Jun 29, 2016

@WeatherGod It looks like there is an issue with the OSX travis instances at the moment https://www.traviscistatus.com/ IMHO it's fine to merge this as is

Update - We apologize for the continued delays. All of our OSX builds are currently paused due to issues with our core virtualization layer and we're working in our infrastructure provider and vendor support on recovering things. We'll provide another update in 60 minutes or if we have an update sooner. 
Jun 29, 15:14 UTC
Update - We're going to temporarily pause all OS X related build processing 
Jun 29, 14:04 UTC
Update - In order to work to stabilize some internal load in our vSphere cluster and get back to full capacity, we're going to be throttling builds for a few minutes and this will increase build delays temporarily. 
Jun 29, 13:55 UTC
Identified - We're currently running with reduced capacity for our OSX builders, due to some hosts having hardware issues. We're working with our infrastructure provider to determine why and resolve the issue 
Jun 29, 13:00 UTC

@WeatherGod WeatherGod merged commit f6effa8 into matplotlib:master Jun 29, 2016

0 of 3 checks passed

continuous-integration/appveyor/pr AppVeyor build failed
Details
coverage/coveralls Coverage decreased (-0.002%) to 70.273%
Details
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details

mdboom removed the needs_review label Jun 29, 2016

Member

WeatherGod commented Jun 29, 2016

This should backport to v2.x, but what about v1.5.x?

Owner

jenshnielsen commented Jun 29, 2016

I vote for 1.5.x too since the bug has come up a number of times now on 1.5.1 and we should try to avoid crashing bugs as much as possible.

Member

WeatherGod commented Jun 29, 2016

so, do I cherry-pick to both branches, or just one of them and everything gets merged around later?

Owner

jenshnielsen commented Jun 29, 2016

Normally 1.5.x will be merged into 2.x which will be merged into master, I guess @tacaswell should have final say on if this goes into 1.5.x since he will have to do the release.

Owner

tacaswell commented Jun 29, 2016

👍 on all the way back to 1.5.x

Member

WeatherGod commented Jun 29, 2016

ok, backporting this to v1.5.x brings up a merge conflict in the tests. Seems like it wants to merge in the AGG filter tests. I left them out (keeping only the test_too_large_image()). How well will that go over for the merge to v2.x?

Owner

tacaswell commented Jun 29, 2016

Those sorts of things tend to go ok.

On Wed, Jun 29, 2016 at 12:03 PM Benjamin Root notifications@github.com
wrote:

ok, backporting this to v1.5.x brings up a merge conflict in the tests.
Seems like it wants to merge in the AGG filter tests. I left them out
(keeping only the test_too_large_image()). How well will that go over for
the merge to v2.x?


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#6666 (comment),
or mute the thread
https://github.com/notifications/unsubscribe/AAMMhRexLj2lTbQ_m8LQsJkyeBiS14Tgks5qQpdLgaJpZM4JBJoh
.

@WeatherGod WeatherGod added a commit that referenced this pull request Jun 29, 2016

@WeatherGod WeatherGod Merge pull request #6666 from mdboom/limit-image-size
Guard against too-large figures
84f3a6f
Member

WeatherGod commented Jun 29, 2016

forgot to note: backported to v1.5.x via 84f3a6f. I'll leave it as an exercise for the more experienced to handle the merge over to v2.x.

Owner

jenshnielsen commented Jun 29, 2016

I have done the merge to 2.x and master

tacaswell referenced this pull request Jun 30, 2016

Open

Qt window does not give accurate maximum size #6661

0 of 2 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment