Mercurial > hg > waaad
changeset 395:f0ba4fa1665e
Fixed couple of possible issues
| author | Sebastien Decugis <sdecugis@nict.go.jp> |
|---|---|
| date | Mon, 01 Jun 2009 18:20:48 +0900 |
| parents | b1eb38915f04 |
| children | 9d3dc44c9c22 |
| files | waaad/dict-base.c waaad/dictionary.c |
| diffstat | 2 files changed, 25 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/waaad/dict-base.c Fri May 29 18:00:51 2009 +0900 +++ b/waaad/dict-base.c Mon Jun 01 18:20:48 2009 +0900 @@ -152,8 +152,12 @@ #define CHECK_dict_new( _type, _data, _parent, _ref ) \ CHECK_FCT( dict_new( (_type), (_data), (_parent), (_ref)) ); -#define CHECK_dict_search( _type, _criteria, _what, _result ) \ - CHECK_FCT( dict_search( (_type), (_criteria), (_what), (_result)) ); +#define CHECK_dict_search( _type, _criteria, _what, _result ) \ + CHECK_FCT( dict_search( (_type), (_criteria), (_what), (_result)) ); \ + if ( !*(_result) ) { \ + TRACE_DEBUG(INFO, "Not found: "#_type ", "#_criteria", "#_what", "#_result ); \ + return ENOENT; \ + } typedef struct { char *avp_name; @@ -175,11 +179,21 @@ (_rulearray)[__ar].max, \ (_rulearray)[__ar].template}; \ __data.rule_order = RULE_ORDER(__data.rule_position); \ - CHECK_dict_search( DICT_AVP, \ + CHECK_FCT( dict_search( \ + DICT_AVP, \ AVP_BY_NAME, \ (_rulearray)[__ar].avp_name, \ - &__data.rule_avp ); \ - CHECK_dict_new( DICT_RULE, &__data, _parent, NULL); \ + &__data.rule_avp ) ); \ + if ( !__data.rule_avp ) { \ + TRACE_DEBUG(INFO, "AVP Not found: '%s'", (_rulearray)[__ar].avp_name ); \ + return ENOENT; \ + } \ + CHECK_FCT_DO( dict_new( DICT_RULE, &__data, _parent, NULL), \ + { \ + TRACE_DEBUG(INFO, "Error on rule with AVP '%s'", \ + (_rulearray)[__ar].avp_name ); \ + return EINVAL; \ + } ); \ } \ }
--- a/waaad/dictionary.c Fri May 29 18:00:51 2009 +0900 +++ b/waaad/dictionary.c Mon Jun 01 18:20:48 2009 +0900 @@ -1405,6 +1405,12 @@ } } + /* For RULE object, we must also check that the "avp" referenced exists */ + if (type == DICT_RULE) { + CHECK_PARAMS( verify_object(((dict_rule_data_t *)data)->rule_avp) ); + CHECK_PARAMS( _O(((dict_rule_data_t *)data)->rule_avp)->type == DICT_AVP ); + } + /* For COMMAND object, check that the 'R' flag is fixed */ if (type == DICT_COMMAND) { CHECK_PARAMS( ((dict_cmd_data_t *)data)->cmd_flag_mask & CMD_FLAG_REQUEST );