mirror of
https://github.com/python/cpython.git
synced 2025-07-17 00:05:20 +00:00
Avoid some potential (though unlikely) sprintf buffer overflows.
This commit is contained in:
parent
15e33a4c42
commit
bc2472db8e
1 changed files with 6 additions and 3 deletions
|
@ -298,7 +298,8 @@ _PyImport_LoadDynamicModule(name, pathname, fp)
|
||||||
(void)FSMakeFSSpec(0, 0, Pstring(pathname), &libspec);
|
(void)FSMakeFSSpec(0, 0, Pstring(pathname), &libspec);
|
||||||
err = ResolveAliasFile(&libspec, 1, &isfolder, &didsomething);
|
err = ResolveAliasFile(&libspec, 1, &isfolder, &didsomething);
|
||||||
if ( err ) {
|
if ( err ) {
|
||||||
sprintf(buf, "%s: %s", pathname, PyMac_StrError(err));
|
sprintf(buf, "%.255s: %.200s",
|
||||||
|
pathname, PyMac_StrError(err));
|
||||||
PyErr_SetString(PyExc_ImportError, buf);
|
PyErr_SetString(PyExc_ImportError, buf);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
@ -318,7 +319,8 @@ _PyImport_LoadDynamicModule(name, pathname, fp)
|
||||||
kLoadCFrag, &connID, &mainAddr,
|
kLoadCFrag, &connID, &mainAddr,
|
||||||
errMessage);
|
errMessage);
|
||||||
if ( err ) {
|
if ( err ) {
|
||||||
sprintf(buf, "%.*s: %s", errMessage[0], errMessage+1,
|
sprintf(buf, "%.*s: %.200s",
|
||||||
|
errMessage[0], errMessage+1,
|
||||||
PyMac_StrError(err));
|
PyMac_StrError(err));
|
||||||
PyErr_SetString(PyExc_ImportError, buf);
|
PyErr_SetString(PyExc_ImportError, buf);
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -326,7 +328,8 @@ _PyImport_LoadDynamicModule(name, pathname, fp)
|
||||||
/* Locate the address of the correct init function */
|
/* Locate the address of the correct init function */
|
||||||
err = FindSymbol(connID, Pstring(funcname), &symAddr, &class);
|
err = FindSymbol(connID, Pstring(funcname), &symAddr, &class);
|
||||||
if ( err ) {
|
if ( err ) {
|
||||||
sprintf(buf, "%s: %s", funcname, PyMac_StrError(err));
|
sprintf(buf, "%s: %.200s",
|
||||||
|
funcname, PyMac_StrError(err));
|
||||||
PyErr_SetString(PyExc_ImportError, buf);
|
PyErr_SetString(PyExc_ImportError, buf);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue