clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.4' into PHP-8.0

Browse Source 
* PHP-7.4:
  Avoid OOB reads in create_name_with_username()
This commit is contained in:
Christoph M. Becker 2021-07-04 22:54:48 +02:00
commit 948b83d7ea
No known key found for this signature in database
GPG Key ID: D66C9593118BCCB6
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ext/opcache/shared_alloc_win32.c
View File

@ -71,8 +71,19 @@ static void zend_win_error_message(int type, char *msg, int err)
static char *create_name_with_username(char *name)
{
static char newname[MAXPATHLEN + 32 + 4 + 1 + 32 + 21];
snprintf(newname, sizeof(newname) - 1, "%s@%.32s@%.20s@%.32s", name, accel_uname_id, sapi_module.name, zend_system_id);
static char newname[MAXPATHLEN + 1 + 32 + 1 + 20 + 1 + 32 + 1];
char *p = newname;
p += strlcpy(newname, name, MAXPATHLEN + 1);
*(p++) = '@';
memcpy(p, accel_uname_id, 32);
p += 32;
*(p++) = '@';
p += strlcpy(p, sapi_module.name, 21);
*(p++) = '@';
memcpy(p, accel_system_id, 32);
p += 32;
*(p++) = '\0';
ZEND_ASSERT(p - newname <= sizeof(newname));
return newname;
}