RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-18 09:24:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: server: Be more strict when reading the version of a server-state file

Browse Source 
Now, we read a full line and expects to found an integer only on it. And if
the line is empty or truncated, an error is returned. If the version is not
valid, an error is also returned. This way, the first line is no longer
partially read.
This commit is contained in:
Christopher Faulet 2021-02-15 16:24:10 +01:00
parent 8b4b6a0d63
commit 8a14b73ecf
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/server.c
View File

@ -3049,20 +3049,26 @@ static void srv_update_state(struct server *srv, int version, char **params)
* Note that this should be the first read on <f>
*/
static int srv_state_get_version(FILE *f) {
char buf[2];
int ret;
char mybuf[SRV_STATE_LINE_MAXLEN];
char *endptr;
long int vsn;
/* first character of first line of the file must contain the version of the export */
if (fgets(buf, 2, f) == NULL) {
if (fgets(mybuf, SRV_STATE_LINE_MAXLEN, f) == NULL)
return 0;
vsn = strtol(mybuf, &endptr, 10);
if (endptr == mybuf || *endptr != '\n') {
/* Empty or truncated line */
return 0;
}
ret = atoi(buf);
if ((ret < SRV_STATE_FILE_VERSION_MIN) ||
(ret > SRV_STATE_FILE_VERSION_MAX))
if (vsn < SRV_STATE_FILE_VERSION_MIN || vsn > SRV_STATE_FILE_VERSION_MAX) {
/* Wrong version number */
return 0;
}
return ret;
return vsn;
}