[FFmpeg-cvslog] sgienc: Make sure to initialize skipped header portions

Vittorio Giovara git at videolan.org
Fri Dec 18 14:48:27 CET 2015


ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Wed Dec  2 19:10:02 2015 -0500| [c34df422628e6b7b657faee241fe7bb2629e0f57] | committer: Vittorio Giovara

sgienc: Make sure to initialize skipped header portions

Fix fate tests with asan. Introduced during bytestream2 porting
(in revision 62cc8f4d79dad119e8efeaae080a58a8dcb1e89d).

Signed-off-by: Vittorio Giovara <vittorio.giovara at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c34df422628e6b7b657faee241fe7bb2629e0f57
---

 libavcodec/sgienc.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/libavcodec/sgienc.c b/libavcodec/sgienc.c
index 763de48..07e224c 100644
--- a/libavcodec/sgienc.c
+++ b/libavcodec/sgienc.c
@@ -95,7 +95,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
     const AVFrame * const p = frame;
     PutByteContext pbc;
     uint8_t *in_buf, *encode_buf;
-    int x, y, z, length, tablesize, ret;
+    int x, y, z, length, tablesize, ret, i;
     unsigned int width, height, depth, dimension;
     unsigned int bytes_per_channel, pixmax, put_be;
 
@@ -188,13 +188,15 @@ FF_ENABLE_DEPRECATION_WARNINGS
     bytestream2_put_be32(&pbc, 0L); /* dummy */
 
     /* name */
-    bytestream2_skip_p(&pbc, 80);
+    for (i = 0; i < 80; i++)
+        bytestream2_put_byte(&pbc, 0L);
 
     /* colormap */
     bytestream2_put_be32(&pbc, 0L);
 
     /* The rest of the 512 byte header is unused. */
-    bytestream2_skip_p(&pbc, 404);
+    for (i = 0; i < 404; i++)
+        bytestream2_put_byte(&pbc, 0L);
 
     if (s->rle) {
         PutByteContext taboff_pcb, tablen_pcb;



More information about the ffmpeg-cvslog mailing list