alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-12-15 19:34:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/jpeg_driver_handle_invalid_marker' into 'master'

Browse Source 
fix(jpeg_decoder): Correctly handle invalid 0xffff JPEG marker

Closes IDF-12204

See merge request espressif/esp-idf!36764
This commit is contained in:
Peter Marcisovsky
2025-03-07 17:21:54 +08:00
parent 6184bdaa7f f9d55c1fb2
commit 430bb9dc2c
4 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/esp_driver_jpeg/jpeg_decode.c
View File

@@ -716,6 +716,9 @@ static esp_err_t jpeg_parse_marker(jpeg_decoder_handle_t decoder_engine, const u
case JPEG_M_SOS:
ESP_RETURN_ON_ERROR(jpeg_parse_sos_marker(header_info), TAG, "deal sos marker failed");
break;
case JPEG_M_INV:
ESP_RETURN_ON_ERROR(jpeg_parse_inv_marker(header_info), TAG, "deal invalid marker failed");
break;
}
if (marker == JPEG_M_SOS) {
break;