com php-src: Merge branch 'PHP-7.2' into PHP-7.3: NEWS ext/com_dotnet/com_typeinfo.c
| From: | Christoph Michael Becker | Date: | Thu, 14 Feb 2019 23:37:39 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.2' into PHP-7.3: NEWS ext/com_dotnet/com_typeinfo.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-104649@lists.php.net to get a copy of this message | ||
Commit: 8946ad30009af055b5b2fed3044e61c78b7d77fb
Author: Christoph M. Becker <cmbecker69@gmx.de> Fri, 15 Feb 2019 00:37:39 +0100
Parents: eb063c8a9f130f2981c590d31aa2dd548a8d523b de738496c2c323b580d9aff0f121876e4101a910
Branches: PHP-7.3 PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8946ad30009af055b5b2fed3044e61c78b7d77fb
Log:
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77621: Already defined constants are not properly reported
Bugs:
https://bugs.php.net/77621
Changed paths:
MM NEWS
MM ext/com_dotnet/com_typeinfo.c
Diff:
diff --cc NEWS
index b54d2fa,2f6d4ef..852eb97
--- a/NEWS
+++ b/NEWS
@@@ -5,23 -5,11 +5,27 @@@ PH
- Core:
. Fixed bug #77589 (Core dump using parse_ini_string with numeric sections).
(Laruence)
+ . Fixed bug #77329 (Buffer Overflow via overly long Error Messages).
+ (Dmitry)
+ . Fixed bug #77494 (Disabling class causes segfault on member access).
+ (Dmitry)
+ . Fixed bug #77498 (Custom extension Segmentation fault when declare static
+ property). (Nikita)
+ . Fixed bug #77530 (PHP crashes when parsing
(2)::class). (Ekin)
+ . Fixed bug #77546 (iptcembed broken function). (gdegoulet)
+ - COM:
+ . Fixed bug #77621 (Already defined constants are not properly reported).
+ (cmb)
+
+- Mbstring:
+ . Fixed bug #77514 (mb_ereg_replace() with trailing backslash adds null byte).
+ (Nikita)
+
+- OpenSSL:
+ . Fixed bug #77390 (feof might hang on TLS streams in case of fragmented TLS
+ records). (Abyl Valg, Jakub Zelenka)
+
- PDO_OCI:
. Support Oracle Database tracing attributes ACTION, MODULE,
CLIENT_INFO, and CLIENT_IDENTIFIER. (Cameron Porter)
diff --cc ext/com_dotnet/com_typeinfo.c
index 0ba344f,40f21ae..6da55f7
--- a/ext/com_dotnet/com_typeinfo.c
+++ b/ext/com_dotnet/com_typeinfo.c
@@@ -195,20 -197,21 +195,20 @@@ PHP_COM_DOTNET_API int php_com_import_t
SysFreeString(bstr_ids);
/* sanity check for the case where the constant is already defined */
+ php_com_zval_from_variant(&value, pVarDesc->lpvarValue, codepage);
if ((exists = zend_get_constant(c.name)) != NULL) {
- if (COMG(autoreg_verbose) && !compare_function(&results, &c.value, exists)) {
- php_error_docref(NULL, E_WARNING, "Type library constant %s is already defined",
c.name);
+ if (COMG(autoreg_verbose) && !compare_function(&results, &value, exists)) {
+ php_error_docref(NULL, E_WARNING, "Type library constant %s is already defined",
ZSTR_VAL(c.name));
}
- zend_string_release(c.name);
+ zend_string_release_ex(c.name, 1);
ITypeInfo_ReleaseVarDesc(TypeInfo, pVarDesc);
continue;
}
/* register the constant */
- php_com_zval_from_variant(&value, pVarDesc->lpvarValue, codepage);
if (Z_TYPE(value) == IS_LONG) {
- c.flags = mode;
+ ZEND_CONSTANT_SET_FLAGS(&c, mode, 0);
ZVAL_LONG(&c.value, Z_LVAL(value));
- c.module_number = 0;
zend_register_constant(&c);
}
ITypeInfo_ReleaseVarDesc(TypeInfo, pVarDesc);