Merge branch 'dev' into develop

Author: raissi-oussema

.pre-commit-config.yaml

@@ -38,17 +38,17 @@ repos:
       - id: cppcheck
         args: ["--std=c++11", "--language=c++", "--suppressions-list=cppcheckSuppressions.txt", "--inline-suppr", "--force"]
   - repo: https://github.com/BlankSpruce/gersemi
-    rev: 0.17.1
+    rev: 0.18.2
     hooks:
     - id: gersemi
       args: ["-c"]
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.3.0
+    rev: v2.4.1
     hooks:
       - id: codespell
         pass_filenames: false
   - repo: https://github.com/crate-ci/typos
-    rev: codespell-dict-v0.5.0
+    rev: typos-dict-v0.12.4
     hooks:
       - id: typos
         args: ['--config=typos-config.toml']

3rdParty/LightPcapNg/LightPcapNg/src/light_pcapng.c

@@ -49,15 +49,28 @@ static struct _light_option *__parse_options(uint32_t **memory, const int32_t ma
       opt->custom_option_code = *local_memory++;
       opt->option_length = *local_memory++;
 
+      // PCPP patch
+      // Validate option_length
+      if (opt->option_length > max_len - 2 * sizeof(*local_memory)) {
+          free(opt);
+          return NULL;
+      }
+      // PCPP patch end
+
       actual_length = (opt->option_length % alignment) == 0 ?
             opt->option_length :
             (opt->option_length / alignment + 1) * alignment;
 
-      if (actual_length > 0) {
-         opt->data = calloc(1, actual_length);
-         memcpy(opt->data, local_memory, actual_length);
-         local_memory += (sizeof(**memory) / sizeof(*local_memory)) * (actual_length / alignment);
+      // PCPP patch
+      // Validate actual_length
+      if (actual_length <= 0 || actual_length > max_len - 2 * sizeof(*local_memory)) {
+          free(opt);
+          return NULL;
       }
+      opt->data = calloc(1, actual_length);
+      memcpy(opt->data, local_memory, actual_length);
+      local_memory += (sizeof(**memory) / sizeof(*local_memory)) * (actual_length / alignment);
+      // PCPP patch end
 
       *memory = (uint32_t*)local_memory;
       remaining_size = max_len - actual_length - 2 * sizeof(*local_memory);