diff options
| author | Felipe Pena <felipe@php.net> | 2011-10-01 13:01:12 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2011-10-01 13:01:12 +0000 |
| commit | 021b650a6acdbaab66df4015ff96de0594335b62 (patch) | |
| tree | cfeaa6b8e8c87c0979f62db75af00213df7c59f5 | |
| parent | 3e14579486cc550bf1ec985abc80ed0c9904b431 (diff) | |
| download | php-git-021b650a6acdbaab66df4015ff96de0594335b62.tar.gz | |
- Improve void arg check
- Removed unused variable
- Added check for empty tag in enchant_broker_request_dict() (to avoid assert warning)
| -rwxr-xr-x | ext/enchant/enchant.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/ext/enchant/enchant.c b/ext/enchant/enchant.c index 8bbea75f84..4ed12c36b2 100755 --- a/ext/enchant/enchant.c +++ b/ext/enchant/enchant.c @@ -244,8 +244,8 @@ static void php_enchant_broker_free(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ if (broker->pbroker) { if (broker->dictcnt && broker->dict) { if (broker->dict) { - int total, tofree; - tofree = total = broker->dictcnt-1; + int total; + total = broker->dictcnt-1; do { zend_list_delete(broker->dict[total]->rsrc_id); efree(broker->dict[total]); @@ -357,8 +357,8 @@ PHP_FUNCTION(enchant_broker_init) enchant_broker *broker; EnchantBroker *pbroker; - if (ZEND_NUM_ARGS()) { - ZEND_WRONG_PARAM_COUNT(); + if (zend_parse_parameters_none() == FAILURE) { + return; } pbroker = enchant_broker_init(); @@ -542,6 +542,11 @@ PHP_FUNCTION(enchant_broker_request_dict) } 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); if (d) { |