diff options
author | Damien Miller <djm@mindrot.org> | 2006-03-26 13:53:32 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2006-03-26 13:53:32 +1100 |
commit | 928b23684a1d94dc2bc1cecc75b0e596eb7a4cb9 (patch) | |
tree | 517691f8fb0f6e16746524d9eee3d61582cbe0e6 | |
parent | 6db780e259f985b9c88dff222eb56b4726a5a5e1 (diff) |
- djm@cvs.openbsd.org 2006/03/19 02:24:05
[dh.c readconf.c servconf.c]
potential NULL pointer dereferences detected by Coverity
via elad AT netbsd.org; ok deraadt@
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | dh.c | 3 | ||||
-rw-r--r-- | readconf.c | 3 | ||||
-rw-r--r-- | servconf.c | 3 |
4 files changed, 11 insertions, 4 deletions
@@ -26,6 +26,10 @@ [hostfile.c] FILE* leak detected by Coverity via elad AT netbsd.org; ok deraadt@ + - djm@cvs.openbsd.org 2006/03/19 02:24:05 + [dh.c readconf.c servconf.c] + potential NULL pointer dereferences detected by Coverity + via elad AT netbsd.org; ok deraadt@ 20060325 - OpenBSD CVS Sync @@ -4283,4 +4287,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.4248 2006/03/26 02:52:20 djm Exp $ +$Id: ChangeLog,v 1.4249 2006/03/26 02:53:32 djm Exp $ @@ -45,7 +45,8 @@ parse_prime(int linenum, char *line, struct dhgroup *dhg) char *strsize, *gen, *prime; cp = line; - arg = strdelim(&cp); + if ((arg = strdelim(&cp)) == NULL) + return 0; /* Ignore leading whitespace */ if (*arg == '\0') arg = strdelim(&cp); @@ -324,7 +324,8 @@ process_config_line(Options *options, const char *host, s = line; /* Get the keyword. (Each line is supposed to begin with a keyword). */ - keyword = strdelim(&s); + if ((keyword = strdelim(&s)) == NULL) + return 0; /* Ignore leading whitespace. */ if (*keyword == '\0') keyword = strdelim(&s); @@ -447,7 +447,8 @@ process_server_config_line(ServerOptions *options, char *line, u_int i; cp = line; - arg = strdelim(&cp); + if ((arg = strdelim(&cp)) != NULL) + return 0; /* Ignore leading whitespace */ if (*arg == '\0') arg = strdelim(&cp); |