summaryrefslogtreecommitdiffstats
path: root/PC/os2vacpp/getpathp.c
diff options
context:
space:
mode:
authorAndrew MacIntyre <andymac@bullseye.apana.org.au>2004-12-12 08:28:11 (GMT)
committerAndrew MacIntyre <andymac@bullseye.apana.org.au>2004-12-12 08:28:11 (GMT)
commitd0278ec97ffd252094cf56ea00e40b3c6f442a7a (patch)
tree1d212cb1831173578517a8b5e932769fba4ee010 /PC/os2vacpp/getpathp.c
parent222d5b466b3c23a6100ee490551b5feb54946d70 (diff)
downloadcpython-d0278ec97ffd252094cf56ea00e40b3c6f442a7a.zip
cpython-d0278ec97ffd252094cf56ea00e40b3c6f442a7a.tar.gz
cpython-d0278ec97ffd252094cf56ea00e40b3c6f442a7a.tar.bz2
OS/2 specific fixes related to SF bug # 1003471
Diffstat (limited to 'PC/os2vacpp/getpathp.c')
-rw-r--r--PC/os2vacpp/getpathp.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/PC/os2vacpp/getpathp.c b/PC/os2vacpp/getpathp.c
index 5860e75..607f2a1 100644
--- a/PC/os2vacpp/getpathp.c
+++ b/PC/os2vacpp/getpathp.c
@@ -83,6 +83,15 @@ exists(char *filename)
}
+/* Add a path component, by appending stuff to buffer.
+ buffer must have at least MAXPATHLEN + 1 bytes allocated, and contain a
+ NUL-terminated string with no more than MAXPATHLEN characters (not counting
+ the trailing NUL). It's a fatal error if it contains a string longer than
+ that (callers must be careful!). If these requirements are met, it's
+ guaranteed that buffer will still be a NUL-terminated string with no more
+ than MAXPATHLEN characters at exit. If stuff is too long, only as much of
+ stuff as fits will be appended.
+*/
static void
join(char *buffer, char *stuff)
{
@@ -94,6 +103,8 @@ join(char *buffer, char *stuff)
if (n > 0 && !is_sep(buffer[n-1]) && n < MAXPATHLEN)
buffer[n++] = SEP;
}
+ if (n > MAXPATHLEN)
+ Py_FatalError("buffer overflow in getpathp.c's joinpath()");
k = strlen(stuff);
if (n + k > MAXPATHLEN)
k = MAXPATHLEN - n;