You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
27 lines
786 B
27 lines
786 B
7 years ago
|
autofs-5.0.7 - add null check in read_one()
|
||
|
|
|
||
|
|
From: Ian Kent <raven@themaw.net>
|
||
|
|
|
||
|
|
The pointter p shouldn't be null here but add a chack anyway.
|
||
|
|
---
|
||
|
|
modules/lookup_file.c | 6 ++++--
|
||
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/modules/lookup_file.c b/modules/lookup_file.c
|
||
|
|
index 65e5ee6..2836996 100644
|
||
|
|
--- a/modules/lookup_file.c
|
||
|
|
+++ b/modules/lookup_file.c
|
||
|
|
@@ -302,8 +302,10 @@ static int read_one(unsigned logopt, FILE *f, char *key, unsigned int *k_len, ch
|
||
|
|
if (gotten == got_real || gotten == getting)
|
||
|
|
goto got_it;
|
||
|
|
} else if (mapent_len < MAPENT_MAX_LEN) {
|
||
|
|
- mapent_len++;
|
||
|
|
- *(p++) = ch;
|
||
|
|
+ if (p) {
|
||
|
|
+ mapent_len++;
|
||
|
|
+ *(p++) = ch;
|
||
|
|
+ }
|
||
|
|
nch = getc(f);
|
||
|
|
if (nch == EOF &&
|
||
|
|
(gotten == got_real || gotten == getting))
|