| Message ID | 1429790258-19416-4-git-send-email-colin.king@canonical.com |
|---|---|
| State | Accepted |
| Headers | show |
On 15-04-23 07:57 PM, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > fwts_acpi_load_tables_from_acpidump should only attempt to open an ACPI > dumpfile if the fw->acpi_table_acpidump_file is actually defined > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > src/lib/src/fwts_acpi_tables.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/src/lib/src/fwts_acpi_tables.c b/src/lib/src/fwts_acpi_tables.c > index 24a724e..81fb096 100644 > --- a/src/lib/src/fwts_acpi_tables.c > +++ b/src/lib/src/fwts_acpi_tables.c > @@ -618,6 +618,9 @@ static int fwts_acpi_load_tables_from_acpidump(fwts_framework *fw) > { > FILE *fp; > > + if (!fw->acpi_table_acpidump_file) > + return FWTS_ERROR; > + > if ((fp = fopen(fw->acpi_table_acpidump_file, "r")) == NULL) { > fwts_log_error(fw, "Cannot open '%s' to read ACPI tables.", > fw->acpi_table_acpidump_file); Acked-by: Alex Hung <alex.hung@canonical.com>
On 2015年04月23日 19:57, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > fwts_acpi_load_tables_from_acpidump should only attempt to open an ACPI > dumpfile if the fw->acpi_table_acpidump_file is actually defined > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > src/lib/src/fwts_acpi_tables.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/src/lib/src/fwts_acpi_tables.c b/src/lib/src/fwts_acpi_tables.c > index 24a724e..81fb096 100644 > --- a/src/lib/src/fwts_acpi_tables.c > +++ b/src/lib/src/fwts_acpi_tables.c > @@ -618,6 +618,9 @@ static int fwts_acpi_load_tables_from_acpidump(fwts_framework *fw) > { > FILE *fp; > > + if (!fw->acpi_table_acpidump_file) > + return FWTS_ERROR; > + > if ((fp = fopen(fw->acpi_table_acpidump_file, "r")) == NULL) { > fwts_log_error(fw, "Cannot open '%s' to read ACPI tables.", > fw->acpi_table_acpidump_file); Acked-by: Ivan Hu<ivan.hu@canonical.com>
diff --git a/src/lib/src/fwts_acpi_tables.c b/src/lib/src/fwts_acpi_tables.c index 24a724e..81fb096 100644 --- a/src/lib/src/fwts_acpi_tables.c +++ b/src/lib/src/fwts_acpi_tables.c @@ -618,6 +618,9 @@ static int fwts_acpi_load_tables_from_acpidump(fwts_framework *fw) { FILE *fp; + if (!fw->acpi_table_acpidump_file) + return FWTS_ERROR; + if ((fp = fopen(fw->acpi_table_acpidump_file, "r")) == NULL) { fwts_log_error(fw, "Cannot open '%s' to read ACPI tables.", fw->acpi_table_acpidump_file);