From: Daniel P. Berrange <berrange@redhat.com>
Date: Tue, 5 Mar 2013 15:18:20 +0000 (+0000)
Subject: [zbin] Fix size used for memset in alloc_output_file
X-Git-Tag: v1.20.1~1577
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb5a2ba5962579e514b377f5fdab7292be0fb2a7;p=thirdparty%2Fipxe.git

[zbin] Fix size used for memset in alloc_output_file

The output->buf field is a pointer, not an array, so sizeof() is not
applicable.  We must use the allocated string length instead.

Identified by gcc:

  util/zbin.c: In function ‘alloc_output_file’:
  util/zbin.c:146:37: warning: argument to ‘sizeof’ in ‘memset’ call
    is the same expression as the destination; did you mean to
    dereference it? [-Wsizeof-pointer-memaccess]
  memset ( output->buf, 0xff, sizeof ( output->buf ) );

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
---

diff --git a/src/util/zbin.c b/src/util/zbin.c
index 0dabaf1e3..3b7cf95b3 100644
--- a/src/util/zbin.c
+++ b/src/util/zbin.c
@@ -143,7 +143,7 @@ static int alloc_output_file ( size_t max_len, struct output_file *output ) {
 			  max_len );
 		return -1;
 	}
-	memset ( output->buf, 0xff, sizeof ( output->buf ) );
+	memset ( output->buf, 0xff, max_len );
 	return 0;
 }