RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/hnm4video: fix missing newlines in error messages 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-22 22:15:35 +01:00
parent 78446f0d9d
commit b33f3246e2
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/hnm4video.c
View File

@ -78,7 +78,7 @@ static void unpack_intraframe(AVCodecContext *avctx, uint8_t *src,
if (getbit(&gb, &bitbuf, &bits)) { if (getbit(&gb, &bitbuf, &bits)) {
if (writeoffset >= hnm->width * hnm->height) { if (writeoffset >= hnm->width * hnm->height) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"Attempting to write out of bounds"); "Attempting to write out of bounds\n");
break; break;
} }
hnm->current[writeoffset++] = bytestream2_get_byte(&gb); hnm->current[writeoffset++] = bytestream2_get_byte(&gb);
@ -99,11 +99,11 @@ static void unpack_intraframe(AVCodecContext *avctx, uint8_t *src,
count += 2; count += 2;
offset += writeoffset; offset += writeoffset;
if (offset < 0 || offset + count >= hnm->width * hnm->height) { if (offset < 0 || offset + count >= hnm->width * hnm->height) {
av_log(avctx, AV_LOG_ERROR, "Attempting to read out of bounds"); av_log(avctx, AV_LOG_ERROR, "Attempting to read out of bounds\n");
break; break;
} else if (writeoffset + count >= hnm->width * hnm->height) { } else if (writeoffset + count >= hnm->width * hnm->height) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"Attempting to write out of bounds"); "Attempting to write out of bounds\n");
break; break;
} }
while (count--) { while (count--) {
@ -202,14 +202,14 @@ static void decode_interframe_v4(AVCodecContext *avctx, uint8_t *src, uint32_t s
left = count; left = count;
if (!backward && offset + 2*count > hnm->width * hnm->height) { if (!backward && offset + 2*count > hnm->width * hnm->height) {
av_log(avctx, AV_LOG_ERROR, "Attempting to read out of bounds"); av_log(avctx, AV_LOG_ERROR, "Attempting to read out of bounds\n");
break; break;
} else if (backward && offset + 1 >= hnm->width * hnm->height) { } else if (backward && offset + 1 >= hnm->width * hnm->height) {
av_log(avctx, AV_LOG_ERROR, "Attempting to read out of bounds"); av_log(avctx, AV_LOG_ERROR, "Attempting to read out of bounds\n");
break; break;
} else if (writeoffset + 2*count > hnm->width * hnm->height) { } else if (writeoffset + 2*count > hnm->width * hnm->height) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"Attempting to write out of bounds"); "Attempting to write out of bounds\n");
break; break;
} }
if(backward) { if(backward) {
@ -307,10 +307,10 @@ static void decode_interframe_v4a(AVCodecContext *avctx, uint8_t *src,
offset -= 0x10000; offset -= 0x10000;
if (offset + hnm->width + count >= hnm->width * hnm->height) { if (offset + hnm->width + count >= hnm->width * hnm->height) {
av_log(avctx, AV_LOG_ERROR, "Attempting to read out of bounds"); av_log(avctx, AV_LOG_ERROR, "Attempting to read out of bounds\n");
break; break;
} else if (writeoffset + hnm->width + count >= hnm->width * hnm->height) { } else if (writeoffset + hnm->width + count >= hnm->width * hnm->height) {
av_log(avctx, AV_LOG_ERROR, "Attempting to write out of bounds"); av_log(avctx, AV_LOG_ERROR, "Attempting to write out of bounds\n");
break; break;
} }