Changeset 38c773e7 in mainline

Timestamp:

2011-05-17T16:07:31Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

e6eee2b

Parents:

013a5d7

Message:

make really sure the test does not trip over and fell on its own running chain saw

Location:

uspace/app/tester/mm

Files:

• common.c (modified) (1 diff)
• malloc3.c (modified) (1 diff)

uspace/app/tester/mm/common.c

@@ -323 +323 @@
         /* Map the memory area */
         void *addr = as_get_mappable_page(size);
+        if (addr == NULL) {
+                free(area);
+                return NULL;
+        }
+        
         area->addr = as_area_create(addr, size, AS_AREA_WRITE | AS_AREA_READ);
         if (area->addr == (void *) -1) {

uspace/app/tester/mm/malloc3.c

@@ -236 +236 @@
                                         mem_area_t *area = map_area(AREA_SIZE);
                                         RETURN_IF_ERROR;
-                                        
-                                        TPRINTF("*");
-                                        fill_area(area);
+                                        if (area != NULL) {
+                                                TPRINTF("*");
+                                                fill_area(area);
+                                        } else
+                                                TPRINTF("F(*)");
                                 }
                         }