gh-148821: Always reject known multi-byte encodings in pyexpat#148911
Open
serhiy-storchaka wants to merge 7 commits intopython:mainfrom
Open
gh-148821: Always reject known multi-byte encodings in pyexpat#148911serhiy-storchaka wants to merge 7 commits intopython:mainfrom
serhiy-storchaka wants to merge 7 commits intopython:mainfrom
Conversation
The XML parser (pyexpat) now raises ValueError for known unsupported multi-byte encodings such us "ISO-2022-JP", "utf8" (without hyphen) or "raw-unicode-escape" instead of failing later, when encounter non-ASCII data.
Member
Author
|
It is a draft, because I have a technical issue here. I need to use a private C API, but simply adding |
Member
|
I see |
vstinner
reviewed
Apr 27, 2026
Member
|
diff --git a/Include/codecs.h b/Include/codecs.h
index d14f527dee7..512a3c723ec 100644
--- a/Include/codecs.h
+++ b/Include/codecs.h
@@ -170,12 +170,6 @@ PyAPI_FUNC(PyObject *) PyCodec_NameReplaceErrors(PyObject *exc);
PyAPI_DATA(const char *) Py_hexdigits;
#endif
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject*) _PyCodec_LookupTextEncoding(
- const char *encoding,
- const char *alternate_command);
-#endif
-
#ifdef __cplusplus
}
#endif
diff --git a/Python/codecs.c b/Python/codecs.c
index 0bde56c0ac6..a522e6b8806 100644
--- a/Python/codecs.c
+++ b/Python/codecs.c
@@ -10,6 +10,7 @@ Copyright (c) Corporation for National Research Initiatives.
#include "Python.h"
#include "pycore_call.h" // _PyObject_CallNoArgs()
+#include "pycore_codecs.h" // export _PyCodec_LookupTextEncoding()
#include "pycore_interp.h" // PyInterpreterState.codec_search_path
#include "pycore_pyerrors.h" // _PyErr_FormatNote()
#include "pycore_pystate.h" // _PyInterpreterState_GET() |
Member
Author
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The XML parser (pyexpat) now raises ValueError for known unsupported multi-byte encodings such us "ISO-2022-JP", "utf8" (without hyphen) or "raw-unicode-escape" instead of failing later, when encounter non-ASCII data.