35 lines
		
	
	
		
			1010 B
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			35 lines
		
	
	
		
			1010 B
		
	
	
	
		
			Diff
		
	
	
	
	
	
autofs-5.1.4 - add NULL check in prepare_attempt_prefix()
 | 
						|
 | 
						|
From: Ian Kent <raven@themaw.net>
 | 
						|
 | 
						|
prepare_attempt_prefix() calls calloc(3) and continues without
 | 
						|
checking if the allocation succeeded.
 | 
						|
 | 
						|
Signed-off-by: Ian Kent <raven@themaw.net>
 | 
						|
---
 | 
						|
 CHANGELOG |    1 +
 | 
						|
 lib/log.c |    2 ++
 | 
						|
 2 files changed, 3 insertions(+)
 | 
						|
 | 
						|
--- autofs-5.1.4.orig/CHANGELOG
 | 
						|
+++ autofs-5.1.4/CHANGELOG
 | 
						|
@@ -39,6 +39,7 @@ xx/xx/2018 autofs-5.1.5
 | 
						|
 - better handle hesiod support not built in.
 | 
						|
 - fix hesiod string check in master_parse().
 | 
						|
 - remove autofs4 module load code.
 | 
						|
+- add NULL check in prepare_attempt_prefix().
 | 
						|
 
 | 
						|
 19/12/2017 autofs-5.1.4
 | 
						|
 - fix spec file url.
 | 
						|
--- autofs-5.1.4.orig/lib/log.c
 | 
						|
+++ autofs-5.1.4/lib/log.c
 | 
						|
@@ -44,6 +44,8 @@ static char *prepare_attempt_prefix(cons
 | 
						|
 
 | 
						|
 		snprintf(buffer, ATTEMPT_ID_SIZE, "%02lx", *attempt_id);
 | 
						|
 		prefixed_msg = (char *) calloc(len, sizeof(char));
 | 
						|
+		if (!prefixed_msg)
 | 
						|
+			return NULL;
 | 
						|
 		strcpy(prefixed_msg, buffer);
 | 
						|
 		strcat(prefixed_msg, "|");
 | 
						|
 		strcat(prefixed_msg, msg);
 |