Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
* [FFmpeg-devel] [PATCH 1/2] tools/target_dec_fuzzer: Adjust threshold for TQI
@ 2022-02-12 21:13 Michael Niedermayer
  2022-02-12 21:13 ` [FFmpeg-devel] [PATCH 2/2] avcodec/jpeglsdec: Check get_ur_golomb_jpegls() for error Michael Niedermayer
  2022-03-17 19:26 ` [FFmpeg-devel] [PATCH 1/2] tools/target_dec_fuzzer: Adjust threshold for TQI Michael Niedermayer
  0 siblings, 2 replies; 5+ messages in thread
From: Michael Niedermayer @ 2022-02-12 21:13 UTC (permalink / raw)
  To: FFmpeg development discussions and patches

Fixes: Timeout
Fixes: 44455/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EATQI_fuzzer-6069950551293952

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 tools/target_dec_fuzzer.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c
index 13766d22b9..cdb3b96c38 100644
--- a/tools/target_dec_fuzzer.c
+++ b/tools/target_dec_fuzzer.c
@@ -203,6 +203,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
     case AV_CODEC_ID_TAK:         maxsamples /= 1024;  break;
     case AV_CODEC_ID_TGV:         maxpixels  /= 32;    break;
     case AV_CODEC_ID_THEORA:      maxpixels  /= 16384; break;
+    case AV_CODEC_ID_TQI:         maxpixels  /= 1024;  break;
     case AV_CODEC_ID_TRUEMOTION2: maxpixels  /= 1024;  break;
     case AV_CODEC_ID_TSCC:        maxpixels  /= 1024;  break;
     case AV_CODEC_ID_VC1:         maxpixels  /= 8192;  break;
-- 
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] 5+ messages in thread

* [FFmpeg-devel] [PATCH 2/2] avcodec/jpeglsdec: Check get_ur_golomb_jpegls() for error
  2022-02-12 21:13 [FFmpeg-devel] [PATCH 1/2] tools/target_dec_fuzzer: Adjust threshold for TQI Michael Niedermayer
@ 2022-02-12 21:13 ` Michael Niedermayer
  2022-02-12 21:27   ` Paul B Mahol
  2022-03-17 19:26 ` [FFmpeg-devel] [PATCH 1/2] tools/target_dec_fuzzer: Adjust threshold for TQI Michael Niedermayer
  1 sibling, 1 reply; 5+ messages in thread
From: Michael Niedermayer @ 2022-02-12 21:13 UTC (permalink / raw)
  To: FFmpeg development discussions and patches

Fixes: Timeout
Fixes: Invalid shift
Fixes: 44548/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEGLS_fuzzer-556487680891289

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/jpeglsdec.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c
index 6ca723f797..1766b8f09c 100644
--- a/libavcodec/jpeglsdec.c
+++ b/libavcodec/jpeglsdec.c
@@ -200,6 +200,8 @@ static inline int ls_get_code_runterm(GetBitContext *gb, JLSState *state,
 #endif
     ret = get_ur_golomb_jpegls(gb, k, state->limit - limit_add - 1,
                                state->qbpp);
+    if(ret < 0)
+        return -0x10000;
 
     /* decode mapped error */
     map = 0;
-- 
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] 5+ messages in thread

* Re: [FFmpeg-devel] [PATCH 2/2] avcodec/jpeglsdec: Check get_ur_golomb_jpegls() for error
  2022-02-12 21:13 ` [FFmpeg-devel] [PATCH 2/2] avcodec/jpeglsdec: Check get_ur_golomb_jpegls() for error Michael Niedermayer
@ 2022-02-12 21:27   ` Paul B Mahol
  2022-02-15 20:03     ` Michael Niedermayer
  0 siblings, 1 reply; 5+ messages in thread
From: Paul B Mahol @ 2022-02-12 21:27 UTC (permalink / raw)
  To: FFmpeg development discussions and patches

Please follow code style.
_______________________________________________
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] 5+ messages in thread

* Re: [FFmpeg-devel] [PATCH 2/2] avcodec/jpeglsdec: Check get_ur_golomb_jpegls() for error
  2022-02-12 21:27   ` Paul B Mahol
@ 2022-02-15 20:03     ` Michael Niedermayer
  0 siblings, 0 replies; 5+ messages in thread
From: Michael Niedermayer @ 2022-02-15 20:03 UTC (permalink / raw)
  To: FFmpeg development discussions and patches


[-- Attachment #1.1: Type: text/plain, Size: 411 bytes --]

On Sat, Feb 12, 2022 at 10:27:13PM +0100, Paul B Mahol wrote:
> Please follow code style.

ill add the space between if and ( before applying
also, ill fix the other similar issues in the file in a seperate commit

thx

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

I am the wisest man alive, for I know one thing, and that is that I know
nothing. -- Socrates

[-- 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] 5+ messages in thread

* Re: [FFmpeg-devel] [PATCH 1/2] tools/target_dec_fuzzer: Adjust threshold for TQI
  2022-02-12 21:13 [FFmpeg-devel] [PATCH 1/2] tools/target_dec_fuzzer: Adjust threshold for TQI Michael Niedermayer
  2022-02-12 21:13 ` [FFmpeg-devel] [PATCH 2/2] avcodec/jpeglsdec: Check get_ur_golomb_jpegls() for error Michael Niedermayer
@ 2022-03-17 19:26 ` Michael Niedermayer
  1 sibling, 0 replies; 5+ messages in thread
From: Michael Niedermayer @ 2022-03-17 19:26 UTC (permalink / raw)
  To: FFmpeg development discussions and patches


[-- Attachment #1.1: Type: text/plain, Size: 613 bytes --]

On Sat, Feb 12, 2022 at 10:13:49PM +0100, Michael Niedermayer wrote:
> Fixes: Timeout
> Fixes: 44455/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EATQI_fuzzer-6069950551293952
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  tools/target_dec_fuzzer.c | 1 +
>  1 file changed, 1 insertion(+)

will apply

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

No great genius has ever existed without some touch of madness. -- Aristotle

[-- 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] 5+ messages in thread

end of thread, other threads:[~2022-03-17 19:26 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-12 21:13 [FFmpeg-devel] [PATCH 1/2] tools/target_dec_fuzzer: Adjust threshold for TQI Michael Niedermayer
2022-02-12 21:13 ` [FFmpeg-devel] [PATCH 2/2] avcodec/jpeglsdec: Check get_ur_golomb_jpegls() for error Michael Niedermayer
2022-02-12 21:27   ` Paul B Mahol
2022-02-15 20:03     ` Michael Niedermayer
2022-03-17 19:26 ` [FFmpeg-devel] [PATCH 1/2] tools/target_dec_fuzzer: Adjust threshold for TQI Michael Niedermayer

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