Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

complex_to_buf(), complex_subtype_from_c_complex(): Conversion of 

sprintf() to PyOS_snprintf() for buffer overrun avoidance.

complex_print(), complex_repr(), complex_str(): Call complex_to_buf()
passing in sizeof(buf).
This commit is contained in:
Barry Warsaw 2001-11-28 20:50:56 +00:00
parent 518ab1c02a
commit 01d697a067
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Objects/complexobject.c
View File

@ -270,20 +270,22 @@ complex_dealloc(PyObject *op)
static void static void
complex_to_buf(char *buf, PyComplexObject *v, int precision) complex_to_buf(char *buf, int bufsz, PyComplexObject *v, int precision)
{ {
if (v->cval.real == 0.) if (v->cval.real == 0.)
sprintf(buf, "%.*gj", precision, v->cval.imag); PyOS_snprintf(buf, bufsz, "%.*gj",
precision, v->cval.imag);
else else
sprintf(buf, "(%.*g%+.*gj)", precision, v->cval.real, PyOS_snprintf(buf, bufsz, "(%.*g%+.*gj)",
precision, v->cval.imag); precision, v->cval.real,
precision, v->cval.imag);
} }
static int static int
complex_print(PyComplexObject *v, FILE *fp, int flags) complex_print(PyComplexObject *v, FILE *fp, int flags)
{ {
char buf[100]; char buf[100];
complex_to_buf(buf, v, complex_to_buf(buf, sizeof(buf), v,
(flags & Py_PRINT_RAW) ? PREC_STR : PREC_REPR); (flags & Py_PRINT_RAW) ? PREC_STR : PREC_REPR);
fputs(buf, fp); fputs(buf, fp);
return 0; return 0;
@ -293,7 +295,7 @@ static PyObject *
complex_repr(PyComplexObject *v) complex_repr(PyComplexObject *v)
{ {
char buf[100]; char buf[100];
complex_to_buf(buf, v, PREC_REPR); complex_to_buf(buf, sizeof(buf), v, PREC_REPR);
return PyString_FromString(buf); return PyString_FromString(buf);
} }
@ -301,7 +303,7 @@ static PyObject *
complex_str(PyComplexObject *v) complex_str(PyComplexObject *v)
{ {
char buf[100]; char buf[100];
complex_to_buf(buf, v, PREC_STR); complex_to_buf(buf, sizeof(buf), v, PREC_STR);
return PyString_FromString(buf); return PyString_FromString(buf);
} }
@ -752,7 +754,7 @@ complex_subtype_from_string(PyTypeObject *type, PyObject *v)
z = strtod(s, &end) ; z = strtod(s, &end) ;
PyFPE_END_PROTECT(z) PyFPE_END_PROTECT(z)
if (errno != 0) { if (errno != 0) {
sprintf(buffer, PyOS_snprintf(buffer, sizeof(buffer),
"float() out of range: %.150s", s); "float() out of range: %.150s", s);
PyErr_SetString( PyErr_SetString(
PyExc_ValueError, PyExc_ValueError,