update sources to v12.2.3

[ceph.git] / ceph / src / boost / libs / python / src / converter / builtin_converters.cpp

diff --git a/ceph/src/boost/libs/python/src/converter/builtin_converters.cpp b/ceph/src/boost/libs/python/src/converter/builtin_converters.cpp
index 9900602b776aaec64ccb3a7bdc3612c44d276077..1c28af7fc9cc67a5e4a0ed50ce884dc03123b03c 100644 (file)
--- a/ceph/src/boost/libs/python/src/converter/builtin_converters.cpp
+++ b/ceph/src/boost/libs/python/src/converter/builtin_converters.cpp
@@ -430,6 +430,22 @@ namespace
       // Remember that this will be used to construct the result object 
       static std::wstring extract(PyObject* intermediate)
       {
+          // On Windows, with Python >= 3.3, PyObject_Length cannot be used to get
+          // the size of the wchar_t string, because it will count the number of
+          // *code points*, but some characters not on the BMP will use two UTF-16
+          // *code units* (surrogate pairs).
+          // This is not a problem on Unix, since wchar_t is 32-bit.
+#if defined(_WIN32) && PY_VERSION_HEX >= 0x03030000
+          BOOST_STATIC_ASSERT(sizeof(wchar_t) == 2);
+
+          Py_ssize_t size = 0;
+          wchar_t *buf = PyUnicode_AsWideCharString(intermediate, &size);
+          if (buf == NULL) {
+              boost::python::throw_error_already_set();
+          }
+          std::wstring result(buf, size);
+          PyMem_Free(buf);
+#else
           std::wstring result(::PyObject_Length(intermediate), L' ');
           if (!result.empty())
           {
@@ -444,6 +460,7 @@ namespace
               if (err == -1)
                   throw_error_already_set();
           }
+#endif
           return result;
       }
       static PyTypeObject const* get_pytype() { return &PyUnicode_Type;}