summaryrefslogtreecommitdiff
path: root/package/snort/patches/patch-src_target-based_sf_attribute_table_parser_c
diff options
context:
space:
mode:
Diffstat (limited to 'package/snort/patches/patch-src_target-based_sf_attribute_table_parser_c')
-rw-r--r--package/snort/patches/patch-src_target-based_sf_attribute_table_parser_c95
1 files changed, 95 insertions, 0 deletions
diff --git a/package/snort/patches/patch-src_target-based_sf_attribute_table_parser_c b/package/snort/patches/patch-src_target-based_sf_attribute_table_parser_c
new file mode 100644
index 000000000..4279b4a72
--- /dev/null
+++ b/package/snort/patches/patch-src_target-based_sf_attribute_table_parser_c
@@ -0,0 +1,95 @@
+--- snort-2.9.5.orig/src/target-based/sf_attribute_table_parser.c 2013-06-04 23:23:12.000000000 +0200
++++ snort-2.9.5/src/target-based/sf_attribute_table_parser.c 2013-07-17 11:10:59.000000000 +0200
+@@ -73,7 +73,6 @@ typedef int flex_int32_t;
+ typedef unsigned char flex_uint8_t;
+ typedef unsigned short int flex_uint16_t;
+ typedef unsigned int flex_uint32_t;
+-#endif /* ! C99 */
+
+ /* Limits of integral types. */
+ #ifndef INT8_MIN
+@@ -104,6 +103,8 @@ typedef unsigned int flex_uint32_t;
+ #define UINT32_MAX (4294967295U)
+ #endif
+
++#endif /* ! C99 */
++
+ #endif /* ! FLEXINT_H */
+
+ #ifdef __cplusplus
+@@ -160,7 +161,15 @@ typedef unsigned int flex_uint32_t;
+
+ /* Size of default input buffer. */
+ #ifndef YY_BUF_SIZE
++#ifdef __ia64__
++/* On IA-64, the buffer size is 16k, not 8k.
++ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
++ * Ditto for the __ia64__ case accordingly.
++ */
++#define YY_BUF_SIZE 32768
++#else
+ #define YY_BUF_SIZE 16384
++#endif /* __ia64__ */
+ #endif
+
+ /* The state buf must be large enough to hold one state per character in the main buffer.
+@@ -6264,7 +6273,7 @@ int sfat_parse(void);
+ /* Rules Section.
+ * All rules are in here prior to second "%%" seperator
+ */
+-#line 6268 "sf_attribute_table_parser.c"
++#line 6277 "sf_attribute_table_parser.c"
+
+ #define INITIAL 0
+ #define waiting_for_comma_prior_to_data 1
+@@ -6345,7 +6354,12 @@ static int input (void );
+
+ /* Amount of stuff to slurp up with each read. */
+ #ifndef YY_READ_BUF_SIZE
++#ifdef __ia64__
++/* On IA-64, the buffer size is 16k, not 8k */
++#define YY_READ_BUF_SIZE 16384
++#else
+ #define YY_READ_BUF_SIZE 8192
++#endif /* __ia64__ */
+ #endif
+
+ /* Copy whatever the last rule matched to the standard output. */
+@@ -6364,7 +6378,7 @@ static int input (void );
+ if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
+ { \
+ int c = '*'; \
+- unsigned n; \
++ size_t n; \
+ for ( n = 0; n < max_size && \
+ (c = getc( sfatin )) != EOF && c != '\n'; ++n ) \
+ buf[n] = (char) c; \
+@@ -6448,7 +6462,7 @@ YY_DECL
+
+ #line 100 "sf_attribute_table_parser.l"
+
+-#line 6452 "sf_attribute_table_parser.c"
++#line 6466 "sf_attribute_table_parser.c"
+
+ if ( !(yy_init) )
+ {
+@@ -6842,7 +6856,7 @@ YY_RULE_SETUP
+ #line 186 "sf_attribute_table_parser.l"
+ ECHO;
+ YY_BREAK
+-#line 6846 "sf_attribute_table_parser.c"
++#line 6860 "sf_attribute_table_parser.c"
+
+ case YY_END_OF_BUFFER:
+ {
+@@ -7558,8 +7572,8 @@ YY_BUFFER_STATE sfat_scan_string (yycons
+
+ /** Setup the input buffer state to scan the given bytes. The next call to sfatlex() will
+ * scan from a @e copy of @a bytes.
+- * @param bytes the byte buffer to scan
+- * @param len the number of bytes in the buffer pointed to by @a bytes.
++ * @param yybytes the byte buffer to scan
++ * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
+ *
+ * @return the newly allocated buffer state object.
+ */