Assert logic inverted in chfactory.c Topic is solved

[FXCoder]

In function dyn_list_find in chfactory.c the assert logic looks to be inverted for "invalid reference passed".

Code: Select all

static dyn_element_t *dyn_list_find(const char *name, dyn_list_t *dlp) {
  dyn_element_t *p = dlp->next;

  while (p != (dyn_element_t *)dlp) {
    if (strncmp(p->name, name, CH_CFG_FACTORY_MAX_NAMES_LENGTH) == 0) {
      return p;
    }
    p = p->next;
  }

  chDbgAssert(true, "invalid reference passed");

  return NULL;
}


Should be...

Code: Select all

static dyn_element_t *dyn_list_find(const char *name, dyn_list_t *dlp) {
  dyn_element_t *p = dlp->next;

  while (p != (dyn_element_t *)dlp) {
    if (strncmp(p->name, name, CH_CFG_FACTORY_MAX_NAMES_LENGTH) == 0) {
      return p;
    }
    p = p->next;
  }

  chDbgAssert(false, "invalid reference passed");

  return NULL;
}


[Giovanni]

Fixed thanks.

Giovanni

[FXCoder]

It turns out that the assert should not be there at all.
In chfactory.c the dyn_create_object_heap(...) function relies on dyn_list_find(...) returning NULL when a name does not already exist.
Thus NULL is a normal/expected result from dyn_list_find(...).

Code: Select all

Index: chfactory.c
===================================================================
--- chfactory.c   (revision 11077)
+++ chfactory.c   (working copy)
@@ -98,8 +98,6 @@
     p = p->next;
   }
 
-  chDbgAssert(false, "invalid reference passed");
-
   return NULL;
 }
 


[Giovanni]

Fixed thanks.

Giovanni