OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
048905a
)
Fix extreme stupidity: buffer size check must of course be before buffer use!
author
Reimar Döffinger
<Reimar.Doeffinger@gmx.de>
Sun, 9 Sep 2007 09:00:12 +0000
(09:00 +0000)
committer
Reimar Döffinger
<Reimar.Doeffinger@gmx.de>
Sun, 9 Sep 2007 09:00:12 +0000
(09:00 +0000)
Originally committed as revision 10443 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/nuv.c
patch
|
blob
|
history
diff --git
a/libavcodec/nuv.c
b/libavcodec/nuv.c
index
d07c868
..
232cea3
100644
(file)
--- a/
libavcodec/nuv.c
+++ b/
libavcodec/nuv.c
@@
-156,12
+156,12
@@
static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
buf_size = c->decomp_size;
}
if (c->codec_frameheader) {
- get_quant_quality(c, buf[10]);
- rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height, c->lq, c->cq);
if (buf_size < 12) {
av_log(avctx, AV_LOG_ERROR, "invalid nuv video frame\n");
return -1;
}
+ get_quant_quality(c, buf[10]);
+ rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height, c->lq, c->cq);
buf = &buf[12];
buf_size -= 12;
}