Browse code

bb11915 - Fix for whitelisting bytecode signatures. Patch by Georgy Salnikov.

Steven Morgan authored on 2017/10/14 01:23:06
Showing 2 changed files
... ...
@@ -48,6 +48,7 @@ Marc Deslauriers
48 48
 Mark Allan
49 49
 Andreas Schulze
50 50
 Jonas Zaddach
51
+Georgy Salnikov
51 52
 
52 53
 --
53 54
 The ClamAV team (http://www.clamav.net/about.html#credits)
... ...
@@ -772,7 +772,13 @@ static char *cli_signorm(const char *signame)
772 772
 
773 773
     nsz = strlen(signame);
774 774
 
775
-    if (nsz > 11) {
775
+    if (nsz > 3 && signame[nsz-1] == '}') {
776
+        char *pt = strstr(signame, ".{");
777
+        if (pt)         /* strip the ".{ }" clause at the end of signame */
778
+            nsz = pt - signame;
779
+        else
780
+            return NULL;
781
+    } else if (nsz > 11) {
776 782
         if (!strncmp(signame+nsz-11, ".UNOFFICIAL", 11))
777 783
             nsz -= 11;
778 784
         else