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

Add NULL check after native call to __html__ method #109

Merged
merged 1 commit into from Feb 20, 2019

Conversation

Projects
None yet
3 participants
@mthuurne
Copy link
Contributor

mthuurne commented Feb 18, 2019

If the method raises an exception, PyObject_CallObject() returns NULL,
but the code didn't check for that, which led to a segfault.

Fixes #108

Add NULL check after native call to __html__ method
If the method raises an exception, PyObject_CallObject() returns NULL,
but the code didn't check for that, which led to a segfault.

Fixes #108
@davidism

This comment was marked as resolved.

Copy link
Member

davidism commented Feb 18, 2019

It looks like you have Git misconfigured. If you want to, set the user.email to match one associated with GitHub then amend the commit to change the author.

@davidism davidism added this to the 1.1.1 milestone Feb 18, 2019

@mthuurne

This comment was marked as resolved.

Copy link
Contributor Author

mthuurne commented Feb 18, 2019

The e-mail is as intended. I used the company e-mail address because markupsafe is a dependency of Lektor, which we use for our web site and documentation. But I use the same GitHub account for both hobby and work.

@ThiefMaster

This comment was marked as resolved.

Copy link
Member

ThiefMaster commented Feb 18, 2019

Tip, you can add multiple emails to github - that way you still get proper credit on your account for the commit. Anyway, up to you of course.

@mthuurne

This comment was marked as resolved.

Copy link
Contributor Author

mthuurne commented Feb 18, 2019

Yeah, probably I should do that.

@davidism davidism merged commit 1ab4f0a into pallets:master Feb 20, 2019

1 check passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details

davidism added a commit that referenced this pull request Feb 20, 2019

@davidism

This comment has been minimized.

Copy link
Member

davidism commented Feb 20, 2019

Cherry picked to 1.1.x branch: eb9c1d4
Added changelog: d1b3c5a

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.