Changeset 691:78b665400097 in freeDiameter for libfdcore/peers.c

Timestamp:

Jan 20, 2011, 7:44:27 PM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Cleanup all pthread_cleanup_push / pop pairs so that pop is always called after push, or ASSERT(0) is some grave errors

File:

• libfdcore/peers.c (modified) (1 diff)

libfdcore/peers.c

@@ -533 +533 @@
                 int auth = 0;
                 pthread_cleanup_push(fd_cleanup_rwlock, &validators_rw);
-                CHECK_FCT_DO( ret = ((int(*)(struct peer_info *, int *, int (**)(struct peer_info *)))(v->o)) (&peer->p_hdr.info, &auth, &peer->p_cb2), goto out );
+                CHECK_FCT_DO( ret = ((int(*)(struct peer_info *, int *, int (**)(struct peer_info *)))(v->o)) (&peer->p_hdr.info, &auth, &peer->p_cb2),  );
                 pthread_cleanup_pop(0);
+                if (ret)
+                        goto out;
                 if (auth) {
                         ret = (auth > 0) ? 0 : -1;