Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/php-5_3/php-sapi/patches/290_php_20804061.patch
author Craig Mohrman <craig.mohrman@oracle.com>
Tue, 16 Jun 2015 14:11:47 -0700
changeset 4494 f5b717124172
permissions -rw-r--r--
20192108 problem in UTILITY/PHP 20231115 problem in UTILITY/PHP 20936509 problem in UTILITY/PHP 20804024 problem in UTILITY/PHP 20804061 problem in UTILITY/PHP 20804135 problem in UTILITY/PHP 20804363 problem in UTILITY/PHP 20804424 problem in UTILITY/PHP 20433657 problem in UTILITY/PHP 20803998 problem in UTILITY/PHP 20804391 problem in UTILITY/PHP
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4494
f5b717124172 20192108 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
     1
 
CVE-2014-9705
f5b717124172 20192108 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
     2
 
Community BUG:
f5b717124172 20192108 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
     3
 
https://bugs.php.net/bug.php?id=68552
f5b717124172 20192108 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
     4
 
Community CODE:
f5b717124172 20192108 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
     5
 
http://svn.php.net/viewvc/pecl/enchant/trunk/enchant.c?r1=317600&r2=335803
f5b717124172 20192108 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
     6
 
Below is the community patch.
f5b717124172 20192108 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset 
     7
 












f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




     8














f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




     9


--- a/ext/enchant/enchant.c	2011/10/01 13:13:13	317600













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    10


+++ b/ext/enchant/enchant.c	2015/01/26 11:49:40	335803













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    11


@@ -549,13 +549,12 @@













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    12


 













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    13


 	d = enchant_broker_request_dict(pbroker->pbroker, (const char *)tag);













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    14


 	if (d) {













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    15


+		pos = pbroker->dictcnt++;













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    16


 		if (pbroker->dictcnt) {













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    17


 			pbroker->dict = (enchant_dict **)erealloc(pbroker->dict, sizeof(enchant_dict *) * pbroker->dictcnt);













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    18


-			pos = pbroker->dictcnt++;













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    19


 		} else {













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    20


 			pbroker->dict = (enchant_dict **)emalloc(sizeof(enchant_dict *));













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    21


 			pos = 0;













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    22


-			pbroker->dictcnt++;













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    23


 		}













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    24


 













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    25


 		dict = pbroker->dict[pos] = (enchant_dict *)emalloc(sizeof(enchant_dict));













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    26


@@ -606,14 +605,14 @@













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    27


 













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    28


 	d = enchant_broker_request_pwl_dict(pbroker->pbroker, (const char *)pwl);













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    29


 	if (d) {













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    30


+		pos = pbroker->dictcnt++;













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    31


 		if (pbroker->dictcnt) {













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    32


-			pos = pbroker->dictcnt++;













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    33


 			pbroker->dict = (enchant_dict **)erealloc(pbroker->dict, sizeof(enchant_dict *) * pbroker->dictcnt);













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    34


 		} else {













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    35


 			pbroker->dict = (enchant_dict **)emalloc(sizeof(enchant_dict *));













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    36


 			pos = 0;













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    37


-			pbroker->dictcnt++;













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    38


 		}













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    39


+













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    40


 		dict = pbroker->dict[pos] = (enchant_dict *)emalloc(sizeof(enchant_dict));













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    41


 		dict->id = pos;













f5b717124172
20192108 problem in UTILITY/PHP



Craig Mohrman <craig.mohrman@oracle.com>


parents: 

diff
changeset




    42


 		dict->pbroker = pbroker;















upstream/oracle/userland-gate