RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-12 09:39:46 +00:00
Code Issues Projects Releases Wiki Activity

ffmpeg_mux_init: use strtoll() to parse stream and group indexes

Browse Source 
Long is 32 bits signed on Windows, and nb_stream{s,_groups} are both unsigned
int. In a realistic scenario this wont make a difference, but it's still
proper.

Also ensure the parsed string is an integer while at it.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2023-12-19 10:39:52 -03:00
parent 1747c2fc33
commit fa961bb383
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fftools/ffmpeg_mux_init.c
View File

@ -2147,12 +2147,13 @@ static int of_parse_iamf_submixes(Muxer *mux, AVStreamGroup *stg, char *ptr)
if (element) { if (element) {
AVIAMFSubmixElement *submix_element; AVIAMFSubmixElement *submix_element;
char *endptr = NULL;
int64_t idx = -1; int64_t idx = -1;
if (e = av_dict_get(dict, "stg", NULL, 0)) if (e = av_dict_get(dict, "stg", NULL, 0))
idx = strtol(e->value, NULL, 0); idx = strtoll(e->value, &endptr, 0);
av_dict_set(&dict, "stg", NULL, 0); av_dict_set(&dict, "stg", NULL, 0);
if (idx < 0 || idx >= oc->nb_stream_groups - 1 || if (!endptr || *endptr || idx < 0 || idx >= oc->nb_stream_groups - 1 ||
oc->stream_groups[idx]->type != AV_STREAM_GROUP_PARAMS_IAMF_AUDIO_ELEMENT) { oc->stream_groups[idx]->type != AV_STREAM_GROUP_PARAMS_IAMF_AUDIO_ELEMENT) {
av_log(mux, AV_LOG_ERROR, "Invalid or missing stream group index in " av_log(mux, AV_LOG_ERROR, "Invalid or missing stream group index in "
"submix element specification \"%s\"\n", subtoken); "submix element specification \"%s\"\n", subtoken);
@ -2268,8 +2269,9 @@ static int of_parse_group_token(Muxer *mux, const char *token, char *ptr)
e = NULL; e = NULL;
while (e = av_dict_get(dict, "st", e, 0)) { while (e = av_dict_get(dict, "st", e, 0)) {
int64_t idx = strtol(e->value, NULL, 0); char *endptr;
if (idx < 0 || idx >= oc->nb_streams) { int64_t idx = strtoll(e->value, &endptr, 0);
if (*endptr || idx < 0 || idx >= oc->nb_streams) {
av_log(mux, AV_LOG_ERROR, "Invalid stream index %"PRId64"\n", idx); av_log(mux, AV_LOG_ERROR, "Invalid stream index %"PRId64"\n", idx);
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto end; goto end;
@ -2279,8 +2281,9 @@ static int of_parse_group_token(Muxer *mux, const char *token, char *ptr)
goto end; goto end;
} }
while (e = av_dict_get(dict, "stg", e, 0)) { while (e = av_dict_get(dict, "stg", e, 0)) {
int64_t idx = strtol(e->value, NULL, 0); char *endptr;
if (idx < 0 || idx >= oc->nb_stream_groups - 1) { int64_t idx = strtoll(e->value, &endptr, 0);
if (*endptr || idx < 0 || idx >= oc->nb_stream_groups - 1) {
av_log(mux, AV_LOG_ERROR, "Invalid stream group index %"PRId64"\n", idx); av_log(mux, AV_LOG_ERROR, "Invalid stream group index %"PRId64"\n", idx);
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto end; goto end;