[FFmpeg-cvslog] ffmpeg_mux_init: use strtoll() to parse stream and group indexes

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Dec 19 10:39:52 2023 -0300| [fa961bb3830a6ab27a55f8f1b29325091a01b624] | committer: James Almer

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

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fa961bb3830a6ab27a55f8f1b29325091a01b624
---

 fftools/ffmpeg_mux_init.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c
index cca7baf79e..bdda93a569 100644
--- a/fftools/ffmpeg_mux_init.c
+++ b/fftools/ffmpeg_mux_init.c
@@ -2147,12 +2147,13 @@ static int of_parse_iamf_submixes(Muxer *mux, AVStreamGroup *stg, char *ptr)
 
             if (element) {
                 AVIAMFSubmixElement *submix_element;
+                char *endptr = NULL;
                 int64_t idx = -1;
 
                 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);
-                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) {
                     av_log(mux, AV_LOG_ERROR, "Invalid or missing stream group index in "
                                               "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;
     while (e = av_dict_get(dict, "st", e, 0)) {
-        int64_t idx = strtol(e->value, NULL, 0);
-        if (idx < 0 || idx >= oc->nb_streams) {
+        char *endptr;
+        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);
             ret = AVERROR(EINVAL);
             goto end;
@@ -2279,8 +2281,9 @@ static int of_parse_group_token(Muxer *mux, const char *token, char *ptr)
             goto end;
     }
     while (e = av_dict_get(dict, "stg", e, 0)) {
-        int64_t idx = strtol(e->value, NULL, 0);
-        if (idx < 0 || idx >= oc->nb_stream_groups - 1) {
+        char *endptr;
+        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);
             ret = AVERROR(EINVAL);
             goto end;