Changeset 5438:4eb05969f66c in roaraudio for libroar/roardl.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/roardl.c (modified) (9 diffs)

libroar/roardl.c

@@ -110 +110 @@
 int roar_dl_para_ref                    (struct roar_dl_librarypara * para) {
  if ( para == NULL ) {
+  ROAR_DBG("roar_dl_para_ref(para=%p) = -1 // error=FAULT", para);
   roar_err_set(ROAR_ERROR_FAULT);
   return -1;
@@ -116 +117 @@
  para->refc++;
 
+ ROAR_DBG("roar_dl_para_ref(para=%p) = 0", para);
  return 0;
 }
@@ -121 +123 @@
 int roar_dl_para_unref                  (struct roar_dl_librarypara * para) {
  if ( para == NULL ) {
+  ROAR_DBG("roar_dl_para_unref(para=%p) = -1 // error=FAULT", para);
   roar_err_set(ROAR_ERROR_FAULT);
   return -1;
@@ -127 +130 @@
  para->refc--;
 
- if ( para->refc )
+ if ( para->refc ) {
+  ROAR_DBG("roar_dl_para_unref(para=%p) = 0", para);
   return 0;
+ }
 
  if ( para->notifycore != NULL )
@@ -140 +145 @@
  roar_mm_free(para);
 
+ ROAR_DBG("roar_dl_para_unref(para=%p) = 0", para);
  return 0;
 }
@@ -408 +414 @@
 int                      roar_dl_ref    (struct roar_dl_lhandle * lhandle) {
  if ( (void*)lhandle < (void*)128 ) {
+  ROAR_DBG("roar_dl_ref(lhandle=%p) = -1 // error=BADFH", lhandle);
   roar_err_set(ROAR_ERROR_BADFH);
   return -1;
@@ -414 +421 @@
  lhandle->refc++;
 
+ ROAR_DBG("roar_dl_ref(lhandle=%p) = 0", lhandle);
  return 0;
 }
@@ -421 +429 @@
 
  if ( (void*)lhandle < (void*)128 ) {
+  ROAR_DBG("roar_dl_unref(lhandle=%p) = -1 // error=BADFH", lhandle);
   roar_err_set(ROAR_ERROR_BADFH);
   return -1;
  }
 
- lhandle->refc++;
-
- if ( lhandle->refc )
+ lhandle->refc--;
+
+ if ( lhandle->refc ) {
+  ROAR_DBG("roar_dl_unref(lhandle=%p) = 0", lhandle);
   return 0;
+ }
 
  if ( lhandle->lib != NULL && lhandle->lib->unload != NULL ) {
@@ -457 +468 @@
  roar_mm_free(lhandle);
 
+ ROAR_DBG("roar_dl_unref(lhandle=%p) = %i", lhandle, ret);
  return ret;
 }