[FFmpeg-devel,1/2] avformat/rpl: Replace strcpy with av_strlcpy

Submitted by Cameron Cawley on June 29, 2019, 11 p.m.

Details

Message ID 20190629230044.28388-1-ccawley2011@gmail.com
State New
Headers show

Commit Message

Cameron Cawley June 29, 2019, 11 p.m.
---
 libavformat/rpl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Michael Niedermayer July 1, 2019, 2:06 p.m.
On Sun, Jun 30, 2019 at 12:00:43AM +0100, Cameron Cawley wrote:
> ---
>  libavformat/rpl.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

this doesnt apply, against which branch is that patch ?

thx

[...]
Cameron Cawley July 3, 2019, 2:17 p.m.
The patch should be applied on top of the Replay ADPCM patches.

Regards
Cameron


On Mon, 1 Jul 2019 at 15:07, Michael Niedermayer <michael@niedermayer.cc>
wrote:

> On Sun, Jun 30, 2019 at 12:00:43AM +0100, Cameron Cawley wrote:
> > ---
> >  libavformat/rpl.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
>
> this doesnt apply, against which branch is that patch ?


> thx
>
> [...]
>
> --
> Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
>
> It is what and why we do it that matters, not just one of them.
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
Michael Niedermayer July 5, 2019, 4:18 p.m.
On Sun, Jun 30, 2019 at 12:00:43AM +0100, Cameron Cawley wrote:
> ---
>  libavformat/rpl.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/libavformat/rpl.c b/libavformat/rpl.c
> index b4859320f4..579ab4f57e 100644
> --- a/libavformat/rpl.c
> +++ b/libavformat/rpl.c
> @@ -192,7 +192,7 @@ static int rpl_read_header(AVFormatContext *s)
>      // samples, though. This code will ignore additional tracks.
>      error |= read_line(pb, line, sizeof(line));
>      audio_format = read_int(line, &endptr, &error);  // audio format ID
> -    strcpy(audio_codec, endptr);
> +    av_strlcpy(audio_codec, endptr, RPL_LINE_LENGTH);
>      if (audio_format) {
>          ast = avformat_new_stream(s, NULL);
>          if (!ast)
> @@ -203,7 +203,7 @@ static int rpl_read_header(AVFormatContext *s)
>          ast->codecpar->channels        = read_line_and_int(pb, &error);  // number of audio channels
>          error |= read_line(pb, line, sizeof(line));
>          ast->codecpar->bits_per_coded_sample = read_int(line, &endptr, &error);  // audio bits per sample
> -        strcpy(audio_type, endptr);
> +        av_strlcpy(audio_type, endptr, RPL_LINE_LENGTH);
>          // At least one sample uses 0 for ADPCM, which is really 4 bits
>          // per sample.
>          if (ast->codecpar->bits_per_coded_sample == 0)

please include this in the patch that adds the strcpy()

thanks

[...]
Cameron Cawley July 9, 2019, 9:46 p.m.
The second use of strcpy() that this patch fixes was added in
commit 0e9c01f.

Regards
Cameron

On Fri, 5 Jul 2019 at 17:47, Michael Niedermayer <michael@niedermayer.cc>
wrote:

> On Sun, Jun 30, 2019 at 12:00:43AM +0100, Cameron Cawley wrote:
> > ---
> >  libavformat/rpl.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/libavformat/rpl.c b/libavformat/rpl.c
> > index b4859320f4..579ab4f57e 100644
> > --- a/libavformat/rpl.c
> > +++ b/libavformat/rpl.c
> > @@ -192,7 +192,7 @@ static int rpl_read_header(AVFormatContext *s)
> >      // samples, though. This code will ignore additional tracks.
> >      error |= read_line(pb, line, sizeof(line));
> >      audio_format = read_int(line, &endptr, &error);  // audio format ID
> > -    strcpy(audio_codec, endptr);
> > +    av_strlcpy(audio_codec, endptr, RPL_LINE_LENGTH);
> >      if (audio_format) {
> >          ast = avformat_new_stream(s, NULL);
> >          if (!ast)
> > @@ -203,7 +203,7 @@ static int rpl_read_header(AVFormatContext *s)
> >          ast->codecpar->channels        = read_line_and_int(pb,
> &error);  // number of audio channels
> >          error |= read_line(pb, line, sizeof(line));
> >          ast->codecpar->bits_per_coded_sample = read_int(line, &endptr,
> &error);  // audio bits per sample
> > -        strcpy(audio_type, endptr);
> > +        av_strlcpy(audio_type, endptr, RPL_LINE_LENGTH);
> >          // At least one sample uses 0 for ADPCM, which is really 4 bits
> >          // per sample.
> >          if (ast->codecpar->bits_per_coded_sample == 0)
>
> please include this in the patch that adds the strcpy()
>
> thanks
>
> [...]
> --
> Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
>
> He who knows, does not speak. He who speaks, does not know. -- Lao Tsu
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Patch hide | download patch | download mbox

diff --git a/libavformat/rpl.c b/libavformat/rpl.c
index b4859320f4..579ab4f57e 100644
--- a/libavformat/rpl.c
+++ b/libavformat/rpl.c
@@ -192,7 +192,7 @@  static int rpl_read_header(AVFormatContext *s)
     // samples, though. This code will ignore additional tracks.
     error |= read_line(pb, line, sizeof(line));
     audio_format = read_int(line, &endptr, &error);  // audio format ID
-    strcpy(audio_codec, endptr);
+    av_strlcpy(audio_codec, endptr, RPL_LINE_LENGTH);
     if (audio_format) {
         ast = avformat_new_stream(s, NULL);
         if (!ast)
@@ -203,7 +203,7 @@  static int rpl_read_header(AVFormatContext *s)
         ast->codecpar->channels        = read_line_and_int(pb, &error);  // number of audio channels
         error |= read_line(pb, line, sizeof(line));
         ast->codecpar->bits_per_coded_sample = read_int(line, &endptr, &error);  // audio bits per sample
-        strcpy(audio_type, endptr);
+        av_strlcpy(audio_type, endptr, RPL_LINE_LENGTH);
         // At least one sample uses 0 for ADPCM, which is really 4 bits
         // per sample.
         if (ast->codecpar->bits_per_coded_sample == 0)