Check for malloc failing in pcap_ether_aton().

That also means that the lexical analyzer, which calls pcap_ether_aton(), needs to check for pcap_ether_aton() failing.
mcr · Apr 14, 2013 · c8e2d55 · c8e2d55
1 parent 8a90ccf
commit c8e2d55
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/nametoaddr.c b/nametoaddr.c
@@ -415,6 +415,8 @@ pcap_ether_aton(const char *s)
 	register u_int d;
 
 	e = ep = (u_char *)malloc(6);
+	if (e == NULL)
+		return (NULL);
 
 	while (*s) {
 		if (*s == ':' || *s == '.' || *s == '-')

diff --git a/scanner.l b/scanner.l
@@ -325,8 +325,12 @@ sls		return SLS;
 "<<"			return LSH;
 ">>"			return RSH;
 ${B}			{ yylval.e = pcap_ether_aton(((char *)yytext)+1);
+			  if (yylval.e == NULL)
+				bpf_error("malloc");
 			  return AID; }
 {MAC}			{ yylval.e = pcap_ether_aton((char *)yytext);
+			  if (yylval.e == NULL)
+				bpf_error("malloc");
 			  return EID; }
 {N}			{ yylval.i = stoi((char *)yytext); return NUM; }
 ({N}\.{N})|({N}\.{N}\.{N})|({N}\.{N}\.{N}\.{N})	{