ilusha/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2026-09-29 12:10:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Issue 1267, continued.

Browse source 
Additional patch by Christian Heimes to deal more cleanly with the
FILE* vs file-descriptor issues.
I cleaned up his code a bit, and moved the lseek() call into import.c.
This commit is contained in:
Guido van Rossum 2007-10-22 00:09:51 +00:00
parent c2954e5273
commit 40d20bcf1f
12 changed files with 94 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Objects/bytesobject.c
View file

@ -1214,7 +1214,7 @@ _bytes_tailmatch(PyBytesObject *self, PyObject *substr, Py_ssize_t start,
Py_ssize_t len = PyBytes_GET_SIZE(self);
const char* str;
Py_buffer vsubstr;
int rv;
int rv = 0;
str = PyBytes_AS_STRING(self);
@ -1226,13 +1226,11 @@ _bytes_tailmatch(PyBytesObject *self, PyObject *substr, Py_ssize_t start,
if (direction < 0) {
/* startswith */
if (start+vsubstr.len > len) {
rv = 0;
goto done;
}
} else {
/* endswith */
if (end-start < vsubstr.len || start > len) {
rv = 0;
goto done;
}