And avoid a memory leak.
---
I need to doublecheck what happens to buf.
libavformat/rtpdec.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c
index 0efcdb9..4360bd9 100644
--- a/libavformat/rtpdec.c
+++ b/libavformat/rtpdec.c
@@ -680,7 +680,7 @@ void ff_rtp_reset_packet_queue(RTPDemuxContext *s)
s->prev_ret = 0;
}
-static void enqueue_packet(RTPDemuxContext *s, uint8_t *buf, int len)
+static int enqueue_packet(RTPDemuxContext *s, uint8_t *buf, int len)
{
uint16_t seq = AV_RB16(buf + 2);
RTPPacket **cur = &s->queue, *packet;
@@ -695,7 +695,7 @@ static void enqueue_packet(RTPDemuxContext *s, uint8_t
*buf, int len)
packet = av_mallocz(sizeof(*packet));
if (!packet)
- return;
+ return AVERROR(ENOMEM);
packet->recvtime = av_gettime_relative();
packet->seq = seq;
packet->len = len;
@@ -703,6 +703,8 @@ static void enqueue_packet(RTPDemuxContext *s, uint8_t
*buf, int len)
packet->next = *cur;
*cur = packet;
s->queue_len++;
+
+ return 0;
}
static int has_next_packet(RTPDemuxContext *s)
@@ -800,7 +802,9 @@ static int rtp_parse_one_packet(RTPDemuxContext *s,
AVPacket *pkt,
return rv;
} else {
/* Still missing some packet, enqueue this one. */
- enqueue_packet(s, buf, len);
+ rv = enqueue_packet(s, buf, len);
+ if (rv < 0)
+ return rv;
*bufptr = NULL;
/* Return the first enqueued packet if the queue is full,
* even if we're missing something */
--
2.5.0
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
