mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-08 07:15:46 +00:00
openvz: Handle getline failures in openvzReadConfigParam properly
The regression fix in 3aab7f2d6b
altered the error handling.
getline returns -1 on failure to read a line (including EOF). The
original openvzReadConfigParam function using openvz_readline only
treated EOF as not-found. The current getline version treats all
getline failures as not-found.
This patch fixes this and distinguishes EOF from other getline
failures.
This commit is contained in:
parent
ad962bcdaa
commit
4b15aad0d6
@ -659,7 +659,12 @@ openvzReadConfigParam(const char *conf_file, const char *param, char **value)
|
||||
return -1;
|
||||
|
||||
VIR_FREE(*value);
|
||||
while (getline(&line, &line_size, fp) >= 0) {
|
||||
while (1) {
|
||||
if (getline(&line, &line_size, fp) < 0) {
|
||||
err = !feof(fp);
|
||||
break;
|
||||
}
|
||||
|
||||
if (! STREQLEN(line, param, strlen(param)))
|
||||
continue;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user