summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2014-11-18 22:08:38 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2014-11-18 22:08:38 (GMT)
commit81f68a7d4b36be360b1dd28e6cbb49a43dc8937b (patch)
treef5f4ddb2c8e9f62dbaa5c81298d0d0407364360c
parent60fe569673eecaffd4afccd9b4d8a2c2bb4df15e (diff)
downloadcpython-81f68a7d4b36be360b1dd28e6cbb49a43dc8937b.zip
cpython-81f68a7d4b36be360b1dd28e6cbb49a43dc8937b.tar.gz
cpython-81f68a7d4b36be360b1dd28e6cbb49a43dc8937b.tar.bz2
Issue #22453: Warn against the use of leaking macro PyObject_REPR().
-rw-r--r--Include/object.h8
-rw-r--r--Python/compile.c20
2 files changed, 16 insertions, 12 deletions
diff --git a/Include/object.h b/Include/object.h
index 7584d4c..9306288 100644
--- a/Include/object.h
+++ b/Include/object.h
@@ -572,8 +572,12 @@ PyAPI_FUNC(PyObject *) PyObject_Dir(PyObject *);
PyAPI_FUNC(int) Py_ReprEnter(PyObject *);
PyAPI_FUNC(void) Py_ReprLeave(PyObject *);
-/* Helper for passing objects to printf and the like */
-#define PyObject_REPR(obj) _PyUnicode_AsString(PyObject_Repr(obj))
+#ifndef Py_LIMITED_API
+/* Helper for passing objects to printf and the like.
+ Leaks refcounts. Don't use it!
+*/
+#define PyObject_REPR(obj) PyUnicode_AsUTF8(PyObject_Repr(obj))
+#endif
/* Flag bits for printing: */
#define Py_PRINT_RAW 1 /* No string quotes etc. */
diff --git a/Python/compile.c b/Python/compile.c
index 69419ec..ec7a4ac 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -1412,12 +1412,12 @@ get_ref_type(struct compiler *c, PyObject *name)
PyOS_snprintf(buf, sizeof(buf),
"unknown scope for %.100s in %.100s(%s)\n"
"symbols: %s\nlocals: %s\nglobals: %s",
- PyBytes_AS_STRING(name),
- PyBytes_AS_STRING(c->u->u_name),
- PyObject_REPR(c->u->u_ste->ste_id),
- PyObject_REPR(c->u->u_ste->ste_symbols),
- PyObject_REPR(c->u->u_varnames),
- PyObject_REPR(c->u->u_names)
+ PyUnicode_AsUTF8(name),
+ PyUnicode_AsUTF8(c->u->u_name),
+ PyUnicode_AsUTF8(PyObject_Repr(c->u->u_ste->ste_id)),
+ PyUnicode_AsUTF8(PyObject_Repr(c->u->u_ste->ste_symbols)),
+ PyUnicode_AsUTF8(PyObject_Repr(c->u->u_varnames)),
+ PyUnicode_AsUTF8(PyObject_Repr(c->u->u_names))
);
Py_FatalError(buf);
}
@@ -1474,11 +1474,11 @@ compiler_make_closure(struct compiler *c, PyCodeObject *co, Py_ssize_t args, PyO
fprintf(stderr,
"lookup %s in %s %d %d\n"
"freevars of %s: %s\n",
- PyObject_REPR(name),
- PyBytes_AS_STRING(c->u->u_name),
+ PyUnicode_AsUTF8(PyObject_Repr(name)),
+ PyUnicode_AsUTF8(c->u->u_name),
reftype, arg,
- _PyUnicode_AsString(co->co_name),
- PyObject_REPR(co->co_freevars));
+ PyUnicode_AsUTF8(co->co_name),
+ PyUnicode_AsUTF8(PyObject_Repr(co->co_freevars)));
Py_FatalError("compiler_make_closure()");
}
ADDOP_I(c, LOAD_CLOSURE, arg);