summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Collingbourne <pcc@google.com>2020-10-22 23:05:11 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-10-22 23:05:11 +0000
commit4a86774d36f1a3c109a7e2da05aca9f9ca33b0df (patch)
tree0cbbb48fc8e77ac87b29049daeefac565a507235
parentbae1b814cddeae589396327273550162a9d556be (diff)
parentebef015a20ca2b7a7b0ec49f94539886312c2705 (diff)
Merge "Fix an out-of-bounds read in assoc_next."
-rw-r--r--qcom/pd-mapper/assoc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/qcom/pd-mapper/assoc.c b/qcom/pd-mapper/assoc.c
index 692c882..460f0d0 100644
--- a/qcom/pd-mapper/assoc.c
+++ b/qcom/pd-mapper/assoc.c
@@ -128,7 +128,7 @@ const char *assoc_next(struct assoc *assoc, void **value, unsigned long *iter)
{
unsigned long it = *iter;
- while (!assoc->keys[it] && it < assoc->size)
+ while (it < assoc->size && !assoc->keys[it])
it++;
if (it == assoc->size)