summaryrefslogtreecommitdiff
path: root/vorbis-tools/vorbis-tools-r19117-CVE-2014-9640.patch
blob: 30a6c6b689c89e86ef30b0a59cf0a4cf1cf39f25 (plain)
    1 ---
    2  oggenc/oggenc.c   |    4 ++--
    3  oggenc/skeleton.h |    2 +-
    4  2 files changed, 3 insertions(+), 3 deletions(-)
    5 
    6 --- a/oggenc/oggenc.c
    7 +++ b/oggenc/oggenc.c
    8 @@ -97,6 +97,8 @@ int main(int argc, char **argv)
    9                .3,-1,
   10                0,0,0.f,
   11                0, 0, 0, 0, 0};
   12 +    input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", 
   13 +      N_("RAW file reader")};
   14  
   15      int i;
   16  
   17 @@ -239,8 +241,6 @@ int main(int argc, char **argv)
   18  
   19          if(opt.rawmode)
   20          {
   21 -            input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", 
   22 -                N_("RAW file reader")};
   23  
   24              enc_opts.rate=opt.raw_samplerate;
   25              enc_opts.channels=opt.raw_channels;
   26 --- a/oggenc/skeleton.h
   27 +++ b/oggenc/skeleton.h
   28 @@ -41,7 +41,7 @@ typedef struct {
   29      ogg_int64_t granule_rate_d;                            /* granule rate denominator */
   30      ogg_int64_t start_granule;                             /* start granule value */
   31      ogg_uint32_t preroll;                                   /* preroll */
   32 -    unsigned char granule_shift; // a 8-bit field           /* 1 byte value holding the granule shift */
   33 +    unsigned char granule_shift;                            /* 1 byte value holding the granule shift */
   34      char *message_header_fields;                            /* holds all the message header fields */
   35      /* current total size of the message header fields, for realloc purpose, initially zero */
   36      ogg_uint32_t current_header_size;

Generated by cgit