Merge with ns-3-dev

2009-04-29 18:26:25 +04:00
parent 0b3595f809 16b6cfbe71
commit 933d9b22fe
97 changed files with 7132 additions and 401 deletions
--- a/utils/lcov/geninfo
+++ b/utils/lcov/geninfo
@@ -1292,6 +1292,12 @@ sub read_gcno_file($)
 				{
 					next;
 				}
+				#added because if length is zero the following
+				#reading process will die, it will read garbage
+				if ($length == 0)
+				{
+					next;
+				}
 				($blocks, $filename) =
 					read_gcno_string(*INPUT, $endianness);
 				if ($blocks > 1)