forked from vanhauser-thc/afl-patches
-
Notifications
You must be signed in to change notification settings - Fork 0
/
afl-fuzz-79x24.diff
221 lines (162 loc) · 8.16 KB
/
afl-fuzz-79x24.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
--- ./afl-fuzz.c 2017-11-05 03:25:56.000000000 +0100
+++ ./afl-fuzz.c 2018-08-18 09:33:50.633610556 +0200
@@ -3980,7 +3980,7 @@
if (term_too_small) {
SAYF(cBRI "Your terminal is too small to display the UI.\n"
- "Please resize terminal window to at least 80x25.\n" cRST);
+ "Please resize terminal window to at least 79x24.\n" cRST);
return;
@@ -3989,14 +3989,14 @@
/* Let's start by drawing a centered banner. */
banner_len = (crash_mode ? 24 : 22) + strlen(VERSION) + strlen(use_banner);
- banner_pad = (80 - banner_len) / 2;
+ banner_pad = (79 - banner_len) / 2;
memset(tmp, ' ', banner_pad);
sprintf(tmp + banner_pad, "%s " cLCY VERSION cLGN
" (%s)", crash_mode ? cPIN "peruvian were-rabbit" :
cYEL "american fuzzy lop", use_banner);
- SAYF("\n%s\n\n", tmp);
+ SAYF("\n%s\n", tmp);
/* "Handy" shortcuts for drawing boxes... */
@@ -4013,7 +4013,7 @@
/* Lord, forgive me this. */
SAYF(SET_G1 bSTG bLT bH bSTOP cCYA " process timing " bSTG bH30 bH5 bH2 bHB
- bH bSTOP cCYA " overall results " bSTG bH5 bRT "\n");
+ bH bSTOP cCYA " overall results " bSTG bH2 bH2 bRT "\n");
if (dumb_mode) {
@@ -4039,7 +4039,7 @@
}
SAYF(bV bSTOP " run time : " cRST "%-34s " bSTG bV bSTOP
- " cycles done : %s%-5s " bSTG bV "\n",
+ " cycles done : %s%-5s " bSTG bV "\n",
DTD(cur_ms, start_time), tmp, DI(queue_cycle - 1));
/* We want to warn people about not seeing new paths after a full cycle,
@@ -4065,7 +4065,7 @@
}
- SAYF(bSTG bV bSTOP " total paths : " cRST "%-5s " bSTG bV "\n",
+ SAYF(bSTG bV bSTOP " total paths : " cRST "%-5s " bSTG bV "\n",
DI(queued_paths));
/* Highlight crashes in red if found, denote going over the KEEP_UNIQUE_CRASH
@@ -4075,7 +4075,7 @@
(unique_crashes >= KEEP_UNIQUE_CRASH) ? "+" : "");
SAYF(bV bSTOP " last uniq crash : " cRST "%-34s " bSTG bV bSTOP
- " uniq crashes : %s%-6s " bSTG bV "\n",
+ " uniq crashes : %s%-6s" bSTG bV "\n",
DTD(cur_ms, last_crash_time), unique_crashes ? cLRD : cRST,
tmp);
@@ -4083,11 +4083,11 @@
(unique_hangs >= KEEP_UNIQUE_HANG) ? "+" : "");
SAYF(bV bSTOP " last uniq hang : " cRST "%-34s " bSTG bV bSTOP
- " uniq hangs : " cRST "%-6s " bSTG bV "\n",
+ " uniq hangs : " cRST "%-6s" bSTG bV "\n",
DTD(cur_ms, last_hang_time), tmp);
SAYF(bVR bH bSTOP cCYA " cycle progress " bSTG bH20 bHB bH bSTOP cCYA
- " map coverage " bSTG bH bHT bH20 bH2 bH bVL "\n");
+ " map coverage " bSTG bH bHT bH20 bH2 bVL "\n");
/* This gets funny because we want to print several variable-length variables
together, but then cram them into a fixed-width field - so we need to
@@ -4102,7 +4102,7 @@
sprintf(tmp, "%0.02f%% / %0.02f%%", ((double)queue_cur->bitmap_size) *
100 / MAP_SIZE, t_byte_ratio);
- SAYF(" map density : %s%-21s " bSTG bV "\n", t_byte_ratio > 70 ? cLRD :
+ SAYF(" map density : %s%-21s" bSTG bV "\n", t_byte_ratio > 70 ? cLRD :
((t_bytes < 200 && !dumb_mode) ? cPIN : cRST), tmp);
sprintf(tmp, "%s (%0.02f%%)", DI(cur_skipped_paths),
@@ -4113,10 +4113,10 @@
sprintf(tmp, "%0.02f bits/tuple",
t_bytes ? (((double)t_bits) / t_bytes) : 0);
- SAYF(bSTOP " count coverage : " cRST "%-21s " bSTG bV "\n", tmp);
+ SAYF(bSTOP " count coverage : " cRST "%-21s" bSTG bV "\n", tmp);
SAYF(bVR bH bSTOP cCYA " stage progress " bSTG bH20 bX bH bSTOP cCYA
- " findings in depth " bSTG bH20 bVL "\n");
+ " findings in depth " bSTG bH10 bH5 bH2 bH2 bVL "\n");
sprintf(tmp, "%s (%0.02f%%)", DI(queued_favored),
((double)queued_favored) * 100 / queued_paths);
@@ -4124,7 +4124,7 @@
/* Yeah... it's still going on... halp? */
SAYF(bV bSTOP " now trying : " cRST "%-21s " bSTG bV bSTOP
- " favored paths : " cRST "%-22s " bSTG bV "\n", stage_name, tmp);
+ " favored paths : " cRST "%-22s" bSTG bV "\n", stage_name, tmp);
if (!stage_max) {
@@ -4142,7 +4142,7 @@
sprintf(tmp, "%s (%0.02f%%)", DI(queued_with_cov),
((double)queued_with_cov) * 100 / queued_paths);
- SAYF(" new edges on : " cRST "%-22s " bSTG bV "\n", tmp);
+ SAYF(" new edges on : " cRST "%-22s" bSTG bV "\n", tmp);
sprintf(tmp, "%s (%s%s unique)", DI(total_crashes), DI(unique_crashes),
(unique_crashes >= KEEP_UNIQUE_CRASH) ? "+" : "");
@@ -4150,13 +4150,13 @@
if (crash_mode) {
SAYF(bV bSTOP " total execs : " cRST "%-21s " bSTG bV bSTOP
- " new crashes : %s%-22s " bSTG bV "\n", DI(total_execs),
+ " new crashes : %s%-22s" bSTG bV "\n", DI(total_execs),
unique_crashes ? cLRD : cRST, tmp);
} else {
SAYF(bV bSTOP " total execs : " cRST "%-21s " bSTG bV bSTOP
- " total crashes : %s%-22s " bSTG bV "\n", DI(total_execs),
+ " total crashes : %s%-22s" bSTG bV "\n", DI(total_execs),
unique_crashes ? cLRD : cRST, tmp);
}
@@ -4180,12 +4180,12 @@
sprintf(tmp, "%s (%s%s unique)", DI(total_tmouts), DI(unique_tmouts),
(unique_hangs >= KEEP_UNIQUE_HANG) ? "+" : "");
- SAYF (bSTG bV bSTOP " total tmouts : " cRST "%-22s " bSTG bV "\n", tmp);
+ SAYF (bSTG bV bSTOP " total tmouts : " cRST "%-22s" bSTG bV "\n", tmp);
/* Aaaalmost there... hold on! */
SAYF(bVR bH cCYA bSTOP " fuzzing strategy yields " bSTG bH10 bH bHT bH10
- bH5 bHB bH bSTOP cCYA " path geometry " bSTG bH5 bH2 bH bVL "\n");
+ bH5 bHB bH bSTOP cCYA " path geometry " bSTG bH5 bH2 bVL "\n");
if (skip_deterministic) {
@@ -4201,7 +4201,7 @@
}
SAYF(bV bSTOP " bit flips : " cRST "%-37s " bSTG bV bSTOP " levels : "
- cRST "%-10s " bSTG bV "\n", tmp, DI(max_depth));
+ cRST "%-10s" bSTG bV "\n", tmp, DI(max_depth));
if (!skip_deterministic)
sprintf(tmp, "%s/%s, %s/%s, %s/%s",
@@ -4210,7 +4210,7 @@
DI(stage_finds[STAGE_FLIP32]), DI(stage_cycles[STAGE_FLIP32]));
SAYF(bV bSTOP " byte flips : " cRST "%-37s " bSTG bV bSTOP " pending : "
- cRST "%-10s " bSTG bV "\n", tmp, DI(pending_not_fuzzed));
+ cRST "%-10s" bSTG bV "\n", tmp, DI(pending_not_fuzzed));
if (!skip_deterministic)
sprintf(tmp, "%s/%s, %s/%s, %s/%s",
@@ -4219,7 +4219,7 @@
DI(stage_finds[STAGE_ARITH32]), DI(stage_cycles[STAGE_ARITH32]));
SAYF(bV bSTOP " arithmetics : " cRST "%-37s " bSTG bV bSTOP " pend fav : "
- cRST "%-10s " bSTG bV "\n", tmp, DI(pending_favored));
+ cRST "%-10s" bSTG bV "\n", tmp, DI(pending_favored));
if (!skip_deterministic)
sprintf(tmp, "%s/%s, %s/%s, %s/%s",
@@ -4228,7 +4228,7 @@
DI(stage_finds[STAGE_INTEREST32]), DI(stage_cycles[STAGE_INTEREST32]));
SAYF(bV bSTOP " known ints : " cRST "%-37s " bSTG bV bSTOP " own finds : "
- cRST "%-10s " bSTG bV "\n", tmp, DI(queued_discovered));
+ cRST "%-10s" bSTG bV "\n", tmp, DI(queued_discovered));
if (!skip_deterministic)
sprintf(tmp, "%s/%s, %s/%s, %s/%s",
@@ -4237,7 +4237,7 @@
DI(stage_finds[STAGE_EXTRAS_AO]), DI(stage_cycles[STAGE_EXTRAS_AO]));
SAYF(bV bSTOP " dictionary : " cRST "%-37s " bSTG bV bSTOP
- " imported : " cRST "%-10s " bSTG bV "\n", tmp,
+ " imported : " cRST "%-10s" bSTG bV "\n", tmp,
sync_id ? DI(queued_imported) : (u8*)"n/a");
sprintf(tmp, "%s/%s, %s/%s",
@@ -4249,7 +4249,7 @@
if (t_bytes) sprintf(tmp, "%0.02f%%", stab_ratio);
else strcpy(tmp, "n/a");
- SAYF(" stability : %s%-10s " bSTG bV "\n", (stab_ratio < 85 && var_byte_count > 40)
+ SAYF(" stability : %s%-10s" bSTG bV "\n", (stab_ratio < 85 && var_byte_count > 40)
? cLRD : ((queued_variable && (!persistent_mode || var_byte_count > 20))
? cMGN : cRST), tmp);
@@ -4284,7 +4284,7 @@
}
- SAYF(bV bSTOP " trim : " cRST "%-37s " bSTG bVR bH20 bH2 bH2 bRB "\n"
+ SAYF(bV bSTOP " trim : " cRST "%-37s " bSTG bVR bH20 bH2 bH bRB "\n"
bLB bH30 bH20 bH2 bH bRB bSTOP cRST RESET_G1, tmp);
/* Provide some CPU utilization stats. */
@@ -7032,7 +7032,7 @@
if (ioctl(1, TIOCGWINSZ, &ws)) return;
- if (ws.ws_row < 25 || ws.ws_col < 80) term_too_small = 1;
+ if (ws.ws_row < 24 || ws.ws_col < 79) term_too_small = 1;
}