Module Name: src Committed By: tsutsui Date: Tue May 31 15:24:59 UTC 2022
Modified Files: src/sys/arch/atari/atari: stalloc.c Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/atari/atari/stalloc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/atari/atari/stalloc.c diff -u src/sys/arch/atari/atari/stalloc.c:1.16 src/sys/arch/atari/atari/stalloc.c:1.17 --- src/sys/arch/atari/atari/stalloc.c:1.16 Fri Jan 3 07:14:20 2014 +++ src/sys/arch/atari/atari/stalloc.c Tue May 31 15:24:59 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: stalloc.c,v 1.16 2014/01/03 07:14:20 mlelstv Exp $ */ +/* $NetBSD: stalloc.c,v 1.17 2022/05/31 15:24:59 tsutsui 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.17 2022/05/31 15:24:59 tsutsui Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -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 */