Add checks in "rd_add_field_to_tree()" for the length of the field.

[obnox/wireshark/wip.git] / epan / plugins.c

diff --git a/epan/plugins.c b/epan/plugins.c
index 87edd1021a5370880a1d8ff030333332964c7e32..79a4306fe1b15244b7386be3b0ad5f8806d50858 100644 (file)
--- a/epan/plugins.c
+++ b/epan/plugins.c
@@ -1,7 +1,7 @@
 /* plugins.c
  * plugin routines
  *
- * $Id: plugins.c,v 1.83 2004/05/21 00:39:33 guy Exp $
+ * $Id$
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -61,15 +61,19 @@
 #ifdef PLUGINS_NEED_ADDRESS_TABLE
 #include "conversation.h"
 #include "reassemble.h"
-#include "prefs.h"
-#include "packet-giop.h"
-#include "packet-tpkt.h"
-#include "packet-tcp.h"
-#include "tap.h"
+#include <epan/prefs.h>
+#include <epan/dissectors/packet-giop.h>
+#include <epan/dissectors/packet-tpkt.h>
+#include <epan/dissectors/packet-tcp.h>
+#include <epan/dissectors/packet-rpc.h>
+#include <epan/tap.h>
 #include "asn1.h"
-#include "packet-per.h"
-#include "packet-ber.h"
-#include "xdlc.h"
+#include <epan/dissectors/packet-per.h>
+#include <epan/dissectors/packet-ber.h>
+#include <epan/dissectors/packet-rtp.h>
+#include <epan/dissectors/packet-rtcp.h>
+#include <epan/xdlc.h>
+#include <epan/crc16.h>
 #include "report_err.h"
 #include "plugins/plugin_table.h"
 static plugin_address_table_t  patable = {
@@ -311,7 +315,7 @@ plugins_scan_dir(const char *dirname)
 /* Return value is malloced so the caller should g_free() it. */
 const char *get_plugins_global_dir(const char *plugin_dir)
 {
-#ifdef WIN32
+#ifdef _WIN32
        char *install_plugin_dir;
 
        /*