summaryrefslogtreecommitdiff
path: root/main/SAPI.c
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>2000-08-27 09:32:23 +0000
committerSascha Schumann <sas@php.net>2000-08-27 09:32:23 +0000
commitb2cecd9d8b84e65f544999fbb3bb3114e04d5eea (patch)
treee6fe6d2c80970ec6652eb1f9e1e58900624e72f9 /main/SAPI.c
parent365edaddd4f8d412cd5933cf2cfc6571a12ca887 (diff)
downloadphp-git-b2cecd9d8b84e65f544999fbb3bb3114e04d5eea.tar.gz
newtype has a length of newlen+1, 'len' refers to the length of *mimetype
here.
Diffstat (limited to 'main/SAPI.c')
-rw-r--r--main/SAPI.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/SAPI.c b/main/SAPI.c
index 60b886fd0a..95adcc9e68 100644
--- a/main/SAPI.c
+++ b/main/SAPI.c
@@ -247,8 +247,8 @@ SAPI_API size_t sapi_apply_default_charset(char **mimetype, size_t len SLS_DC)
if (*charset && strncmp(*mimetype, "text/", 5) == 0 && strstr(*mimetype, "charset=") == NULL) {
newlen = len + (sizeof(";charset=")-1) + strlen(charset);
newtype = emalloc(newlen + 1);
- strlcpy(newtype, *mimetype, len);
- strlcat(newtype, ";charset=", len);
+ PHP_STRLCPY(newtype, *mimetype, newlen + 1, len);
+ strlcat(newtype, ";charset=", newlen + 1);
if (*mimetype != NULL) {
efree(*mimetype);
}