diff options
| author | Kamil Nowosad <k.nowosad@students.mimuw.edu.pl> | 2007-03-30 09:26:13 +0000 |
|---|---|---|
| committer | Panagiotis Issaris <takis.issaris@uhasselt.be> | 2007-03-30 09:26:13 +0000 |
| commit | a4072c453b23a24afd276f17fe1876df11ab1e0d (patch) | |
| tree | 027e43f0106832c768899c7109cec3a5ca84d065 /libavcodec/opt.c | |
| parent | 226d6947bc6e6592eabbcb7b401bf164be5bfe6e (diff) | |
| download | ffmpeg-a4072c453b23a24afd276f17fe1876df11ab1e0d.tar.gz | |
Fix a bug in av_find_opt(). Because some of the AVOption structures have field
unit = NULL, the function could pass NULL to strcmp and cause a segfault.
Patch by Kamil Nowosad, k nowosad % students mimuw edu pl.
Original thread:
Subject: [PATCH] small bugfix in av_find_opt()
Date: 03/23/2007 12:20 PM
Originally committed as revision 8553 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/opt.c')
| -rw-r--r-- | libavcodec/opt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/opt.c b/libavcodec/opt.c index cfff0c19d9..97b593cb2f 100644 --- a/libavcodec/opt.c +++ b/libavcodec/opt.c @@ -36,7 +36,7 @@ const AVOption *av_find_opt(void *v, const char *name, const char *unit, int mas const AVOption *o= c->option; for(;o && o->name; o++){ - if(!strcmp(o->name, name) && (!unit || !strcmp(o->unit, unit)) && (o->flags & mask) == flags ) + if(!strcmp(o->name, name) && (!unit || (o->unit && !strcmp(o->unit, unit))) && (o->flags & mask) == flags ) return o; } return NULL; |