Changeset 1a60fee in mainline for kernel/generic/src/ipc/sysipc.c

Timestamp:

2008-05-15T18:28:50Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4452366

Parents:

e1f51712

Message:

Do not attempt to malloc() zero bytes of memory during VFS_READ at end of file.

File:

• kernel/generic/src/ipc/sysipc.c (modified) (2 diffs)

kernel/generic/src/ipc/sysipc.c

@@ -244 +244 @@
                         size_t max_size = IPC_GET_ARG2(*olddata);
                         size_t size = IPC_GET_ARG2(answer->data);
-                        if (size <= max_size) {
+                        if (size && size <= max_size) {
                                 /*
                                  * Copy the destination VA so that this piece of
@@ -259 +259 @@
                                         answer->buffer = NULL;
                                 }
+                        } else if (!size) {
+                                IPC_SET_RETVAL(answer->data, EOK);
                         } else {
                                 IPC_SET_RETVAL(answer->data, ELIMIT);