com php-src: Fix bug #72708 - php_snmp_parse_oid intege r overflow in memory allocation: ext/snmp/snmp.c
| From: | Stanislav Malyshev | Date: | Wed, 17 Aug 2016 05:55:19 +0000 |
| Subject: | com php-src: Fix bug #72708 - php_snmp_parse_oid intege r overflow in memory allocation: ext/snmp/snmp.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93839@lists.php.net to get a copy of this message | ||
Commit: da316b50bdad5850a18b1146f712395093c8f570
Author: Stanislav Malyshev <stas@php.net> Wed, 3 Aug 2016 22:37:57 -0700
Parents: 8763c6090d627d8bb0ee1d030c30e58f406be9ce
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=da316b50bdad5850a18b1146f712395093c8f570
Log:
Fix bug #72708 - php_snmp_parse_oid integer overflow in memory allocation
Bugs:
https://bugs.php.net/72708
Changed paths:
M ext/snmp/snmp.c
Diff:
diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c
index b88cdcd..d2c1b94 100644
--- a/ext/snmp/snmp.c
+++ b/ext/snmp/snmp.c
@@ -1032,7 +1032,7 @@ static int php_snmp_parse_oid(zval *object, int st, struct objid_query
*objid_qu
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Got empty OID array");
return FALSE;
}
- objid_query->vars = (snmpobjarg *)emalloc(sizeof(snmpobjarg) *
zend_hash_num_elements(Z_ARRVAL_PP(oid)));
+ objid_query->vars = (snmpobjarg *)safe_emalloc(sizeof(snmpobjarg),
zend_hash_num_elements(Z_ARRVAL_PP(oid)), 0);
if (objid_query->vars == NULL) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "emalloc() failed while parsing oid array:
%s", strerror(errno));
efree(objid_query->vars);