CMake: Allow setting per target compiler warnings

[metze/wireshark/wip.git] / wiretap / ber.c

diff --git a/wiretap/ber.c b/wiretap/ber.c
index bde62347634a32d6ff676828c8600f269bf0893f..4897447a046df79f50856442a05619de5811cd70 100644 (file)
--- a/wiretap/ber.c
+++ b/wiretap/ber.c
@@ -21,22 +21,18 @@
 
 #include <errno.h>
 
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
 #include "wtap-int.h"
 #include "file_wrappers.h"
 #include <wsutil/buffer.h>
 #include "ber.h"
 
 
-#define BER_CLASS_UNI  0
-#define BER_CLASS_APP  1
-#define BER_CLASS_CON  2
+#define BER_CLASS_UNI   0
+#define BER_CLASS_APP   1
+#define BER_CLASS_CON   2
 
-#define BER_UNI_TAG_SEQ        16      /* SEQUENCE, SEQUENCE OF */
-#define BER_UNI_TAG_SET        17      /* SET, SET OF */
+#define BER_UNI_TAG_SEQ 16      /* SEQUENCE, SEQUENCE OF */
+#define BER_UNI_TAG_SET 17      /* SET, SET OF */
 
 static gboolean ber_read_file(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr,
                               Buffer *buf, int *err, gchar **err_info)
@@ -47,14 +43,14 @@ static gboolean ber_read_file(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr,
   if ((file_size = wtap_file_size(wth, err)) == -1)
     return FALSE;
 
-  if (file_size > WTAP_MAX_PACKET_SIZE) {
+  if (file_size > G_MAXINT) {
     /*
      * Probably a corrupt capture file; don't blow up trying
      * to allocate space for an immensely-large packet.
      */
     *err = WTAP_ERR_BAD_FILE;
     *err_info = g_strdup_printf("ber: File has %" G_GINT64_MODIFIER "d-byte packet, bigger than maximum of %u",
-                               file_size, WTAP_MAX_PACKET_SIZE);
+                                file_size, G_MAXINT);
     return FALSE;
   }
   packet_size = (int)file_size;
@@ -68,6 +64,7 @@ static gboolean ber_read_file(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr,
   phdr->ts.secs = 0;
   phdr->ts.nsecs = 0;
 
+  ws_buffer_assure_space(buf, packet_size);
   return wtap_read_packet_bytes(fh, buf, packet_size, err, err_info);
 }
 
@@ -88,8 +85,8 @@ static gboolean ber_read(wtap *wth, int *err, gchar **err_info, gint64 *data_off
   return ber_read_file(wth, wth->fh, &wth->phdr, wth->frame_buffer, err, err_info);
 }
 
-static gboolean ber_seek_read(wtap *wth, gint64 seek_off, struct wtap_pkthdr *phdr _U_,
-                             Buffer *buf, int *err, gchar **err_info)
+static gboolean ber_seek_read(wtap *wth, gint64 seek_off, struct wtap_pkthdr *phdr,
+                              Buffer *buf, int *err, gchar **err_info)
 {
   /* there is only one packet */
   if(seek_off > 0) {
@@ -103,7 +100,7 @@ static gboolean ber_seek_read(wtap *wth, gint64 seek_off, struct wtap_pkthdr *ph
   return ber_read_file(wth, wth->random_fh, phdr, buf, err, err_info);
 }
 
-int ber_open(wtap *wth, int *err, gchar **err_info)
+wtap_open_return_val ber_open(wtap *wth, int *err, gchar **err_info)
 {
 #define BER_BYTES_TO_CHECK 8
   guint8 bytes[BER_BYTES_TO_CHECK];
@@ -118,8 +115,8 @@ int ber_open(wtap *wth, int *err, gchar **err_info)
 
   if (!wtap_read_bytes(wth->fh, &bytes, BER_BYTES_TO_CHECK, err, err_info)) {
     if (*err != WTAP_ERR_SHORT_READ)
-      return -1;
-    return 0;
+      return WTAP_OPEN_ERROR;
+    return WTAP_OPEN_NOT_MINE;
   }
 
   ber_id = bytes[offset++];
@@ -129,12 +126,11 @@ int ber_open(wtap *wth, int *err, gchar **err_info)
   ber_tag = ber_id & 0x1F;
 
   /* it must be constructed and either a SET or a SEQUENCE */
-  /* or a CONTEXT less than 32 (arbitrary) */
-  /* XXX: do we also want to allow APPLICATION */
+  /* or a CONTEXT/APPLICATION less than 32 (arbitrary) */
   if(!(ber_pc &&
        (((ber_class == BER_CLASS_UNI) && ((ber_tag == BER_UNI_TAG_SET) || (ber_tag == BER_UNI_TAG_SEQ))) ||
-       ((ber_class == BER_CLASS_CON) && (ber_tag < 32)))))
-    return 0;
+        (((ber_class == BER_CLASS_CON) || (ber_class == BER_CLASS_APP)) && (ber_tag < 32)))))
+    return WTAP_OPEN_NOT_MINE;
 
   /* now check the length */
   oct = bytes[offset++];
@@ -149,12 +145,12 @@ int ber_open(wtap *wth, int *err, gchar **err_info)
       nlb = oct & 0x7F; /* number of length bytes */
 
       if((nlb > 0) && (nlb <= (BER_BYTES_TO_CHECK - 2))) {
-       /* not indefinite length and we have read enough bytes to compute the length */
-       i = nlb;
-       while(i--) {
-         oct = bytes[offset++];
-         len = (len<<8) + oct;
-       }
+        /* not indefinite length and we have read enough bytes to compute the length */
+        i = nlb;
+        while(i--) {
+          oct = bytes[offset++];
+          len = (len<<8) + oct;
+        }
       }
     }
 
@@ -162,7 +158,7 @@ int ber_open(wtap *wth, int *err, gchar **err_info)
     file_size = wtap_file_size(wth, err);
 
     if(len != file_size) {
-      return 0; /* not ASN.1 */
+      return WTAP_OPEN_NOT_MINE; /* not ASN.1 */
     }
   } else {
     /* Indefinite length encoded - assume it is BER */
@@ -170,7 +166,7 @@ int ber_open(wtap *wth, int *err, gchar **err_info)
 
   /* seek back to the start of the file  */
   if (file_seek(wth->fh, 0, SEEK_SET, err) == -1)
-    return -1;
+    return WTAP_OPEN_ERROR;
 
   wth->file_type_subtype = WTAP_FILE_TYPE_SUBTYPE_BER;
   wth->file_encap = WTAP_ENCAP_BER;
@@ -180,5 +176,18 @@ int ber_open(wtap *wth, int *err, gchar **err_info)
   wth->subtype_seek_read = ber_seek_read;
   wth->file_tsprec = WTAP_TSPREC_SEC;
 
-  return 1;
+  return WTAP_OPEN_MINE;
 }
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local Variables:
+ * c-basic-offset: 2
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=2 tabstop=8 expandtab:
+ * :indentSize=2:tabSize=8:noTabs=true:
+ */