aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-06-01 12:27:19 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-06-01 12:27:33 +0200
commit194bd16cfa763af1a2a9bb4bf0cba15b6fb26804 (patch)
treeaaa541d19b5f0ff09ecd5ddaa59a12c57827d7db
parentae6429e633d206ef7b4aa662777fd681cd22349a (diff)
parent4c4cc9b27b69a86e405fd7612aa0a62f3b62b027 (diff)
downloadffmpeg-194bd16cfa763af1a2a9bb4bf0cba15b6fb26804.tar.gz
Merge commit '4c4cc9b27b69a86e405fd7612aa0a62f3b62b027' into release/2.2
* commit '4c4cc9b27b69a86e405fd7612aa0a62f3b62b027': rtsp: Make sure we don't write too many transport entries into a fixed-size array Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/rtsp.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 82ae3bd3eb..879ce731ee 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -907,6 +907,8 @@ static void rtsp_parse_transport(RTSPMessageHeader *reply, const char *p)
p++;
reply->nb_transports++;
+ if (reply->nb_transports >= RTSP_MAX_TRANSPORTS)
+ break;
}
}