Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix zero sized mask convolve segmentation fault #922

Merged
merged 1 commit into from Mar 23, 2019

Conversation

@charlesej
Copy link
Contributor

@charlesej charlesej commented Mar 22, 2019

This update fixes the segmentation fault caused by calling pygame.mask.Mask.convolve on a zero sized mask.

Overview of changes:

  • Changed convolve to work correctly with zero sized masks and added some error checking
  • Added negative size check to bitmask_create
  • Removed @unittest.skip decorator from the now passing test
  • Updated the mask documentation

System details:

  • os: windows 10 (64bit)
  • python: 3.7.2 (64bit) and 2.7.10 (64bit)
  • pygame: 1.9.5.dev0 (SDL: 1.2.15) at adac292

Resolves #890.

- Changed convolve to work correctly with zero sized masks and added
  some error checking
- Added negative size check to bitmask_create
- Removed @unittest.skip decorator from the now passing test
- Updated the mask documentation
@illume
illume approved these changes Mar 23, 2019
Copy link
Member

@illume illume left a comment

👍 🎉 🎈

@illume illume merged commit 7d7736d into pygame:master Mar 23, 2019
2 checks passed
2 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@charlesej charlesej deleted the charlesej:fix-mask-convolve-segfault branch Mar 23, 2019
@dlon dlon mentioned this pull request Mar 23, 2019
4 tasks done
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

2 participants