fix defer with statement between

trailofbits · Oct 13, 2023 · b8e5566 · b8e5566
1 parent 8531f10
commit b8e5566
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/go/racy-append-to-slice.go b/go/racy-append-to-slice.go
@@ -74,8 +74,8 @@ func appendToSlice_FP1() []int {
 		go func(iCpy int) {
 			defer wg.Done()
 			m := iCpy * 2
-			// ok: racy-append-to-slice
 			rMut.Lock()
+			// ok: racy-append-to-slice
 			r = append(r, m)
 			rMut.Unlock()
 		}(i)
@@ -159,9 +159,10 @@ func appendToSlice_FP5() []int {
 		go func(iCpy int) {
 			defer wg.Done()
 			m := iCpy * 2
-			// ok: racy-append-to-slice
 			rMut.Lock()
+			fmt.Println("test")
 			defer rMut.Unlock()
+			// ok: racy-append-to-slice
 			r = append(r, m)
 		}(i)
 	}

diff --git a/go/racy-append-to-slice.yaml b/go/racy-append-to-slice.yaml
@@ -50,5 +50,6 @@ rules:
           $MUTEX.Unlock()
     - pattern-not-inside: |
           $MUTEX.Lock()
+          ...
           defer $MUTEX.Unlock()
           ...
diff --git a/go/racy-write-to-map.go b/go/racy-write-to-map.go
@@ -89,8 +89,8 @@ func appendToMap_FP1() map[int]string {
 		wg.Add(1)
 		go func(iCpy int) {
 			defer wg.Done()
-			// ok: racy-write-to-map
 			rMut.Lock()
+			// ok: racy-write-to-map
 			r[iCpy] = fmt.Sprintf("number-%d", iCpy)
 			rMut.Unlock()
 		}(i)
@@ -174,9 +174,10 @@ func appendToMap_FP5() map[int]string {
 		wg.Add(1)
 		go func(iCpy int) {
 			defer wg.Done()
-			// ok: racy-write-to-map
 			rMut.Lock()
+			fmt.Println("test")
 			defer rMut.Unlock()
+			// ok: racy-write-to-map
 			r[iCpy] = fmt.Sprintf("number-%d", iCpy)
 		}(i)
 	}

diff --git a/go/racy-write-to-map.yaml b/go/racy-write-to-map.yaml
@@ -37,5 +37,6 @@ rules:
           $MUTEX.Unlock()
     - pattern-not-inside: |
           $MUTEX.Lock()
+          ...
           defer $MUTEX.Unlock()
           ...