Pull request #3298: utils: fix compilation issues in js_tokenizer

Merge in SNORT/snort3 from ~VHORBATO/snort3:js_platforms_fix to master

Squashed commit of the following:

commit 1dcb665ab0353b30d7df6a89e74de3a7ffb47889
Author: Vitalii <vhorbato@cisco.com>
Date:   Fri Mar 4 12:35:30 2022 +0200

    utils: fix compilation issues in js_tokenizer

diff --git a/src/utils/js_tokenizer.h b/src/utils/js_tokenizer.h
index 2e8cc6c8a6cbd0231418ebb44881ca645b4f263d..2dcdc1fe74cc7d8a0d9463b04de623f81e490b78 100644 (file)
--- a/src/utils/js_tokenizer.h
+++ b/src/utils/js_tokenizer.h
@@ -20,6 +20,7 @@
 #ifndef JS_TOKENIZER_H
 #define JS_TOKENIZER_H
 
+#include <array>
 #include <sstream>
 #include <stack>
 #include <vector>

diff --git a/src/utils/js_tokenizer.l b/src/utils/js_tokenizer.l
index 4439e496e0ddfb58f1c52ff517badeabe938b7b5..4e3ff0a2c1420bae65d0f01d76eaf83e9678ec8b 100644 (file)
--- a/src/utils/js_tokenizer.l
+++ b/src/utils/js_tokenizer.l
@@ -1783,8 +1783,8 @@ JSTokenizer::FuncType JSTokenizer::detect_func_type()
             assert(size >= 0);
             
             char tail[256];
-            assert((long unsigned int)size <= sizeof(tail));
-            size = std::min((long unsigned int)size, sizeof(tail));
+            assert((size_t)size <= sizeof(tail));
+            size = std::min((size_t)size, sizeof(tail));
 
             pbuf->pubseekoff(-size, yyout.cur, yyout.out);
             pbuf->sgetn(tail, size);