archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

- Improve void arg check

Browse source 
- Removed unused variable
- Added check for empty tag in enchant_broker_request_dict() (to avoid assert warning)
This commit is contained in:
Felipe Pena 2011-10-01 13:01:12 +00:00
parent 3e14579486
commit 021b650a6a
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
ext/enchant/enchant.c
View file

@ -244,8 +244,8 @@ static void php_enchant_broker_free(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{
if (broker->pbroker) { if (broker->pbroker) {
if (broker->dictcnt && broker->dict) { if (broker->dictcnt && broker->dict) {
if (broker->dict) { if (broker->dict) {
int total, tofree; int total;
tofree = total = broker->dictcnt-1; total = broker->dictcnt-1;
do { do {
zend_list_delete(broker->dict[total]->rsrc_id); zend_list_delete(broker->dict[total]->rsrc_id);
efree(broker->dict[total]); efree(broker->dict[total]);
@ -357,8 +357,8 @@ PHP_FUNCTION(enchant_broker_init)
enchant_broker *broker; enchant_broker *broker;
EnchantBroker *pbroker; EnchantBroker *pbroker;
if (ZEND_NUM_ARGS()) { if (zend_parse_parameters_none() == FAILURE) {
ZEND_WRONG_PARAM_COUNT(); return;
} }
pbroker = enchant_broker_init(); pbroker = enchant_broker_init();
@ -542,6 +542,11 @@ PHP_FUNCTION(enchant_broker_request_dict)
} }
PHP_ENCHANT_GET_BROKER; PHP_ENCHANT_GET_BROKER;
if (taglen == 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Tag cannot be empty");
RETURN_FALSE;
}
d = enchant_broker_request_dict(pbroker->pbroker, (const char *)tag); d = enchant_broker_request_dict(pbroker->pbroker, (const char *)tag);
if (d) { if (d) {