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

CID 1132759: Abort on dehumanize_number error on constant built-in string.

This commit is contained in:
christos 2013-11-27 20:48:28 +00:00
parent ce980385c0
commit fc0ed55151
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
usr.sbin/syslogd/syslogd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: syslogd.c,v 1.118 2013/11/11 16:39:21 christos Exp $ */ /* $NetBSD: syslogd.c,v 1.119 2013/11/27 20:48:28 christos Exp $ */
/* /*
* Copyright (c) 1983, 1988, 1993, 1994 * Copyright (c) 1983, 1988, 1993, 1994
@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1988, 1993, 1994\
#if 0 #if 0
static char sccsid[] = "@(#)syslogd.c 8.3 (Berkeley) 4/4/94"; static char sccsid[] = "@(#)syslogd.c 8.3 (Berkeley) 4/4/94";
#else #else
__RCSID("$NetBSD: syslogd.c,v 1.118 2013/11/11 16:39:21 christos Exp $"); __RCSID("$NetBSD: syslogd.c,v 1.119 2013/11/27 20:48:28 christos Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -3207,13 +3207,15 @@ read_config_file(FILE *cf, struct filed **f_ptr)
if (!TypeInfo[i].queue_length_string if (!TypeInfo[i].queue_length_string
|| dehumanize_number(TypeInfo[i].queue_length_string, || dehumanize_number(TypeInfo[i].queue_length_string,
&TypeInfo[i].queue_length) == -1) &TypeInfo[i].queue_length) == -1)
dehumanize_number(TypeInfo[i].default_length_string, if (dehumanize_number(TypeInfo[i].default_length_string,
&TypeInfo[i].queue_length); &TypeInfo[i].queue_length) == -1)
abort();
if (!TypeInfo[i].queue_size_string if (!TypeInfo[i].queue_size_string
|| dehumanize_number(TypeInfo[i].queue_size_string, || dehumanize_number(TypeInfo[i].queue_size_string,
&TypeInfo[i].queue_size) == -1) &TypeInfo[i].queue_size) == -1)
dehumanize_number(TypeInfo[i].default_size_string, if (dehumanize_number(TypeInfo[i].default_size_string,
&TypeInfo[i].queue_size); &TypeInfo[i].queue_size) == -1)
abort();
} }
#ifndef DISABLE_SIGN #ifndef DISABLE_SIGN