Don't overwrite abort or out-of-memory with seek error

xiph · Nov 13, 2024 · 431838a · 431838a
1 parent 0541dd2
commit 431838a
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/libFLAC/stream_decoder.c b/src/libFLAC/stream_decoder.c
@@ -3653,7 +3653,8 @@ FLAC__bool seek_to_absolute_sample_(FLAC__StreamDecoder *decoder, FLAC__uint64 s
 				continue;
 			}
 			else {
-				decoder->protected_->state = FLAC__STREAM_DECODER_SEEK_ERROR;
+				if(decoder->protected_->state != FLAC__STREAM_DECODER_ABORTED && decoder->protected_->state != FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR)
+					decoder->protected_->state = FLAC__STREAM_DECODER_SEEK_ERROR;
 				return false;
 			}
 		}
@@ -3846,7 +3847,8 @@ FLAC__bool seek_to_absolute_sample_ogg_(FLAC__StreamDecoder *decoder, FLAC__uint
 		decoder->private_->got_a_frame = false;
 		if(!FLAC__stream_decoder_process_single(decoder) ||
 		   decoder->protected_->state == FLAC__STREAM_DECODER_ABORTED) {
-			decoder->protected_->state = FLAC__STREAM_DECODER_SEEK_ERROR;
+			if(decoder->protected_->state != FLAC__STREAM_DECODER_ABORTED && decoder->protected_->state != FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR)
+				decoder->protected_->state = FLAC__STREAM_DECODER_SEEK_ERROR;
 			return false;
 		}
 		if(!decoder->private_->got_a_frame) {