[v4,31/35] libctf: allow ctf_type_lname of a null pointer.

Message ID 20190924135131.441906-32-nick.alcock@oracle.com
State New
Headers show
Series
  • CTF linking support
Related show

Commit Message

Nick Alcock Sept. 24, 2019, 1:51 p.m.
The code was meant to handle this, but accidentally dereferenced the
null pointer before checking it for nullity.

libctf/
	* ctf-types.c (ctf_type_name): Don't strlen a potentially-
        null pointer.
---
 libctf/ctf-types.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

-- 
2.23.0.239.g28aa4420fd

Patch

diff --git a/libctf/ctf-types.c b/libctf/ctf-types.c
index 6e677622343..ec221d73494 100644
--- a/libctf/ctf-types.c
+++ b/libctf/ctf-types.c
@@ -438,11 +438,12 @@  ssize_t
 ctf_type_lname (ctf_file_t *fp, ctf_id_t type, char *buf, size_t len)
 {
   char *str = ctf_type_aname (fp, type);
-  size_t slen = strlen (str);
+  size_t slen;
 
   if (str == NULL)
     return CTF_ERR;             /* errno is set for us */
 
+  slen = strlen (str);
   snprintf (buf, len, "%s", str);
   free (str);