Changeset 4649 for pjproject/trunk/pjlib-util/src/pjlib-util/resolver.c

Timestamp:

Nov 7, 2013 8:20:30 AM (10 years ago)

Author:

nanang

Message:

Fix #1710: Modified resolver to always remove cache entry from cache hash table first before releasing/resetting cache pool.

File:

• pjproject/trunk/pjlib-util/src/pjlib-util/resolver.c (modified) (3 diffs)

pjproject/trunk/pjlib-util/src/pjlib-util/resolver.c

@@ -1198 +1198 @@
         cache = (struct cached_res *) pj_hash_get(resolver->hrescache, key, 
                                                   sizeof(*key), &hval);
+        /* Remove the entry before releasing its pool (see ticket #1710) */
+        pj_hash_set(NULL, resolver->hrescache, key, sizeof(*key), hval, NULL);
+        
+        /* Free the entry */
         if (cache && --cache->ref_cnt <= 0)
             free_entry(resolver, cache);
-        pj_hash_set(NULL, resolver->hrescache, key, sizeof(*key), hval, NULL);
     }
 
@@ -1234 +1237 @@
         cache = (struct cached_res *) pj_hash_get(resolver->hrescache, key, 
                                                   sizeof(*key), &hval);
+        /* Remove the entry before releasing its pool (see ticket #1710) */
+        pj_hash_set(NULL, resolver->hrescache, key, sizeof(*key), hval, NULL);
+
+        /* Free the entry */
         if (cache && --cache->ref_cnt <= 0)
             free_entry(resolver, cache);
-        pj_hash_set(NULL, resolver->hrescache, key, sizeof(*key), hval, NULL);
         return;
     }
@@ -1253 +1259 @@
         cache = alloc_entry(resolver);
     } else {
+        /* Remove the entry before resetting its pool (see ticket #1710) */
+        pj_hash_set(NULL, resolver->hrescache, key, sizeof(*key), hval, NULL);
+
         /* Reset cache to avoid bloated cache pool */
         reset_entry(&cache);