weakref_repr(), proxy_repr(): Conversion of sprintf() to

warsaw · warsaw · commit d586756dc5ef · 2001-11-28T21:01:56.000Z
PyOS_snprintf() for buffer overrun avoidance.
diff --git a/Objects/weakrefobject.c b/Objects/weakrefobject.c
@@ -131,13 +131,15 @@ weakref_repr(PyWeakReference *self)
 {
     char buffer[256];
     if (PyWeakref_GET_OBJECT(self) == Py_None) {
-        sprintf(buffer, "<weakref at %lx; dead>",
-                (long)(self));
+        PyOS_snprintf(buffer, sizeof(buffer), "<weakref at %lx; dead>",
+		      (long)(self));
     }
     else {
-        sprintf(buffer, "<weakref at %#lx; to '%.50s' at %#lx>",
-                (long)(self), PyWeakref_GET_OBJECT(self)->ob_type->tp_name,
-                (long)(PyWeakref_GET_OBJECT(self)));
+        PyOS_snprintf(buffer, sizeof(buffer),
+		      "<weakref at %#lx; to '%.50s' at %#lx>",
+		      (long)(self),
+		      PyWeakref_GET_OBJECT(self)->ob_type->tp_name,
+		      (long)(PyWeakref_GET_OBJECT(self)));
     }
     return PyString_FromString(buffer);
 }
@@ -265,9 +267,10 @@ static PyObject *
 proxy_repr(PyWeakReference *proxy)
 {
     char buf[160];
-    sprintf(buf, "<weakref at %p to %.100s at %p>", proxy,
-            PyWeakref_GET_OBJECT(proxy)->ob_type->tp_name,
-            PyWeakref_GET_OBJECT(proxy));
+    PyOS_snprintf(buf, sizeof(buf),
+		  "<weakref at %p to %.100s at %p>", proxy,
+		  PyWeakref_GET_OBJECT(proxy)->ob_type->tp_name,
+		  PyWeakref_GET_OBJECT(proxy));
     return PyString_FromString(buf);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -131,13 +131,15 @@ weakref_repr(PyWeakReference *self)`
`131`	`131`	`{`
`132`	`132`	`char buffer[256];`
`133`	`133`	`if (PyWeakref_GET_OBJECT(self) == Py_None) {`
`134`		`- sprintf(buffer, "<weakref at %lx; dead>",`
`135`		`- (long)(self));`
	`134`	`+ PyOS_snprintf(buffer, sizeof(buffer), "<weakref at %lx; dead>",`
	`135`	`+ (long)(self));`
`136`	`136`	`}`
`137`	`137`	`else {`
`138`		`- sprintf(buffer, "<weakref at %#lx; to '%.50s' at %#lx>",`
`139`		`- (long)(self), PyWeakref_GET_OBJECT(self)->ob_type->tp_name,`
`140`		`- (long)(PyWeakref_GET_OBJECT(self)));`
	`138`	`+ PyOS_snprintf(buffer, sizeof(buffer),`
	`139`	`+ "<weakref at %#lx; to '%.50s' at %#lx>",`
	`140`	`+ (long)(self),`
	`141`	`+ PyWeakref_GET_OBJECT(self)->ob_type->tp_name,`
	`142`	`+ (long)(PyWeakref_GET_OBJECT(self)));`
`141`	`143`	`}`
`142`	`144`	`return PyString_FromString(buffer);`
`143`	`145`	`}`
`@@ -265,9 +267,10 @@ static PyObject *`
`265`	`267`	`proxy_repr(PyWeakReference *proxy)`
`266`	`268`	`{`
`267`	`269`	`char buf[160];`
`268`		`- sprintf(buf, "<weakref at %p to %.100s at %p>", proxy,`
`269`		`- PyWeakref_GET_OBJECT(proxy)->ob_type->tp_name,`
`270`		`- PyWeakref_GET_OBJECT(proxy));`
	`270`	`+ PyOS_snprintf(buf, sizeof(buf),`
	`271`	`+ "<weakref at %p to %.100s at %p>", proxy,`
	`272`	`+ PyWeakref_GET_OBJECT(proxy)->ob_type->tp_name,`
	`273`	`+ PyWeakref_GET_OBJECT(proxy));`
`271`	`274`	`return PyString_FromString(buf);`
`272`	`275`	`}`
`273`	`276`