Changeset 47f5a77 in mainline for uspace/srv/net/tcp/sock.c

Timestamp:

2013-07-17T08:46:06Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

3a0a4d8

Parents:

cdc3afa (diff), 1d94e21 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

File:

• uspace/srv/net/tcp/sock.c (modified) (6 diffs)

uspace/srv/net/tcp/sock.c

@@ -613 +613 @@
         ipc_callid_t wcallid;
         size_t length;
-        uint8_t buffer[TCP_SOCK_FRAGMENT_SIZE];
         tcp_error_t trc;
         int rc;
+        
+        uint8_t *buffer = calloc(TCP_SOCK_FRAGMENT_SIZE, 1);
+        if (buffer == NULL) {
+                async_answer_0(callid, ENOMEM);
+                return;
+        }
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_sock_send()");
@@ -625 +630 @@
         if (sock_core == NULL) {
                 async_answer_0(callid, ENOTSOCK);
-                return;
+                goto out;
         }
 
@@ -641 +646 @@
                         fibril_mutex_unlock(&socket->lock);
                         async_answer_0(callid, EINVAL);
-                        return;
+                        goto out;
                 }
 
@@ -651 +656 @@
                         fibril_mutex_unlock(&socket->lock);
                         async_answer_0(callid, rc);
-                        return;
+                        goto out;
                 }
 
@@ -676 +681 @@
                         fibril_mutex_unlock(&socket->lock);
                         async_answer_0(callid, rc);
-                        return;
+                        goto out;
                 }
         }
@@ -685 +690 @@
             IPC_GET_ARG2(answer));
         fibril_mutex_unlock(&socket->lock);
+        
+out:
+        free(buffer);
 }