From 0884d04dc329087e287cab345330303f8972f270 Mon Sep 17 00:00:00 2001 From: Nicolas George Date: Sun, 7 Apr 2013 09:48:57 +0200 Subject: [PATCH] lavc: fix recoded subtitles end. Text subtitles packets are not 0-terminated (and if they are, it is handled by the recoding process since 0 is a valid Unicode code point). The terminating 0 would overwrite the last payload octet. OTOH, packets must be 0-padded. Fix a problem reported in trac ticket #2431. --- libavcodec/utils.c | 2 +- tests/ref/fate/sub-charenc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 76f7e8e142..e4ea32523d 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -2185,7 +2185,7 @@ static int recode_subtitle(AVCodecContext *avctx, goto end; } outpkt->size -= outl; - outpkt->data[outpkt->size - 1] = '\0'; + memset(outpkt->data + outpkt->size, 0, outl); end: if (cd != (iconv_t)-1) diff --git a/tests/ref/fate/sub-charenc b/tests/ref/fate/sub-charenc index 3c4825e206..ef727546fd 100644 --- a/tests/ref/fate/sub-charenc +++ b/tests/ref/fate/sub-charenc @@ -1 +1 @@ -a39d7e299a8e25b4ffece0f8d64bf19e +9615088d613931b50fd5016c7535b99a