Attempt to fix issues with CI build

VirusTotal · Mar 1, 2022 · 5d498a4 · 5d498a4
1 parent c0b0b77
commit 5d498a4
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 10 deletions.
diff --git a/configure.ac b/configure.ac
@@ -52,6 +52,7 @@ case $host_os in
              proc_interface=mach
              jemalloc_prefix=je_ ;;
     mingw*|cygwin*) CFLAGS="$CFLAGS -DUSE_WINDOWS_PROC"
+            LDFLAGS="$LDFLAGS -lntdll"
             proc_interface=windows
             jemalloc_prefix= ;;
     linux*|netbsd*|dragonfly*|kfreebsd*)

diff --git a/libyara/modules/pe/pe.c b/libyara/modules/pe/pe.c
@@ -1569,7 +1569,7 @@ static void pe_parse_exports(PE* pe)
   if (offset > 0)
   {
     remaining = pe->data_size - (size_t) offset;
-    char* name;
+    char* name = NULL;
     if (pe->memory)
     {
       get_data_pointer_memory(pe, offset, name, char*);
@@ -1723,7 +1723,7 @@ static void pe_parse_exports(PE* pe)
 
           if (offset > 0)
           {
-            char* name;
+            char* name = NULL;
             if (pe->memory)
             {
               get_data_pointer_memory_with_size(pe, offset, name, char*, remaining);

diff --git a/tests/BUILD.bazel b/tests/BUILD.bazel
@@ -32,6 +32,11 @@ COPTS = [
     "-std=c99",
 ]
 
+
+LOPTS = [
+    "-lntdll",
+]
+
 cc_library(
     name = "blob",
     hdrs = ["blob.h"],
@@ -40,6 +45,7 @@ cc_library(
 cc_library(
     name = "util",
     srcs = ["util.c"],
+    linkopts = LOPTS,
     copts = COPTS,
     textual_hdrs = ["util.h"],
     deps = ["@//:libyara"],
@@ -48,6 +54,7 @@ cc_library(
 cc_test(
     name = "test_alignment",
     srcs = ["test-alignment.c"],
+    linkopts = LOPTS,
     copts = COPTS,
     linkstatic = True,
     deps = [
@@ -59,6 +66,7 @@ cc_test(
 cc_test(
     name = "test_arena",
     srcs = ["test-arena.c"],
+    linkopts = LOPTS,
     copts = COPTS,
     linkstatic = True,
     deps = [
@@ -70,6 +78,7 @@ cc_test(
 cc_test(
     name = "test_atoms",
     srcs = ["test-atoms.c"],
+    linkopts = LOPTS,
     copts = COPTS,
     linkstatic = True,
     deps = [
@@ -87,6 +96,7 @@ cc_binary(
 cc_test(
     name = "test_rules",
     srcs = ["test-rules.c"],
+    linkopts = LOPTS,
     copts = COPTS,
     data = [
         "data/base64",
@@ -109,6 +119,7 @@ cc_test(
 cc_test(
     name = "test_pe",
     srcs = ["test-pe.c"],
+    linkopts = LOPTS,
     copts = COPTS,
     data = [
         "data/079a472d22290a94ebb212aa8015cdc8dd28a968c6b4d3b88acdd58ce2d3b885",
@@ -136,6 +147,7 @@ cc_test(
 cc_test(
     name = "test_elf",
     srcs = ["test-elf.c"],
+    linkopts = LOPTS,
     copts = COPTS,
     linkstatic = True,
     deps = [
@@ -148,6 +160,7 @@ cc_test(
 cc_test(
     name = "test_api",
     srcs = ["test-api.c"],
+    linkopts = LOPTS,
     copts = COPTS,
     data = [
         "data/baz.yar",
@@ -163,6 +176,7 @@ cc_test(
 cc_test(
     name = "test_bitmask",
     srcs = ["test-bitmask.c"],
+    linkopts = LOPTS,
     copts = COPTS,
     linkstatic = True,
     deps = [
@@ -174,6 +188,7 @@ cc_test(
 cc_test(
     name = "test_math",
     srcs = ["test-math.c"],
+    linkopts = LOPTS,
     copts = COPTS,
     linkstatic = True,
     deps = [
@@ -185,6 +200,7 @@ cc_test(
 cc_test(
     name = "test_stack",
     srcs = ["test-stack.c"],
+    linkopts = LOPTS,
     copts = COPTS,
     linkstatic = True,
     deps = [
@@ -197,6 +213,7 @@ cc_test(
 cc_test(
     name = "test_exception",
     srcs = ["test-exception.c"],
+    linkopts = LOPTS,
     copts = COPTS,
     linkstatic = True,
     deps = [
@@ -208,6 +225,7 @@ cc_test(
 cc_test(
     name = "test_macho",
     srcs = ["test-macho.c"],
+    linkopts = LOPTS,
     copts = COPTS,
     data = [
         "data/tiny-macho",
@@ -224,6 +242,7 @@ cc_test(
 cc_test(
     name = "test_dex",
     srcs = ["test-dex.c"],
+    linkopts = LOPTS,
     copts = COPTS,
     linkstatic = True,
     deps = [
@@ -236,6 +255,7 @@ cc_test(
 cc_test(
     name = "test_re_split",
     srcs = ["test-re-split.c"],
+    linkopts = LOPTS,
     copts = COPTS,
     linkstatic = True,
     deps = [

diff --git a/tests/test-pe.c b/tests/test-pe.c
@@ -324,7 +324,7 @@ int main(int argc, char** argv)
         condition: \
           pe.number_of_signatures == 1 and \
           pe.signatures[0].thumbprint == \"c1bf1b8f751bf97626ed77f755f0a393106f2454\" and \
-          pe.signatures[0].subject == \"/C=US/ST=California/L=Menlo Park/O=Quicken, Inc./OU=Operations/CN=Quicken, Inc.\" \
+          pe.signatures[0].subject == \"C = US, ST = California, L = Menlo Park, O = \"Quicken, Inc.\", OU = Operations, CN = \"Quicken, Inc.\"\" \
       }",
       "tests/data/"
       "079a472d22290a94ebb212aa8015cdc8dd28a968c6b4d3b88acdd58ce2d3b885");

diff --git a/windows/vs2015/libyara/libyara.vcxproj b/windows/vs2015/libyara/libyara.vcxproj
@@ -100,7 +100,7 @@
     </ClCompile>
     <Lib>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>jansson.lib;libcrypto.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ntdll.lib;jansson.lib;libcrypto.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
       <TargetMachine>MachineX86</TargetMachine>
       <AdditionalLibraryDirectories>..\packages\YARA.OpenSSL.x86.1.1.1\lib;..\packages\YARA.Jansson.x86.1.1.0\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -128,7 +128,7 @@
     </ClCompile>
     <Lib>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>crypt32.lib;ws2_32.lib;advapi32.lib;jansson.lib;libcrypto.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ntdll.lib;crypt32.lib;ws2_32.lib;advapi32.lib;jansson.lib;libcrypto.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
       <AdditionalLibraryDirectories>..\packages\YARA.OpenSSL.x64.1.1.1\lib;..\packages\YARA.Jansson.x64.1.1.0\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalOptions>/IGNORE:4221</AdditionalOptions>
@@ -152,7 +152,7 @@
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     </ClCompile>
     <Lib>
-      <AdditionalDependencies>jansson.lib;libcrypto.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ntdll.lib;jansson.lib;libcrypto.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
       <TargetMachine>MachineX86</TargetMachine>
       <AdditionalLibraryDirectories>..\packages\YARA.OpenSSL.x86.1.1.1\lib;..\packages\YARA.Jansson.x86.1.1.0\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -178,7 +178,7 @@
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     </ClCompile>
     <Lib>
-      <AdditionalDependencies>jansson.lib;libcrypto.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ntdll.lib;jansson.lib;libcrypto.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <LinkTimeCodeGeneration>false</LinkTimeCodeGeneration>
       <AdditionalLibraryDirectories>..\packages\YARA.OpenSSL.x64.1.1.1\lib;..\packages\YARA.Jansson.x64.1.1.0\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -205,7 +205,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Lib>
-      <AdditionalDependencies>jansson.lib;libcrypto.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ntdll.lib;jansson.lib;libcrypto.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <LinkTimeCodeGeneration>false</LinkTimeCodeGeneration>
       <AdditionalLibraryDirectories>..\packages\YARA.OpenSSL.x64.1.1.0\lib;..\packages\YARA.Jansson.x64.1.1.0\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

diff --git a/windows/vs2017/libyara/libyara.vcxproj b/windows/vs2017/libyara/libyara.vcxproj
@@ -204,7 +204,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Lib>
-      <AdditionalDependencies>jansson.lib;libcrypto.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ntdll.lib;jansson.lib;libcrypto.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <LinkTimeCodeGeneration>false</LinkTimeCodeGeneration>
       <AdditionalLibraryDirectories>..\packages\YARA.OpenSSL.x64.1.1.1\lib;..\packages\YARA.Jansson.x64.1.1.0\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

diff --git a/windows/vs2019/libyara/libyara.vcxproj b/windows/vs2019/libyara/libyara.vcxproj
@@ -204,7 +204,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Lib>
-      <AdditionalDependencies>jansson.lib;libcrypto.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ntdll.lib;jansson.lib;libcrypto.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <LinkTimeCodeGeneration>false</LinkTimeCodeGeneration>
       <AdditionalLibraryDirectories>..\packages\YARA.OpenSSL.x64.1.1.1\lib;..\packages\YARA.Jansson.x64.1.1.0\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>