Attachment 584269 Details for Bug 821334 – Fix for the memory leak part1

[patch] Fix for the memory leak part1

0001-server-mjpeg_encoder-Fix-memory-leak-for-the-inital-.patch (text/plain), 2.30 KB, created by Yonit Halperin on 2012-05-14 07:24:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yonit Halperin

Created: 2012-05-14 07:24:37 UTC

Size: 2.30 KB

patch

obsolete

>From fecc1e3d4d3d93ade71a318ad655e85974638162 Mon Sep 17 00:00:00 2001
>From: Yonit Halperin <yhalperi@redhat.com>
>Date: Thu, 10 May 2012 12:26:01 +0300
>Subject: [PATCH 1/2] server/mjpeg_encoder: Fix memory leak for the inital
> output buffer given for each frame
>
>---
> server/mjpeg_encoder.c |   11 +++--------
> server/mjpeg_encoder.h |    5 +++++
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
>diff --git a/server/mjpeg_encoder.c b/server/mjpeg_encoder.c
>index 9c3d079..3c2fc31 100644
>--- a/server/mjpeg_encoder.c
>+++ b/server/mjpeg_encoder.c
>@@ -101,7 +101,6 @@ typedef struct {
> 
>   unsigned char ** outbuffer;	/* target buffer */
>   size_t * outsize;
>-  unsigned char * newbuffer;	/* newly allocated buffer */
>   uint8_t * buffer;		/* start of buffer */
>   size_t bufsize;
> } mem_destination_mgr;
>@@ -125,9 +124,7 @@ static boolean empty_mem_output_buffer(j_compress_ptr cinfo)
> 
>   memcpy(nextbuffer, dest->buffer, dest->bufsize);
> 
>-  free(dest->newbuffer);
>-
>-  dest->newbuffer = nextbuffer;
>+  free(dest->buffer);
> 
>   dest->pub.next_output_byte = nextbuffer + dest->bufsize;
>   dest->pub.free_in_buffer = dest->bufsize;
>@@ -180,12 +177,10 @@ spice_jpeg_mem_dest(j_compress_ptr cinfo,
>   dest->pub.term_destination = term_mem_destination;
>   dest->outbuffer = outbuffer;
>   dest->outsize = outsize;
>-  dest->newbuffer = NULL;
>-
>   if (*outbuffer == NULL || *outsize == 0) {
>     /* Allocate initial buffer */
>-    dest->newbuffer = *outbuffer = malloc(OUTPUT_BUF_SIZE);
>-    if (dest->newbuffer == NULL)
>+    *outbuffer = malloc(OUTPUT_BUF_SIZE);
>+    if (*outbuffer == NULL)
>       ERREXIT1(cinfo, JERR_OUT_OF_MEMORY, 10);
>     *outsize = OUTPUT_BUF_SIZE;
>   }
>diff --git a/server/mjpeg_encoder.h b/server/mjpeg_encoder.h
>index 91297d0..b9a2ed7 100644
>--- a/server/mjpeg_encoder.h
>+++ b/server/mjpeg_encoder.h
>@@ -27,6 +27,11 @@ MJpegEncoder *mjpeg_encoder_new(void);
> void mjpeg_encoder_destroy(MJpegEncoder *encoder);
> 
> uint8_t mjpeg_encoder_get_bytes_per_pixel(MJpegEncoder *encoder);
>+
>+/*
>+ * *dest must be either NULL or allocated by malloc, since it might be freed
>+ * during the encoding, if its size is too small.
>+ */
> int mjpeg_encoder_start_frame(MJpegEncoder *encoder, SpiceBitmapFmt format,
>                               int width, int height,
>                               uint8_t **dest, size_t *dest_len);
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 821334: 584269 | 584270 | 585438