Mercurial > mplayer.hg
view subopt-helper.h @ 18708:9e2b300db17b
Change free_sh_audio() to take demuxer and stream id as parameters
(same as new_sh_audio()) instead of sh_audio_t *, use those to remove
the pointer from demuxer->a_streams[] before freeing it.
Some demuxers use free_sh_audio() to undo the creation of an
already-allocated audio stream in case of error. These uses were unsafe
since free_sh_audio() freed the data structure but left the pointer in
demuxer->a_streams[], leading to double free later in free_demuxer()
(and perhaps use of the freed stream before that, I didn't check).
author | uau |
---|---|
date | Wed, 14 Jun 2006 14:05:59 +0000 |
parents | f73adf296f1e |
children | 2ec2301183cd |
line wrap: on
line source
#ifndef SUBOPT_HELPER_H #define SUBOPT_HELPER_H /** * \file subopt-helper.h * * \brief Datatype and functions declarations for usage * of the suboption parser. * */ #define OPT_ARG_BOOL 0 #define OPT_ARG_INT 1 #define OPT_ARG_STR 2 #define OPT_ARG_MSTRZ 3 ///< A malloced, zero terminated string, use free()! #define OPT_ARG_FLOAT 4 typedef int (*opt_test_f)(void *); /** simple structure for defining the option name, type and storage location */ typedef struct opt_s { char * name; ///< string that identifies the option int type; ///< option type as defined in subopt-helper.h void * valp; ///< pointer to the mem where the value should be stored opt_test_f test; ///< argument test func ( optional ) int set; ///< Is set internally by the parser if the option was found. ///< Don't use it at initialization of your opts, it will be ///< overriden anyway! } opt_t; /** parses the string for the options specified in opt */ int subopt_parse( char const * const str, opt_t * opts ); /*------------------ arg specific types and declaration -------------------*/ typedef struct strarg_s { int len; ///< length of the string determined by the parser char const * str; ///< pointer to position inside the parse string } strarg_t; int int_non_neg( int * i ); int int_pos( int * i ); int strargcmp(strarg_t *arg, char *str); int strargcasecmp(strarg_t *arg, char *str); #endif