Issue 1267, continued.
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.
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
index 18d0f57..db475cd 100644
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -1214,7 +1214,7 @@
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 @@
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;
}