Message ID | 20170426084359.69628-1-lq@chinaffmpeg.org |
---|---|
State | Accepted |
Commit | cbfd44a9229cdead17c2857469ed1340615b3f36 |
Headers | show |
2017-04-26 16:43 GMT+08:00 Steven Liu <lq@chinaffmpeg.org>: > Fixes Coverity CID: 1405135 > > Signed-off-by: Steven Liu <lq@chinaffmpeg.org> > --- > libavformat/hlsenc.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c > index 3ec0f330fb..b7aafb73da 100644 > --- a/libavformat/hlsenc.c > +++ b/libavformat/hlsenc.c > @@ -394,11 +394,11 @@ static int do_encrypt(AVFormatContext *s) > av_strlcat(hls->key_basename, ".key", len); > > if (hls->key_url) { > - strncpy(hls->key_file, hls->key_url, sizeof(hls->key_file)); > - strncpy(hls->key_uri, hls->key_url, sizeof(hls->key_uri)); > + av_strlcpy(hls->key_file, hls->key_url, sizeof(hls->key_file)); > + av_strlcpy(hls->key_uri, hls->key_url, sizeof(hls->key_uri)); > } else { > - strncpy(hls->key_file, hls->key_basename, sizeof(hls->key_file)); > - strncpy(hls->key_uri, hls->key_basename, sizeof(hls->key_uri)); > + av_strlcpy(hls->key_file, hls->key_basename, > sizeof(hls->key_file)); > + av_strlcpy(hls->key_uri, hls->key_basename, sizeof(hls->key_uri)); > } > > if (!*hls->iv_string) { > -- > 2.11.0 (Apple Git-81) > > > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel > Applied! Thanks
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 3ec0f330fb..b7aafb73da 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -394,11 +394,11 @@ static int do_encrypt(AVFormatContext *s) av_strlcat(hls->key_basename, ".key", len); if (hls->key_url) { - strncpy(hls->key_file, hls->key_url, sizeof(hls->key_file)); - strncpy(hls->key_uri, hls->key_url, sizeof(hls->key_uri)); + av_strlcpy(hls->key_file, hls->key_url, sizeof(hls->key_file)); + av_strlcpy(hls->key_uri, hls->key_url, sizeof(hls->key_uri)); } else { - strncpy(hls->key_file, hls->key_basename, sizeof(hls->key_file)); - strncpy(hls->key_uri, hls->key_basename, sizeof(hls->key_uri)); + av_strlcpy(hls->key_file, hls->key_basename, sizeof(hls->key_file)); + av_strlcpy(hls->key_uri, hls->key_basename, sizeof(hls->key_uri)); } if (!*hls->iv_string) {
Fixes Coverity CID: 1405135 Signed-off-by: Steven Liu <lq@chinaffmpeg.org> --- libavformat/hlsenc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)