summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@coresystems.de>2008-09-18 14:49:33 +0000
committerStefan Reinauer <stepan@openbios.org>2008-09-18 14:49:33 +0000
commit297b91c6cde7e1570be67cc664d5adef2823a53f (patch)
tree5d20e962beff5200b48f946296026c75192ab8ed
parent4614aedd4b6fb31c30f4eff347f91e4972edecf7 (diff)
downloadcoreboot-297b91c6cde7e1570be67cc664d5adef2823a53f.tar.xz
fix two minor bugs in nvramtool. (trivial)
Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3582 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
-rw-r--r--util/nvramtool/layout.h4
-rw-r--r--util/nvramtool/lbtable.c5
2 files changed, 5 insertions, 4 deletions
diff --git a/util/nvramtool/layout.h b/util/nvramtool/layout.h
index 94beb12c4b..69e71d6a9d 100644
--- a/util/nvramtool/layout.h
+++ b/util/nvramtool/layout.h
@@ -59,7 +59,7 @@ typedef struct
unsigned length;
cmos_entry_config_t config;
unsigned config_id;
- char name[CMOS_MAX_NAME_LENGTH];
+ char name[CMOS_MAX_NAME_LENGTH + 1];
}
cmos_entry_t;
@@ -69,7 +69,7 @@ cmos_entry_t;
typedef struct
{ unsigned config_id;
unsigned long long value;
- char text[CMOS_MAX_TEXT_LENGTH];
+ char text[CMOS_MAX_TEXT_LENGTH + 1];
}
cmos_enum_t;
diff --git a/util/nvramtool/lbtable.c b/util/nvramtool/lbtable.c
index ec2cc8545d..176085228f 100644
--- a/util/nvramtool/lbtable.c
+++ b/util/nvramtool/lbtable.c
@@ -30,6 +30,7 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
\*****************************************************************************/
+#include <string.h>
#include <sys/mman.h>
#include "common.h"
#include "coreboot_tables.h"
@@ -556,7 +557,7 @@ static void process_cmos_table (void)
for (p = first_cmos_table_enum(); p != NULL; p = next_cmos_table_enum(p))
{ cmos_enum.config_id = p->config_id;
cmos_enum.value = p->value;
- strncpy(cmos_enum.text, p->text, CMOS_MAX_TEXT_LENGTH);
+ strncpy(cmos_enum.text, (char *)p->text, CMOS_MAX_TEXT_LENGTH);
cmos_enum.text[CMOS_MAX_TEXT_LENGTH] = '\0';
try_add_cmos_table_enum(&cmos_enum);
}
@@ -589,7 +590,7 @@ static void process_cmos_table (void)
}
cmos_entry.config_id = q->config_id;
- strncpy(cmos_entry.name, q->name, CMOS_MAX_NAME_LENGTH);
+ strncpy(cmos_entry.name, (char *)q->name, CMOS_MAX_NAME_LENGTH);
cmos_entry.name[CMOS_MAX_NAME_LENGTH] = '\0';
try_add_cmos_table_entry(&cmos_entry);
}