* [FFmpeg-devel] [PATCH] tools/target_dec_fuzzer: Fix build failure from channels API
@ 2022-03-15 22:34 Michael Niedermayer
2022-03-15 22:45 ` James Almer
0 siblings, 1 reply; 4+ messages in thread
From: Michael Niedermayer @ 2022-03-15 22:34 UTC (permalink / raw)
To: FFmpeg development discussions and patches
Regression since 2f8ccca2fa94ce256ff77baa18f462c1abd8d2cc and surrounding commits
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
tools/target_dec_fuzzer.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c
index eaa26b0e62..3bd1eff3ce 100644
--- a/tools/target_dec_fuzzer.c
+++ b/tools/target_dec_fuzzer.c
@@ -47,6 +47,7 @@
#include "config.h"
#include "libavutil/avassert.h"
+#include "libavutil/avstring.h"
#include "libavutil/cpu.h"
#include "libavutil/imgutils.h"
#include "libavutil/intreadwrite.h"
@@ -273,7 +274,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
extradata_size = bytestream2_get_le32(&gbc);
ctx->sample_rate = bytestream2_get_le32(&gbc) & 0x7FFFFFFF;
- ctx->ch_layout.channels = (unsigned)bytestream2_get_le32(&gbc) % FF_SANE_NB_CHANNELS;
+ ctx->ch_layout.nb_channels = (unsigned)bytestream2_get_le32(&gbc) % FF_SANE_NB_CHANNELS;
ctx->block_align = bytestream2_get_le32(&gbc) & 0x7FFFFFFF;
ctx->codec_tag = bytestream2_get_le32(&gbc);
if (c->codec_tags) {
--
2.17.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [FFmpeg-devel] [PATCH] tools/target_dec_fuzzer: Fix build failure from channels API
2022-03-15 22:34 [FFmpeg-devel] [PATCH] tools/target_dec_fuzzer: Fix build failure from channels API Michael Niedermayer
@ 2022-03-15 22:45 ` James Almer
2022-03-16 0:33 ` Michael Niedermayer
0 siblings, 1 reply; 4+ messages in thread
From: James Almer @ 2022-03-15 22:45 UTC (permalink / raw)
To: ffmpeg-devel
On 3/15/2022 7:34 PM, Michael Niedermayer wrote:
> Regression since 2f8ccca2fa94ce256ff77baa18f462c1abd8d2cc and surrounding commits
>
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
> tools/target_dec_fuzzer.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c
> index eaa26b0e62..3bd1eff3ce 100644
> --- a/tools/target_dec_fuzzer.c
> +++ b/tools/target_dec_fuzzer.c
> @@ -47,6 +47,7 @@
>
> #include "config.h"
> #include "libavutil/avassert.h"
> +#include "libavutil/avstring.h"
Why?
> #include "libavutil/cpu.h"
> #include "libavutil/imgutils.h"
> #include "libavutil/intreadwrite.h"
> @@ -273,7 +274,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
> extradata_size = bytestream2_get_le32(&gbc);
>
> ctx->sample_rate = bytestream2_get_le32(&gbc) & 0x7FFFFFFF;
> - ctx->ch_layout.channels = (unsigned)bytestream2_get_le32(&gbc) % FF_SANE_NB_CHANNELS;
> + ctx->ch_layout.nb_channels = (unsigned)bytestream2_get_le32(&gbc) % FF_SANE_NB_CHANNELS;
LGTM, sorry about the breakage.
> ctx->block_align = bytestream2_get_le32(&gbc) & 0x7FFFFFFF;
> ctx->codec_tag = bytestream2_get_le32(&gbc);
> if (c->codec_tags) {
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [FFmpeg-devel] [PATCH] tools/target_dec_fuzzer: Fix build failure from channels API
2022-03-15 22:45 ` James Almer
@ 2022-03-16 0:33 ` Michael Niedermayer
2022-03-16 0:37 ` James Almer
0 siblings, 1 reply; 4+ messages in thread
From: Michael Niedermayer @ 2022-03-16 0:33 UTC (permalink / raw)
To: FFmpeg development discussions and patches
[-- Attachment #1.1: Type: text/plain, Size: 1601 bytes --]
On Tue, Mar 15, 2022 at 07:45:36PM -0300, James Almer wrote:
> On 3/15/2022 7:34 PM, Michael Niedermayer wrote:
> > Regression since 2f8ccca2fa94ce256ff77baa18f462c1abd8d2cc and surrounding commits
> >
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> > tools/target_dec_fuzzer.c | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c
> > index eaa26b0e62..3bd1eff3ce 100644
> > --- a/tools/target_dec_fuzzer.c
> > +++ b/tools/target_dec_fuzzer.c
> > @@ -47,6 +47,7 @@
> > #include "config.h"
> > #include "libavutil/avassert.h"
> > +#include "libavutil/avstring.h"
>
> Why?
av_strlcatf() IIRC
>
> > #include "libavutil/cpu.h"
> > #include "libavutil/imgutils.h"
> > #include "libavutil/intreadwrite.h"
> > @@ -273,7 +274,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
> > extradata_size = bytestream2_get_le32(&gbc);
> > ctx->sample_rate = bytestream2_get_le32(&gbc) & 0x7FFFFFFF;
> > - ctx->ch_layout.channels = (unsigned)bytestream2_get_le32(&gbc) % FF_SANE_NB_CHANNELS;
> > + ctx->ch_layout.nb_channels = (unsigned)bytestream2_get_le32(&gbc) % FF_SANE_NB_CHANNELS;
>
> LGTM, sorry about the breakage.
will apply tomorrow, feel free to apply before
thx
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
In a rich man's house there is no place to spit but his face.
-- Diogenes of Sinope
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
[-- Attachment #2: Type: text/plain, Size: 251 bytes --]
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [FFmpeg-devel] [PATCH] tools/target_dec_fuzzer: Fix build failure from channels API
2022-03-16 0:33 ` Michael Niedermayer
@ 2022-03-16 0:37 ` James Almer
0 siblings, 0 replies; 4+ messages in thread
From: James Almer @ 2022-03-16 0:37 UTC (permalink / raw)
To: ffmpeg-devel
On 3/15/2022 9:33 PM, Michael Niedermayer wrote:
> On Tue, Mar 15, 2022 at 07:45:36PM -0300, James Almer wrote:
>> On 3/15/2022 7:34 PM, Michael Niedermayer wrote:
>>> Regression since 2f8ccca2fa94ce256ff77baa18f462c1abd8d2cc and surrounding commits
>>>
>>> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
>>> ---
>>> tools/target_dec_fuzzer.c | 3 ++-
>>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c
>>> index eaa26b0e62..3bd1eff3ce 100644
>>> --- a/tools/target_dec_fuzzer.c
>>> +++ b/tools/target_dec_fuzzer.c
>>> @@ -47,6 +47,7 @@
>>> #include "config.h"
>>> #include "libavutil/avassert.h"
>>> +#include "libavutil/avstring.h"
>>
>> Why?
>
> av_strlcatf() IIRC
Seems unrelated, but ok.
>
>>
>>> #include "libavutil/cpu.h"
>>> #include "libavutil/imgutils.h"
>>> #include "libavutil/intreadwrite.h"
>>> @@ -273,7 +274,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
>>> extradata_size = bytestream2_get_le32(&gbc);
>>> ctx->sample_rate = bytestream2_get_le32(&gbc) & 0x7FFFFFFF;
>>> - ctx->ch_layout.channels = (unsigned)bytestream2_get_le32(&gbc) % FF_SANE_NB_CHANNELS;
>>> + ctx->ch_layout.nb_channels = (unsigned)bytestream2_get_le32(&gbc) % FF_SANE_NB_CHANNELS;
>>
>> LGTM, sorry about the breakage.
>
> will apply tomorrow, feel free to apply before
>
> thx
Applied.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-03-16 0:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-15 22:34 [FFmpeg-devel] [PATCH] tools/target_dec_fuzzer: Fix build failure from channels API Michael Niedermayer
2022-03-15 22:45 ` James Almer
2022-03-16 0:33 ` Michael Niedermayer
2022-03-16 0:37 ` James Almer
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git