Changeset 4a0bc99 in mainline

Timestamp:

2016-03-30T09:47:15Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

88ab6e9

Parents:

83e69b9

Message:

tcp_pdu_encode fixes

• Test the return value of tcp_header_encode()
• Do not leak npdu and npdu→header in error paths

File:

• uspace/srv/net/tcp/pdu.c (modified) (2 diffs)

uspace/srv/net/tcp/pdu.c

@@ -324 +324 @@
         size_t text_size;
         uint16_t checksum;
+        int rc;
 
         npdu = tcp_pdu_new();
@@ -331 +332 @@
         npdu->src = epp->local.addr;
         npdu->dest = epp->remote.addr;
-        tcp_header_encode(epp, seg, &npdu->header, &npdu->header_size);
+        rc = tcp_header_encode(epp, seg, &npdu->header, &npdu->header_size);
+        if (rc != EOK) {
+                free(npdu);
+                return rc;
+        }
 
         text_size = tcp_segment_text_size(seg);
         npdu->text = calloc(1, text_size);
-        if (npdu->text == NULL)
+        if (npdu->text == NULL) {
+                free(npdu->header);
+                free(npdu);
                 return ENOMEM;
+        }
 
         npdu->text_size = text_size;