Matej Cepl
4a7871d409
partially reverting CVE-2023-27043-email-parsing-errors.patch, because of the regression in gh#python/cpython#106669. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python310?expand=0&rev=103
31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
From 6c8ea7c1dacd42f3ba00440231ec0e6b1a38300d Mon Sep 17 00:00:00 2001
|
|
From: Inada Naoki <songofacandy@gmail.com>
|
|
Date: Sat, 14 Jul 2018 00:46:11 +0900
|
|
Subject: [PATCH] Use FLAG_REF always for interned strings
|
|
|
|
---
|
|
Python/marshal.c | 9 +++++++--
|
|
1 file changed, 7 insertions(+), 2 deletions(-)
|
|
|
|
Index: Python-3.10.12/Python/marshal.c
|
|
===================================================================
|
|
--- Python-3.10.12.orig/Python/marshal.c
|
|
+++ Python-3.10.12/Python/marshal.c
|
|
@@ -298,9 +298,14 @@ w_ref(PyObject *v, char *flag, WFILE *p)
|
|
if (p->version < 3 || p->hashtable == NULL)
|
|
return 0; /* not writing object references */
|
|
|
|
- /* if it has only one reference, it definitely isn't shared */
|
|
- if (Py_REFCNT(v) == 1)
|
|
+ /* If it has only one reference, it definitely isn't shared.
|
|
+ * But we use TYPE_REF always for interned string, to PYC file stable
|
|
+ * as possible.
|
|
+ */
|
|
+ if (Py_REFCNT(v) == 1 &&
|
|
+ !(PyUnicode_CheckExact(v) && PyUnicode_CHECK_INTERNED(v))) {
|
|
return 0;
|
|
+ }
|
|
|
|
entry = _Py_hashtable_get_entry(p->hashtable, v);
|
|
if (entry != NULL) {
|