fix windows paths, end test thread

PJDude · Nov 18, 2023 · af90bc0 · af90bc0
1 parent c0c7fe5
commit af90bc0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/core.py b/src/core.py
@@ -115,7 +115,6 @@ def byte_to_bools(byte, num_bools=8):
 
     return tuple(bool_list)
 
-
 def test_regexp(expr):
     teststring='abc'
     try:
@@ -492,7 +491,7 @@ def extract_custom_data(self):
 
             expressions,use_smin,smin_int,use_smax,smax_int,executable,timeout,crc = self_db_cde_list[rule_nr]
 
-            full_file_path = normpath(abspath(sep.join([scan_path,subpath])))
+            full_file_path = normpath(abspath(sep.join([scan_path,subpath]))).replace('/',sep)
 
             size = list_ref[4]
 
@@ -725,6 +724,7 @@ def test_cde(self,executable,timeout,file_to_test):
         cde_run_list = executable + [file_to_test]
 
         cd_ok,output = exe.run(cde_run_list,timeout)
+        exe.end()
 
         return cd_ok,output
 

diff --git a/src/librer.py b/src/librer.py
@@ -2731,7 +2731,8 @@ def cde_test(self,e):
             except:
                 timeout_int = None
 
-            file_to_test = res
+            file_to_test = res.replace('/',sep)
+            #print('file_to_test:',file_to_test)
 
             info = ' '.join(self.CDE_executable_var_list[e].get().split() + [file_to_test]) + ( ('\ntimeout:' + str(timeout_int)) if timeout_int else '')