Skip to content

ntpd: bound remote config error accumulation #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
carrerasdarren-cell wants to merge 1 commit into
base: stable
Choose a base branch
from
Open

ntpd: bound remote config error accumulation #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions ntpd/ntp_parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@
#ifndef YYDEBUG
# define YYDEBUG 1
#endif

#if YYDEBUG
extern int yydebug;
#endif
Expand Down Expand Up @@ -4113,7 +4114,7 @@ yyerror(
const char *msg
)
{
int retval;
char *err_next;
struct FILE_INFO * ip_ctx;

ip_ctx = lex_current();
Expand All @@ -4122,18 +4123,15 @@ yyerror(
msyslog(LOG_ERR, "line %d column %d %s",
ip_ctx->errpos.nline, ip_ctx->errpos.ncol, msg);
if (!lex_from_file()) {
/* Save the error message in the correct buffer */
retval = snprintf(remote_config.err_msg + remote_config.err_pos,
sizeof remote_config.err_msg - remote_config.err_pos,
"column %d %s",
ip_ctx->errpos.ncol, msg);

/* Increment the value of err_pos */
if (retval > 0)
remote_config.err_pos += retval;

/* Increment the number of errors */
++remote_config.no_errors;

/* Append only complete messages that fit in the buffer. */
err_next = remote_config.err_msg + remote_config.err_pos;
xsbprintf(&err_next,
remote_config.err_msg + sizeof remote_config.err_msg,
"column %d %s", ip_ctx->errpos.ncol, msg);
remote_config.err_pos = (int)(err_next - remote_config.err_msg);
}
}

Expand Down Expand Up @@ -4162,4 +4160,3 @@ int main(int argc, char *argv[])
return 0;
}
#endif

21 changes: 9 additions & 12 deletions ntpd/ntp_parser.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1378,6 +1378,7 @@ misc_cmd_int_keyword
#ifndef LEAP_SMEAR
yyerror("Built without LEAP_SMEAR support.");
#endif

}
;

Expand Down Expand Up @@ -1837,7 +1838,7 @@ yyerror(
const char *msg
)
{
int retval;
char *err_next;
struct FILE_INFO * ip_ctx;

ip_ctx = lex_current();
Expand All @@ -1846,18 +1847,15 @@ yyerror(
msyslog(LOG_ERR, "line %d column %d %s",
ip_ctx->errpos.nline, ip_ctx->errpos.ncol, msg);
if (!lex_from_file()) {
/* Save the error message in the correct buffer */
retval = snprintf(remote_config.err_msg + remote_config.err_pos,
sizeof remote_config.err_msg - remote_config.err_pos,
"column %d %s",
ip_ctx->errpos.ncol, msg);

/* Increment the value of err_pos */
if (retval > 0)
remote_config.err_pos += retval;

/* Increment the number of errors */
++remote_config.no_errors;

/* Append only complete messages that fit in the buffer. */
err_next = remote_config.err_msg + remote_config.err_pos;
xsbprintf(&err_next,
remote_config.err_msg + sizeof remote_config.err_msg,
"column %d %s", ip_ctx->errpos.ncol, msg);
remote_config.err_pos = (int)(err_next - remote_config.err_msg);
}
}

Expand Down Expand Up @@ -1886,4 +1884,3 @@ int main(int argc, char *argv[])
return 0;
}
#endif