Skip to content

gh-96821: Fix undefined behaviour in audioop.c #96923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mdickinson merged 11 commits into from
Oct 10, 2022
+16 −12
Merged

gh-96821: Fix undefined behaviour in audioop.c #96923

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
13b5850
gh-96821: Fix undefined behaviour in `audioop.c`
matthiasgoergens Sep 19, 2022
07d709a
📜🤖 Added by blurb_it.
blurb-it[bot] Sep 19, 2022
fd6f822
Merge branch 'main' into matthias/fix-audioop-UB
matthiasgoergens Sep 20, 2022
a3502da
Merge branch 'main' into matthias/fix-audioop-UB
matthiasgoergens Sep 26, 2022
98b2352
Merge branch 'main' into matthias/fix-audioop-UB
matthiasgoergens Sep 27, 2022
c549094
Merge remote-tracking branch 'origin/main' into matthias/fix-audioop-UB
matthiasgoergens Oct 5, 2022
15e43a6
Move asserts for more coverage
matthiasgoergens Oct 5, 2022
4e36000
Merge branch 'main' into matthias/fix-audioop-UB
matthiasgoergens Oct 8, 2022
c3f9108
Merge branch 'main' into matthias/fix-audioop-UB
matthiasgoergens Oct 9, 2022
da7aab3
Merge remote-tracking branch 'origin/main' into matthias/fix-audioop-UB
matthiasgoergens Oct 9, 2022
ba80611
Revert unneeded changes
matthiasgoergens Oct 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Core and Builtins/2022-09-19-03-35-01.gh-issue-96821.izK6JA.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix undefined behaviour in ``audioop.c``.
30 changes: 16 additions & 14 deletions Modules/audioop.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ search(int16_t val, const int16_t *table, int size)
if (val <= *table++)
return (i);
}
assert(0 <= size);
Comment thread
matthiasgoergens marked this conversation as resolved.
Outdated
assert(size < INT16_MAX);
return (size);
}
#define st_ulaw2linear16(uc) (_st_ulaw2linear16[uc])
Expand Down Expand Up @@ -170,7 +172,7 @@ st_14linear2ulaw(int16_t pcm_val) /* 2's complement (14-bit range) */
if (seg >= 8) /* out of range, return maximum value. */
return (unsigned char) (0x7F ^ mask);
else {
uval = (unsigned char) (seg << 4) | ((pcm_val >> (seg + 1)) & 0xF);
uval = (unsigned char) (seg * (1 << 4)) | ((pcm_val >> (seg + 1)) & 0xF);
Comment thread
matthiasgoergens marked this conversation as resolved.
Outdated
return (uval ^ mask);
}

Expand Down Expand Up @@ -259,7 +261,7 @@ st_linear2alaw(int16_t pcm_val) /* 2's complement (13-bit range) */
if (seg >= 8) /* out of range, return maximum value. */
return (unsigned char) (0x7F ^ mask);
else {
aval = (unsigned char) seg << SEG_SHIFT;
aval = (unsigned char) seg * (1 << SEG_SHIFT);
Comment thread
matthiasgoergens marked this conversation as resolved.
Outdated
if (seg < 2)
aval |= (pcm_val >> 1) & QUANT_MASK;
else
Expand Down Expand Up @@ -300,13 +302,13 @@ static const int stepsizeTable[89] = {
#ifdef WORDS_BIGENDIAN
#define GETINT24(cp, i) ( \
((unsigned char *)(cp) + (i))[2] + \
(((unsigned char *)(cp) + (i))[1] << 8) + \
(((signed char *)(cp) + (i))[0] << 16) )
(((unsigned char *)(cp) + (i))[1] * (1 << 8)) + \
Comment thread
matthiasgoergens marked this conversation as resolved.
(((signed char *)(cp) + (i))[0] * (1 << 16)) )
#else
#define GETINT24(cp, i) ( \
((unsigned char *)(cp) + (i))[0] + \
(((unsigned char *)(cp) + (i))[1] << 8) + \
(((signed char *)(cp) + (i))[2] << 16) )
(((unsigned char *)(cp) + (i))[1] * (1 << 8)) + \
(((signed char *)(cp) + (i))[2] * (1 << 16)) )
#endif


Expand Down Expand Up @@ -347,10 +349,10 @@ static const int stepsizeTable[89] = {
} while(0)


#define GETSAMPLE32(size, cp, i) ( \
(size == 1) ? (int)GETINT8((cp), (i)) << 24 : \
(size == 2) ? (int)GETINT16((cp), (i)) << 16 : \
(size == 3) ? (int)GETINT24((cp), (i)) << 8 : \
#define GETSAMPLE32(size, cp, i) ( \
(size == 1) ? (int)GETINT8((cp), (i)) * (1 << 24) : \
(size == 2) ? (int)GETINT16((cp), (i)) * (1 << 16) : \
(size == 3) ? (int)GETINT24((cp), (i)) * (1 << 8) : \
(int)GETINT32((cp), (i)))

#define SETSAMPLE32(size, cp, i, val) do { \
Expand Down Expand Up @@ -1558,7 +1560,7 @@ audioop_ulaw2lin_impl(PyObject *module, Py_buffer *fragment, int width)

cp = fragment->buf;
for (i = 0; i < fragment->len*width; i += width) {
int val = st_ulaw2linear16(*cp++) << 16;
int val = st_ulaw2linear16(*cp++) * (1 << 16);
SETSAMPLE32(width, ncp, i, val);
}
return rv;
Expand Down Expand Up @@ -1632,7 +1634,7 @@ audioop_alaw2lin_impl(PyObject *module, Py_buffer *fragment, int width)
cp = fragment->buf;

for (i = 0; i < fragment->len*width; i += width) {
val = st_alaw2linear16(*cp++) << 16;
val = st_alaw2linear16(*cp++) * (1 << 16);
SETSAMPLE32(width, ncp, i, val);
}
return rv;
Expand Down Expand Up @@ -1757,7 +1759,7 @@ audioop_lin2adpcm_impl(PyObject *module, Py_buffer *fragment, int width,

/* Step 6 - Output value */
if ( bufferstep ) {
outputbuffer = (delta << 4) & 0xf0;
outputbuffer = (delta * (1 << 4)) & 0xf0;
} else {
*ncp++ = (delta & 0x0f) | outputbuffer;
}
Expand Down Expand Up @@ -1875,7 +1877,7 @@ audioop_adpcm2lin_impl(PyObject *module, Py_buffer *fragment, int width,
step = stepsizeTable[index];

/* Step 6 - Output value */
SETSAMPLE32(width, ncp, i, valpred << 16);
SETSAMPLE32(width, ncp, i, valpred * (1 << 16));
}

rv = Py_BuildValue("(O(ii))", str, valpred, index);
Expand Down