[binutils-gdb] resbin: don't pass NULL as printf %s arg

Alan Modra amodra@sourceware.org
Wed May 14 12:29:36 GMT 2025


https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=c6c8d0b82175226b0e87904b613fbac3e704cc28

commit c6c8d0b82175226b0e87904b613fbac3e704cc28
Author: Alan Modra <amodra@gmail.com>
Date:   Wed May 14 17:37:42 2025 +0930

    resbin: don't pass NULL as printf %s arg
    
    Fix three place where a NULL could be passed to "toosmall".

Diff:
---
 binutils/resbin.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/binutils/resbin.c b/binutils/resbin.c
index 3bce84f6766..889126e9e32 100644
--- a/binutils/resbin.c
+++ b/binutils/resbin.c
@@ -1250,7 +1250,7 @@ bin_to_res_version (windres_bfd *wrbfd, const bfd_byte *data,
 
 	      vst = res_alloc (sizeof (rc_ver_stringtable));
 
-	      if (!get_version_header (wrbfd, data, length, (const char *) NULL,
+	      if (!get_version_header (wrbfd, data, length, "version stringtable",
 				       &vst->language, &stverlen, &vallen,
 				       &type, &off))
 		return NULL;
@@ -1284,9 +1284,9 @@ bin_to_res_version (windres_bfd *wrbfd, const bfd_byte *data,
 
 		  vs = res_alloc (sizeof (rc_ver_stringinfo));
 
-		  if (!get_version_header (wrbfd, data, length,
-					   (const char *) NULL, &vs->key,
-					   &sverlen, &vallen, &type, &off))
+		  if (!get_version_header (wrbfd, data, length, "version string",
+					   &vs->key, &sverlen, &vallen,
+					   &type, &off))
 		    return NULL;
 
 		  data += off;
@@ -1348,7 +1348,7 @@ bin_to_res_version (windres_bfd *wrbfd, const bfd_byte *data,
 	  data += off;
 	  length -= off;
 
-	  if (!get_version_header (wrbfd, data, length, (const char *) NULL,
+	  if (!get_version_header (wrbfd, data, length, "version varfileinfo",
 				   &vi->u.var.key, &verlen, &vallen,
 				   &type, &off))
 	    return NULL;


More information about the Binutils-cvs mailing list