diff options
author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2017-09-29 23:31:48 +0100 |
---|---|---|
committer | João Valverde <j@v6e.pt> | 2017-09-30 11:59:31 +0000 |
commit | cf79a87705c3b22233b252705bb3570ce357bbd4 (patch) | |
tree | 86ac7af222a072fa4a7fd103d397b7a1a61448d3 /plugins/wimax/wimax-int.h | |
parent | bf580c066a52ce86226f40cfb32a48a819c160f8 (diff) |
WiMAX: Fix possible crash during protocol registration
proto_register_wimax() cannot be assumed to run before all other dissectors
that depend on the global proto_wimax variable. It happens to work now but
registration order is never guaranteed and cannot be relied upon. Wireshark
will crash with a null pointer dereference if proto_register_wimax() is not
run first.
Have proto_register_wimax() call the registration routine for the other dissectors
that depend on proto_wimax to impose the hard-coded order.
Change-Id: I3e9a9ea742f3feeb5b802ad79cfc9ed916264d2f
Reviewed-on: https://code.wireshark.org/review/23788
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'plugins/wimax/wimax-int.h')
-rw-r--r-- | plugins/wimax/wimax-int.h | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/plugins/wimax/wimax-int.h b/plugins/wimax/wimax-int.h new file mode 100644 index 0000000000..9141d92abd --- /dev/null +++ b/plugins/wimax/wimax-int.h @@ -0,0 +1,39 @@ +/* wimax-int.h + * + * Wireshark - Network traffic analyzer + * By Gerald Combs <gerald@wireshark.org> + * Copyright 1999 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef __WIMAX_INT_H__ +#define __WIMAX_INT_H__ + +void wimax_proto_register_wimax_cdma(void); +void wimax_proto_register_wimax_compact_dlmap_ie(void); +void wimax_proto_register_wimax_compact_ulmap_ie(void); +void wimax_proto_register_wimax_fch(void); +void wimax_proto_register_wimax_ffb(void); +void wimax_proto_register_wimax_hack(void); +void wimax_proto_register_wimax_harq_map(void); +void wimax_proto_register_wimax_pdu(void); +void wimax_proto_register_wimax_phy_attributes(void); +void wimax_proto_register_wimax_utility_decoders(void); +void wimax_proto_register_mac_header_generic(void); +void wimax_proto_register_mac_header_type_1(void); +void wimax_proto_register_mac_header_type_2(void); + +#endif
\ No newline at end of file |