From 75e61b0e88ddb17fa57f8e3bc10d27cb1282a815 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= Date: Sat, 23 Jun 2007 23:10:32 +0000 Subject: [PATCH] =?UTF-8?q?use=20new=20string=20functions=20based=20on=20p?= =?UTF-8?q?atch=20by=20Reimar=20D=C3=B6ffinger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Originally committed as revision 9401 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/avio.c | 3 ++- libavformat/http.c | 3 ++- libavformat/img2.c | 5 +++-- libavformat/mp3.c | 3 ++- libavformat/nutdec.c | 9 +++++---- libavformat/rmdec.c | 5 ++--- libavformat/rtsp.c | 33 +++++++++++++++++---------------- libavformat/utils.c | 5 +++-- 8 files changed, 36 insertions(+), 30 deletions(-) diff --git a/libavformat/avio.c b/libavformat/avio.c index a22bd22f3c..4bfa13762f 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "avformat.h" +#include "avstring.h" static int default_interrupt_cb(void); @@ -169,7 +170,7 @@ int url_get_max_packet_size(URLContext *h) void url_get_filename(URLContext *h, char *buf, int buf_size) { - pstrcpy(buf, buf_size, h->filename); + av_strlcpy(buf, h->filename, buf_size); } diff --git a/libavformat/http.c b/libavformat/http.c index 6a509dc6aa..6acf094443 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -23,6 +23,7 @@ #include "network.h" #include "base64.h" +#include "avstring.h" /* XXX: POST protocol is not completely implemented because ffmpeg uses only a subset of it. */ @@ -72,7 +73,7 @@ static int http_open_cnx(URLContext *h) if (port > 0) { snprintf(hoststr, sizeof(hoststr), "%s:%d", hostname, port); } else { - pstrcpy(hoststr, sizeof(hoststr), hostname); + av_strlcpy(hoststr, hostname, sizeof(hoststr)); } if (use_proxy) { diff --git a/libavformat/img2.c b/libavformat/img2.c index 7292bff719..8d36593ac2 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "avformat.h" +#include "avstring.h" typedef struct { int img_first; @@ -182,7 +183,7 @@ static int img_read_header(AVFormatContext *s1, AVFormatParameters *ap) return AVERROR(ENOMEM); } - pstrcpy(s->path, sizeof(s->path), s1->filename); + av_strlcpy(s->path, s1->filename, sizeof(s->path)); s->img_number = 0; s->img_count = 0; @@ -307,7 +308,7 @@ static int img_write_header(AVFormatContext *s) VideoData *img = s->priv_data; img->img_number = 1; - pstrcpy(img->path, sizeof(img->path), s->filename); + av_strlcpy(img->path, s->filename, sizeof(img->path)); /* find format */ if (s->oformat->flags & AVFMT_NOFILE) diff --git a/libavformat/mp3.c b/libavformat/mp3.c index c0d7f8a11c..4a03c00fa4 100644 --- a/libavformat/mp3.c +++ b/libavformat/mp3.c @@ -20,6 +20,7 @@ */ #include "avformat.h" #include "mpegaudio.h" +#include "avstring.h" #define ID3v2_HEADER_SIZE 10 #define ID3v1_TAG_SIZE 128 @@ -350,7 +351,7 @@ static int id3v1_parse_tag(AVFormatContext *s, const uint8_t *buf) s->track = buf[126]; genre = buf[127]; if (genre <= ID3v1_GENRE_MAX) - pstrcpy(s->genre, sizeof(s->genre), id3v1_genre_str[genre]); + av_strlcpy(s->genre, id3v1_genre_str[genre], sizeof(s->genre)); return 0; } diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index 0f5c85df60..fab672043f 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -23,6 +23,7 @@ #include "tree.h" #include "nut.h" +#include "avstring.h" #undef NDEBUG #include @@ -404,13 +405,13 @@ static int decode_info_header(NUTContext *nut){ if(chapter_id==0 && !strcmp(type, "UTF-8")){ if (!strcmp(name, "Author")) - pstrcpy(s->author , sizeof(s->author) , str_value); + av_strlcpy(s->author , str_value, sizeof(s->author)); else if(!strcmp(name, "Title")) - pstrcpy(s->title , sizeof(s->title) , str_value); + av_strlcpy(s->title , str_value, sizeof(s->title)); else if(!strcmp(name, "Copyright")) - pstrcpy(s->copyright, sizeof(s->copyright), str_value); + av_strlcpy(s->copyright, str_value, sizeof(s->copyright)); else if(!strcmp(name, "Description")) - pstrcpy(s->comment , sizeof(s->comment) , str_value); + av_strlcpy(s->comment , str_value, sizeof(s->comment)); } } diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index 8ac86d7727..7ce21e9af4 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -20,7 +20,7 @@ */ #include "avformat.h" #include "rm.h" - +#include "avstring.h" static void get_str(ByteIOContext *pb, char *buf, int buf_size) { @@ -175,8 +175,7 @@ static int rm_read_audio_stream_info(AVFormatContext *s, AVStream *st, } } else { st->codec->codec_id = CODEC_ID_NONE; - pstrcpy(st->codec->codec_name, sizeof(st->codec->codec_name), - buf); + av_strlcpy(st->codec->codec_name, buf, sizeof(st->codec->codec_name)); } if (read_all) { get_byte(pb); diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index a931e62bda..05349ab2ac 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -23,6 +23,7 @@ #include #include /* for select() prototype */ #include "network.h" +#include "avstring.h" #include "rtp_internal.h" @@ -405,11 +406,11 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1, } break; case 's': - pstrcpy(s->title, sizeof(s->title), p); + av_strlcpy(s->title, p, sizeof(s->title)); break; case 'i': if (s->nb_streams == 0) { - pstrcpy(s->comment, sizeof(s->comment), p); + av_strlcpy(s->comment, p, sizeof(s->comment)); break; } break; @@ -456,7 +457,7 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1, } } /* put a default control url */ - pstrcpy(rtsp_st->control_url, sizeof(rtsp_st->control_url), s->filename); + av_strlcpy(rtsp_st->control_url, s->filename, sizeof(rtsp_st->control_url)); break; case 'a': if (strstart(p, "control:", &p) && s->nb_streams > 0) { @@ -469,10 +470,10 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1, url_split(proto, sizeof(proto), NULL, 0, NULL, 0, NULL, NULL, 0, p); if (proto[0] == '\0') { /* relative control URL */ - pstrcat(rtsp_st->control_url, sizeof(rtsp_st->control_url), "/"); - pstrcat(rtsp_st->control_url, sizeof(rtsp_st->control_url), p); + av_strlcat(rtsp_st->control_url, "/", sizeof(rtsp_st->control_url)); + av_strlcat(rtsp_st->control_url, p, sizeof(rtsp_st->control_url)); } else { - pstrcpy(rtsp_st->control_url, sizeof(rtsp_st->control_url), p); + av_strlcpy(rtsp_st->control_url, p, sizeof(rtsp_st->control_url)); } } else if (strstart(p, "rtpmap:", &p)) { /* NOTE: rtpmap is only supported AFTER the 'm=' tag */ @@ -749,14 +750,14 @@ static void rtsp_send_cmd(AVFormatContext *s, memset(reply, 0, sizeof(RTSPHeader)); rt->seq++; - pstrcpy(buf, sizeof(buf), cmd); + av_strlcpy(buf, cmd, sizeof(buf)); snprintf(buf1, sizeof(buf1), "CSeq: %d\r\n", rt->seq); - pstrcat(buf, sizeof(buf), buf1); + av_strlcat(buf, buf1, sizeof(buf)); if (rt->session_id[0] != '\0' && !strstr(cmd, "\nIf-Match:")) { snprintf(buf1, sizeof(buf1), "Session: %s\r\n", rt->session_id); - pstrcat(buf, sizeof(buf), buf1); + av_strlcat(buf, buf1, sizeof(buf)); } - pstrcat(buf, sizeof(buf), "\r\n"); + av_strlcat(buf, "\r\n", sizeof(buf)); #ifdef DEBUG printf("Sending:\n%s--\n", buf); #endif @@ -795,14 +796,14 @@ static void rtsp_send_cmd(AVFormatContext *s, reply->status_code = atoi(buf1); } else { rtsp_parse_line(reply, p); - pstrcat(rt->last_reply, sizeof(rt->last_reply), p); - pstrcat(rt->last_reply, sizeof(rt->last_reply), "\n"); + av_strlcat(rt->last_reply, p, sizeof(rt->last_reply)); + av_strlcat(rt->last_reply, "\n", sizeof(rt->last_reply)); } line_count++; } if (rt->session_id[0] == '\0' && reply->session_id[0] != '\0') - pstrcpy(rt->session_id, sizeof(rt->session_id), reply->session_id); + av_strlcpy(rt->session_id, reply->session_id, sizeof(rt->session_id)); content_length = reply->content_length; if (content_length > 0) { @@ -947,7 +948,7 @@ static int rtsp_read_header(AVFormatContext *s, rtp_opened: port = rtp_get_local_port(rtsp_st->rtp_handle); if (transport[0] != '\0') - pstrcat(transport, sizeof(transport), ","); + av_strlcat(transport, ",", sizeof(transport)); snprintf(transport + strlen(transport), sizeof(transport) - strlen(transport) - 1, "RTP/AVP/UDP;unicast;client_port=%d-%d", port, port + 1); @@ -956,14 +957,14 @@ static int rtsp_read_header(AVFormatContext *s, /* RTP/TCP */ else if (protocol_mask & (1 << RTSP_PROTOCOL_RTP_TCP)) { if (transport[0] != '\0') - pstrcat(transport, sizeof(transport), ","); + av_strlcat(transport, ",", sizeof(transport)); snprintf(transport + strlen(transport), sizeof(transport) - strlen(transport) - 1, "RTP/AVP/TCP"); } else if (protocol_mask & (1 << RTSP_PROTOCOL_RTP_UDP_MULTICAST)) { if (transport[0] != '\0') - pstrcat(transport, sizeof(transport), ","); + av_strlcat(transport, ",", sizeof(transport)); snprintf(transport + strlen(transport), sizeof(transport) - strlen(transport) - 1, "RTP/AVP/UDP;multicast"); diff --git a/libavformat/utils.c b/libavformat/utils.c index 0609ff3d7a..431eaaf83b 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -21,6 +21,7 @@ #include "avformat.h" #include "allformats.h" #include "opt.h" +#include "avstring.h" #undef NDEBUG #include @@ -362,7 +363,7 @@ int av_open_input_stream(AVFormatContext **ic_ptr, ic->pb = *pb; ic->duration = AV_NOPTS_VALUE; ic->start_time = AV_NOPTS_VALUE; - pstrcpy(ic->filename, sizeof(ic->filename), filename); + av_strlcpy(ic->filename, filename, sizeof(ic->filename)); /* allocate private data */ if (fmt->priv_data_size > 0) { @@ -2840,7 +2841,7 @@ void url_split(char *proto, int proto_size, } if (port_ptr) *port_ptr = port; - pstrcpy(path, path_size, p); + av_strlcpy(path, p, path_size); } void av_set_pts_info(AVStream *s, int pts_wrap_bits,