gh-113626: Add allow_code parameter in marshal functions #113648
+339
∄1�749
Conversation
This file contains 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
Passing allow_code=False prevents serialization and de-serialization of code objects which is incompatible between Python versions.
eendebakpt
reviewed
Jan 2, 2024
Co-authored-by: Pieter Eendebak <pieter.eendebak@gmail.com>
vstinner
reviewed
Jan 10, 2024
Comment on lines
+145
to
+147
| with self.assertRaises(ValueError): | ||
| marshal.dumps(data, allow_code=False) | ||
| self.assertEqual(marshal.loads(dump, allow_code=True), data) |
There was a problem hiding this comment.
I suggest to move the allow_code=True test before the allow_code=False test (exchange the 2 tests). Same below.
| @@ -1364,6 +1375,11 @@ r_object(RFILE *p) | |||
| PyObject* linetable = NULL; | |||
| PyObject *exceptiontable = NULL; | |||
|
|
|||
| if (!p->allow_code) { | |||
| PyErr_SetString(PyExc_ValueError, | |||
| "loading of code objects is prohibited"); | |||
There was a problem hiding this comment.
I suggest "disallowed" to be closer to "allow":
Suggested change
| "loading of code objects is prohibited"); | |
| "loading of code objects is disallowed"); |
| @@ -549,6 +554,10 @@ w_complex_object(PyObject *v, char flag, WFILE *p) | |||
| Py_DECREF(pairs); | |||
| } | |||
| else if (PyCode_Check(v)) { | |||
| if (!p->allow_code) { | |||
| p->error = WFERR_UNMARSHALLABLE; | |||
There was a problem hiding this comment.
Maybe it would be worth it to have a more specific error just for code, to have a more specific error message in PyMarshal_WriteObjectToString().
|
|
||
| * Add the *allow_code* parameter in module functions. | ||
| Passing ``allow_code=False`` prevents serialization and de-serialization of | ||
| code objects which is incompatible between Python versions. |
There was a problem hiding this comment.
Suggested change
| code objects which is incompatible between Python versions. | |
| code objects which are incompatible between Python versions. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Passing allow_code=False prevents serialization and de-serialization of code objects which is incompatible between Python versions.
📚 Documentation preview 📚: https://cpython-previews--113648.org.readthedocs.build/