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@xxxxxxxxxxxxxx>
> ---
> 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
Attachment:
signature.asc
Description: OpenPGP digital signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list