- int ret = avio_read(s1->pb, probe_buffer, 8);
- if (ret < 8)
- return AVERROR(EINVAL);
- avio_seek(s1->pb, -8, SEEK_CUR);
+
+ if (!probe_buffer)
+ return AVERROR(ENOMEM);
+
+ probe_buffer_size = avio_read(s1->pb, probe_buffer, probe_buffer_size);
+ if (probe_buffer_size < 0) {
+ av_free(probe_buffer);
+ return probe_buffer_size;
+ }
+ memset(probe_buffer + probe_buffer_size, 0, AVPROBE_PADDING_SIZE);