Attachment 193581 Details for Bug 287811 – Backported patch from upstream

[patch] Backported patch from upstream

KG523.patch (text/plain), 1.72 KB, created by Flavio Leitner on 2007-09-12 15:47:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Flavio Leitner

Created: 2007-09-12 15:47:54 UTC

Size: 1.72 KB

patch

obsolete

>diff -upNr aaa/libvirt-0.2.3/src/xend_internal.c bbb/libvirt-0.2.3/src/xend_internal.c
>--- aaa/libvirt-0.2.3/src/xend_internal.c	2007-09-08 09:58:41.000000000 +0900
>+++ bbb/libvirt-0.2.3/src/xend_internal.c	2007-09-08 10:04:01.000000000 +0900
>@@ -1367,10 +1367,9 @@ xend_parse_sexp_desc(virConnectPtr conn,
>         /* ERROR */
>         return (NULL);
>     }
>-    ret = malloc(4000);
>-    if (ret == NULL)
>+    buf.content = malloc(4000);
>+    if (buf.content == NULL)
>         return (NULL);
>-    buf.content = ret;
>     buf.size = 4000;
>     buf.use = 0;
> 
>@@ -1743,11 +1742,11 @@ xend_parse_sexp_desc(virConnectPtr conn,
>     virBufferAdd(&buf, "</domain>\n", 10);
> 
>     buf.content[buf.use] = 0;
>-    return (ret);
>+    return (buf.content);
> 
>   error:
>-    if (ret != NULL)
>-        free(ret);
>+    if (buf.content != NULL)
>+        free(buf.content);
>     return (NULL);
> }
> 
>diff -upNr aaa/libvirt-0.2.3/src/xml.c bbb/libvirt-0.2.3/src/xml.c
>--- aaa/libvirt-0.2.3/src/xml.c	2007-09-08 09:58:41.000000000 +0900
>+++ bbb/libvirt-0.2.3/src/xml.c	2007-09-08 10:02:32.000000000 +0900
>@@ -381,7 +381,7 @@ virBufferFree(virBufferPtr buf)
> int
> virBufferVSprintf(virBufferPtr buf, const char *format, ...)
> {
>-    int size, count;
>+    int size, count, grow_size;
>     va_list locarg, argptr;
> 
>     if ((format == NULL) || (buf == NULL)) {
>@@ -394,7 +394,8 @@ virBufferVSprintf(virBufferPtr buf, cons
>                                locarg)) < 0) || (count >= size - 1)) {
>         buf->content[buf->use] = 0;
>         va_end(locarg);
>-        if (virBufferGrow(buf, 1000) < 0) {
>+        grow_size = (count > 1000) ? count : 1000;
>+        if (virBufferGrow(buf, grow_size) < 0) {
>             return (-1);
>         }
>         size = buf->size - buf->use - 1;

Actions: View | Diff

Attachments on bug 287811: 193581