]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
[3.14] gh-139927: Fix test_embed on OpenIndiana (GH-142514) (#142520)
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Wed, 10 Dec 2025 16:41:12 +0000 (17:41 +0100)
committerGitHub <noreply@github.com>
Wed, 10 Dec 2025 16:41:12 +0000 (16:41 +0000)
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 <vstinner@python.org>
Programs/_testembed.c

index 3256464b7b82191f13cd4149f76c9e8d309a970e..fe3e656a22ae31fd4e38062407e19e67101bd81d 100644 (file)
@@ -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;