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.

Sign up for GitHub

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

Jump to bottom

gh-92434: Silence a compiler warning in _sqlite/connection.c for 32bit version #93090

Merged
merged 8 commits into from
Jun 10, 2022
Merged

gh-92434: Silence a compiler warning in _sqlite/connection.c for 32bit version #93090

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
893665d
gh-92434: Silence a compiler warning in _sqlite/connection.c for 32bi…
neonene May 23, 2022
3fbf0d0
check the size of serialized data
neonene May 24, 2022
ca1810f
📜🤖 Added by blurb_it.
blurb-it[bot] May 25, 2022
7bb93cd
Use INT_MAX, update NEWS
neonene Jun 2, 2022
f28e454
correct NEWS
neonene Jun 3, 2022
49a0f64
Remove OverflowError
neonene Jun 3, 2022
3261f0c
Update Modules/_sqlite/connection.c
erlend-aasland Jun 10, 2022
a158fcd
Delete 2022-05-25-04-48-30.gh-issue-92434.ZCv8o0.rst
erlend-aasland Jun 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2022-05-25-04-48-30.gh-issue-92434.ZCv8o0.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
:meth:`~sqlite3.Connection.serialize` raises :exc:`OverflowError` on 32bit Python
when more than ``Py_SSIZE_T_MAX`` bytes of serialization occurs.
neonene marked this conversation as resolved.
Show resolved Hide resolved
9 changes: 8 additions & 1 deletion Modules/_sqlite/connection.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2091,7 +2091,14 @@ serialize_impl(pysqlite_Connection *self, const char *name)
name);
return NULL;
}
PyObject *res = PyBytes_FromStringAndSize(data, size);
#if PY_SSIZE_T_MAX < 9223372036854775807
erlend-aasland marked this conversation as resolved.
Show resolved Hide resolved
if (size > PY_SSIZE_T_MAX) {
neonene marked this conversation as resolved.
Show resolved Hide resolved
PyErr_Format(PyExc_OverflowError,
"serialized '%s' too large to convert to bytes", name);
return NULL;
}
#endif
PyObject *res = PyBytes_FromStringAndSize(data, (Py_ssize_t)size);
if (!(flags & SQLITE_SERIALIZE_NOCOPY)) {
sqlite3_free((void *)data);
}
Expand Down