This buffer was supposed to be initialized by sscanf(input, "%7[A-Z]%n", buf, &len), yet if the first input character is not in the A-Z range, buf is not touched (in particular it needn't be zero-terminated if the failure happened when parsing the first channel and it still contains the last channel name if the failure happened when one channel name could be successfully parsed). This is treated as error in which case buf is used directly in the log message. This commit fixes this by actually using the string that could not be matched in the log message instead.
Unified · Split
| @@ -135,7 +135,7 @@ static void parse_map(AVFilterContext *ctx) · 134 unmodified lines | |||
| 135 | 135 | ||
| 136 | p = NULL; | 136 | p = NULL; |
| 137 | if (parse_channel_name(s, s->nb_irs, &arg, &out_ch_id, buf)) { | 137 | if (parse_channel_name(s, s->nb_irs, &arg, &out_ch_id, buf)) { |
| 138 | av_log(ctx, AV_LOG_WARNING, "Failed to parse \'%s\' as channel name.\n", buf); | 138 | av_log(ctx, AV_LOG_WARNING, "Failed to parse \'%s\' as channel name.\n", arg); |
| 139 | continue; | 139 | continue; |
| 140 | } | 140 | } |
| 141 | s->mapping[s->nb_irs] = out_ch_id; | 141 | s->mapping[s->nb_irs] = out_ch_id; |