Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make(1): fix undefined behavior in ParseEOF

Browse Source 
Adding a number to a null pointer should have been caught by any
Undefined Behavior Sanitizer, but apparently neither GCC nor Clang do
this.
This commit is contained in:
rillig 2020-12-06 18:37:04 +00:00
parent 2069cc7bbf
commit 856f84743d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.bin/make/parse.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: parse.c,v 1.469 2020/12/05 19:46:04 rillig Exp $ */
/* $NetBSD: parse.c,v 1.470 2020/12/06 18:37:04 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@ -117,7 +117,7 @@
#include "pathnames.h"
/* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */
MAKE_RCSID("$NetBSD: parse.c,v 1.469 2020/12/05 19:46:04 rillig Exp $");
MAKE_RCSID("$NetBSD: parse.c,v 1.470 2020/12/06 18:37:04 rillig Exp $");
/* types and constants */
@ -2623,7 +2623,7 @@ ParseEOF(void)
ptr = curFile->nextbuf(curFile->nextbuf_arg, &len);
curFile->buf_ptr = ptr;
curFile->buf_freeIt = ptr;
curFile->buf_end = ptr + len; /* XXX: undefined behavior if ptr == NULL */
curFile->buf_end = ptr == NULL ? NULL : ptr + len;
curFile->lineno = curFile->first_lineno;
if (ptr != NULL)
return TRUE; /* Iterate again */