Changeset 4553

Timestamp:

Jul 8, 2013 1:44:48 AM (11 years ago)

Author:

nanang

Message:

Re #1686: avoid cache entry destroy in update_res_cache() when it is being used by callback.

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);
-        if (cache)
+        if (cache && --cache->ref_cnt <= 0)
             free_entry(resolver, cache);
         pj_hash_set(NULL, resolver->hrescache, key, sizeof(*key), hval, NULL);
@@ -1234 +1234 @@
         cache = (struct cached_res *) pj_hash_get(resolver->hrescache, key, 
                                                   sizeof(*key), &hval);
-        if (cache)
+        if (cache && --cache->ref_cnt <= 0)
             free_entry(resolver, cache);
         pj_hash_set(NULL, resolver->hrescache, key, sizeof(*key), hval, NULL);
@@ -1244 +1244 @@
                                               sizeof(*key), &hval);
     if (cache == NULL) {
+        cache = alloc_entry(resolver);
+    } else if (cache->ref_cnt > 1) {
+        /* When cache entry is being used by callback (to app), just decrement
+         * ref_cnt so it will be freed after the callback returns and allocate
+         * new entry.
+         */
+        cache->ref_cnt--;
         cache = alloc_entry(resolver);
     } else {