Track without evading PyObject

Author: nanjekyejoannah

Include/object.h

@@ -465,6 +465,8 @@ PyAPI_FUNC(PyObject *) PyObject_Str(PyObject *);
 #ifdef Py_USING_UNICODE
 PyAPI_FUNC(PyObject *) PyObject_Unicode(PyObject *);
 #endif
+PyAPI_DATA(Py_ssize_t) PyObject_GetBState(PyObject *);
+PyAPI_FUNC() PyObject_Unicode(PyObject *);
 PyAPI_FUNC(int) PyObject_Compare(PyObject *, PyObject *);
 PyAPI_FUNC(PyObject *) PyObject_RichCompare(PyObject *, PyObject *, int);
 PyAPI_FUNC(int) PyObject_RichCompareBool(PyObject *, PyObject *, int);

Objects/object.c

@@ -471,6 +471,57 @@ PyObject_Str(PyObject *v)
     return res;
 }
 
+PyObject *
+PyObject_GetBState(PyObject *v)
+{
+    PyUnicodeObject *uni;
+    PyStringObject *str;
+    PyBytesObject *byt;
+    Py_ssize_t bbstate;
+
+    if (v == NULL) {
+        return 0
+    }
+    else {
+        if (!PyUnicode_CheckExact(v) || !PyByte_CheckExact(v)) {
+            return -1;
+        }
+        if (PyUnicode_CheckExact(v)) {
+            uni = (PyUnicodeObject *) PyUnicode_FromObject(v);
+            if (uni == NULL)
+                return 0;
+            bbstate = uni->ob_bstate;
+            if (bbstate == NULL)
+                Py_XDECREF(uni);
+                return 0;
+            Py_DECREF(uni);
+            return bbstate;
+        }
+        if (PyString_CheckExact(v)) {
+            str = (PyStringObject *) v;
+            if (str == NULL)
+                return 0;
+            bbstate = str->ob_bstate;
+            if (bbstate == NULL)
+                Py_XDECREF(str);
+                return 0;
+            Py_DECREF(str);
+            return bbstate;
+        }
+        if (PyBytes_CheckExact(v)) {
+            byt = (PyBytesObject *) v;
+            if (byt == NULL)
+                return 0;
+            bbstate = byt->ob_bstate;
+            if (bbstate == NULL)
+                Py_XDECREF(byt);
+                return 0;
+            Py_DECREF(byt);
+            return bbstate;
+        }
+    }
+}
+
 #ifdef Py_USING_UNICODE
 PyObject *
 PyObject_Unicode(PyObject *v)

Objects/stringobject.c

@@ -3728,6 +3728,11 @@ string_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
         return NULL;
     if (x == NULL)
         return PyString_FromString("");
+    if (PyBytes_CheckExact(v)) {
+        (PyStringObject *)x->ob_bstate = BSTATE_NOT_SURE;
+    } else {
+        (PyBytesObject *)x->ob_bstate = BSTATE_BYTE;
+    }
     return PyObject_Str(x);
 }
 

Objects/unicodeobject.c

@@ -8859,6 +8859,7 @@ unicode_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
         return NULL;
     if (x == NULL)
         return (PyObject *)_PyUnicode_New(0);
+    (PyUnicodeObject *)x->ob_bstate = BSTATE_UNICODE;
     if (encoding == NULL && errors == NULL)
         return PyObject_Unicode(x);
     else