Automatic date update in version.in

[binutils.git] / libctf / ctf-lookup.c

diff --git a/libctf/ctf-lookup.c b/libctf/ctf-lookup.c
index 6e17e5f4c54e6e7c5658e61dfce8cc48f75a5a4c..26b3f8863c0136a8bcd963a39cb503a4ffa980b3 100644 (file)
--- a/libctf/ctf-lookup.c
+++ b/libctf/ctf-lookup.c
@@ -1,5 +1,5 @@
 /* Symbol, variable and name lookup.
-   Copyright (C) 2019-2021 Free Software Foundation, Inc.
+   Copyright (C) 2019-2022 Free Software Foundation, Inc.
 
    This file is part of libctf.
 
@@ -111,10 +111,14 @@ isqualifier (const char *s, size_t len)
   };
 
   int h = s[len - 1] + (int) len - 105;
-  const struct qual *qp = &qhash[h];
+  const struct qual *qp;
 
-  return (h >= 0 && (size_t) h < sizeof (qhash) / sizeof (qhash[0])
-         && (size_t) len == qp->q_len &&
+  if (h < 0 || (size_t) h >= sizeof (qhash) / sizeof (qhash[0]))
+    return 0;
+
+  qp = &qhash[h];
+
+  return ((size_t) len == qp->q_len &&
          strncmp (qp->q_name, s, qp->q_len) == 0);
 }
 
@@ -172,7 +176,7 @@ ctf_lookup_by_name_internal (ctf_dict_t *fp, ctf_dict_t *child,
          int in_child = 0;
 
          ntype = CTF_ERR;
-         if (child && idx <= child->ctf_pptrtab_len)
+         if (child && idx < child->ctf_pptrtab_len)
            {
              ntype = child->ctf_pptrtab[idx];
              if (ntype)
@@ -202,7 +206,7 @@ ctf_lookup_by_name_internal (ctf_dict_t *fp, ctf_dict_t *child,
              idx = LCTF_TYPE_TO_INDEX (fp, ntype);
 
              ntype = CTF_ERR;
-             if (child && idx <= child->ctf_pptrtab_len)
+             if (child && idx < child->ctf_pptrtab_len)
                {
                  ntype = child->ctf_pptrtab[idx];
                  if (ntype)
@@ -592,9 +596,9 @@ ctf_lookup_symbol_idx (ctf_dict_t *fp, const char *symname)
                                       cache->ctf_symhash_latest) < 0)
                goto oom;
            if (strcmp (sym.st_name, symname) == 0)
-              return cache->ctf_symhash_latest++;
-          }
-          break;
+             return cache->ctf_symhash_latest++;
+         }
+         break;
        case sizeof (Elf32_Sym):
          {
            Elf32_Sym *symp = (Elf32_Sym *) sp->cts_data;
@@ -607,8 +611,8 @@ ctf_lookup_symbol_idx (ctf_dict_t *fp, const char *symname)
                                       cache->ctf_symhash_latest) < 0)
                goto oom;
            if (strcmp (sym.st_name, symname) == 0)
-              return cache->ctf_symhash_latest++;
-          }
+             return cache->ctf_symhash_latest++;
+         }
          break;
        default:
          ctf_set_errno (fp, ECTF_SYMTAB);
@@ -723,7 +727,8 @@ ctf_symbol_next (ctf_dict_t *fp, ctf_next_t **it, const char **name,
 
          *name = ctf_strptr (fp, idx[i->ctn_n]);
          sym = tab[i->ctn_n++];
-       } while (sym == -1u || sym == 0);
+       }
+      while (sym == -1u || sym == 0);
     }
   else
     {
@@ -902,7 +907,7 @@ ctf_lookup_by_sym_or_name (ctf_dict_t *fp, unsigned long symidx,
          if (symidx > fp->ctf_dynsymmax)
            goto try_parent;
 
-          sym = fp->ctf_dynsymidx[symidx];
+         sym = fp->ctf_dynsymidx[symidx];
          err = ECTF_NOTYPEDAT;
          if (!sym || (sym->st_shndx != STT_OBJECT && sym->st_shndx != STT_FUNC))
            goto try_parent;