From d2db85948a4a988f0dc7319ef9fc34a4c0a5bfcc Mon Sep 17 00:00:00 2001
From: Guillaume Valadon <guillaume.valadon@ssi.gouv.fr>
Date: Tue, 27 Jun 2017 13:36:56 +0200
Subject: [PATCH] Don't call randval() on unused ConditionalField
---
scapy/packet.py | 7 ++++---
test/regression.uts | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/scapy/packet.py b/scapy/packet.py
index 7fe4261c..bfe926d9 100644
--- a/scapy/packet.py
+++ b/scapy/packet.py
@@ -1459,9 +1459,10 @@ def fuzz(p, _inplace=0):
print "fuzzing", repr(r)
fuzz(r, _inplace=1)
elif f.default is not None:
- rnd = f.randval()
- if rnd is not None:
- q.default_fields[f.name] = rnd
+ if not isinstance(f, ConditionalField) or f._evalcond(q):
+ rnd = f.randval()
+ if rnd is not None:
+ q.default_fields[f.name] = rnd
q = q.payload
return p
diff --git a/test/regression.uts b/test/regression.uts
index 01d14911..6b07791b 100644
--- a/test/regression.uts
+++ b/test/regression.uts
@@ -403,7 +403,7 @@ bind_layers(IP, ICMP, frag=0, proto=1)
= fuzz
~ not_pypy
random.seed(0x2807)
-str(fuzz(IP()/ICMP())) == '\xe5S\x00\x1c\x9dC \x007\x01(H\x7f\x00\x00\x01\x7f\x00\x00\x01*\xdb\xf7,9\x8e\xa4i'
+str(fuzz(IP()/ICMP())) == 'u\x14\x00\x1c\xc2\xf6\x80\x00\xde\x01k\xd3\x7f\x00\x00\x01\x7f\x00\x00\x01y\xc9>\xa6\x84\xd8\xc2\xb7'
= Building some packets
~ basic IP TCP UDP NTP LLC SNAP Dot11
--
GitLab