Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
359893a5
Commit
359893a5
authored
Mar 05, 2010
by
Gerhard Häring
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #7670: sqlite3: Fixed crashes when operating on closed connections.
parent
b732aafe
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
89 additions
and
0 deletions
+89
-0
Lib/sqlite3/test/dbapi.py
Lib/sqlite3/test/dbapi.py
+67
-0
Misc/NEWS
Misc/NEWS
+2
-0
Modules/_sqlite/connection.c
Modules/_sqlite/connection.c
+20
-0
No files found.
Lib/sqlite3/test/dbapi.py
View file @
359893a5
...
...
@@ -744,6 +744,73 @@ class ClosedTests(unittest.TestCase):
except
:
self
.
fail
(
"Should have raised a ProgrammingError"
)
def
CheckClosedCreateFunction
(
self
):
con
=
sqlite
.
connect
(
":memory:"
)
con
.
close
()
def
f
(
x
):
return
17
try
:
con
.
create_function
(
"foo"
,
1
,
f
)
self
.
fail
(
"Should have raised a ProgrammingError"
)
except
sqlite
.
ProgrammingError
:
pass
except
:
self
.
fail
(
"Should have raised a ProgrammingError"
)
def
CheckClosedCreateAggregate
(
self
):
con
=
sqlite
.
connect
(
":memory:"
)
con
.
close
()
class
Agg
:
def
__init__
(
self
):
pass
def
step
(
self
,
x
):
pass
def
finalize
(
self
):
return
17
try
:
con
.
create_aggregate
(
"foo"
,
1
,
Agg
)
self
.
fail
(
"Should have raised a ProgrammingError"
)
except
sqlite
.
ProgrammingError
:
pass
except
:
self
.
fail
(
"Should have raised a ProgrammingError"
)
def
CheckClosedSetAuthorizer
(
self
):
con
=
sqlite
.
connect
(
":memory:"
)
con
.
close
()
def
authorizer
(
*
args
):
return
sqlite
.
DENY
try
:
con
.
set_authorizer
(
authorizer
)
self
.
fail
(
"Should have raised a ProgrammingError"
)
except
sqlite
.
ProgrammingError
:
pass
except
:
self
.
fail
(
"Should have raised a ProgrammingError"
)
def
CheckClosedSetProgressCallback
(
self
):
con
=
sqlite
.
connect
(
":memory:"
)
con
.
close
()
def
progress
():
pass
try
:
con
.
set_progress_handler
(
progress
,
100
)
self
.
fail
(
"Should have raised a ProgrammingError"
)
except
sqlite
.
ProgrammingError
:
pass
except
:
self
.
fail
(
"Should have raised a ProgrammingError"
)
def
CheckClosedCall
(
self
):
con
=
sqlite
.
connect
(
":memory:"
)
con
.
close
()
try
:
con
()
self
.
fail
(
"Should have raised a ProgrammingError"
)
except
sqlite
.
ProgrammingError
:
pass
except
:
self
.
fail
(
"Should have raised a ProgrammingError"
)
def
suite
():
module_suite
=
unittest
.
makeSuite
(
ModuleTests
,
"Check"
)
connection_suite
=
unittest
.
makeSuite
(
ConnectionTests
,
"Check"
)
...
...
Misc/NEWS
View file @
359893a5
...
...
@@ -356,6 +356,8 @@ Library
Extension Modules
-----------------
- Issue #7670: sqlite3: Fixed crashes when operating on closed connections.
- Stop providing crtassem.h symbols when compiling with Visual Studio 2010, as
msvcr100.dll is not a platform assembly anymore.
...
...
Modules/_sqlite/connection.c
View file @
359893a5
...
...
@@ -690,6 +690,10 @@ PyObject* pysqlite_connection_create_function(pysqlite_Connection* self, PyObjec
int
narg
;
int
rc
;
if
(
!
pysqlite_check_thread
(
self
)
||
!
pysqlite_check_connection
(
self
))
{
return
NULL
;
}
if
(
!
PyArg_ParseTupleAndKeywords
(
args
,
kwargs
,
"siO"
,
kwlist
,
&
name
,
&
narg
,
&
func
))
{
...
...
@@ -719,6 +723,10 @@ PyObject* pysqlite_connection_create_aggregate(pysqlite_Connection* self, PyObje
static
char
*
kwlist
[]
=
{
"name"
,
"n_arg"
,
"aggregate_class"
,
NULL
};
int
rc
;
if
(
!
pysqlite_check_thread
(
self
)
||
!
pysqlite_check_connection
(
self
))
{
return
NULL
;
}
if
(
!
PyArg_ParseTupleAndKeywords
(
args
,
kwargs
,
"siO:create_aggregate"
,
kwlist
,
&
name
,
&
n_arg
,
&
aggregate_class
))
{
return
NULL
;
...
...
@@ -809,6 +817,10 @@ PyObject* pysqlite_connection_set_authorizer(pysqlite_Connection* self, PyObject
static
char
*
kwlist
[]
=
{
"authorizer_callback"
,
NULL
};
int
rc
;
if
(
!
pysqlite_check_thread
(
self
)
||
!
pysqlite_check_connection
(
self
))
{
return
NULL
;
}
if
(
!
PyArg_ParseTupleAndKeywords
(
args
,
kwargs
,
"O:set_authorizer"
,
kwlist
,
&
authorizer_cb
))
{
return
NULL
;
...
...
@@ -834,6 +846,10 @@ PyObject* pysqlite_connection_set_progress_handler(pysqlite_Connection* self, Py
static
char
*
kwlist
[]
=
{
"progress_handler"
,
"n"
,
NULL
};
if
(
!
pysqlite_check_thread
(
self
)
||
!
pysqlite_check_connection
(
self
))
{
return
NULL
;
}
if
(
!
PyArg_ParseTupleAndKeywords
(
args
,
kwargs
,
"Oi:set_progress_handler"
,
kwlist
,
&
progress_handler
,
&
n
))
{
return
NULL
;
...
...
@@ -948,6 +964,10 @@ PyObject* pysqlite_connection_call(pysqlite_Connection* self, PyObject* args, Py
PyObject
*
weakref
;
int
rc
;
if
(
!
pysqlite_check_thread
(
self
)
||
!
pysqlite_check_connection
(
self
))
{
return
NULL
;
}
if
(
!
PyArg_ParseTuple
(
args
,
"O"
,
&
sql
))
{
return
NULL
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment