CI: Fixed valgrind memory leak detection logic (false positive)

Author: foxweb

.github/workflows/ci.yml

@@ -10,75 +10,80 @@ jobs:
   build-and-test:
     name: Build and Test
     runs-on: ubuntu-latest
-    
+
     strategy:
       matrix:
         compiler: [gcc, clang]
-    
+
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
-    
+
     - name: Set up environment
       run: |
         if [ "${{ matrix.compiler }}" = "gcc" ]; then
           echo "CC=gcc" >> $GITHUB_ENV
         else
           echo "CC=clang" >> $GITHUB_ENV
         fi
-    
+
     - name: Install dependencies
       run: |
         sudo apt-get update
         sudo apt-get install -y valgrind python3 python3-pip
         pip3 install requests
-    
+
     - name: Build server
       run: |
         make clean
         make
-    
+
     - name: Check for compilation warnings
       run: |
         make clean
         make CFLAGS="-Wall -Wextra -Werror"
-    
+
     - name: Run unit tests
       run: |
         gcc -o tests/test_main tests/test_main.c main.c httpd.c -I. -DTESTING
         ./tests/test_main
-    
+
     - name: Run integration tests
       run: |
         python3 tests/integration_test.py
-    
+
     - name: Memory leak check
       run: |
         # Start server with valgrind
         valgrind --leak-check=full --error-exitcode=1 --log-file=valgrind.log \
           ./server 9999 &
         SERVER_PID=$!
-        
+
         # Wait for server
         sleep 2
-        
+
         # Send test request
         curl -s http://localhost:9999/ || true
-        
+
         # Stop server
         kill -INT $SERVER_PID
         wait $SERVER_PID || true
-        
+
         # Check results
-        if grep -q "definitely lost: 0 bytes" valgrind.log && \
-           grep -q "indirectly lost: 0 bytes" valgrind.log; then
-          echo "✓ No memory leaks detected"
+        echo "=== Valgrind Report ==="
+        cat valgrind.log
+        echo ""
+
+        # Check for memory leaks (multiple possible formats)
+        if grep -q "All heap blocks were freed -- no leaks are possible" valgrind.log || \
+           (grep -q "definitely lost: 0 bytes" valgrind.log && \
+            grep -q "indirectly lost: 0 bytes" valgrind.log); then
+          echo "✅ No memory leaks detected"
         else
-          echo "⚠ Memory leaks detected:"
-          cat valgrind.log
+          echo "❌ Memory leaks detected"
           exit 1
         fi
-    
+
     - name: Static analysis with compiler
       run: |
         $CC -Wall -Wextra -pedantic -fsyntax-only main.c httpd.c 2>&1 | tee static-analysis.log
@@ -88,7 +93,7 @@ jobs:
         else
           echo "✓ No static analysis warnings"
         fi
-    
+
     - name: Upload artifacts on failure
       if: failure()
       uses: actions/upload-artifact@v4
@@ -102,38 +107,38 @@ jobs:
   security-scan:
     name: Security Scan
     runs-on: ubuntu-latest
-    
+
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
-    
+
     - name: Run cppcheck
       run: |
         sudo apt-get update
         sudo apt-get install -y cppcheck
         cppcheck --enable=all --error-exitcode=1 --suppress=missingIncludeSystem \
           main.c httpd.c httpd.h 2>&1 | tee cppcheck.log || true
-        
+
         # Show results but don't fail build on warnings
         if [ -s cppcheck.log ]; then
           echo "⚠ Cppcheck found issues:"
           cat cppcheck.log
         else
           echo "✓ No cppcheck issues found"
         fi
-    
+
     - name: Check for common vulnerabilities
       run: |
         echo "Checking for common security issues..."
-        
+
         # Check for unsafe functions
         if grep -r "gets\|sprintf\|strcpy\|strcat\|scanf" *.c *.h; then
           echo "❌ Found usage of unsafe functions"
           exit 1
         else
           echo "✓ No unsafe function usage found"
         fi
-        
+
         # Check for TODO/FIXME related to security
         if grep -ri "TODO.*security\|FIXME.*security\|XXX.*security" *.c *.h; then
           echo "⚠ Found security-related TODOs"
@@ -144,31 +149,31 @@ jobs:
   documentation:
     name: Documentation Check
     runs-on: ubuntu-latest
-    
+
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
-    
+
     - name: Check for required documentation
       run: |
         echo "Checking documentation..."
-        
+
         files="README.md CONTRIBUTING.md SECURITY.md CHANGELOG.md"
         missing=""
-        
+
         for file in $files; do
           if [ ! -f "$file" ]; then
             missing="$missing $file"
           fi
         done
-        
+
         if [ -n "$missing" ]; then
           echo "❌ Missing documentation files:$missing"
           exit 1
         else
           echo "✓ All required documentation files present"
         fi
-    
+
     - name: Validate markdown
       run: |
         echo "Checking markdown files..."
@@ -188,7 +193,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [build-and-test, security-scan, documentation]
     if: always()
-    
+
     steps:
     - name: Check build status
       run: |

CHANGELOG.md

@@ -56,6 +56,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Unit tests: Added conditional compilation for `main()` function
 - Unit tests: Fixed file path in `test_file_exists_real_file`
 - Unit tests: Updated compilation to include `httpd.c`
+- CI: Fixed valgrind memory leak detection logic (false positive)
 
 ### Security
 - Fixed critical path traversal vulnerability (CVE-TBD)