diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-10 21:05:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-10 21:05:49 +0200 |
| commit | 544f8114534457e2d2ea04aaffa3b4986d6c8130 (patch) | |
| tree | 56eae48cb3099e89d1bed61311b7fb753cf6ca55 /libavformat | |
| parent | cec7afd03640f7296af1f1f3a3b20845ce37ee39 (diff) | |
| parent | c27328e749ff3be648411765cd17362fee017341 (diff) | |
| download | ffmpeg-544f8114534457e2d2ea04aaffa3b4986d6c8130.tar.gz | |
Merge commit 'c27328e749ff3be648411765cd17362fee017341'
* commit 'c27328e749ff3be648411765cd17362fee017341':
rtsp: Check for command strings without spaces
Conflicts:
libavformat/rtspdec.c
See: a0568ed2544025de3c66dd500811f5ba43f38af4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/rtspdec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c index b4b4f12556..bb27a76763 100644 --- a/libavformat/rtspdec.c +++ b/libavformat/rtspdec.c @@ -360,10 +360,12 @@ static inline int parse_command_line(AVFormatContext *s, const char *line, RTSPState *rt = s->priv_data; const char *linept, *searchlinept; linept = strchr(line, ' '); + if (!linept) { av_log(s, AV_LOG_ERROR, "Error parsing method string\n"); return AVERROR_INVALIDDATA; } + if (linept - line > methodsize - 1) { av_log(s, AV_LOG_ERROR, "Method string too long\n"); return AVERROR(EIO); |