mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 11:23:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix refleaks from execfile('file that contains a # coding: line')

Browse source 
Also simplify logic a bit in fp_setreadl.
This commit is contained in:
Neal Norwitz 2007-08-12 00:03:22 +00:00
parent bb217d9ed8
commit 41eaedd361
1 changed files with 21 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Parser/tokenizer.c
View file

@ -369,6 +369,7 @@ fp_readl(char *s, int size, struct tok_state *tok)
PyObject* bufobj = tok->decoding_buffer; PyObject* bufobj = tok->decoding_buffer;
const char *buf; const char *buf;
Py_ssize_t buflen; Py_ssize_t buflen;
int allocated = 0;
/* Ask for one less byte so we can terminate it */ /* Ask for one less byte so we can terminate it */
assert(size > 0); assert(size > 0);
@ -377,21 +378,34 @@ fp_readl(char *s, int size, struct tok_state *tok)
if (bufobj == NULL) { if (bufobj == NULL) {
bufobj = PyObject_CallObject(tok->decoding_readline, NULL); bufobj = PyObject_CallObject(tok->decoding_readline, NULL);
if (bufobj == NULL) if (bufobj == NULL)
return error_ret(tok); goto error;
allocated = 1;
}
if (PyObject_AsCharBuffer(bufobj, &buf, &buflen) < 0) {
goto error;
} }
if (PyObject_AsCharBuffer(bufobj, &buf, &buflen) < 0)
return error_ret(tok);
if (buflen > size) { if (buflen > size) {
Py_XDECREF(tok->decoding_buffer);
tok->decoding_buffer = PyBytes_FromStringAndSize(buf+size, tok->decoding_buffer = PyBytes_FromStringAndSize(buf+size,
buflen-size); buflen-size);
if (tok->decoding_buffer == NULL) if (tok->decoding_buffer == NULL)
return error_ret(tok); goto error;
buflen = size; buflen = size;
} }
memcpy(s, buf, buflen); memcpy(s, buf, buflen);
s[buflen] = '\0'; s[buflen] = '\0';
if (buflen == 0) return NULL; /* EOF */ if (buflen == 0) /* EOF */
s = NULL;
if (allocated) {
Py_DECREF(bufobj);
}
return s; return s;
error:
if (allocated) {
Py_XDECREF(bufobj);
}
return error_ret(tok);
} }
/* Set the readline function for TOK to a StreamReader's /* Set the readline function for TOK to a StreamReader's
@ -408,7 +422,6 @@ static int
fp_setreadl(struct tok_state *tok, const char* enc) fp_setreadl(struct tok_state *tok, const char* enc)
{ {
PyObject *readline = NULL, *stream = NULL, *io = NULL; PyObject *readline = NULL, *stream = NULL, *io = NULL;
int ok = 0;
io = PyImport_ImportModule("io"); io = PyImport_ImportModule("io");
if (io == NULL) if (io == NULL)
@ -419,17 +432,14 @@ fp_setreadl(struct tok_state *tok, const char* enc)
if (stream == NULL) if (stream == NULL)
goto cleanup; goto cleanup;
Py_XDECREF(tok->decoding_readline);
readline = PyObject_GetAttrString(stream, "readline"); readline = PyObject_GetAttrString(stream, "readline");
if (readline == NULL)
goto cleanup;
tok->decoding_readline = readline; tok->decoding_readline = readline;
ok = 1;
cleanup: cleanup:
Py_XDECREF(stream); Py_XDECREF(stream);
Py_XDECREF(io); Py_XDECREF(io);
return ok; return readline != NULL;
} }
/* Fetch the next byte from TOK. */ /* Fetch the next byte from TOK. */