From 568603eff8dba995d01799cf9bfffad66c57e1e9 Mon Sep 17 00:00:00 2001 From: martin Date: Sat, 4 Jun 2022 12:38:34 +0000 Subject: 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. --- sys/arch/atari/atari/stalloc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/arch/atari/atari/stalloc.c b/sys/arch/atari/atari/stalloc.c index f4e592b3522..3bdbbe4740b 100644 --- a/sys/arch/atari/atari/stalloc.c +++ b/sys/arch/atari/atari/stalloc.c @@ -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 -__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 #include @@ -163,7 +163,7 @@ free_stmem(void *mem) /* * 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 @@ free_stmem(void *mem) 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 */ -- cgit