diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-05-22 03:43:29 +0100 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2016-05-22 04:56:10 +0000 |
| commit | 38cc4287a2aff4b3a1a2caefda8714015bb73259 (patch) | |
| tree | f0143e11bad4d99f4a964e965acfe50ba0e3713e /caputils | |
| parent | 1140b1151ea831a9fbbb59c40229ef0a2a908a9f (diff) | |
Reapply "ws80211: Disable shorten-64-to-32."
Disable shorten-64-to-32 in ws80211_create_on_demand_interface,
which calls NLA_PUT_STRING, which passes the output of strlen to an
int parameter. NLA_PUT_STRING is defined in netlink/attr.h so there's
not much we can do to fix it directly.
By Gerald in b8f90de70efa2d271274fbb48df12737f6eddd12.
Change-Id: Ifb92244423fcb2cc267f8fcefb7a2700a7b7c0ea
Reviewed-on: https://code.wireshark.org/review/15522
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'caputils')
| -rw-r--r-- | caputils/ws80211_utils.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/caputils/ws80211_utils.c b/caputils/ws80211_utils.c index 66e935fa87..4f9a6927b6 100644 --- a/caputils/ws80211_utils.c +++ b/caputils/ws80211_utils.c @@ -727,6 +727,8 @@ out_err: return -1; } +/* Needed for NLA_PUT_STRING, which passes strlen as an int */ +DIAG_OFF_CLANG(shorten-64-to-32) static int ws80211_create_on_demand_interface(const char *name) { int devidx, phyidx, err; @@ -765,6 +767,7 @@ nla_put_failure: fprintf(stderr, "building message failed\n"); return 2; } +DIAG_ON_CLANG(shorten-64-to-32) int ws80211_set_freq(const char *name, int freq, int chan_type, int _U_ center_freq, int _U_ center_freq2) { |