diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-09-28 16:44:20 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-09-28 16:44:20 +0000 |
| commit | f1c09d5fa75c5b60749189cb1e7a7eeb132cc75e (patch) | |
| tree | c5b251ee42a12d3377d3c329db37801abd2fa8b7 /user/faad2/overflow.patch | |
| parent | 392df44317bc4ddfbf182293305442712d6ce863 (diff) | |
| parent | 9d975a16f6054ccfa09bcd932da9f18eff7d37d1 (diff) | |
| download | packages-f1c09d5fa75c5b60749189cb1e7a7eeb132cc75e.tar.gz packages-f1c09d5fa75c5b60749189cb1e7a7eeb132cc75e.tar.bz2 packages-f1c09d5fa75c5b60749189cb1e7a7eeb132cc75e.tar.xz packages-f1c09d5fa75c5b60749189cb1e7a7eeb132cc75e.zip | |
Merge branch 'cves.2019.08.29' into 'master'
Misc. security updates
See merge request adelie/packages!336
Diffstat (limited to 'user/faad2/overflow.patch')
| -rw-r--r-- | user/faad2/overflow.patch | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/user/faad2/overflow.patch b/user/faad2/overflow.patch deleted file mode 100644 index 5a198f8d8..000000000 --- a/user/faad2/overflow.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- faad2/libfaad/bits.c 2007-11-01 13:33:29.000000000 +0100 -+++ faad2.new/libfaad/bits.c 2019-03-25 17:29:26.134199188 +0100 -@@ -167,7 +167,10 @@ - int words = bits >> 5; - int remainder = bits & 0x1F; - -- ld->bytes_left = ld->buffer_size - words*4; -+ if (ld->buffer_size < words * 4) -+ ld->bytes_left = 0; -+ else -+ ld->bytes_left = ld->buffer_size - words*4; - - if (ld->bytes_left >= 4) - { ---- faad2/libfaad/syntax.c 2019-03-25 17:57:36.930937066 +0100 -+++ faad2.new/libfaad/syntax.c 2019-03-25 17:49:26.135368525 +0100 -@@ -2292,6 +2292,8 @@ - while ((drc->additional_excluded_chns[n-1] = faad_get1bit(ld - DEBUGVAR(1,104,"excluded_channels(): additional_excluded_chns"))) == 1) - { -+ if (i >= MAX_CHANNELS - num_excl_chan - 7) -+ return n; - for (i = num_excl_chan; i < num_excl_chan+7; i++) - { - drc->exclude_mask[i] = faad_get1bit(ld |