Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-104399: Use newer libtommath APIs when necessary (GH-104407)

This commit is contained in:
Christopher Chavez 2023-06-06 01:52:07 -05:00 committed by GitHub
parent 852348ab65
commit 00d73caf80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Misc/NEWS.d/next/Library/2023-05-11-23-03-00.gh-issue-104399.MMatTP.rst Normal file
View File

@ -0,0 +1,4 @@
Prepare the ``_tkinter`` module for building with Tcl 9.0 and future
libtommath by replacing usage of deprecated functions
:c:func:`mp_to_unsigned_bin_n` and :c:func:`mp_unsigned_bin_size`
when necessary.

23
Modules/_tkinter.c
View File

@ -65,6 +65,12 @@ Copyright (C) 1994 Steen Lumholt.
#endif
#include <tclTomMath.h>
#if defined(TCL_WITH_EXTERNAL_TOMMATH) || (TK_HEX_VERSION >= 0x08070000)
#define USE_DEPRECATED_TOMMATH_API 0
#else
#define USE_DEPRECATED_TOMMATH_API 1
#endif
#if !(defined(MS_WINDOWS) || defined(__CYGWIN__))
#define HAVE_CREATEFILEHANDLER
#endif
@ -1049,20 +1055,33 @@ static PyObject*
fromBignumObj(TkappObject *tkapp, Tcl_Obj *value)
{
mp_int bigValue;
mp_err err;
#if USE_DEPRECATED_TOMMATH_API
unsigned long numBytes;
#else
size_t numBytes;
#endif
unsigned char *bytes;
PyObject *res;
if (Tcl_GetBignumFromObj(Tkapp_Interp(tkapp), value, &bigValue) != TCL_OK)
return Tkinter_Error(tkapp);
#if USE_DEPRECATED_TOMMATH_API
numBytes = mp_unsigned_bin_size(&bigValue);
#else
numBytes = mp_ubin_size(&bigValue);
#endif
bytes = PyMem_Malloc(numBytes);
if (bytes == NULL) {
mp_clear(&bigValue);
return PyErr_NoMemory();
}
if (mp_to_unsigned_bin_n(&bigValue, bytes,
&numBytes) != MP_OKAY) {
#if USE_DEPRECATED_TOMMATH_API
err = mp_to_unsigned_bin_n(&bigValue, bytes, &numBytes);
#else
err = mp_to_ubin(&bigValue, bytes, numBytes, NULL);
#endif
if (err != MP_OKAY) {
mp_clear(&bigValue);
PyMem_Free(bytes);
return PyErr_NoMemory();