Commit 544f8114 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'c27328e7'

* commit 'c27328e7':
  rtsp: Check for command strings without spaces

Conflicts:
	libavformat/rtspdec.c

See: a0568ed2Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents cec7afd0 c27328e7
...@@ -360,10 +360,12 @@ static inline int parse_command_line(AVFormatContext *s, const char *line, ...@@ -360,10 +360,12 @@ static inline int parse_command_line(AVFormatContext *s, const char *line,
RTSPState *rt = s->priv_data; RTSPState *rt = s->priv_data;
const char *linept, *searchlinept; const char *linept, *searchlinept;
linept = strchr(line, ' '); linept = strchr(line, ' ');
if (!linept) { if (!linept) {
av_log(s, AV_LOG_ERROR, "Error parsing method string\n"); av_log(s, AV_LOG_ERROR, "Error parsing method string\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if (linept - line > methodsize - 1) { if (linept - line > methodsize - 1) {
av_log(s, AV_LOG_ERROR, "Method string too long\n"); av_log(s, AV_LOG_ERROR, "Method string too long\n");
return AVERROR(EIO); return AVERROR(EIO);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment