Changeset 1179:f5e9b53d6f86 in freeDiameter for extensions

Timestamp:

Jun 4, 2013, 7:41:07 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Fix invalid NULL pointer indirection in log

File:

• extensions/rt_default/rtd_rules.c (modified) (3 diffs)

extensions/rt_default/rtd_rules.c

@@ -414 +414 @@
         
         TRACE_ENTRY("%d %p %d %p %d %x", ct, criteria, tt, target, score, flags);
-        CHECK_PARAMS((ct < RTD_CRI_MAX) && ((ct == 0) || criteria) && (tt < RTD_TAR_MAX) && target);
+        CHECK_PARAMS((ct < RTD_CRI_MAX) && ((ct == RTD_CRI_ALL) || criteria) && (tt < RTD_TAR_MAX) && target);
         
         /* First, search in the TARGET list if we already have this target */
@@ -451 +451 @@
         
         /* Now, search for the rule position in this target's list */
-        if (ct == 0) {
+        if (ct == RTD_CRI_ALL) {
                 /* Special case: we don't have a criteria -- always create a rule element */
                 CHECK_MALLOC( rul = new_rule(NULL, 0, score) );
-                fd_list_insert_before( &trg->rules[0], &rul->chain );
+                fd_list_insert_before( &trg->rules[RTD_CRI_ALL], &rul->chain );
         } else {
                 for (rule_suiv = trg->rules[ct].next; rule_suiv != &trg->rules[ct]; rule_suiv = rule_suiv->next) {
@@ -536 +536 @@
                                 
                                 /* First, apply all rules of criteria RTD_CRI_ALL */
-                                for ( l = target->rules[0].next; l != &target->rules[0]; l = l->next ) {
+                                for ( l = target->rules[RTD_CRI_ALL].next; l != &target->rules[RTD_CRI_ALL]; l = l->next ) {
                                         r = (struct rule *)l;
                                         cand->score += r->score;
-                                        TRACE_DEBUG(ANNOYING, "Applied rule {'%s' : '%s' += %d} to candidate '%s'", r->md.plain, target->md.plain, r->score, cand->diamid);
+                                        TRACE_DEBUG(ANNOYING, "Applied rule {'*' : '%s' += %d} to candidate '%s'", target->md.plain, r->score, cand->diamid);
                                 }