svn commit: r1300300 - /qpid/proton/proton-c/src/engine/engine.c

[rh...@apache.org]

Author: rhs
Date: Tue Mar 13 19:38:16 2012
New Revision: 1300300

URL: http://svn.apache.org/viewvc?rev=1300300&view=rev
Log:
check malloc return pointers

Modified:
    qpid/proton/proton-c/src/engine/engine.c

Modified: qpid/proton/proton-c/src/engine/engine.c
URL: http://svn.apache.org/viewvc/qpid/proton/proton-c/src/engine/engine.c?rev=1300300&r1=1300299&r2=1300300&view=diff
==============================================================================
--- qpid/proton/proton-c/src/engine/engine.c (original)
+++ qpid/proton/proton-c/src/engine/engine.c Tue Mar 13 19:38:16 2012
@@ -378,6 +378,8 @@ void pn_close(pn_endpoint_t *endpoint)
 pn_connection_t *pn_connection()
 {
   pn_connection_t *conn = malloc(sizeof(pn_connection_t));
+  if (!conn) return NULL;
+
   conn->endpoint_head = NULL;
   conn->endpoint_tail = NULL;
   pn_endpoint_init(&conn->endpoint, CONNECTION, conn);
@@ -535,6 +537,8 @@ pn_session_t *pn_session(pn_connection_t
 {
 
   pn_session_t *ssn = malloc(sizeof(pn_session_t));
+  if (!ssn) return NULL;
+
   pn_endpoint_init(&ssn->endpoint, SESSION, conn);
   pn_add_session(conn, ssn);
   ssn->links = NULL;
@@ -616,6 +620,8 @@ pn_transport_t *pn_transport(pn_connecti
     return NULL;
   } else {
     conn->transport = malloc(sizeof(pn_transport_t));
+    if (!conn->transport) return NULL;
+
     conn->transport->connection = conn;
     pn_transport_init(conn->transport);
     return conn->transport;
@@ -626,6 +632,7 @@ wchar_t *wcsdup(const wchar_t *src)
 {
   if (src) {
     wchar_t *dest = malloc((wcslen(src)+1)*sizeof(wchar_t));
+    if (!dest) return NULL;
     return wcscpy(dest, src);
   } else {
     return 0;
@@ -696,6 +703,7 @@ pn_link_state_t *pn_handle_state(pn_sess
 pn_sender_t *pn_sender(pn_session_t *session, const wchar_t *name)
 {
   pn_sender_t *snd = malloc(sizeof(pn_sender_t));
+  if (!snd) return NULL;
   pn_link_init(&snd->link, SENDER, session, name);
   return snd;
 }
@@ -703,6 +711,7 @@ pn_sender_t *pn_sender(pn_session_t *ses
 pn_receiver_t *pn_receiver(pn_session_t *session, const wchar_t *name)
 {
   pn_receiver_t *rcv = malloc(sizeof(pn_receiver_t));
+  if (!rcv) return NULL;
   pn_link_init(&rcv->link, RECEIVER, session, name);
   rcv->credits = 0;
   return rcv;
@@ -718,6 +727,7 @@ pn_delivery_t *pn_delivery(pn_link_t *li
   pn_delivery_t *delivery = link->settled_head;
   LL_POP_PFX(link->settled_head, link->settled_tail, link_);
   if (!delivery) delivery = malloc(sizeof(pn_delivery_t));
+  if (!delivery) return NULL;
   delivery->link = link;
   delivery->tag = pn_binary_dup(tag);
   delivery->local_state = 0;



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org