mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Skip Montanaro: add string precisions to calls to PyErr_Format

Browse source 
to prevent possible buffer overruns.
This commit is contained in:
Guido van Rossum 2000-04-10 12:46:51 +00:00
parent fa972c987c
commit 5db862dd0c
5 changed files with 29 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Modules/pyexpat.c
View file

@ -307,7 +307,7 @@ xmlparse_Parse( xmlparseobject *self, PyObject *args )
return NULL; return NULL;
} }
else if (rv == 0) { else if (rv == 0) {
PyErr_Format(ErrorObject, "%s: line %i, column %i", PyErr_Format(ErrorObject, "%.200s: line %i, column %i",
XML_ErrorString( XML_GetErrorCode(self->itself) ), XML_ErrorString( XML_GetErrorCode(self->itself) ),
XML_GetErrorLineNumber(self->itself), XML_GetErrorLineNumber(self->itself),
XML_GetErrorColumnNumber(self->itself) ); XML_GetErrorColumnNumber(self->itself) );

4
Objects/object.c
View file

@ -236,7 +236,7 @@ PyObject_Repr(v)
return NULL; return NULL;
if (!PyString_Check(res)) { if (!PyString_Check(res)) {
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"__repr__ returned non-string (type %s)", "__repr__ returned non-string (type %.200s)",
res->ob_type->tp_name); res->ob_type->tp_name);
Py_DECREF(res); Py_DECREF(res);
return NULL; return NULL;
@ -273,7 +273,7 @@ PyObject_Str(v)
return NULL; return NULL;
if (!PyString_Check(res)) { if (!PyString_Check(res)) {
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"__str__ returned non-string (type %s)", "__str__ returned non-string (type %.200s)",
res->ob_type->tp_name); res->ob_type->tp_name);
Py_DECREF(res); Py_DECREF(res);
return NULL; return NULL;

44
Objects/unicodeobject.c
View file

@ -365,7 +365,7 @@ PyObject *PyUnicode_Decode(const char *s,
goto onError; goto onError;
if (!PyUnicode_Check(unicode)) { if (!PyUnicode_Check(unicode)) {
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"decoder did not return an unicode object (type=%s)", "decoder did not return an unicode object (type=%.400s)",
unicode->ob_type->tp_name); unicode->ob_type->tp_name);
Py_DECREF(unicode); Py_DECREF(unicode);
goto onError; goto onError;
@ -416,7 +416,7 @@ PyObject *PyUnicode_AsEncodedString(PyObject *unicode,
/* XXX Should we really enforce this ? */ /* XXX Should we really enforce this ? */
if (!PyString_Check(v)) { if (!PyString_Check(v)) {
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"encoder did not return a string object (type=%s)", "encoder did not return a string object (type=%.400s)",
v->ob_type->tp_name); v->ob_type->tp_name);
Py_DECREF(v); Py_DECREF(v);
goto onError; goto onError;
@ -484,7 +484,7 @@ int utf8_decoding_error(const char **source,
if ((errors == NULL) || if ((errors == NULL) ||
(strcmp(errors,"strict") == 0)) { (strcmp(errors,"strict") == 0)) {
PyErr_Format(PyExc_UnicodeError, PyErr_Format(PyExc_UnicodeError,
"UTF-8 decoding error: %s", "UTF-8 decoding error: %.400s",
details); details);
return -1; return -1;
} }
@ -500,7 +500,7 @@ int utf8_decoding_error(const char **source,
} }
else { else {
PyErr_Format(PyExc_ValueError, PyErr_Format(PyExc_ValueError,
"UTF-8 decoding error; unknown error handling code: %s", "UTF-8 decoding error; unknown error handling code: %.400s",
errors); errors);
return -1; return -1;
} }
@ -607,7 +607,7 @@ int utf8_encoding_error(const Py_UNICODE **source,
if ((errors == NULL) || if ((errors == NULL) ||
(strcmp(errors,"strict") == 0)) { (strcmp(errors,"strict") == 0)) {
PyErr_Format(PyExc_UnicodeError, PyErr_Format(PyExc_UnicodeError,
"UTF-8 encoding error: %s", "UTF-8 encoding error: %.400s",
details); details);
return -1; return -1;
} }
@ -622,7 +622,7 @@ int utf8_encoding_error(const Py_UNICODE **source,
else { else {
PyErr_Format(PyExc_ValueError, PyErr_Format(PyExc_ValueError,
"UTF-8 encoding error; " "UTF-8 encoding error; "
"unknown error handling code: %s", "unknown error handling code: %.400s",
errors); errors);
return -1; return -1;
} }
@ -728,7 +728,7 @@ int utf16_decoding_error(const Py_UNICODE **source,
if ((errors == NULL) || if ((errors == NULL) ||
(strcmp(errors,"strict") == 0)) { (strcmp(errors,"strict") == 0)) {
PyErr_Format(PyExc_UnicodeError, PyErr_Format(PyExc_UnicodeError,
"UTF-16 decoding error: %s", "UTF-16 decoding error: %.400s",
details); details);
return -1; return -1;
} }
@ -744,7 +744,7 @@ int utf16_decoding_error(const Py_UNICODE **source,
} }
else { else {
PyErr_Format(PyExc_ValueError, PyErr_Format(PyExc_ValueError,
"UTF-16 decoding error; unknown error handling code: %s", "UTF-16 decoding error; unknown error handling code: %.400s",
errors); errors);
return -1; return -1;
} }
@ -918,7 +918,7 @@ int unicodeescape_decoding_error(const char **source,
if ((errors == NULL) || if ((errors == NULL) ||
(strcmp(errors,"strict") == 0)) { (strcmp(errors,"strict") == 0)) {
PyErr_Format(PyExc_UnicodeError, PyErr_Format(PyExc_UnicodeError,
"Unicode-Escape decoding error: %s", "Unicode-Escape decoding error: %.400s",
details); details);
return -1; return -1;
} }
@ -932,7 +932,7 @@ int unicodeescape_decoding_error(const char **source,
else { else {
PyErr_Format(PyExc_ValueError, PyErr_Format(PyExc_ValueError,
"Unicode-Escape decoding error; " "Unicode-Escape decoding error; "
"unknown error handling code: %s", "unknown error handling code: %.400s",
errors); errors);
return -1; return -1;
} }
@ -1296,7 +1296,7 @@ int latin1_encoding_error(const Py_UNICODE **source,
if ((errors == NULL) || if ((errors == NULL) ||
(strcmp(errors,"strict") == 0)) { (strcmp(errors,"strict") == 0)) {
PyErr_Format(PyExc_UnicodeError, PyErr_Format(PyExc_UnicodeError,
"Latin-1 encoding error: %s", "Latin-1 encoding error: %.400s",
details); details);
return -1; return -1;
} }
@ -1310,7 +1310,7 @@ int latin1_encoding_error(const Py_UNICODE **source,
else { else {
PyErr_Format(PyExc_ValueError, PyErr_Format(PyExc_ValueError,
"Latin-1 encoding error; " "Latin-1 encoding error; "
"unknown error handling code: %s", "unknown error handling code: %.400s",
errors); errors);
return -1; return -1;
} }
@ -1366,7 +1366,7 @@ int ascii_decoding_error(const char **source,
if ((errors == NULL) || if ((errors == NULL) ||
(strcmp(errors,"strict") == 0)) { (strcmp(errors,"strict") == 0)) {
PyErr_Format(PyExc_UnicodeError, PyErr_Format(PyExc_UnicodeError,
"ASCII decoding error: %s", "ASCII decoding error: %.400s",
details); details);
return -1; return -1;
} }
@ -1381,7 +1381,7 @@ int ascii_decoding_error(const char **source,
else { else {
PyErr_Format(PyExc_ValueError, PyErr_Format(PyExc_ValueError,
"ASCII decoding error; " "ASCII decoding error; "
"unknown error handling code: %s", "unknown error handling code: %.400s",
errors); errors);
return -1; return -1;
} }
@ -1429,7 +1429,7 @@ int ascii_encoding_error(const Py_UNICODE **source,
if ((errors == NULL) || if ((errors == NULL) ||
(strcmp(errors,"strict") == 0)) { (strcmp(errors,"strict") == 0)) {
PyErr_Format(PyExc_UnicodeError, PyErr_Format(PyExc_UnicodeError,
"ASCII encoding error: %s", "ASCII encoding error: %.400s",
details); details);
return -1; return -1;
} }
@ -1443,7 +1443,7 @@ int ascii_encoding_error(const Py_UNICODE **source,
else { else {
PyErr_Format(PyExc_ValueError, PyErr_Format(PyExc_ValueError,
"ASCII encoding error; " "ASCII encoding error; "
"unknown error handling code: %s", "unknown error handling code: %.400s",
errors); errors);
return -1; return -1;
} }
@ -1558,7 +1558,7 @@ int charmap_decoding_error(const char **source,
if ((errors == NULL) || if ((errors == NULL) ||
(strcmp(errors,"strict") == 0)) { (strcmp(errors,"strict") == 0)) {
PyErr_Format(PyExc_UnicodeError, PyErr_Format(PyExc_UnicodeError,
"charmap decoding error: %s", "charmap decoding error: %.400s",
details); details);
return -1; return -1;
} }
@ -1573,7 +1573,7 @@ int charmap_decoding_error(const char **source,
else { else {
PyErr_Format(PyExc_ValueError, PyErr_Format(PyExc_ValueError,
"charmap decoding error; " "charmap decoding error; "
"unknown error handling code: %s", "unknown error handling code: %.400s",
errors); errors);
return -1; return -1;
} }
@ -1674,7 +1674,7 @@ int charmap_encoding_error(const Py_UNICODE **source,
if ((errors == NULL) || if ((errors == NULL) ||
(strcmp(errors,"strict") == 0)) { (strcmp(errors,"strict") == 0)) {
PyErr_Format(PyExc_UnicodeError, PyErr_Format(PyExc_UnicodeError,
"charmap encoding error: %s", "charmap encoding error: %.400s",
details); details);
return -1; return -1;
} }
@ -1689,7 +1689,7 @@ int charmap_encoding_error(const Py_UNICODE **source,
else { else {
PyErr_Format(PyExc_ValueError, PyErr_Format(PyExc_ValueError,
"charmap encoding error; " "charmap encoding error; "
"unknown error handling code: %s", "unknown error handling code: %.400s",
errors); errors);
return -1; return -1;
} }
@ -1806,7 +1806,7 @@ int translate_error(const Py_UNICODE **source,
if ((errors == NULL) || if ((errors == NULL) ||
(strcmp(errors,"strict") == 0)) { (strcmp(errors,"strict") == 0)) {
PyErr_Format(PyExc_UnicodeError, PyErr_Format(PyExc_UnicodeError,
"translate error: %s", "translate error: %.400s",
details); details);
return -1; return -1;
} }
@ -1821,7 +1821,7 @@ int translate_error(const Py_UNICODE **source,
else { else {
PyErr_Format(PyExc_ValueError, PyErr_Format(PyExc_ValueError,
"translate error; " "translate error; "
"unknown error handling code: %s", "unknown error handling code: %.400s",
errors); errors);
return -1; return -1;
} }

2
Python/ceval.c
View file

@ -2513,7 +2513,7 @@ call_function(func, arg, kw)
else { else {
if (!PyFunction_Check(func)) { if (!PyFunction_Check(func)) {
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"call of non-function (type %s)", "call of non-function (type %.200s)",
func->ob_type->tp_name); func->ob_type->tp_name);
return NULL; return NULL;
} }

4
Python/dynload_next.c
View file

@ -185,7 +185,9 @@ dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname,
if (!NSIsSymbolNameDefined(funcname)) { if (!NSIsSymbolNameDefined(funcname)) {
/* UnlinkModule() isn't implimented in current versions, but calling it does no harm */ /* UnlinkModule() isn't implimented in current versions, but calling it does no harm */
NSUnLinkModule(newModule, FALSE); NSUnLinkModule(newModule, FALSE);
PyErr_Format(PyExc_ImportError, "Loaded module does not contain symbol %s", funcname); PyErr_Format(PyExc_ImportError,
"Loaded module does not contain symbol %.200s",
funcname);
return NULL; return NULL;
} }
theSym = NSLookupAndBindSymbol(funcname); theSym = NSLookupAndBindSymbol(funcname);