summaryrefslogtreecommitdiff
authorMichael Niedermayer <michaelni@gmx.at>2012-09-09 11:35:01 (GMT)
committer Michael Niedermayer <michaelni@gmx.at>2012-09-09 12:09:59 (GMT)
commit9c6af3a3db9a85956680060696014635ee949641 (patch)
tree271f2ad7089994370e25323b94e19c13135795ec
parent77aedc77abbe21f2c28052544a0b2f227bca1c77 (diff)
downloadffmpeg-9c6af3a3db9a85956680060696014635ee949641.zip
ffmpeg-9c6af3a3db9a85956680060696014635ee949641.tar.gz
ffmpeg-9c6af3a3db9a85956680060696014635ee949641.tar.bz2
ffserver: increase buffer size in http_send_too_busy_reply()
also add a assert0 to make sure the data is not truncated (which should be impossible now) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat
-rw-r--r--ffserver.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/ffserver.c b/ffserver.c
index 82d3288..2bd92a1 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -40,6 +40,7 @@
#include "libavformat/internal.h"
#include "libavformat/url.h"
+#include "libavutil/avassert.h"
#include "libavutil/avstring.h"
#include "libavutil/lfg.h"
#include "libavutil/dict.h"
@@ -762,7 +763,7 @@ static void start_wait_request(HTTPContext *c, int is_rtsp)
static void http_send_too_busy_reply(int fd)
{
- char buffer[300];
+ char buffer[400];
int len = snprintf(buffer, sizeof(buffer),
"HTTP/1.0 503 Server too busy\r\n"
"Content-type: text/html\r\n"
@@ -772,6 +773,7 @@ static void http_send_too_busy_reply(int fd)
"<p>The number of current connections is %d, and this exceeds the limit of %d.</p>\r\n"
"</body></html>\r\n",
nb_connections, nb_max_connections);
+ av_assert0(len < sizeof(buffer));
send(fd, buffer, len, 0);
}