summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGleb Natapov <gleb@redhat.com>2011-02-02 17:34:34 +0200
committerAurelien Jarno <aurelien@aurel32.net>2011-02-04 21:23:05 +0100
commitfd08f20c23465c82c62187d463dacc6d00f79508 (patch)
treeecab98978dea6fd56cd6d1101a2152cf7d1c5d79
parent87982401963ff686b0289abaf4455417eadcfdcb (diff)
downloadqemu-fd08f20c23465c82c62187d463dacc6d00f79508.tar.gz
do not pass NULL to strdup.
Also use qemu_strdup() instead of strdup() in bootindex code. Signed-off-by: Gleb Natapov <gleb@redhat.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> (cherry picked from commit 4fef930af8d7fab4b6c777fa4c6e2b902359262a)
-rw-r--r--vl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/vl.c b/vl.c
index 655617f9f3..ed2cdfae42 100644
--- a/vl.c
+++ b/vl.c
@@ -738,7 +738,7 @@ void add_boot_device_path(int32_t bootindex, DeviceState *dev,
node = qemu_mallocz(sizeof(FWBootEntry));
node->bootindex = bootindex;
- node->suffix = strdup(suffix);
+ node->suffix = suffix ? qemu_strdup(suffix) : NULL;
node->dev = dev;
QTAILQ_FOREACH(i, &fw_boot_order, link) {
@@ -785,7 +785,7 @@ char *get_boot_devices_list(uint32_t *size)
} else if (devpath) {
bootpath = devpath;
} else {
- bootpath = strdup(i->suffix);
+ bootpath = qemu_strdup(i->suffix);
assert(bootpath);
}