components/python/python39/patches/24-strxfrm-fix.patch

   1 This patch fixes limitation in python which expects strxfrm function to return
   2 string with characters with values lower than 10ffff. This is know issue:
   3
   4 https://bugs.python.org/issue16258
   5
   6 This is not for upstream as the idea is from the bug itself and was rejected
   7 for use on all platforms.
   8
   9 --- Python-3.9.1/Modules/_localemodule.c
  10 +++ Python-3.9.1/Modules/_localemodule.c
  11 @@ -363,9 +363,10 @@ Return a string that can be used as a ke
  12  static PyObject*
  13  PyLocale_strxfrm(PyObject* self, PyObject* args)
  14  {
  15 +    unsigned int i, j;
  16      PyObject *str;
  17      Py_ssize_t n1;
  18 -    wchar_t *s = NULL, *buf = NULL;
  19 +    wchar_t *s = NULL, *buf = NULL, *solbuf = NULL;
  20      size_t n2;
  21      PyObject *result = NULL;
  22
  23 @@ -409,8 +410,23 @@ PyLocale_strxfrm(PyObject* self, PyObjec
  24              goto exit;
  25          }
  26      }
  27 -    result = PyUnicode_FromWideChar(buf, n2);
  28 +
  29 +    /* Split each character in resulting wide string in two
  30 +       parts in order to prevent Python ValueErrors on Solaris. */
  31 +    solbuf = PyMem_New(wchar_t, (n2*2) + 1);
  32 +    if (!solbuf) {
  33 +        PyErr_NoMemory();
  34 +        goto exit;
  35 +    }
  36 +    for (i = 0, j = 0; i < n2; i ++, j+= 2) {
  37 +        solbuf[j] = 0x10000 + (buf[i] >> 16);
  38 +        solbuf[j+1] = buf[i] & 0xffff;
  39 +    }
  40 +    solbuf[j] = 0;
  41 +
  42 +    result = PyUnicode_FromWideChar(solbuf, n2*2);
  43  exit:
  44 +    PyMem_Free(solbuf);
  45      PyMem_Free(buf);
  46      PyMem_Free(s);
  47      return result;