Re: [Qemu-devel] [PATCH] do not pass NULL to strdup.

2011-02-04 Thread Aurelien Jarno 
On Wed, Feb 02, 2011 at 05:34:34PM +0200, Gleb Natapov wrote:
 Also use qemu_strdup() instead of strdup() in bootindex code.
 
 Signed-off-by: Gleb Natapov g...@redhat.com
 ---
 
 Should go to stable too.

Thanks, applied

 diff --git a/vl.c b/vl.c
 index 655617f..ed2cdfa 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);
  }
  
 --
   Gleb.
 
 

-- 
Aurelien Jarno  GPG: 1024D/F1BCDB73
aurel...@aurel32.net http://www.aurel32.net

[Qemu-devel] [PATCH] do not pass NULL to strdup.

2011-02-02 Thread Gleb Natapov 
Also use qemu_strdup() instead of strdup() in bootindex code.

Signed-off-by: Gleb Natapov g...@redhat.com
---

Should go to stable too.

diff --git a/vl.c b/vl.c
index 655617f..ed2cdfa 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);
 }
 
--
Gleb.

Re: [Qemu-devel] [PATCH] do not pass NULL to strdup.

2011-02-02 Thread Markus Armbruster 
Gleb Natapov g...@redhat.com writes:

 Also use qemu_strdup() instead of strdup() in bootindex code.

 Signed-off-by: Gleb Natapov g...@redhat.com
 ---

 Should go to stable too.

Yes, please!  By the way, putting 0.14 in the subject should help with
that.