CVS log for ports/audio/sox/patches/Attic/patch-src_wav_c

[BACK] Up to [local] / ports / audio / sox / patches

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.10, Wed May 24 21:10:34 2023 UTC (18 months ago) by namtsui
Branch: MAIN
CVS Tags: HEAD
Changes since 1.9: +0 -0 lines
FILE REMOVED

remove finished ports

Revision 1.9 / (download) - annotate - [select for diffs], Mon Apr 3 22:44:33 2023 UTC (19 months, 3 weeks ago) by namtsui
Branch: MAIN
Changes since 1.8: +2 -0 lines
Diff to previous 1.8 (colored) to selected 1.3 (colored)

comment

Revision 1.8 / (download) - annotate - [select for diffs], Mon Apr 3 22:29:00 2023 UTC (19 months, 3 weeks ago) by namtsui
Branch: MAIN
Changes since 1.7: +7 -10 lines
Diff to previous 1.7 (colored) to selected 1.3 (colored)

remove parens and remove newline

Revision 1.7 / (download) - annotate - [select for diffs], Thu Mar 30 22:54:31 2023 UTC (19 months, 3 weeks ago) by namtsui
Branch: MAIN
Changes since 1.6: +21 -5 lines
Diff to previous 1.6 (colored) to selected 1.3 (colored)

don't divide by 0 for wav gsm files

This tweaks Steffen Nurpmeso's diff against git. The tweak avoids
dividing by 0 for wav gsm files. It is based on Steffen's diff and
debian's older sox version before the git refactor.

Test case 1: converting /dev/null to bug.wav (wav gsm) and then converting bug.wav to fail.wav.
This test case is expected to pass.

failing output:
$ sox -t raw -r 44100 -e signed-integer -b 8 /dev/null -t wav -e gsm-full-rate bug.wav
$ sox bug.wav fail.wav
sox FAIL formats: can't open input file `bug.wav': WAV file bits per sample is zero

correct output (which this provides):
$ sox -t raw -r 44100 -e signed-integer -b 8 /dev/null -t wav -e gsm-full-rate bug.wav
$ sox bug.wav fail.wav
$ file fail.wav
fail.wav: RIFF (little-endian) data, WAVE audio, GSM 6.10, mono 44100 Hz

Test case 2: convert flac to wav gsm. then, convert wav gsm to wav gsm.
This test case is expected to pass.

$ sox -t flac -r 44100 -e signed-integer -b 16 song.flac -t wav -e gsm-full-rate ok.wav
$ sox ok.wav ok2.wav

Revision 1.6 / (download) - annotate - [select for diffs], Thu Mar 30 07:14:40 2023 UTC (19 months, 3 weeks ago) by namtsui
Branch: MAIN
Changes since 1.5: +61 -3 lines
Diff to previous 1.5 (colored) to selected 1.3 (colored)

wav gsm patch from Steffen Nurpmeso <steffen () sdaoden ! eu>. it still segfaults.

https://marc.info/?l=oss-security&m=167882517702862&w=2

it still segfaults

$ sox -t raw -r 44100 -e signed-integer -b 8 /dev/null -t wav -e gsm-full-rate bug.wav
$ sox bug.wav fail.wav

Reading symbols from sox...
(gdb) run bug.wav fail.wav
Starting program: /usr/local/bin/sox bug.wav fail.wav

Program received signal SIGFPE, Arithmetic exception.
0x0000019643917fb4 in startread (ft=0x196c0567000) at wav.c:976
976             wav->numSamples = div_bits(qwDataLength, ft->encoding.bits_per_sample)
(gdb) bt
#0  0x0000019643917fb4 in startread (ft=0x196c0567000) at wav.c:976
#1  0x00000196438af7e7 in open_read (path=0x196c05808b0 "bug.wav", buffer=0x0, buffer_size=0, signal=0x196c0588810,
    encoding=0x196c0588830, filetype=0x1964388c650 "wav") at formats.c:600
#2  0x00000196438af0b1 in sox_open_read (path=0x196c05808b0 "bug.wav", signal=0x196c0588810, encoding=0x196c0588830,
    filetype=0x0) at formats.c:641
#3  0x00000193e6a336a9 in main (argc=3, argv=0x7b2ddb9f38e8) at sox.c:2924
(gdb) print ft->encoding.bits_per_sample

Revision 1.5 / (download) - annotate - [select for diffs], Mon Feb 6 22:56:41 2023 UTC (21 months, 2 weeks ago) by namtsui
Branch: MAIN
Changes since 1.4: +11 -91 lines
Diff to previous 1.4 (colored) to selected 1.3 (colored)

CVE fixes from tb@

Helmut Grohne original diff
Steffen Nurpmeso diff applied against latest git version

Revision 1.4, Tue Oct 26 06:14:52 2021 UTC (3 years ago) by namtsui
Branch: MAIN
Changes since 1.3: +0 -0 lines
FILE REMOVED

Summary: mirror a git checkout for latest fixes

Revision 1.3 / (download) - annotate - [selected], Thu Jul 1 22:55:28 2021 UTC (3 years, 4 months ago) by namtsui
Branch: MAIN
Changes since 1.2: +40 -2 lines
Diff to previous 1.2 (colored)

Summary: apply missing patches

Revision 1.2 / (download) - annotate - [select for diffs], Thu Jul 1 22:19:00 2021 UTC (3 years, 4 months ago) by namtsui
Branch: MAIN
Changes since 1.1: +21 -3 lines
Diff to previous 1.1 (colored) to selected 1.3 (colored)

Summary: add comments and fix one missing security fix

Revision 1.1 / (download) - annotate - [select for diffs], Thu Jul 1 01:30:32 2021 UTC (3 years, 4 months ago) by namtsui
Branch: MAIN
Diff to selected 1.3 (colored)

Summary: backported fixes from tj@ now apply cleanly

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.




CVSweb