diff Objects/stringobject.c @ 42335:c8b850b5a066

Fix merge breakage.
author Martin v. Löwis <martin@v.loewis.de>
date Sat, 21 Jul 2007 18:47:48 +0000
parents e70cdce0e8b2
children 3fc3cedc49ca
line wrap: on
line diff
--- a/Objects/stringobject.c	Sat Jul 21 17:22:18 2007 +0000
+++ b/Objects/stringobject.c	Sat Jul 21 18:47:48 2007 +0000
@@ -835,7 +835,7 @@
 	static const char *hexdigits = "0123456789abcdef";
 	register PyStringObject* op = (PyStringObject*) obj;
 	Py_ssize_t length = PyString_GET_SIZE(op);
-	size_t newsize = 3 + 4 * op->ob_size;
+	size_t newsize = 3 + 4 * Py_Size(op);
 	PyObject *v;
 	if (newsize > PY_SSIZE_T_MAX || newsize / 4 != Py_Size(op)) {
 		PyErr_SetString(PyExc_OverflowError,