]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
swf: right input length for decompression
authorPhilippe Antoine <contact@catenacyber.fr>
Thu, 29 Apr 2021 09:57:15 +0000 (11:57 +0200)
committerVictor Julien <victor@inliniac.net>
Fri, 25 Jun 2021 15:11:52 +0000 (17:11 +0200)
(cherry picked from commit 4d2f9cc8a0409bb03f5d285bb83d64afec08ba2a)

src/util-file-decompression.c

index 9009845a1012972d565e0a027499a81625df6bf7..f7b5d00b027332b5656ccb8a48366bd4b71782a0 100644 (file)
@@ -97,12 +97,10 @@ int FileSwfDecompression(const uint8_t *buffer, uint32_t buffer_len,
     }
 
     uint32_t compressed_data_len = 0;
-    if (buffer_len > offset && compress_depth == 0) {
-        compressed_data_len = buffer_len - offset;
-    } else if (compress_depth > 0 && compress_depth <= buffer_len) {
+    if (compress_depth > 0 && compress_depth <= buffer_len) {
         compressed_data_len = compress_depth;
-    } else if (compress_depth > 0 && compress_depth > buffer_len) {
-        compressed_data_len = buffer_len;
+    } else {
+        compressed_data_len = buffer_len - offset;
     }
 
     /* get swf version */