naccyde / rpms / iproute

Forked from rpms/iproute 7 months ago
Clone

Blame SOURCES/0113-netem-maketable-Check-return-value-of-fscanf.patch

36cfb7
From d533a60518e79593c6a1813a6f44aa3889045120 Mon Sep 17 00:00:00 2001
36cfb7
From: Andrea Claudi <aclaudi@redhat.com>
36cfb7
Date: Mon, 29 Apr 2019 20:08:08 +0200
36cfb7
Subject: [PATCH] netem/maketable: Check return value of fscanf()
36cfb7
36cfb7
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1465646
36cfb7
Upstream Status: iproute2.git commit 92963d136de8c
36cfb7
36cfb7
commit 92963d136de8c370324716add98888b2ce6e6a94
36cfb7
Author: Phil Sutter <phil@nwl.cc>
36cfb7
Date:   Thu Aug 24 11:41:28 2017 +0200
36cfb7
36cfb7
    netem/maketable: Check return value of fscanf()
36cfb7
36cfb7
    Signed-off-by: Phil Sutter <phil@nwl.cc>
36cfb7
---
36cfb7
 netem/maketable.c | 4 ++--
36cfb7
 1 file changed, 2 insertions(+), 2 deletions(-)
36cfb7
36cfb7
diff --git a/netem/maketable.c b/netem/maketable.c
36cfb7
index ad660e7d457f0..ccb8f0c68b062 100644
36cfb7
--- a/netem/maketable.c
36cfb7
+++ b/netem/maketable.c
36cfb7
@@ -38,8 +38,8 @@ readdoubles(FILE *fp, int *number)
36cfb7
 	}
36cfb7
 
36cfb7
 	for (i=0; i
36cfb7
-		fscanf(fp, "%lf", &x[i]);
36cfb7
-		if (feof(fp))
36cfb7
+		if (fscanf(fp, "%lf", &x[i]) != 1 ||
36cfb7
+		    feof(fp))
36cfb7
 			break;
36cfb7
 		++n;
36cfb7
 	}
36cfb7
-- 
e138d9
2.21.0
36cfb7