com php-src: Fix bug #72708 - php_snmp_parse_oid intege r overflow in memory allocation: ext/snmp/snmp.c

From: Date: Wed, 17 Aug 2016 11:45:47 +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-93902@lists.php.net to get a copy of this message
Commit: 72d03f8aa460184930cbca3f61de3cec35128e2b Author: Stanislav Malyshev <stas@php.net> Wed, 3 Aug 2016 22:37:57 -0700 Committer: Anatol Belski <ab@php.net> Wed, 17 Aug 2016 13:45:47 +0200 Parents: bab470f6ba67f5b2e83d8152ae9adee5161a975e Branches: PHP-7.0.10 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=72d03f8aa460184930cbca3f61de3cec35128e2b Log: Fix bug #72708 - php_snmp_parse_oid integer overflow in memory allocation (cherry picked from commit c3f6d6da100c6451a540680504de4105b8bed83c) Conflicts: ext/snmp/snmp..c main/php_version.h (cherry picked from commit b735a4419c1e796520b395a2aa0b6943d9157b73) 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 7b685ff..63e8095 100644 --- a/ext/snmp/snmp..c +++ b/ext/snmp/snmp.c @@ -1011,7 +1011,7 @@ static int php_snmp_parse_oid(zval *object, int st, struct objid_query *objid_qu php_error_docref(NULL, E_WARNING, "Got empty OID array"); return FALSE; } - objid_query->vars = (snmpobjarg *)emalloc(sizeof(snmpobjarg) * zend_hash_num_elements(Z_ARRVAL_P(oid))); + objid_query->vars = (snmpobjarg *)safe_emalloc(sizeof(snmpobjarg), zend_hash_num_elements(Z_ARRVAL_P(oid)), 0); if (objid_query->vars == NULL) { php_error_docref(NULL, E_WARNING, "emalloc() failed while parsing oid array: %s", strerror(errno)); efree(objid_query->vars);

« previous php.cvs (#93902) next »