diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-21 22:32:17 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-21 22:32:17 +0000 |
| commit | dce25564cc554cc85c8c28928b1b8d3f965c1b16 (patch) | |
| tree | e62af5fbf2444d5a1a64ae36528132c5de209f05 | |
| parent | 448887a6bb44b267e897899ca48b71bd4f407711 (diff) | |
| download | ffmpeg-dce25564cc554cc85c8c28928b1b8d3f965c1b16.tar.gz | |
'code' is used to index a table so make it unsigned
this prevents using negative index and possibly crashing with broken files
Originally committed as revision 16714 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/isom.c | 2 | ||||
| -rw-r--r-- | libavformat/isom.h | 2 | ||||
| -rw-r--r-- | libavformat/mov.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c index 73ee3285f0..39c58c64df 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -274,7 +274,7 @@ int ff_mov_iso639_to_lang(const char *lang, int mp4) return code; } -int ff_mov_lang_to_iso639(int code, char *to) +int ff_mov_lang_to_iso639(unsigned code, char *to) { int i; /* is it the mangled iso code? */ diff --git a/libavformat/isom.h b/libavformat/isom.h index 934dde8388..2cad5b8b68 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -33,7 +33,7 @@ extern const AVCodecTag codec_movaudio_tags[]; extern const AVCodecTag ff_codec_movsubtitle_tags[]; int ff_mov_iso639_to_lang(const char *lang, int mp4); -int ff_mov_lang_to_iso639(int code, char *to); +int ff_mov_lang_to_iso639(unsigned code, char *to); typedef struct { int count; diff --git a/libavformat/mov.c b/libavformat/mov.c index fc946ea33a..0a93444d18 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -494,7 +494,7 @@ static int mov_read_mdhd(MOVContext *c, ByteIOContext *pb, MOVAtom atom) AVStream *st = c->fc->streams[c->fc->nb_streams-1]; MOVStreamContext *sc = st->priv_data; int version = get_byte(pb); - int lang; + unsigned lang; if (version > 1) return -1; /* unsupported */ |