Browse code

Merge pull request #1426 from micahsnyder/CLAM-2216-ClamOnAccLoop-1.0.8

ClamOnAcc: Fix infinite loop when OnAccessIncludePath doesn't exist (1.0.8)

Micah Snyder authored on 2025/01/14 03:56:16
Showing 2 changed files
... ...
@@ -93,13 +93,13 @@ jobs:
93 93
       - uses: actions/checkout@v4
94 94
 
95 95
       - name: Install Build Tools
96
-        run: brew install bison flex
96
+        run: brew install bison flex pipx
97 97
 
98 98
       - name: Install Dependencies
99
-        run: brew install bzip2 check curl-openssl json-c libxml2 ncurses openssl@1.1 pcre2 zlib
99
+        run: brew install bzip2 check curl json-c libxml2 ncurses openssl@3 pcre2 zlib
100 100
 
101 101
       - name: Install pytest for easier to read test results
102
-        run: python3 -m pip install pytest
102
+        run: pipx install pytest
103 103
 
104 104
       - uses: lukka/get-cmake@v3.30.0
105 105
 
... ...
@@ -118,9 +118,9 @@ jobs:
118 118
         # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
119 119
         run:
120 120
           cmake ${{runner.workspace}}/clamav -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }}
121
-          -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl@1.1/
122
-          -DOPENSSL_CRYPTO_LIBRARY=/usr/local/opt/openssl@1.1/lib/libcrypto.1.1.dylib
123
-          -DOPENSSL_SSL_LIBRARY=/usr/local/opt/openssl@1.1/lib/libssl.1.1.dylib
121
+          -DOPENSSL_ROOT_DIR=/opt/homebrew/include/
122
+          -DOPENSSL_CRYPTO_LIBRARY=/opt/homebrew/lib/libcrypto.3.dylib
123
+          -DOPENSSL_SSL_LIBRARY=/opt/homebrew/lib/libssl.3.dylib
124 124
           -DENABLE_STATIC_LIB=ON
125 125
           -DENABLE_EXAMPLES=ON
126 126
 
... ...
@@ -147,13 +147,13 @@ jobs:
147 147
         run: sudo apt-get update
148 148
 
149 149
       - name: Install Build Tools
150
-        run: sudo apt-get install -y bison flex valgrind
150
+        run: sudo apt-get install -y bison flex valgrind pipx
151 151
 
152 152
       - name: Install Dependencies
153 153
         run: sudo apt-get install -y check libbz2-dev libcurl4-openssl-dev libjson-c-dev libmilter-dev libncurses5-dev libpcre3-dev libssl-dev libxml2-dev zlib1g-dev
154 154
 
155 155
       - name: Install pytest for easier to read test results
156
-        run: python3 -m pip install pytest
156
+        run: pipx install pytest
157 157
 
158 158
       - uses: lukka/get-cmake@v3.30.0
159 159
 
... ...
@@ -585,8 +585,8 @@ void *onas_ddd_th(void *arg)
585 585
                         }
586 586
                     }
587 587
                 }
588
-                pt = (struct optstruct *)pt->nextarg;
589 588
             }
589
+            pt = (struct optstruct *)pt->nextarg;
590 590
         }
591 591
     }
592 592