mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 01:45:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

jp2kdecimator: Don't leak various slices and arrays

Browse source 
CID #1212139
CID #1212140
CID #1212141
This commit is contained in:
Edward Hervey 2014-05-13 11:23:42 +02:00
parent 6baeb94dce
commit 1d01afc166
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gst/jp2kdecimator/jp2kcodestream.c
View file

@ -887,6 +887,7 @@ parse_packet (GstJP2kDecimator * self, GstByteReader * reader,
if (!gst_byte_reader_peek_uint16_be (reader, &marker)) { if (!gst_byte_reader_peek_uint16_be (reader, &marker)) {
GST_ERROR_OBJECT (self, "Truncated file"); GST_ERROR_OBJECT (self, "Truncated file");
ret = GST_FLOW_ERROR; ret = GST_FLOW_ERROR;
g_slice_free (Packet, p);
goto done; goto done;
} }
@ -898,12 +899,14 @@ parse_packet (GstJP2kDecimator * self, GstByteReader * reader,
if (!gst_byte_reader_get_uint16_be (reader, &dummy)) { if (!gst_byte_reader_get_uint16_be (reader, &dummy)) {
GST_ERROR_OBJECT (self, "Truncated file"); GST_ERROR_OBJECT (self, "Truncated file");
ret = GST_FLOW_ERROR; ret = GST_FLOW_ERROR;
g_slice_free (Packet, p);
goto done; goto done;
} }
if (!gst_byte_reader_get_uint16_be (reader, &seqno)) { if (!gst_byte_reader_get_uint16_be (reader, &seqno)) {
GST_ERROR_OBJECT (self, "Truncated file"); GST_ERROR_OBJECT (self, "Truncated file");
ret = GST_FLOW_ERROR; ret = GST_FLOW_ERROR;
g_slice_free (Packet, p);
goto done; goto done;
} }
p->data = gst_byte_reader_peek_data_unchecked (reader); p->data = gst_byte_reader_peek_data_unchecked (reader);
@ -1169,8 +1172,10 @@ parse_tile (GstJP2kDecimator * self, GstByteReader * reader,
PacketLengthTilePart *plt = g_slice_new (PacketLengthTilePart); PacketLengthTilePart *plt = g_slice_new (PacketLengthTilePart);
ret = parse_plt (self, reader, plt, length); ret = parse_plt (self, reader, plt, length);
if (ret != GST_FLOW_OK) if (ret != GST_FLOW_OK) {
g_slice_free (PacketLengthTilePart, plt);
goto done; goto done;
}
tile->plt = g_list_append (tile->plt, plt); tile->plt = g_list_append (tile->plt, plt);
break; break;
@ -1787,6 +1792,8 @@ decimate_main_header (GstJP2kDecimator * self, MainHeader * header)
if (l == NULL) { if (l == NULL) {
GST_ERROR_OBJECT (self, "Not enough packets"); GST_ERROR_OBJECT (self, "Not enough packets");
ret = GST_FLOW_ERROR; ret = GST_FLOW_ERROR;
g_array_free (plt->packet_lengths, TRUE);
g_slice_free (PacketLengthTilePart, plt);
goto done; goto done;
} }