Commitb28f919

authored

[3.11]gh-102281: Fix potential nullptr dereference + use of uninitia… (#103040)

[3.11]gh-102281: Fix potential nullptr dereference + use of uninitialized memory (gh-102282)(cherry picked from commitafa6092)

1 parente1094c6 commitb28f919Copy full SHA for b28f919

File tree

+10

-2

lines changed

+10

-2

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Fix potential nullptr dereference and use of uninitialized memory in fileutils. Patch by Max Bachmann.`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -452,7 +452,10 @@ getpath_realpath(PyObject Py_UNUSED(self) , PyObject args)`
`452`	`452`	`if (s) {`
`453`	`453`	`*s=L'\0';`
`454`	`454`	`}`
`455`		`-path2=_Py_normpath(_Py_join_relfile(path,resolved),-1);`
	`455`	`+path2=_Py_join_relfile(path,resolved);`
	`456`	`+if (path2) {`
	`457`	`+path2=_Py_normpath(path2,-1);`
	`458`	`+ }`
`456`	`459`	`PyMem_RawFree((void*)path);`
`457`	`460`	`path=path2;`
`458`	`461`	`}`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2142,7 +2142,10 @@ _Py_join_relfile(const wchar_t dirname, const wchar_t relfile)`
`2142`	`2142`	`}`
`2143`	`2143`	`assert(wcslen(dirname)<MAXPATHLEN);`
`2144`	`2144`	`assert(wcslen(relfile)<MAXPATHLEN-wcslen(dirname));`
`2145`		`-join_relfile(filename,bufsize,dirname,relfile);`
	`2145`	`+if (join_relfile(filename,bufsize,dirname,relfile)<0) {`
	`2146`	`+PyMem_RawFree(filename);`
	`2147`	`+returnNULL;`
	`2148`	`+ }`
`2146`	`2149`	`returnfilename;`
`2147`	`2150`	`}`
`2148`	`2151`
`@@ -2180,6 +2183,7 @@ _Py_find_basename(const wchar_t *filename)`
`2180`	`2183`	`wchar_t*`
`2181`	`2184`	`_Py_normpath(wchar_t*path,Py_ssize_tsize)`
`2182`	`2185`	`{`
	`2186`	`+assert(path!=NULL);`
`2183`	`2187`	`if (!path[0]\|\|size==0) {`
`2184`	`2188`	`returnpath;`
`2185`	`2189`	`}`

Comments

(0)