Do not pass advanced values to C as bytes

radarhere · Jan 5, 2025 · 8f004cd · 8f004cd
1 parent 5ecacb4
commit 8f004cd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/PIL/AvifImagePlugin.py b/src/PIL/AvifImagePlugin.py
@@ -198,9 +198,9 @@ def _save(
         xmp = xmp.encode("utf-8")
 
     advanced = info.get("advanced")
-    if isinstance(advanced, dict):
-        advanced = tuple([k, v] for (k, v) in advanced.items())
     if advanced is not None:
+        if isinstance(advanced, dict):
+            advanced = advanced.items()
         try:
             advanced = tuple(advanced)
         except TypeError:
@@ -213,9 +213,6 @@ def _save(
                 "pairs or a series of key-value two-tuples"
             )
             raise ValueError(msg)
-        advanced = tuple(
-            (str(k).encode("utf-8"), str(v).encode("utf-8")) for k, v in advanced
-        )
 
     # Setup the AVIF encoder
     enc = _avif.AvifEncoder(

diff --git a/src/_avif.c b/src/_avif.c
@@ -188,7 +188,6 @@ static int
 _add_codec_specific_options(avifEncoder *encoder, PyObject *opts) {
     Py_ssize_t i, size;
     PyObject *keyval, *py_key, *py_val;
-    char *key, *val;
     if (!PyTuple_Check(opts)) {
         PyErr_SetString(PyExc_ValueError, "Invalid advanced codec options");
         return 1;
@@ -203,12 +202,16 @@ _add_codec_specific_options(avifEncoder *encoder, PyObject *opts) {
         }
         py_key = PyTuple_GetItem(keyval, 0);
         py_val = PyTuple_GetItem(keyval, 1);
-        if (!PyBytes_Check(py_key) || !PyBytes_Check(py_val)) {
+        if (!PyUnicode_Check(py_key) || !PyUnicode_Check(py_val)) {
+            PyErr_SetString(PyExc_ValueError, "Invalid advanced codec options");
+            return 1;
+        }
+        const char *key = PyUnicode_AsUTF8(py_key);
+        const char *val = PyUnicode_AsUTF8(py_val);
+        if (key == NULL || val == NULL) {
             PyErr_SetString(PyExc_ValueError, "Invalid advanced codec options");
             return 1;
         }
-        key = PyBytes_AsString(py_key);
-        val = PyBytes_AsString(py_val);
 
         avifResult result = avifEncoderSetCodecSpecificOption(encoder, key, val);
         if (result != AVIF_RESULT_OK) {