mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-28 06:42:16 +00:00
Code Issues 1 Projects Releases Wiki Activity

Fix a mem leak with _peek_bytes. We keep a pointer to the assembled bytes and g_free it on the next flush.

Browse source 
Original commit message from CVS:
Fix a mem leak with _peek_bytes. We keep a pointer to the assembled bytes
and g_free it on the next flush.
This commit is contained in:
Wim Taymans 2001-10-14 12:28:58 +00:00
parent e37919f916
commit 8ade95069b
2 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libs/bytestream/gstbytestream.c
View file

@ -56,6 +56,7 @@ gst_bytestream_new (GstPad * pad)
bs->buflist = NULL;
bs->headbufavail = 0;
bs->listavail = 0;
bs->assembled = NULL;
return bs;
}
@ -71,6 +72,8 @@ gst_bytestream_destroy (GstByteStream * bs)
walk = g_slist_next (walk);
}
g_slist_free (bs->buflist);
if (bs->assembled)
g_free (bs->assembled);
g_free (bs);
}
@ -195,7 +198,7 @@ gst_bytestream_peek (GstByteStream * bs, guint32 len)
gst_bytestream_fill_bytes (bs, len);
bs_print ("peek: there are now %d bytes in the list\n", bs->listavail);
}
bs_status (bs)
bs_status (bs);
// extract the head buffer
headbuf = GST_BUFFER (bs->buflist->data);
@ -239,7 +242,7 @@ gst_bytestream_peek_bytes (GstByteStream * bs, guint32 len)
gst_bytestream_fill_bytes (bs, len);
bs_print ("peek_bytes: there are now %d bytes in the list\n", bs->listavail);
}
bs_status (bs)
bs_status (bs);
// extract the head buffer
headbuf = GST_BUFFER (bs->buflist->data);
@ -257,6 +260,8 @@ gst_bytestream_peek_bytes (GstByteStream * bs, guint32 len)
bs_print ("peek_bytes: current buffer is not big enough for len %d\n", len);
data = gst_bytestream_assemble (bs, len);
bs->assembled = data;
bs->assembled_len = len;
}
return data;
@ -303,6 +308,10 @@ gst_bytestream_flush (GstByteStream * bs, guint32 len)
GstBuffer *headbuf;
bs_print ("flush: flushing %d bytes\n", len);
if (bs->assembled) {
g_free (bs->assembled);
bs->assembled = NULL;
}
// make sure we have enough
bs_print ("flush: there are %d bytes in the list\n", bs->listavail);

11
libs/bytestream/gstbytestream.h
View file

@ -31,15 +31,20 @@ typedef struct _GstByteStream GstByteStream;
struct _GstByteStream {
GstPad *pad;
GSList *buflist;
guint32 headbufavail;
guint32 listavail;
GSList *buflist;
guint32 headbufavail;
guint32 listavail;
// we keep state of assembled pieces
guint8 *assembled;
guint32 assembled_len;
};
GstByteStream* gst_bytestream_new (GstPad *pad);
void gst_bytestream_destroy (GstByteStream *bs);
GstBuffer* gst_bytestream_read (GstByteStream *bs, guint32 len);
GstBuffer* gst_bytestream_peek (GstByteStream *bs, guint32 len);
guint8* gst_bytestream_peek_bytes (GstByteStream *bs, guint32 len);
gboolean gst_bytestream_flush (GstByteStream *bs, guint32 len);