Attachment 229743 Details for Bug 260061 – Port patch.

[patch] Port patch.

a.diff (text/plain), 1.18 KB, created by Hans Petter Selasky on 2021-11-26 16:23:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hans Petter Selasky

Created: 2021-11-26 16:23:31 UTC

Size: 1.18 KB

patch

obsolete

>commit ce2e3fde18b7d1476eaecc94bf09b46010488727
>Author: Hans Petter Selasky <hselasky@FreeBSD.org>
>Date:   Fri Nov 26 17:21:33 2021 +0100
>
>    www/firefox: Fix for buffer overrun in cubeb OSS audio backend.
>    
>    Recent patches in the cubeb OSS audio backend introduced a
>    buffer overrun. Fix this locally for now, until a proper fix
>    is available upstream.
>    
>    PR:          260061
>    Approved by: pi (implicit)
>
>diff --git a/www/firefox/files/patch-media_libcubeb_src_cubeb__oss.c b/www/firefox/files/patch-media_libcubeb_src_cubeb__oss.c
>index a4ac1c9ca331..3f4f8a0057bb 100644
>--- a/www/firefox/files/patch-media_libcubeb_src_cubeb__oss.c
>+++ b/www/firefox/files/patch-media_libcubeb_src_cubeb__oss.c
>@@ -75,6 +75,8 @@
> +      return CUBEB_STATE_ERROR;
> +    }
> +    tnfr = bi.bytes / s->play.frame_size;
>++    if (tnfr > (long)s->play.bufframes)
>++        tnfr = (long)s->play.bufframes;
> +    if (nfr > tnfr) {
> +      nfr = tnfr;
> +    }
>@@ -87,6 +89,8 @@
> +      return CUBEB_STATE_ERROR;
> +    }
> +    tnfr = bi.bytes / s->record.frame_size;
>++    if (tnfr > (long)s->record.bufframes)
>++        tnfr = (long)s->record.bufframes;
> +    if (nfr > tnfr) {
> +      nfr = tnfr;
> +    }

Actions: View | Diff

Attachments on bug 260061: 229742 | 229743 | 229744