From 35df805bb75eb4cc410c26164b8039cdc84b5009 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Wed, 10 Dec 2025 17:41:12 +0100 Subject: [PATCH] [3.14] gh-139927: Fix test_embed on OpenIndiana (GH-142514) (#142520) gh-139927: Fix test_embed on OpenIndiana (GH-142514) Avoid swprintf() function in Programs/_testembed.c since it doesn't work as expected on OpenIndiana. (cherry picked from commit c76cfe8d89c5f44b6a012d24c0e14b45eab16b90) Co-authored-by: Victor Stinner --- Programs/_testembed.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/Programs/_testembed.c b/Programs/_testembed.c index 3256464b7b8..fe3e656a22a 100644 --- a/Programs/_testembed.c +++ b/Programs/_testembed.c @@ -2116,15 +2116,20 @@ static int check_use_frozen_modules(const char *rawval) if (rawval == NULL) { wcscpy(optval, L"frozen_modules"); } - else if (swprintf(optval, 100, -#if defined(_MSC_VER) - L"frozen_modules=%S", -#else - L"frozen_modules=%s", -#endif - rawval) < 0) { - error("rawval is too long"); - return -1; + else { + wchar_t *val = Py_DecodeLocale(rawval, NULL); + if (val == NULL) { + error("unable to decode TESTFROZEN"); + return -1; + } + wcscpy(optval, L"frozen_modules="); + if ((wcslen(optval) + wcslen(val)) >= Py_ARRAY_LENGTH(optval)) { + error("TESTFROZEN is too long"); + PyMem_RawFree(val); + return -1; + } + wcscat(optval, val); + PyMem_RawFree(val); } PyConfig config;