Commited67e60

and

authored

[3.11]gh-107916: Save the error code before decoding the filename in PyErr_SetFromErrnoWithFilename() etc (GH-107929) (GH-108206)

(cherry picked from commit80bdebd)Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>

1 parentbe99653 commited67e60Copy full SHA for ed67e60

File tree

+12

-0

lines changed

+12

-0

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,4 @@`
	`1`	+C API functions:c:func:`PyErr_SetFromErrnoWithFilename`,
	`2`	+:c:func:`PyErr_SetExcFromWindowsErrWithFilename` and
	`3`	+:c:func:`PyErr_SetFromWindowsErrWithFilename` save now the error code before
	`4`	+calling:c:func:`PyUnicode_DecodeFSDefault`.

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -856,10 +856,12 @@ PyErr_SetFromErrnoWithFilename(PyObject exc, const char filename)`
`856`	`856`	`{`
`857`	`857`	`PyObject*name=NULL;`
`858`	`858`	`if (filename) {`
	`859`	`+inti=errno;`
`859`	`860`	`name=PyUnicode_DecodeFSDefault(filename);`
`860`	`861`	`if (name==NULL) {`
`861`	`862`	`returnNULL;`
`862`	`863`	`}`
	`864`	`+errno=i;`
`863`	`865`	`}`
`864`	`866`	`PyObject*result=PyErr_SetFromErrnoWithFilenameObjects(exc,name,NULL);`
`865`	`867`	`Py_XDECREF(name);`
`@@ -959,6 +961,9 @@ PyObject *PyErr_SetExcFromWindowsErrWithFilename(`
`959`	`961`	`{`
`960`	`962`	`PyObject*name=NULL;`
`961`	`963`	`if (filename) {`
	`964`	`+if ((DWORD)ierr==0) {`
	`965`	`+ierr= (int)GetLastError();`
	`966`	`+ }`
`962`	`967`	`name=PyUnicode_DecodeFSDefault(filename);`
`963`	`968`	`if (name==NULL) {`
`964`	`969`	`returnNULL;`
`@@ -989,6 +994,9 @@ PyObject *PyErr_SetFromWindowsErrWithFilename(`
`989`	`994`	`{`
`990`	`995`	`PyObject*name=NULL;`
`991`	`996`	`if (filename) {`
	`997`	`+if ((DWORD)ierr==0) {`
	`998`	`+ierr= (int)GetLastError();`
	`999`	`+ }`
`992`	`1000`	`name=PyUnicode_DecodeFSDefault(filename);`
`993`	`1001`	`if (name==NULL) {`
`994`	`1002`	`returnNULL;`

Comments

(0)