Changeset af96dd57 in mainline

Timestamp:

2010-07-27T16:37:11Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

142084b2

Parents:

a2da43c

Message:

fix two possible NULL dereferences

File:

• kernel/generic/src/mm/frame.c (modified) (2 diffs)

kernel/generic/src/mm/frame.c

@@ -161 +161 @@
         for (j = zones.count; j > i; j--) {
                 zones.info[j] = zones.info[j - 1];
-                zones.info[j].buddy_system->data =
-                    (void *) &zones.info[j - 1];
+                if (zones.info[j].buddy_system != NULL)
+                        zones.info[j].buddy_system->data =
+                            (void *) &zones.info[j];
         }
         
@@ -762 +763 @@
         for (i = z2 + 1; i < zones.count; i++) {
                 zones.info[i - 1] = zones.info[i];
-                zones.info[i - 1].buddy_system->data =
-                    (void *) &zones.info[i - 1];
+                if (zones.info[i - 1].buddy_system != NULL)
+                        zones.info[i - 1].buddy_system->data =
+                            (void *) &zones.info[i - 1];
         }