Changeset e5a4250 in mainline

Timestamp:

2012-08-26T23:10:15Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f39d5c2

Parents:

eb5560a

Message:

Leave cleaning of call→buffer to ipc_call_free() for now.

Location:

kernel/generic/src/ipc/ops

Files:

• dataread.c (modified) (2 diffs)
• datawrite.c (modified) (1 diff)

kernel/generic/src/ipc/ops/dataread.c

@@ -66 +66 @@
                 size_t max_size = IPC_GET_ARG2(*olddata);
                 size_t size = IPC_GET_ARG2(answer->data);
+
                 if (size && size <= max_size) {
                         /*
@@ -78 +79 @@
                         if (rc) {
                                 IPC_SET_RETVAL(answer->data, rc);
-                                free(answer->buffer);
-                                answer->buffer = NULL;
+                                /*
+                                 * answer->buffer will be cleaned up in
+                                 * ipc_call_free().
+                                 */
                         }
                 } else if (!size) {

kernel/generic/src/ipc/ops/datawrite.c

@@ -58 +58 @@
         int rc = copy_from_uspace(call->buffer, (void *) src, size);
         if (rc != 0) {
-                free(call->buffer);
+                /*
+                 * call->buffer will be cleaned up in ipc_call_free() at the
+                 * latest.
+                 */
                 return rc;
         }