[libvirt] [PATCH] util/vshstring: fix the vir_strdup when src is NULL.

[Eric Blake]

On 05/28/2013 01:13 AM, yangdongsheng wrote:
> When src is NULL, vir_strdup will return 0 directly.
> This patch will set dest to NULL before vir_strdup return.
> 
> Signed-off-by: yangdongsheng <yangds.fnst at cn.fujitsu.com>
> ---
>  src/util/virstring.c |    4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)

ACK, but VIR_STRNDUP has the same problem.  I'm pushing this with an
updated commit message (your followup mail that shows where it goes
wrong if not set to NULL) and with both problems fixed.

> 
> diff --git a/src/util/virstring.c b/src/util/virstring.c
> index b244e6c..25b5d81 100644
> --- a/src/util/virstring.c
> +++ b/src/util/virstring.c
> @@ -540,8 +540,10 @@ virStrdup(char **dest,
>            const char *funcname,
>            size_t linenr)
>  {
> -    if (!src)
> +    if (!src) {
> +        *dest = NULL;
>          return 0;
> +    }
>      if (!(*dest = strdup(src))) {
>          if (report)
>              virReportOOMErrorFull(domcode, filename, funcname, linenr);
> 

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 621 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20130528/6f485270/attachment-0001.sig>