From e5fb770e7d9aac53a513965c0f2bcf360934794b Mon Sep 17 00:00:00 2001
From: jbj <devnull@localhost>
Date: Tue, 2 Jul 2002 23:54:35 +0000
Subject: Add boundsread annotations throughout, enable +bounds checking. Start
 narrowing the scope of bounds annotations by adding more annotations.

CVS patchset: 5537
CVS date: 2002/07/02 23:54:35
---
 lib/cpio.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/cpio.c')

diff --git a/lib/cpio.c b/lib/cpio.c
index f5e2733f7..8585b94de 100644
--- a/lib/cpio.c
+++ b/lib/cpio.c
@@ -1,4 +1,3 @@
-/*@-boundsread@*/
 /** \ingroup payload
  * \file lib/cpio.c
  *  Handle cpio payloads within rpm packages.
@@ -55,7 +54,9 @@ static int strntoul(const char *str, /*@out@*/char **endptr, int base, int num)
 	if ( (end - phys) != sizeof(phys) ) return CPIOERR_BAD_HEADER;
 #define SET_NUM_FIELD(phys, val, space) \
 	sprintf(space, "%8.8lx", (unsigned long) (val)); \
-	memcpy(phys, space, 8);
+	/*@-boundsread@*/ \
+	memcpy(phys, space, 8) \
+	/*@=boundsread@*/
 
 int cpioTrailerWrite(FSM_t fsm)
 {
@@ -249,4 +250,3 @@ const char *const cpioStrerror(int rc)
     /*@=branchstate@*/
     return msg;
 }
-/*@=boundsread@*/
-- 
cgit v1.2.3