Skip to content

Commit d90805a

Browse files
committed
Merge branch 'master' into sccp
* master: Added missed dump of "main" script code replace the stack var by a macro [ci skip] sync NEWS minor fix for web announce add missing NEWS entry for #74087 and also fix the formatting move NEWS entry to the correct place, also bump the version
2 parents 2e5e03b + fc336c7 commit d90805a

File tree

7 files changed

+26
-14
lines changed

7 files changed

+26
-14
lines changed

NEWS

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,20 @@ PHP NEWS
22
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
33
?? ??? ????, PHP 7.2.0beta1
44

5+
- Core:
6+
. Fixed bug #74603 (PHP INI Parsing Stack Buffer Overflow Vulnerability).
7+
(Stas)
8+
. Fixed bug #74111 (Heap buffer overread (READ: 1) finish_nested_data from
9+
unserialize). (Nikita)
10+
. Fixed bug #74819 (wddx_deserialize() heap out-of-bound read via
11+
php_parse_date()). (Derick)
12+
13+
- GD:
14+
. Fixed bug #74435 (Buffer over-read into uninitialized memory). (cmb)
15+
16+
- OpenSSL:
17+
. Fixed bug #74651 (negative-size-param (-1) in memcpy in zif_openssl_seal()).
18+
(Stas)
519

620
06 Jul 2017, PHP 7.2.0alpha3
721

README.RELEASE_PROCESS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ highlight the major important things (security fixes) and when it is important
130130
to upgrade.
131131

132132
a. Call php bin/createNewsEntry in your local phpweb checkout
133-
Use category "releases" for all non-stable releases.
134-
Use category "frontpage" for X.Y.0 non-stable releases only.
133+
Use category "releases" for all stable releases.
134+
Use category "frontpage" for X.Y.0 non-stable releases only (news only).
135135

136136
b. Add the content for the news entry. Be sure to include the text:
137137
"THIS IS A DEVELOPMENT PREVIEW - DO NOT USE IT IN PRODUCTION!"

ext/opcache/Optimizer/zend_optimizer.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1260,6 +1260,8 @@ int zend_optimize_script(zend_script *script, zend_long optimization_level, zend
12601260
}
12611261

12621262
if (debug_level & ZEND_DUMP_AFTER_OPTIMIZER) {
1263+
zend_dump_op_array(&script->main_op_array, ZEND_DUMP_RT_CONSTANTS, "after optimizer", NULL);
1264+
12631265
ZEND_HASH_FOREACH_PTR(&script->function_table, op_array) {
12641266
zend_dump_op_array(op_array, ZEND_DUMP_RT_CONSTANTS, "after optimizer", NULL);
12651267
} ZEND_HASH_FOREACH_END();

ext/standard/dl.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,17 +116,15 @@ PHPAPI int php_load_extension(char *filename, int type, int start_now)
116116
} else {
117117
spprintf(&libpath, 0, "%s%c%s", extension_dir, DEFAULT_SLASH, filename); /* SAFE */
118118
}
119+
119120
if (VCWD_ACCESS(libpath, F_OK)) {
120121
/* If file does not exist, consider as extension name and build file name */
121-
const char *libpath_prefix = "";
122122
char *orig_libpath = libpath;
123-
#if PHP_WIN32
124-
libpath_prefix = "php_";
125-
#endif
123+
126124
if (slash_suffix) {
127-
spprintf(&libpath, 0, "%s%s%s." PHP_SHLIB_SUFFIX, extension_dir, libpath_prefix, filename); /* SAFE */
125+
spprintf(&libpath, 0, "%s" PHP_SHLIB_EXT_PREFIX "%s." PHP_SHLIB_SUFFIX, extension_dir, filename); /* SAFE */
128126
} else {
129-
spprintf(&libpath, 0, "%s%c%s%s." PHP_SHLIB_SUFFIX, extension_dir, DEFAULT_SLASH, libpath_prefix, filename); /* SAFE */
127+
spprintf(&libpath, 0, "%s%c" PHP_SHLIB_EXT_PREFIX "%s." PHP_SHLIB_SUFFIX, extension_dir, DEFAULT_SLASH, filename); /* SAFE */
130128
}
131129

132130
if (VCWD_ACCESS(libpath, F_OK)) {

main/build-defs.h.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,3 +89,4 @@
8989
#define PHP_CONFIG_FILE_PATH "@EXPANDED_PHP_CONFIG_FILE_PATH@"
9090
#define PHP_CONFIG_FILE_SCAN_DIR "@EXPANDED_PHP_CONFIG_FILE_SCAN_DIR@"
9191
#define PHP_SHLIB_SUFFIX "@SHLIB_DL_SUFFIX_NAME@"
92+
#define PHP_SHLIB_EXT_PREFIX ""

main/php_ini.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -375,16 +375,12 @@ static void php_load_zend_extension_cb(void *arg)
375375

376376
if (VCWD_ACCESS(libpath, F_OK)) {
377377
/* If file does not exist, consider as extension name and build file name */
378-
const char *libpath_prefix = "";
379378
char *orig_libpath = libpath;
380-
#if PHP_WIN32
381-
libpath_prefix = "php_";
382-
#endif
383379

384380
if (slash_suffix) {
385-
spprintf(&libpath, 0, "%s%s%s." PHP_SHLIB_SUFFIX, extension_dir, libpath_prefix, filename); /* SAFE */
381+
spprintf(&libpath, 0, "%s" PHP_SHLIB_EXT_PREFIX "%s." PHP_SHLIB_SUFFIX, extension_dir, filename); /* SAFE */
386382
} else {
387-
spprintf(&libpath, 0, "%s%c%s%s." PHP_SHLIB_SUFFIX, extension_dir, DEFAULT_SLASH, libpath_prefix, filename); /* SAFE */
383+
spprintf(&libpath, 0, "%s%c" PHP_SHLIB_EXT_PREFIX "%s." PHP_SHLIB_SUFFIX, extension_dir, DEFAULT_SLASH, filename); /* SAFE */
388384
}
389385

390386
if (VCWD_ACCESS(libpath, F_OK)) {

win32/build/config.w32.h.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@
136136
#define HAVE_FNMATCH
137137
#define HAVE_GLOB
138138
#define PHP_SHLIB_SUFFIX "dll"
139+
#define PHP_SHLIB_EXT_PREFIX "php_"
139140
#define HAVE_SQLDATASOURCES
140141

141142
/* Win32 supports strcoll */

0 commit comments

Comments
 (0)