summaryrefslogtreecommitdiff
authorMartin Ettl <ettl.martin78@googlemail.com>2012-10-02 20:57:25 (GMT)
committer Michael Niedermayer <michaelni@gmx.at>2012-10-02 20:59:03 (GMT)
commitf077e1fb4c912a66ab5d766fd256803821d92c67 (patch)
tree8726fe409613e052980290ecf34417eaa1d41a75
parentd4e82a341e1a5f1e3d04a4115ed29429b6c05943 (diff)
downloadffmpeg-f077e1fb4c912a66ab5d766fd256803821d92c67.zip
ffmpeg-f077e1fb4c912a66ab5d766fd256803821d92c67.tar.gz
ffmpeg-f077e1fb4c912a66ab5d766fd256803821d92c67.tar.bz2
ffserver: fix potential buffer overflow, based on wrong fscanf format indentifier.
Fixed Ticket1780 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat
-rw-r--r--ffserver.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ffserver.c b/ffserver.c
index 7fb61d0..cb7e3ae 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -2029,7 +2029,7 @@ static void compute_status(HTTPContext *c)
char cpuperc[10];
char cpuused[64];
- if (fscanf(pid_stat, "%10s %64s", cpuperc,
+ if (fscanf(pid_stat, "%9s %63s", cpuperc,
cpuused) == 2) {
avio_printf(pb, "Currently using %s%% of the cpu. Total time used %s.\n",
cpuperc, cpuused);