python · miss-islington · Nov 18, 2020 · Jun 17, 2020 · Nov 18, 2020
diff --git a/Misc/NEWS.d/next/Build/2020-06-17-09-05-02.bpo-40998.sgqmg9.rst b/Misc/NEWS.d/next/Build/2020-06-17-09-05-02.bpo-40998.sgqmg9.rst
@@ -0,0 +1,2 @@
+Addressed three compiler warnings found by undefined behavior sanitizer
+(ubsan).
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -839,7 +839,11 @@ xmlcharrefreplace(_PyBytesWriter *writer, char *str,

    /* generate replacement */
    for (i = collstart; i < collend; ++i) {
-        str += sprintf(str, "&#%d;", PyUnicode_READ(kind, data, i));
+        size = sprintf(str, "&#%d;", PyUnicode_READ(kind, data, i));
+        if (size < 0) {
+            return NULL;
+        }
+        str += size;
    }
    return str;
 }

diff --git a/Parser/string_parser.c b/Parser/string_parser.c
@@ -69,6 +69,9 @@ decode_unicode_with_escapes(Parser *parser, const char *s, size_t len, Token *t)
        return NULL;
    }
    p = buf = PyBytes_AsString(u);
+    if (p == NULL) {
+        return NULL;
+    }
    end = s + len;
    while (s < end) {
        if (*s == '\\') {

diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
@@ -1644,7 +1644,6 @@ Py_FinalizeEx(void)

    /* Get current thread state and interpreter pointer */
    PyThreadState *tstate = _PyRuntimeState_GetThreadState(runtime);
-    PyInterpreterState *interp = tstate->interp;

    // Wrap up existing "threading"-module-created, non-daemon threads.
    wait_for_thread_shutdown(tstate);
@@ -1667,13 +1666,13 @@ Py_FinalizeEx(void)
    /* Copy the core config, PyInterpreterState_Delete() free
       the core config memory */
 #ifdef Py_REF_DEBUG
-    int show_ref_count = interp->config.show_ref_count;
+    int show_ref_count = tstate->interp->config.show_ref_count;
 #endif
 #ifdef Py_TRACE_REFS
-    int dump_refs = interp->config.dump_refs;
+    int dump_refs = tstate->interp->config.dump_refs;
 #endif
 #ifdef WITH_PYMALLOC
-    int malloc_stats = interp->config.malloc_stats;
+    int malloc_stats = tstate->interp->config.malloc_stats;
 #endif

    /* Remaining daemon threads will automatically exit
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Addressed three compiler warnings found by undefined behavior sanitizer
		(ubsan).