Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2024-11-22 13:15:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check for NULL in raw_str on Python3 (#2290)

Browse Source
This commit is contained in:
Boris Staletic 2020-07-11 17:20:22 +02:00 committed by GitHub
parent b2f52225fa
commit 8b9eb964d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/pybind11/pytypes.h
View File

@ -933,8 +933,8 @@ private:
/// Return string representation -- always returns a new reference, even if already a str /// Return string representation -- always returns a new reference, even if already a str
static PyObject *raw_str(PyObject *op) { static PyObject *raw_str(PyObject *op) {
PyObject *str_value = PyObject_Str(op); PyObject *str_value = PyObject_Str(op);
#if PY_MAJOR_VERSION < 3
if (!str_value) throw error_already_set(); if (!str_value) throw error_already_set();
#if PY_MAJOR_VERSION < 3
PyObject *unicode = PyUnicode_FromEncodedObject(str_value, "utf-8", nullptr); PyObject *unicode = PyUnicode_FromEncodedObject(str_value, "utf-8", nullptr);
Py_XDECREF(str_value); str_value = unicode; Py_XDECREF(str_value); str_value = unicode;
#endif #endif