43 lines
1.7 KiB
Diff
43 lines
1.7 KiB
Diff
From af4a9502aa73c358f331ecc038e1e11375898a32 Mon Sep 17 00:00:00 2001
|
|
Date: Mon, 11 Jan 2021 11:51:23 +0800
|
|
Subject: [PATCH] fix CVE-2014-9640
|
|
|
|
diff --git a/oggenc/oggenc.c b/oggenc/oggenc.c
|
|
index 323dedb..4616506 100644
|
|
--- a/oggenc/oggenc.c
|
|
+++ b/oggenc/oggenc.c
|
|
@@ -97,6 +97,8 @@ int main(int argc, char **argv)
|
|
.3,-1,
|
|
0,0,0.f,
|
|
0, 0, 0, 0, 0};
|
|
+ input_format raw_format = {NULL, 0, raw_open, wav_close, "raw",
|
|
+ N_("RAW file reader")};
|
|
|
|
int i;
|
|
|
|
@@ -239,8 +241,6 @@ int main(int argc, char **argv)
|
|
|
|
if(opt.rawmode)
|
|
{
|
|
- static input_format raw_format = {NULL, 0, raw_open, wav_close, "raw",
|
|
- N_("RAW file reader")};
|
|
|
|
enc_opts.rate=opt.raw_samplerate;
|
|
enc_opts.channels=opt.raw_channels;
|
|
diff --git a/oggenc/skeleton.h b/oggenc/skeleton.h
|
|
index cf87dc2..50b070f 100644
|
|
--- a/oggenc/skeleton.h
|
|
+++ b/oggenc/skeleton.h
|
|
@@ -41,7 +41,7 @@ typedef struct {
|
|
ogg_int64_t granule_rate_d; /* granule rate denominator */
|
|
ogg_int64_t start_granule; /* start granule value */
|
|
ogg_uint32_t preroll; /* preroll */
|
|
- unsigned char granule_shift; // a 8-bit field /* 1 byte value holding the granule shift */
|
|
+ unsigned char granule_shift; /* 1 byte value holding the granule shift */
|
|
char *message_header_fields; /* holds all the message header fields */
|
|
/* current total size of the message header fields, for realloc purpose, initially zero */
|
|
ogg_uint32_t current_header_size;
|
|
--
|
|
2.23.0
|
|
|