diff options
author | Jeremy Hylton <jeremy@alum.mit.edu> | 2001-11-28 20:42:20 (GMT) |
---|---|---|
committer | Jeremy Hylton <jeremy@alum.mit.edu> | 2001-11-28 20:42:20 (GMT) |
commit | 518ab1c02a01a1a502fedeccb62ea73f2a952ba7 (patch) | |
tree | 4fd0238c7960f0001e8b576656acbbbe0947053e /Python/dynload_win.c | |
parent | ef58b319916f6cf2034acc40b411f8405f20416f (diff) | |
download | cpython-518ab1c02a01a1a502fedeccb62ea73f2a952ba7.zip cpython-518ab1c02a01a1a502fedeccb62ea73f2a952ba7.tar.gz cpython-518ab1c02a01a1a502fedeccb62ea73f2a952ba7.tar.bz2 |
Use PyOS_snprintf instead of sprintf.
Diffstat (limited to 'Python/dynload_win.c')
-rw-r--r-- | Python/dynload_win.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/Python/dynload_win.c b/Python/dynload_win.c index 155a9d6..9062cf3 100644 --- a/Python/dynload_win.c +++ b/Python/dynload_win.c @@ -159,7 +159,7 @@ dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname, dl_funcptr p; char funcname[258], *import_python; - sprintf(funcname, "init%.200s", shortname); + PyOS_snprintf(funcname, sizeof(funcname), "init%.200s", shortname); #ifdef MS_WIN32 { @@ -201,9 +201,9 @@ dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname, /* Problem: could not get the error message. This should not happen if called correctly. */ if (theLength == 0) { - sprintf(errBuf, - "DLL load failed with error code %d", - errorCode); + PyOS_snprintf(errBuf, sizeof(errBuf), + "DLL load failed with error code %d", + errorCode); } else { size_t len; /* For some reason a \r\n @@ -225,16 +225,16 @@ dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname, } else { char buffer[256]; - sprintf(buffer,"python%d%d.dll", + PyOS_snprintf(buffer, sizeof(buffer), "python%d%d.dll", PY_MAJOR_VERSION,PY_MINOR_VERSION); import_python = GetPythonImport(hDLL); if (import_python && strcasecmp(buffer,import_python)) { - sprintf(buffer, - "Module use of %.150s conflicts " - "with this version of Python.", - import_python); + PyOS_snprintf(buffer, sizeof(buffer), + "Module use of %.150s conflicts " + "with this version of Python.", + import_python); PyErr_SetString(PyExc_ImportError,buffer); FreeLibrary(hDLL); return NULL; @@ -251,14 +251,16 @@ dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname, strchr(pathname, '/') == NULL) { /* Prefix bare filename with ".\" */ - sprintf(pathbuf, ".\\%-.13s", pathname); + PyOS_snprintf(pathbuf, sizeof(pathbuf), + ".\\%-.13s", pathname); pathname = pathbuf; } hDLL = LoadLibrary(pathname); if (hDLL < HINSTANCE_ERROR){ char errBuf[256]; - sprintf(errBuf, - "DLL load failed with error code %d", hDLL); + PyOS_snprintf(errBuf, sizeof(errBuf), + "DLL load failed with error code %d", + hDLL); PyErr_SetString(PyExc_ImportError, errBuf); return NULL; } |