GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — bpo-31764: Prevent a crash in sqlite3.Cursor.close() in case the Cursor object is uninitialized by orenmn · Pull Request #3958 · python/cpython

bpo-31764: Prevent a crash in sqlite3.Cursor.close() in case the Cursor object is uninitialized #3958

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

Merged

vstinner merged 4 commits into python:master from orenmn:bpo31764-fix-crash

Nov 7, 2017

Uh oh!

There was an error while loading. Please reload this page.

Merged

bpo-31764: Prevent a crash in sqlite3.Cursor.close() in case the Cursor object is uninitialized #3958

Show file tree

Hide file tree

Changes from 1 commit

Commits

Show all changes

4 commits

Select commit Hold shift + click to select a range

improve the NEWS.d item

orenmn Oct 11, 2017

25ff4f3

improve the test and the NEWS.d item, and make a style change in the …

orenmn Oct 12, 2017

7e0cc4c

don't change the old test in CheckCursorConstructorCallCheck

orenmn Oct 12, 2017

File filter

Filter by extension .c (1) .py (1) .rst (1) All 3 file types selected

Viewed files

Clear filters

Conversations

Failed to load comments.

Uh oh!

There was an error while loading. Please reload this page.

Jump to

Jump to file

Failed to load files.

Uh oh!

There was an error while loading. Please reload this page.

Diff view

Unified

Split

Hide whitespace

Diff view

Unified

Split

Hide whitespace

Next commit

init commit

Loading branch information

Uh oh!

There was an error while loading. Please reload this page.

orenmn committed Oct 11, 2017

commit c3bcda3dcf34650c329c26cdb7968bdd8e4ae82c

There are no files selected for viewing

1 change: 1 addition & 0 deletions 1 Lib/sqlite3/test/regression.py

Show comments

View file

Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -188,6 +188,7 @@ def __init__(self, con):
		cur = Cursor(con)
		with self.assertRaises(sqlite.ProgrammingError):
		cur.execute("select 4+5").fetchall()
		self.assertRaises(sqlite.ProgrammingError, cur.close)
Comment thread Outdated berkerpeksag Oct 12, 2017 Copy link Copy Markdown Member There was a problem hiding this comment. Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. `ProgrammingError` is raised by a lot of things so I wonder if we should add a test for the exception message to make it more future-proof. Sorry, something went wrong. Uh oh! There was an error while loading. Please reload this page. All reactions orenmn Oct 12, 2017 Copy link Copy Markdown Contributor Author There was a problem hiding this comment. Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. All right. Should i also change the `assertRaises()` that was already in `CheckCursorConstructorCallCheck()`? Sorry, something went wrong. Uh oh! There was an error while loading. Please reload this page. All reactions berkerpeksag Oct 12, 2017 Copy link Copy Markdown Member There was a problem hiding this comment. Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. I'd say let's do it only for new additions to the test. Sorry, something went wrong. Uh oh! There was an error while loading. Please reload this page. All reactions

		def CheckStrSubclass(self):
		"""
Expand Down

2 changes: 2 additions & 0 deletions 2 Misc/NEWS.d/next/Library/2017-10-11-22-18-04.bpo-31764.EMyIkK.rst

Show comments

View file

Open in desktop

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Prevent a crash in `sqlite3.Cursor.close()` in case the Cursor object is
		uninitialized. Patch by Oren Milman.

5 changes: 5 additions & 0 deletions 5 Modules/_sqlite/cursor.c

Show comments

View file

Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -890,6 +890,11 @@ PyObject* pysqlite_noop(pysqlite_Connection* self, PyObject* args)

		PyObject* pysqlite_cursor_close(pysqlite_Cursor* self, PyObject* args)
		{
		if (self->connection == NULL) {
Comment thread Outdated berkerpeksag Oct 12, 2017 Copy link Copy Markdown Member There was a problem hiding this comment. Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. Style nit: I think `!foo` is more common than `foo == NULL` in sqlite3 codebase. It would be nice to keep styling consistent within the module. Sorry, something went wrong. Uh oh! There was an error while loading. Please reload this page. orenmn reacted with thumbs up emoji All reactions 👍 1 reaction
		PyErr_SetString(pysqlite_ProgrammingError,
		"Base Cursor.__init__ not called.");
		return NULL;
		}
		if (!pysqlite_check_thread(self->connection) \|\| !pysqlite_check_connection(self->connection)) {
		return NULL;
		}
Expand Down

Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.

You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.

GeezerVison

bpo-31764: Prevent a crash in sqlite3.Cursor.close() in case the Cursor object is uninitialized #3958

Uh oh!

bpo-31764: Prevent a crash in sqlite3.Cursor.close() in case the Cursor object is uninitialized #3958

Uh oh!

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

berkerpeksag Oct 12, 2017

Choose a reason for hiding this comment

Uh oh!

orenmn Oct 12, 2017

Choose a reason for hiding this comment

Uh oh!

berkerpeksag Oct 12, 2017

Choose a reason for hiding this comment

Uh oh!

berkerpeksag Oct 12, 2017

Choose a reason for hiding this comment

Uh oh!