From 2284680be58c8b783d8257d1ca36fc214b574d1e Mon Sep 17 00:00:00 2001 From: Yaroslav Kolomiiets Date: Mon, 27 Feb 2017 17:34:01 +0200 Subject: limbo/lex.c: allow malloc(0) to return nil as some implementations do --- limbo/lex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'limbo/lex.c') diff --git a/limbo/lex.c b/limbo/lex.c index d75e28f2..747cfaaf 100644 --- a/limbo/lex.c +++ b/limbo/lex.c @@ -1435,7 +1435,7 @@ allocmem(ulong n) void *p; p = malloc(n); - if(p == nil) + if(p == nil && n != 0) fatal("out of memory"); return p; } -- cgit v1.2.3 From e1178c6dd91d094915c837eb2cf9c854153f00e9 Mon Sep 17 00:00:00 2001 From: Yaroslav Kolomiiets Date: Tue, 28 Feb 2017 18:31:24 +0200 Subject: limbo/lex.c: allocmem(0) to return a valid pointer even though malloc(0) may get nil --- limbo/lex.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'limbo/lex.c') diff --git a/limbo/lex.c b/limbo/lex.c index 747cfaaf..c6af1988 100644 --- a/limbo/lex.c +++ b/limbo/lex.c @@ -1434,8 +1434,8 @@ allocmem(ulong n) { void *p; - p = malloc(n); - if(p == nil && n != 0) + p = malloc(n != 0? n: 1); + if(p == nil) fatal("out of memory"); return p; } -- cgit v1.2.3