diff mbox

[01/41] buffered_file: g_realloc() can't fail

Message ID 1348217255-22441-2-git-send-email-quintela@redhat.com
State New
Headers show

Commit Message

Juan Quintela Sept. 21, 2012, 8:46 a.m. UTC 
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 buffered_file.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

Comments

Paolo Bonzini Sept. 21, 2012, 12:11 p.m. UTC | #1 
Il 21/09/2012 10:46, Juan Quintela ha scritto:
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
>  buffered_file.c | 10 +---------
>  1 file changed, 1 insertion(+), 9 deletions(-)
> 
> diff --git a/buffered_file.c b/buffered_file.c
> index f170aa0..4148abb 100644
> --- a/buffered_file.c
> +++ b/buffered_file.c
> @@ -50,20 +50,12 @@ static void buffered_append(QEMUFileBuffered *s,
>                              const uint8_t *buf, size_t size)
>  {
>      if (size > (s->buffer_capacity - s->buffer_size)) {
> -        void *tmp;
> -
>          DPRINTF("increasing buffer capacity from %zu by %zu\n",
>                  s->buffer_capacity, size + 1024);
> 
>          s->buffer_capacity += size + 1024;
> 
> -        tmp = g_realloc(s->buffer, s->buffer_capacity);
> -        if (tmp == NULL) {
> -            fprintf(stderr, "qemu file buffer expansion failed\n");
> -            exit(1);
> -        }
> -
> -        s->buffer = tmp;
> +        s->buffer = g_realloc(s->buffer, s->buffer_capacity);
>      }
> 
>      memcpy(s->buffer + s->buffer_size, buf, size);
> 

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>

Paolo
Orit Wasserman Sept. 25, 2012, 8:08 a.m. UTC | #2 
On 09/21/2012 11:46 AM, Juan Quintela wrote:
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
>  buffered_file.c | 10 +---------
>  1 file changed, 1 insertion(+), 9 deletions(-)
> 
> diff --git a/buffered_file.c b/buffered_file.c
> index f170aa0..4148abb 100644
> --- a/buffered_file.c
> +++ b/buffered_file.c
> @@ -50,20 +50,12 @@ static void buffered_append(QEMUFileBuffered *s,
>                              const uint8_t *buf, size_t size)
>  {
>      if (size > (s->buffer_capacity - s->buffer_size)) {
> -        void *tmp;
> -
>          DPRINTF("increasing buffer capacity from %zu by %zu\n",
>                  s->buffer_capacity, size + 1024);
> 
>          s->buffer_capacity += size + 1024;
> 
> -        tmp = g_realloc(s->buffer, s->buffer_capacity);
> -        if (tmp == NULL) {
> -            fprintf(stderr, "qemu file buffer expansion failed\n");
> -            exit(1);
> -        }
> -
> -        s->buffer = tmp;
> +        s->buffer = g_realloc(s->buffer, s->buffer_capacity);
>      }
> 
>      memcpy(s->buffer + s->buffer_size, buf, size);
> 

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
diff mbox

Patch

diff --git a/buffered_file.c b/buffered_file.c
index f170aa0..4148abb 100644
--- a/buffered_file.c
+++ b/buffered_file.c
@@ -50,20 +50,12 @@  static void buffered_append(QEMUFileBuffered *s,
                             const uint8_t *buf, size_t size)
 {
     if (size > (s->buffer_capacity - s->buffer_size)) {
-        void *tmp;
-
         DPRINTF("increasing buffer capacity from %zu by %zu\n",
                 s->buffer_capacity, size + 1024);

         s->buffer_capacity += size + 1024;

-        tmp = g_realloc(s->buffer, s->buffer_capacity);
-        if (tmp == NULL) {
-            fprintf(stderr, "qemu file buffer expansion failed\n");
-            exit(1);
-        }
-
-        s->buffer = tmp;
+        s->buffer = g_realloc(s->buffer, s->buffer_capacity);
     }

     memcpy(s->buffer + s->buffer_size, buf, size);