[src/netbsd-9]: src/sys/arch/atari/atari Pull up following revision(s) (reque...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/53552b856e30
branches:  netbsd-9
changeset: 366642:53552b856e30
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Jun 04 12:38:34 2022 +0000

description:
Pull up following revision(s) (requested by tsutsui in ticket #1462):

        sys/arch/atari/atari/stalloc.c: revision 1.17

Restore NULL pointer checks lost in rev 1.16.

Fixes PR port-atari/56859, ok'ed mlelstv@, and confirmed on TT030.
Should be pulled up to netbsd-9 and netbsd-8.

diffstat:

 sys/arch/atari/atari/stalloc.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 2bf5940f3ea6 -r 53552b856e30 sys/arch/atari/atari/stalloc.c
--- a/sys/arch/atari/atari/stalloc.c    Fri Jun 03 12:26:17 2022 +0000
+++ b/sys/arch/atari/atari/stalloc.c    Sat Jun 04 12:38:34 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: stalloc.c,v 1.16 2014/01/03 07:14:20 mlelstv Exp $     */
+/*     $NetBSD: stalloc.c,v 1.16.34.1 2022/06/04 12:38:34 martin Exp $ */
 
 /*
  * Copyright (c) 1995 Leo Weppelman (Atari modifications)
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: stalloc.c,v 1.16 2014/01/03 07:14:20 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: stalloc.c,v 1.16.34.1 2022/06/04 12:38:34 martin Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -163,7 +163,7 @@
        /*
         * check ahead of us.
         */
-       if (next->type == MNODE_FREE) {
+       if (next != NULL && next->type == MNODE_FREE) {
                /*
                 * if next is: a valid node and a free node. ==> merge
                 */
@@ -174,7 +174,7 @@
                stmem_total += mn->size + sizeof(struct mem_node);
                mn->size += next->size + sizeof(struct mem_node);
        }
-       if (prev->type == MNODE_FREE) {
+       if (prev != NULL && prev->type == MNODE_FREE) {
                /*
                 * if prev is: a valid node and a free node. ==> merge
                 */