avformat/aiffdec: sanity check block_align
Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 93f7776921ed8c5219732210067016c3457e864d) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
		
							parent
							
								
									287389faec
								
							
						
					
					
						commit
						d0a99fdfc6
					
				@ -368,7 +368,7 @@ got_sound:
 | 
				
			|||||||
    if (!st->codecpar->block_align && st->codecpar->codec_id == AV_CODEC_ID_QCELP) {
 | 
					    if (!st->codecpar->block_align && st->codecpar->codec_id == AV_CODEC_ID_QCELP) {
 | 
				
			||||||
        av_log(s, AV_LOG_WARNING, "qcelp without wave chunk, assuming full rate\n");
 | 
					        av_log(s, AV_LOG_WARNING, "qcelp without wave chunk, assuming full rate\n");
 | 
				
			||||||
        st->codecpar->block_align = 35;
 | 
					        st->codecpar->block_align = 35;
 | 
				
			||||||
    } else if (!st->codecpar->block_align) {
 | 
					    } else if (st->codecpar->block_align <= 0) {
 | 
				
			||||||
        av_log(s, AV_LOG_ERROR, "could not find COMM tag or invalid block_align value\n");
 | 
					        av_log(s, AV_LOG_ERROR, "could not find COMM tag or invalid block_align value\n");
 | 
				
			||||||
        return -1;
 | 
					        return -1;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user