Made allocations involving sizeof work correctly (test/malloc.c).

[splint.git] / test / moreBufferTests.expect

diff --git a/test/moreBufferTests.expect b/test/moreBufferTests.expect
index 1ebdd143d755ddd85a071f0fef486a873f958506..64e5ccf5028ebe4c4c6b43031f5b491f38094477 100644 (file)
--- a/test/moreBufferTests.expect
+++ b/test/moreBufferTests.expect
@@ -3,43 +3,39 @@ unrecogCall.c: (in function foo)
 unrecogCall.c:8:3: Unrecognized identifier: bar
 initialization.c: (in function initialization)
 initialization.c:5:10: Variable g declared but not used
-initialization.c:8:3: Possible out-of-bounds store.  Unable to resolve
-    constraint:
-    requires: : maxSet ((d @ initialization.c:3:14 ) )  >=  ( 2 ) 
+initialization.c:5:14: Possible out-of-bounds read: e[22]
+    Unable to resolve constraint:
+    requires maxRead(d @ initialization.c:3:14) >= 22
      needed to satisfy precondition:
-    requires: : maxSet ((f @ initialization.c:8:3 ) )  >=  ( 2 ) 
-initialization.c:5:14: Possible out-of-bounds read.  Unable to resolve
-    constraint:
-    requires: : maxRead ((d @ initialization.c:3:14 ) )  >=  ( 22 ) 
+    requires maxRead(e @ initialization.c:5:14) >= 22
+initialization.c:8:3: Possible out-of-bounds store: f[2]
+    Unable to resolve constraint:
+    requires maxSet(d @ initialization.c:3:14) >= 2
      needed to satisfy precondition:
-    requires: : maxRead ((e @ initialization.c:5:14 ) )  >=  ( 22 ) 
+    requires maxSet(f @ initialization.c:8:3) >= 2
 simplifyTest.c: (in function fooSub)
-simplifyTest.c:3:3: Possible out-of-bounds store.  Unable to resolve
-    constraint:
-    requires: : maxSet ((s @ simplifyTest.c:3:3 ) )  >=  (i @
-    simplifyTest.c:3:5 ) 
+simplifyTest.c:3:3: Possible out-of-bounds store: s[i]
+    Unable to resolve constraint:
+    requires maxSet(s @ simplifyTest.c:3:3) >= i @ simplifyTest.c:3:5
      needed to satisfy precondition:
-    requires: : maxSet ((s @ simplifyTest.c:3:3 ) )  >=  (i @
-    simplifyTest.c:3:5 ) 
+    requires maxSet(s @ simplifyTest.c:3:3) >= i @ simplifyTest.c:3:5
 simplifyTest.c: (in function fooAdd)
-simplifyTest.c:10:3: Possible out-of-bounds store.  Unable to resolve
-    constraint:
-    requires: : maxSet ((s @ simplifyTest.c:10:3 ) )  >=  ((i @
-    simplifyTest.c:10:5 ) ) + (( 2 ) )
+simplifyTest.c:10:3: Possible out-of-bounds store: s[i + 2]
+    Unable to resolve constraint:
+    requires maxSet(s @ simplifyTest.c:10:3) >= i @ simplifyTest.c:10:5 + 2
      needed to satisfy precondition:
-    requires: : maxSet ((s @ simplifyTest.c:10:3 ) )  >=  ((i @
-    simplifyTest.c:10:5 ) ) + (( 2 ) )
+    requires maxSet(s @ simplifyTest.c:10:3) >= i @ simplifyTest.c:10:5 + 2
 strncatNotReallyGood.c: (in function NotGoodfunc)
 strncatNotReallyGood.c:4:29: Passed storage buffer not completely defined
                                 (*buffer is undefined): strncat (buffer, ...)
-strncatNotReallyGood.c:4:21: Possible out-of-bounds store.  Unable to resolve
-    constraint:
-    requires: : maxRead ((buffer @ strncatNotReallyGood.c:4:29 ) )  <=  ( 0 ) 
+strncatNotReallyGood.c:4:21: Possible out-of-bounds store:
+    strncat(buffer, str, sizeof((buffer)) - 1)
+    Unable to resolve constraint:
+    requires maxRead(buffer @ strncatNotReallyGood.c:4:29) <= 0
      needed to satisfy precondition:
-    requires: : maxSet ((buffer @ strncatNotReallyGood.c:4:29 ) )  >=  (maxRead
-    ((buffer @ strncatNotReallyGood.c:4:29 ) )) + (( 255 ) )
-     derived from strncat precondition: requires: :
-    maxSet ((<parameter 1> ) )  >=  (maxRead ((<parameter 1> ) )) +
-    ((<parameter 3> ) )
+    requires maxSet(buffer @ strncatNotReallyGood.c:4:29) >= maxRead(buffer @
+    strncatNotReallyGood.c:4:29) + 255
+     derived from strncat precondition: requires maxSet(<parameter 1>) >=
+    maxRead(<parameter 1>) + <parameter 3>
 
-Finished LCLint checking --- 8 code errors found
+Finished checking --- 8 code warnings, as expected