Skip to content

Commit c4e4486

Browse files
committed
RADIUS: Use GET_U_1() to replace a direct dereference
Remove some now unnecessary ND_TCHECK_*().
1 parent 2800b89 commit c4e4486

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

print-radius.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
#define PRINT_HEX(bytes_len, ptr_data) \
105105
while(bytes_len) \
106106
{ \
107-
ND_PRINT("%02X", *ptr_data ); \
107+
ND_PRINT("%02X", GET_U_1(ptr_data)); \
108108
ptr_data++; \
109109
bytes_len--; \
110110
}
@@ -1339,11 +1339,9 @@ print_attr_strange(netdissect_options *ndo,
13391339
return;
13401340
}
13411341
ND_PRINT("User_challenge (");
1342-
ND_TCHECK_8(data);
13431342
len_data = 8;
13441343
PRINT_HEX(len_data, data);
13451344
ND_PRINT(") User_resp(");
1346-
ND_TCHECK_8(data);
13471345
len_data = 8;
13481346
PRINT_HEX(len_data, data);
13491347
ND_PRINT(")");
@@ -1363,15 +1361,12 @@ print_attr_strange(netdissect_options *ndo,
13631361
ND_PRINT(", Min password length: %u", GET_U_1(data));
13641362
data++;
13651363
ND_PRINT(", created at: ");
1366-
ND_TCHECK_4(data);
13671364
len_data = 4;
13681365
PRINT_HEX(len_data, data);
13691366
ND_PRINT(", expires in: ");
1370-
ND_TCHECK_4(data);
13711367
len_data = 4;
13721368
PRINT_HEX(len_data, data);
13731369
ND_PRINT(", Current Time: ");
1374-
ND_TCHECK_4(data);
13751370
len_data = 4;
13761371
PRINT_HEX(len_data, data);
13771372
break;
@@ -1382,7 +1377,6 @@ print_attr_strange(netdissect_options *ndo,
13821377
ND_PRINT("ERROR: length %u != 8", length);
13831378
return;
13841379
}
1385-
ND_TCHECK_8(data);
13861380
len_data = 8;
13871381
PRINT_HEX(len_data, data);
13881382
break;

0 commit comments

Comments
 (0)