projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fbc20c3
)
mpegenc: prevent a NULL pointer dereference
author
Vittorio Giovara
<vittorio.giovara@gmail.com>
Fri, 21 Nov 2014 12:57:42 +0000
(12:57 +0000)
committer
Luca Barbato
<lu_zero@gentoo.org>
Mon, 12 Jan 2015 23:16:40 +0000
(
00:16
+0100)
CC: libav-stable@libav.org
Bug-Id: CID 29261
(cherry picked from commit
065923b0781b06a2604f69f4e2c2407b7750a854
)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
libavformat/mpegenc.c
patch
|
blob
|
history
diff --git
a/libavformat/mpegenc.c
b/libavformat/mpegenc.c
index
88590b3
..
8a62c54
100644
(file)
--- a/
libavformat/mpegenc.c
+++ b/
libavformat/mpegenc.c
@@
-1052,7
+1052,7
@@
retry:
es_size -= stream->premux_packet->unwritten_size;
stream->premux_packet = stream->premux_packet->next;
}
- if (es_size)
+ if (
stream->premux_packet &&
es_size)
stream->premux_packet->unwritten_size -= es_size;
if (remove_decoded_packets(ctx, s->last_scr) < 0)