Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
cpython
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
Batuhan Osman TASKAYA
cpython
Commits
936d518d
Kaydet (Commit)
936d518d
authored
May 09, 2011
tarafından
Gerhard Haering
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
#10811: Fix recursive usage of cursors. Instead of crashing, raise a ProgrammingError now.
üst
83b8c0be
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
43 additions
and
10 deletions
+43
-10
regression.py
Lib/sqlite3/test/regression.py
+23
-0
cursor.c
Modules/_sqlite/cursor.c
+19
-10
cursor.h
Modules/_sqlite/cursor.h
+1
-0
No files found.
Lib/sqlite3/test/regression.py
Dosyayı görüntüle @
936d518d
...
...
@@ -281,6 +281,29 @@ class RegressionTests(unittest.TestCase):
# Lone surrogate cannot be encoded to the default encoding (utf8)
"
\uDC80
"
,
collation_cb
)
def
CheckRecursiveCursorUse
(
self
):
"""
http://bugs.python.org/issue10811
Recursively using a cursor, such as when reusing it from a generator led to segfaults.
Now we catch recursive cursor usage and raise a ProgrammingError.
"""
con
=
sqlite
.
connect
(
":memory:"
)
cur
=
con
.
cursor
()
cur
.
execute
(
"create table a (bar)"
)
cur
.
execute
(
"create table b (baz)"
)
def
foo
():
cur
.
execute
(
"insert into a (bar) values (?)"
,
(
1
,))
yield
1
try
:
cur
.
executemany
(
"insert into b (baz) values (?)"
,
((
i
,)
for
i
in
foo
()))
self
.
fail
(
"should have raised ProgrammingError"
)
except
sqlite
.
ProgrammingError
:
pass
def
suite
():
regression_suite
=
unittest
.
makeSuite
(
RegressionTests
,
"Check"
)
return
unittest
.
TestSuite
((
regression_suite
,))
...
...
Modules/_sqlite/cursor.c
Dosyayı görüntüle @
936d518d
...
...
@@ -430,9 +430,14 @@ static int check_cursor(pysqlite_Cursor* cur)
if
(
cur
->
closed
)
{
PyErr_SetString
(
pysqlite_ProgrammingError
,
"Cannot operate on a closed cursor."
);
return
0
;
}
else
{
return
pysqlite_check_thread
(
cur
->
connection
)
&&
pysqlite_check_connection
(
cur
->
connection
);
}
if
(
cur
->
locked
)
{
PyErr_SetString
(
pysqlite_ProgrammingError
,
"Recursive use of cursors not allowed."
);
return
0
;
}
return
pysqlite_check_thread
(
cur
->
connection
)
&&
pysqlite_check_connection
(
cur
->
connection
);
}
PyObject
*
_pysqlite_query_execute
(
pysqlite_Cursor
*
self
,
int
multiple
,
PyObject
*
args
)
...
...
@@ -455,9 +460,10 @@ PyObject* _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject*
int
allow_8bit_chars
;
if
(
!
check_cursor
(
self
))
{
return
NULL
;
goto
error
;
}
self
->
locked
=
1
;
self
->
reset
=
0
;
/* Make shooting yourself in the foot with not utf-8 decodable 8-bit-strings harder */
...
...
@@ -470,12 +476,12 @@ PyObject* _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject*
if
(
multiple
)
{
/* executemany() */
if
(
!
PyArg_ParseTuple
(
args
,
"OO"
,
&
operation
,
&
second_argument
))
{
return
NULL
;
goto
error
;
}
if
(
!
PyUnicode_Check
(
operation
))
{
PyErr_SetString
(
PyExc_ValueError
,
"operation parameter must be str"
);
return
NULL
;
goto
error
;
}
if
(
PyIter_Check
(
second_argument
))
{
...
...
@@ -486,23 +492,23 @@ PyObject* _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject*
/* sequence */
parameters_iter
=
PyObject_GetIter
(
second_argument
);
if
(
!
parameters_iter
)
{
return
NULL
;
goto
error
;
}
}
}
else
{
/* execute() */
if
(
!
PyArg_ParseTuple
(
args
,
"O|O"
,
&
operation
,
&
second_argument
))
{
return
NULL
;
goto
error
;
}
if
(
!
PyUnicode_Check
(
operation
))
{
PyErr_SetString
(
PyExc_ValueError
,
"operation parameter must be str"
);
return
NULL
;
goto
error
;
}
parameters_list
=
PyList_New
(
0
);
if
(
!
parameters_list
)
{
return
NULL
;
goto
error
;
}
if
(
second_argument
==
NULL
)
{
...
...
@@ -742,7 +748,8 @@ error:
* ROLLBACK could have happened */
#ifdef SQLITE_VERSION_NUMBER
#if SQLITE_VERSION_NUMBER >= 3002002
self
->
connection
->
inTransaction
=
!
sqlite3_get_autocommit
(
self
->
connection
->
db
);
if
(
self
->
connection
&&
self
->
connection
->
db
)
self
->
connection
->
inTransaction
=
!
sqlite3_get_autocommit
(
self
->
connection
->
db
);
#endif
#endif
...
...
@@ -750,6 +757,8 @@ error:
Py_XDECREF
(
parameters_iter
);
Py_XDECREF
(
parameters_list
);
self
->
locked
=
0
;
if
(
PyErr_Occurred
())
{
self
->
rowcount
=
-
1L
;
return
NULL
;
...
...
Modules/_sqlite/cursor.h
Dosyayı görüntüle @
936d518d
...
...
@@ -42,6 +42,7 @@ typedef struct
pysqlite_Statement
*
statement
;
int
closed
;
int
reset
;
int
locked
;
int
initialized
;
/* the next row to be returned, NULL if no next row available */
...
...
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