Changeset 691:78b665400097 in freeDiameter for libfdcore/p_out.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/p_out.c (modified) (1 diff)

libfdcore/p_out.c

@@ -69 +69 @@
         /* Save a request before sending so that there is no race condition with the answer */
         if (msg_is_a_req) {
-                CHECK_FCT_DO( ret = fd_p_sr_store(srl, msg, &hdr->msg_hbhid, bkp_hbh), { free(buf); return ret; } );
+                CHECK_FCT_DO( ret = fd_p_sr_store(srl, msg, &hdr->msg_hbhid, bkp_hbh), goto out );
         }
         
         /* Send the message */
-        CHECK_FCT_DO( ret = fd_cnx_send(cnx, buf, sz, flags), { free(buf); return ret; } );
+        CHECK_FCT_DO( ret = fd_cnx_send(cnx, buf, sz, flags), );
+out:
+        ;       
         pthread_cleanup_pop(1);
+        
+        if (ret)
+                return ret;
         
         /* Free remaining messages (i.e. answers) */