]> granicus.if.org Git - php/commitdiff
- Improve void arg check
authorFelipe Pena <felipe@php.net>
Sat, 1 Oct 2011 13:01:12 +0000 (13:01 +0000)
committerFelipe Pena <felipe@php.net>
Sat, 1 Oct 2011 13:01:12 +0000 (13:01 +0000)
- Removed unused variable
- Added check for empty tag in enchant_broker_request_dict() (to avoid assert warning)

ext/enchant/enchant.c

index 8bbea75f84c965d861077b9f0041743d2b8f353b..4ed12c36b2a717f28e5c4fc8700b0d37aafb1069 100755 (executable)
@@ -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) {