Changeset 7ece1fbe in mainline for uspace/srv/fb/fb.c

Timestamp:

2009-06-30T15:31:39Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

c063d96e

Parents:

057760d3

Message:

avoid possible segfault

File:

• uspace/srv/fb/fb.c (modified) (2 diffs)

uspace/srv/fb/fb.c

@@ -57 +57 @@
 #include <fibril.h>
 #include <bool.h>
+#include <stdio.h>
 
 #include "font-8x16.h"
@@ -1068 +1069 @@
                         void *dest = as_get_mappable_page(IPC_GET_ARG2(*call));
                         shm_size = IPC_GET_ARG2(*call);
-                        if (!ipc_answer_1(callid, EOK, (sysarg_t) dest))
-                                shm = dest;
-                        else
+                        if (ipc_answer_1(callid, EOK, (sysarg_t) dest)) {
                                 shm_id = 0;
+                                return false;
+                        }
+                        shm = dest;
                         
                         if (shm[0] != 'P')