Author: mkarcher Date: Wed Mar 24 18:55:04 2010 New Revision: 973 URL: http://flashrom.org/trac/coreboot/changeset/973
Log: Fix handling of empty dmidecode output Signed-off-by: Michael Karcher <[email protected]> Acked-by: Carl-Daniel Hailfinger <[email protected]> Modified: trunk/dmi.c Modified: trunk/dmi.c ============================================================================== --- trunk/dmi.c Tue Mar 23 18:10:28 2010 (r972) +++ trunk/dmi.c Wed Mar 24 18:55:04 2010 (r973) @@ -56,11 +56,14 @@ 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. */ _______________________________________________ flashrom mailing list [email protected] http://www.flashrom.org/mailman/listinfo/flashrom
