From edb58a5ee8030ec66c04736a025d2a44e7322ba3 Mon Sep 17 00:00:00 2001
From: Adam Richter <adamrichter4@gmail.com>
Date: Sun, 12 May 2019 03:41:49 -0700
Subject: [PATCH] libavformat: Separate assertions of the form
"av_assertN(a && b)" to "av_assertN(a); av_assertN(b)" for more precise
diagnostics.
Signed-off-by: Adam Richter <adamrichter4@gmail.com>
---
libavformat/au.c | 3 ++-
libavformat/avienc.c | 3 ++-
libavformat/aviobuf.c | 3 ++-
libavformat/matroskaenc.c | 6 ++++--
libavformat/mov.c | 3 ++-
libavformat/rtmppkt.c | 3 ++-
libavformat/utils.c | 9 +++++----
7 files changed, 19 insertions(+), 11 deletions(-)
@@ -177,7 +177,8 @@ static int au_read_header(AVFormatContext *s)
bps = 2;
} else {
const uint8_t bpcss[] = {4, 0, 3, 5};
- av_assert0(id >= 23 && id < 23 + 4);
+ av_assert0(id >= 23);
+ av_assert0(id < 23 + 4);
ba = bpcss[id - 23];
bps = bpcss[id - 23];
}
@@ -797,7 +797,8 @@ static int avi_write_packet(AVFormatContext *s, AVPacket *pkt)
int pal_size = 1 << par->bits_per_coded_sample;
int pc_tag, i;
- av_assert0(par->bits_per_coded_sample >= 0 && par->bits_per_coded_sample <= 8);
+ av_assert0(par->bits_per_coded_sample >= 0);
+ av_assert0(par->bits_per_coded_sample <= 8);
if ((pb->seekable & AVIO_SEEKABLE_NORMAL) && avist->pal_offset) {
int64_t cur_offset = avio_tell(pb);
@@ -195,7 +195,8 @@ static void flush_buffer(AVIOContext *s)
void avio_w8(AVIOContext *s, int b)
{
- av_assert2(b>=-128 && b<=255);
+ av_assert2(b >= -128);
+ av_assert2(b <= 255);
*s->buf_ptr++ = b;
if (s->buf_ptr >= s->buf_end)
flush_buffer(s);
@@ -589,7 +589,8 @@ static int64_t mkv_write_cues(AVFormatContext *s, mkv_cues *cues, mkv_track *tra
tracks[j].has_cue = 0;
for (j = 0; j < cues->num_entries - i && entry[j].pts == pts; j++) {
int tracknum = entry[j].stream_idx;
- av_assert0(tracknum>=0 && tracknum<num_tracks);
+ av_assert0(tracknum >= 0);
+ av_assert0(tracknum < num_tracks);
if (tracks[tracknum].has_cue && s->streams[tracknum]->codecpar->codec_type != AVMEDIA_TYPE_SUBTITLE)
continue;
tracks[tracknum].has_cue = 1;
@@ -605,7 +606,8 @@ static int64_t mkv_write_cues(AVFormatContext *s, mkv_cues *cues, mkv_track *tra
tracks[j].has_cue = 0;
for (j = 0; j < cues->num_entries - i && entry[j].pts == pts; j++) {
int tracknum = entry[j].stream_idx;
- av_assert0(tracknum>=0 && tracknum<num_tracks);
+ av_assert0(tracknum >= 0);
+ av_assert0(tracknum < num_tracks);
if (tracks[tracknum].has_cue && s->streams[tracknum]->codecpar->codec_type != AVMEDIA_TYPE_SUBTITLE)
continue;
tracks[tracknum].has_cue = 1;
@@ -3267,7 +3267,8 @@ static void fix_index_entry_timestamps(AVStream* st, int end_index, int64_t end_
int64_t* frame_duration_buffer,
int frame_duration_buffer_size) {
int i = 0;
- av_assert0(end_index >= 0 && end_index <= st->nb_index_entries);
+ av_assert0(end_index >= 0);
+ av_assert0(end_index <= st->nb_index_entries);
for (i = 0; i < frame_duration_buffer_size; i++) {
end_ts -= frame_duration_buffer[frame_duration_buffer_size - 1 - i];
st->index_entries[end_index - 1 - i].timestamp = end_ts;
@@ -501,7 +501,8 @@ int ff_amf_tag_size(const uint8_t *data, const uint8_t *data_end)
ret = amf_tag_skip(&gb);
if (ret < 0 || bytestream2_get_bytes_left(&gb) <= 0)
return -1;
- av_assert0(bytestream2_tell(&gb) >= 0 && bytestream2_tell(&gb) <= data_end - data);
+ av_assert0(bytestream2_tell(&gb) >= 0);
+ av_assert0(bytestream2_tell(&gb) <= data_end - data);
return bytestream2_tell(&gb);
}
@@ -163,10 +163,11 @@ void av_format_inject_global_side_data(AVFormatContext *s)
int ff_copy_whiteblacklists(AVFormatContext *dst, const AVFormatContext *src)
{
- av_assert0(!dst->codec_whitelist &&
- !dst->format_whitelist &&
- !dst->protocol_whitelist &&
- !dst->protocol_blacklist);
+ av_assert0(!dst->codec_whitelist);
+ av_assert0(!dst->format_whitelist);
+ av_assert0(!dst->protocol_whitelist);
+ av_assert0(!dst->protocol_blacklist);
+
dst-> codec_whitelist = av_strdup(src->codec_whitelist);
dst->format_whitelist = av_strdup(src->format_whitelist);
dst->protocol_whitelist = av_strdup(src->protocol_whitelist);
--
2.21.0