openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 15:12:36 +02:00
Code Issues Releases Wiki Activity

Fix handling of empty dmidecode output

Browse Source 
Corresponding to flashrom svn r973.

Signed-off-by: Michael Karcher <flashrom@mkarcher.dialup.fu-berlin.de>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
This commit is contained in:
Michael Karcher 2010-03-24 17:55:04 +00:00
parent 69e5811e79
commit 45f79cb279
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dmi.c
View File

@ -56,11 +56,14 @@ static char *get_dmi_string(const char *string_name)
printf_debug("DMI pipe open error\n");
return NULL;
}
if (!fgets(answerbuf, DMI_MAX_ANSWER_LEN, dmidecode_pipe) &&
ferror(dmidecode_pipe)) {
printf_debug("DMI pipe read error\n");
pclose(dmidecode_pipe);
return NULL;
if (!fgets(answerbuf, DMI_MAX_ANSWER_LEN, dmidecode_pipe)) {
if(ferror(dmidecode_pipe)) {
printf_debug("DMI pipe read error\n");
pclose(dmidecode_pipe);
return NULL;
} else {
answerbuf[0] = 0; /* Hit EOF */
}
}
/* Toss all output above DMI_MAX_ANSWER_LEN away to prevent
deadlock on pclose. */