Changeset 5438:4eb05969f66c in roaraudio for libroar/plugincontainer.c

Timestamp:

03/20/12 17:00:08 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

fix code so refcount is correct and avoid double free

File:

• libroar/plugincontainer.c (modified) (7 diffs)

libroar/plugincontainer.c

@@ -57 +57 @@
 
 static void * _copy_kv(struct roar_keyval ** copy, struct roar_keyval * src, size_t len) {
- size_t buflen, i;
+ size_t buflen = 0;
+ size_t i;
  void * ret;
  char * p;
  struct roar_keyval * c;
 
- buflen = len * (sizeof(struct roar_keyval) + 2 /* terminating \0s */);
-
  for (i = 0; i < len; i++) {
   if ( src[i].key != NULL )
-   buflen += roar_mm_strlen(src[i].key);
+   buflen += roar_mm_strlen(src[i].key) + 1;
   if ( src[i].value != NULL )
-   buflen += roar_mm_strlen(src[i].value);
- }
+   buflen += roar_mm_strlen(src[i].value) + 1;
+ }
+
+ c   = roar_mm_malloc(len * sizeof(struct roar_keyval));
+ if ( c == NULL )
+  return NULL;
+
+ memset(c, 0, len * sizeof(struct roar_keyval));
 
  ret = roar_mm_malloc(buflen);
@@ -77 +82 @@
  memset(ret, 0, buflen);
 
- c = ret;
- p = ret + len*sizeof(struct roar_keyval);
+ p = ret;
 
  for (i = 0; i < len; i++) {
@@ -178 +182 @@
 int roar_plugincontainer_ref(struct roar_plugincontainer * cont) {
  if ( cont == NULL ) {
+  ROAR_DBG("roar_plugincontainer_ref(cont=%p) = -1 // error=FAULT", cont);
   roar_err_set(ROAR_ERROR_FAULT);
   return -1;
@@ -184 +189 @@
  cont->refc++;
 
+ ROAR_DBG("roar_plugincontainer_ref(cont=%p) = 0", cont);
  return 0;
 }
@@ -191 +197 @@
 
  if ( cont == NULL ) {
+  ROAR_DBG("roar_plugincontainer_unref(cont=%p) = -1 // error=FAULT", cont);
   roar_err_set(ROAR_ERROR_FAULT);
   return -1;
@@ -197 +204 @@
  cont->refc--;
 
- if ( cont->refc )
+ if ( cont->refc ) {
+  ROAR_DBG("roar_plugincontainer_unref(cont=%p) = 0", cont);
   return 0;
+ }
 
  while (cont->numhandles) {
@@ -220 +229 @@
  roar_mm_free(cont);
 
+ ROAR_DBG("roar_plugincontainer_unref(cont=%p) = 0", cont);
  return 0;
 }